add enable parameter to SelectionContainer

TwidereProject · Dec 31, 2021 · 28cbbb7 · 28cbbb7
1 parent cb3282c
commit 28cbbb7
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 14 deletions.
diff --git a/common/src/commonMain/kotlin/com/twidere/twiderex/component/status/SelectionContainer.kt b/common/src/commonMain/kotlin/com/twidere/twiderex/component/status/SelectionContainer.kt
@@ -45,8 +45,13 @@ class PositionWrapper {
 @Composable
 fun SelectionContainer(
     modifier: Modifier = Modifier,
+    enable: Boolean = true,
     content: @Composable (PositionWrapper?) -> Unit,
 ) {
+    if (!enable) {
+        content.invoke(null)
+        return
+    }
     val positionWrapper = remember {
         if (currentPlatform != Platform.Android) PositionWrapper() else null
     }

diff --git a/common/src/commonMain/kotlin/com/twidere/twiderex/component/status/StatusText.kt b/common/src/commonMain/kotlin/com/twidere/twiderex/component/status/StatusText.kt
@@ -86,27 +86,15 @@ fun ColumnScope.StatusText(
     }
     AnimatedVisibility(visible = expanded) {
         Column {
-            if (isSelectionAble) {
-                SelectionContainer {
-                    HtmlText(
-                        modifier = Modifier.fillMaxWidth(),
-                        htmlText = status.htmlText,
-                        maxLines = maxLines,
-                        linkResolver = { href ->
-                            status.resolveLink(href)
-                        },
-                        positionWrapper = it
-                    )
-                }
-            } else {
+            SelectionContainer(enable = isSelectionAble) {
                 HtmlText(
                     modifier = Modifier.fillMaxWidth(),
                     htmlText = status.htmlText,
                     maxLines = maxLines,
                     linkResolver = { href ->
                         status.resolveLink(href)
                     },
-                    positionWrapper = null
+                    positionWrapper = it
                 )
             }
             if (showMastodonPoll && status.platformType == PlatformType.Mastodon && status.poll != null) {