Add support for lineLimit(_ limit: Int, reservesSpace: Bool)

Author: dfabulich

Sources/SkipUI/SkipUI/Environment/EnvironmentValues.swift

@@ -282,6 +282,11 @@ extension EnvironmentValues {
         set { setBuiltinValue(key: "lineLimit", value: newValue, defaultValue: { nil }) }
     }
 
+    public var lineLimitReservesSpace: Bool? {
+        get { builtinValue(key: "lineLimitReservesSpace", defaultValue: { nil }) as! Bool? }
+        set { setBuiltinValue(key: "lineLimitReservesSpace", value: newValue, defaultValue: { nil }) }
+    }
+
     public var locale: Locale {
         get { Locale(LocalConfiguration.current.locales[0]) }
         set {

Sources/SkipUI/SkipUI/Text/Text.swift

@@ -364,6 +364,8 @@ struct _Text: View, Equatable {
         let textDecoration = textEnvironment.textDecoration
         let textAlign = EnvironmentValues.shared.multilineTextAlignment.asTextAlign()
         let maxLines = max(1, EnvironmentValues.shared.lineLimit ?? Int.MAX_VALUE)
+        let reservesSpace = EnvironmentValues.shared.lineLimitReservesSpace ?? false
+        let minLines = reservesSpace ? maxLines : 1
         let redaction = EnvironmentValues.shared.redactionReasons
         let styleInfo = Text.styleInfo(textEnvironment: textEnvironment, redaction: redaction, context: context)
         let animatable = styleInfo.style.asAnimatable(context: context)
@@ -390,7 +392,7 @@ struct _Text: View, Equatable {
                     }
                 }
             }
-            options = Material3TextOptions(annotatedText: annotatedText, modifier: modifier, color: styleInfo.color ?? androidx.compose.ui.graphics.Color.Unspecified, maxLines: maxLines, style: animatable.value, textDecoration: textDecoration, textAlign: textAlign, onTextLayout: { layoutResult.value = $0 })
+            options = Material3TextOptions(annotatedText: annotatedText, modifier: modifier, color: styleInfo.color ?? androidx.compose.ui.graphics.Color.Unspecified, maxLines: maxLines, minLines: minLines, style: animatable.value, textDecoration: textDecoration, textAlign: textAlign, onTextLayout: { layoutResult.value = $0 })
         } else {
             var text: String
             if let interpolations {
@@ -403,14 +405,15 @@ struct _Text: View, Equatable {
             } else if styleInfo.isLowercased {
                 text = text.lowercased()
             }
-            options = Material3TextOptions(text: text, modifier: context.modifier, color: styleInfo.color ?? androidx.compose.ui.graphics.Color.Unspecified, maxLines: maxLines, style: animatable.value, textDecoration: textDecoration, textAlign: textAlign)
+            options = Material3TextOptions(text: text, modifier: context.modifier, color: styleInfo.color ?? androidx.compose.ui.graphics.Color.Unspecified, maxLines: maxLines, minLines: minLines, style: animatable.value, textDecoration: textDecoration, textAlign: textAlign)
         }
         if let updateOptions = EnvironmentValues.shared._material3Text {
             options = updateOptions(options)
         }
         if let annotatedText = options.annotatedText, let onTextLayout = options.onTextLayout {
             androidx.compose.material3.Text(text: annotatedText, modifier: options.modifier, color: options.color, fontSize: options.fontSize, fontStyle: options.fontStyle, fontWeight: options.fontWeight, fontFamily: options.fontFamily, letterSpacing: options.letterSpacing, textDecoration: options.textDecoration, textAlign: options.textAlign, lineHeight: options.lineHeight, overflow: options.overflow, softWrap: options.softWrap, maxLines: options.maxLines, minLines: options.minLines, onTextLayout: onTextLayout, style: options.style)
         } else {
+            logger.info("text \(options.text) reservesSpace \(reservesSpace) maxLines \(maxLines) minLines \(minLines)")
             androidx.compose.material3.Text(text: options.text ?? "", modifier: options.modifier, color: options.color, fontSize: options.fontSize, fontStyle: options.fontStyle, fontWeight: options.fontWeight, fontFamily: options.fontFamily, letterSpacing: options.letterSpacing, textDecoration: options.textDecoration, textAlign: options.textAlign, lineHeight: options.lineHeight, overflow: options.overflow, softWrap: options.softWrap, maxLines: options.maxLines, minLines: options.minLines, onTextLayout: options.onTextLayout, style: options.style)
         }
     }
@@ -649,9 +652,13 @@ extension View {
         return self
     }
 
-    @available(*, unavailable)
+    // SKIP @bridge
     public func lineLimit(_ limit: Int, reservesSpace: Bool) -> some View {
+        #if SKIP
+        return environment(\.lineLimit, limit).environment(\.lineLimitReservesSpace, reservesSpace)
+        #else
         return self
+        #endif
     }
 
     @available(*, unavailable)