try 2

Author: bjdodson-openai

richtext-ui/src/commonMain/kotlin/com/halilibo/richtext/ui/string/Text.kt

@@ -28,7 +28,6 @@ import androidx.compose.ui.graphics.StrokeCap
 import androidx.compose.ui.graphics.isSpecified
 import androidx.compose.ui.layout.layout
 import androidx.compose.ui.text.AnnotatedString
-import androidx.compose.ui.text.LinkAnnotation
 import androidx.compose.ui.text.SpanStyle
 import androidx.compose.ui.text.TextLayoutResult
 import androidx.compose.ui.text.buildAnnotatedString
@@ -116,7 +115,7 @@ public fun RichTextScope.Text(
   val inlineContents = decoratedTextResult.inlineContents
   val decoratedLinkRanges = decoratedTextResult.decoratedLinkRanges
   var textLayoutResult by remember { mutableStateOf<TextLayoutResult?>(null) }
-  val animatedText = if (renderOptions.animate && inlineContents.isEmpty()) {
+  val animatedTextResult = if (renderOptions.animate && inlineContents.isEmpty()) {
     rememberAnimatedText(
       annotated = decoratedTextResult.annotatedString,
       contentColor = contentColor,
@@ -125,44 +124,43 @@ public fun RichTextScope.Text(
       sharedAnimationState = sharedAnimationState,
     )
   } else {
-    decoratedTextResult.annotatedString
+    remember(decoratedTextResult.annotatedString) {
+      AnimatedTextResult(
+        text = decoratedTextResult.annotatedString,
+        activeAnimations = emptyList(),
+      )
+    }
   }
-  val isPartialText = animatedText.text.length < decoratedTextResult.annotatedString.text.length
-  val underlineSpecs = remember(
-    decoratedLinkRanges,
-    resolvedStyle,
-    contentColor,
-    animatedText,
-    isPartialText,
-  ) {
+  val animatedText = animatedTextResult.text
+  val underlineSpecs = remember(decoratedLinkRanges, resolvedStyle, contentColor) {
     decoratedLinkRanges.mapNotNull { range ->
-      if (isPartialText && range.end > animatedText.text.length) return@mapNotNull null
       val linkStyle = range.linkStyleOverride
         ?.invoke(resolvedStyle.linkStyle)
         ?: resolvedStyle.linkStyle
       val underlineColor = range.underlineColor
         ?: linkStyle?.style?.color
           ?.takeIf { it.isSpecified }
         ?: contentColor
-      val textLength = animatedText.text.length
-      val clampedStart = range.start.coerceIn(0, textLength)
-      val clampedEnd = range.end.coerceIn(0, textLength)
-      if (clampedStart >= clampedEnd) return@mapNotNull null
-      val hasLinkAnnotation = animatedText
-        .getLinkAnnotations(clampedStart, clampedEnd)
-        .isNotEmpty()
-      if (!hasLinkAnnotation) return@mapNotNull null
       UnderlineSpec(
         range = range,
         color = underlineColor,
       )
     }
   }
   val underlineModifier = if (underlineSpecs.isNotEmpty()) {
+    val activeAnimations = animatedTextResult.activeAnimations
     Modifier.drawWithContent {
       drawContent()
       val layoutResult = textLayoutResult ?: return@drawWithContent
       underlineSpecs.fastForEach { spec ->
+        if (activeAnimations.any { animation ->
+            animation.startIndex >= spec.range.start &&
+              animation.startIndex < spec.range.end &&
+              animation.alpha < 1f
+          }
+        ) {
+          return@fastForEach
+        }
         drawUnderline(
           layoutResult = layoutResult,
           start = spec.range.start,
@@ -319,14 +317,19 @@ public class MarkdownAnimationState {
     (lastAnimationStartMs - System.currentTimeMillis()).coerceAtLeast(0).toInt()
 }
 
+private data class AnimatedTextResult(
+  val text: AnnotatedString,
+  val activeAnimations: Collection<TextAnimation>,
+)
+
 @Composable
 private fun rememberAnimatedText(
   annotated: AnnotatedString,
   renderOptions: RichTextRenderOptions,
   contentColor: Color,
   sharedAnimationState: MarkdownAnimationState,
   isLeafText: Boolean,
-): AnnotatedString {
+): AnimatedTextResult {
   val coroutineScope = rememberCoroutineScope()
   val animations = remember { mutableStateMapOf<Int, TextAnimation>() }
   val textToRender = remember { mutableStateOf(AnnotatedString("")) }
@@ -398,10 +401,13 @@ private fun rememberAnimatedText(
     // the text will just be re-drawn, since the animated alpha state was read only inside
     // DynamicSolidColor during the draw phase.
     derivedStateOf {
-      textToRender.value.withDynamicColorPhrases(
-        contentColor = contentColor,
-        animations = animations.values,
-        onlyVisible = renderOptions.onlyRenderVisibleText,
+      AnimatedTextResult(
+        text = textToRender.value.withDynamicColorPhrases(
+          contentColor = contentColor,
+          animations = animations.values,
+          onlyVisible = renderOptions.onlyRenderVisibleText,
+        ),
+        activeAnimations = animations.values.toList(),
       )
     }
   }.value
@@ -461,17 +467,7 @@ private fun AnnotatedString.withDynamicColor(color: Color, alpha: () -> Float):
     start = 0,
     end = length
   )
-  val builder = AnnotatedString.Builder(text)
-  subStyles.fastForEach { builder.addStyle(it.item, it.start, it.end) }
-  builder.addStyle(fullStyle.item, fullStyle.start, fullStyle.end)
-  paragraphStyles.fastForEach { builder.addStyle(it.item, it.start, it.end) }
-  getLinkAnnotations(0, length).fastForEach { annotation ->
-    when (val link = annotation.item) {
-      is LinkAnnotation.Url -> builder.addLink(link, annotation.start, annotation.end)
-      is LinkAnnotation.Clickable -> builder.addLink(link, annotation.start, annotation.end)
-    }
-  }
-  return builder.toAnnotatedString()
+  return AnnotatedString(text, subStyles + fullStyle)
 }
 
 private fun CharSequence.maybeContainsEmojis(): Boolean {