From 223bf662ce64ad209278bf312c999d3b8d844a4f Mon Sep 17 00:00:00 2001
From: fankesyooni <qzmmcn@163.com>
Date: Sat, 2 Dec 2023 14:00:38 +0800
Subject: [PATCH] refactor: make softWrap follow singleLine and change overflow
 default to TextOverflow.Ellipsis in Text

---
 .../kotlin/com/highcapable/flexiui/component/Text.kt      | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/flexiui-core/src/commonMain/kotlin/com/highcapable/flexiui/component/Text.kt b/flexiui-core/src/commonMain/kotlin/com/highcapable/flexiui/component/Text.kt
index dfb5ff6..044c74a 100644
--- a/flexiui-core/src/commonMain/kotlin/com/highcapable/flexiui/component/Text.kt
+++ b/flexiui-core/src/commonMain/kotlin/com/highcapable/flexiui/component/Text.kt
@@ -44,11 +44,11 @@ fun Text(
     modifier: Modifier = Modifier,
     color: Color = Color.Unspecified,
     style: TextStyle = Text.style,
-    overflow: TextOverflow = TextOverflow.Clip,
-    softWrap: Boolean = true,
     singleLine: Boolean = false,
     maxLines: Int = if (singleLine) 1 else Int.MAX_VALUE,
     minLines: Int = 1,
+    overflow: TextOverflow = TextOverflow.Ellipsis,
+    softWrap: Boolean = !singleLine || maxLines > 1,
     onTextLayout: (TextLayoutResult) -> Unit = {}
 ) {
     Text(
@@ -71,11 +71,11 @@ fun Text(
     modifier: Modifier = Modifier,
     color: Color = Color.Unspecified,
     style: TextStyle = Text.style,
-    overflow: TextOverflow = TextOverflow.Clip,
-    softWrap: Boolean = true,
     singleLine: Boolean = false,
     maxLines: Int = if (singleLine) 1 else Int.MAX_VALUE,
     minLines: Int = 1,
+    overflow: TextOverflow = TextOverflow.Ellipsis,
+    softWrap: Boolean = !singleLine || maxLines > 1,
     inlineContent: Map<String, InlineTextContent> = mapOf(),
     onTextLayout: (TextLayoutResult) -> Unit = {}
 ) {