Be a bit smarter about parenthesis pairs, add another preview as a test.

element-hq · Jan 29, 2025 · da1a9d1 · da1a9d1
1 parent 34d9d64
commit da1a9d1
Showing 1 changed file with 17 additions and 6 deletions.
diff --git a/...src/main/kotlin/io/element/android/libraries/designsystem/components/ClickableLinkText.kt b/...src/main/kotlin/io/element/android/libraries/designsystem/components/ClickableLinkText.kt
@@ -176,18 +176,17 @@ private fun adjustEndIndex(spannable: SpannableString, start: Int, end: Int): In
     var end = end
 
     // Trailing punctuation found, adjust the end index
-    while (spannable[end - 1] in sequenceOf('.', ',', ';', ':', '!', '?') && end > start) {
+    while (spannable[end - 1] in sequenceOf('.', ',', ';', ':', '!', '?', '…') && end > start) {
         end--
     }
 
     // If the last character is a closing parenthesis, check if it's part of a pair
     if (spannable[end - 1] == ')' && end > start) {
-        val lastChar = spannable[end - 1]
         val linkifiedTextLastPath = spannable.substring(start, end).substringAfterLast('/')
+        val closingParenthesisCount = linkifiedTextLastPath.count { it == ')' }
+        val openingParenthesisCount = linkifiedTextLastPath.count { it == '(' }
         // If it's not part of a pair, remove it from the link span by adjusting the end index
-        if (!linkifiedTextLastPath.contains('(')) {
-            end--
-        }
+        end -= closingParenthesisCount - openingParenthesisCount
     }
     return end
 }
@@ -208,7 +207,19 @@ internal fun ClickableLinkTextPreview() = ElementThemedPreview {
 @Composable
 internal fun ClickableLinkTextWithParenthesisPreview() = ElementThemedPreview {
     ClickableLinkText(
-        annotatedString = AnnotatedString("Does this work (url: github.com/element-hq/element-x-android/README?)?!.", ParagraphStyle()),
+        annotatedString = AnnotatedString("Does this work (url: github.com/element-hq/element-x-android/README?)?.", ParagraphStyle()),
+        linkAnnotationTag = "",
+        onClick = {},
+        onLongClick = {},
+        interactionSource = remember { MutableInteractionSource() },
+    )
+}
+
+@Preview(group = PreviewGroup.Text)
+@Composable
+internal fun ClickableLinkTextWithParenthesisInsideUrlPreview() = ElementThemedPreview {
+    ClickableLinkText(
+        annotatedString = AnnotatedString("Does this work ((url: github.com/element-hq/element-x-android/READ(ME)))!", ParagraphStyle()),
         linkAnnotationTag = "",
         onClick = {},
         onLongClick = {},