@mathers101/react-native-render-rich-text 0.1.10 → 0.1.14

package/android/src/main/java/com/renderrichtext/utils/text/interaction/TaskListTapUtils.kt

@@ -1,286 +1,286 @@
-package com.renderrichtext.utils.text.interaction
-
-import android.text.Spannable
-import android.text.SpannableStringBuilder
-import android.text.Spanned
-import android.text.style.ForegroundColorSpan
-import android.text.style.StrikethroughSpan
-import android.widget.TextView
-import com.renderrichtext.renderer.SpanStyleCache
-import com.renderrichtext.spans.BaseListSpan
-import com.renderrichtext.spans.CodeBlockSpan
-import com.renderrichtext.spans.ListMarkerAnchorSpan
-import com.renderrichtext.spans.TaskListSpan
-import com.renderrichtext.styles.StyleConfig
-import com.renderrichtext.utils.text.span.SPAN_FLAGS_EXCLUSIVE_EXCLUSIVE
-
-data class TaskListHitTestResult(
-  val taskIndex: Int,
-  val checked: Boolean,
-  val itemText: String,
-)
-
-object TaskListToggleUtils {
-  private val TASK_PATTERN = Regex("""^([ \t]*[-*+][ \t]+)\[[ xX]]""", RegexOption.MULTILINE)
-
-  fun toggleAtIndex(
-    tiptap: String,
-    index: Int,
-    checked: Boolean,
-  ): String {
-    val matches = TASK_PATTERN.findAll(tiptap).toList()
-    if (index < 0 || index >= matches.size) return tiptap
-
-    val match = matches[index]
-    val prefix = match.groupValues[1]
-
-    val replacement = "$prefix[${if (checked) "x" else " "}]"
-
-    return tiptap.replaceRange(match.range, replacement)
-  }
-}
-
-object TaskListTapUtils {
-  fun hitTest(
-    textView: TextView,
-    rawX: Float,
-    rawY: Float,
-  ): TaskListHitTestResult? =
-    with(textView) {
-      val layout = layout ?: return null
-      val spannable = text as? Spanned ?: return null
-
-      val x = rawX.toInt() - totalPaddingLeft + scrollX
-      val y = rawY.toInt() - totalPaddingTop + scrollY
-
-      val line = layout.getLineForVertical(y)
-
-      val taskSpan =
-        spannable
-          .getSpans(
-            layout.getLineStart(line),
-            layout.getLineEnd(line),
-            TaskListSpan::class.java,
-          ).maxByOrNull { it.depth } ?: return null
-
-      val isRtl = layout.getParagraphDirection(line) == android.text.Layout.DIR_RIGHT_TO_LEFT
-      if (isRtl) {
-        val lineRight = layout.getLineRight(line).toInt()
-        val indentWidth = lineRight - layout.getParagraphRight(line).toInt()
-        if (x <= layout.width - indentWidth) return null
-      } else {
-        val lineLeft = layout.getLineLeft(line).toInt()
-        val indentWidth = layout.getParagraphLeft(line).toInt() - lineLeft
-        if (x >= indentWidth) return null
-      }
-
-      val spanStart = spannable.getSpanStart(taskSpan)
-      val spanEnd = spannable.getSpanEnd(taskSpan)
-
-      val itemText =
-        spannable
-          .subSequence(spanStart, spanEnd)
-          .toString()
-          .substringBefore('\n')
-          .trim()
-
-      return TaskListHitTestResult(
-        taskIndex = taskSpan.taskIndex,
-        checked = taskSpan.isChecked,
-        itemText = itemText,
-      )
-    }
-
-  fun updateTaskListItemCheckedState(
-    textView: TextView,
-    targetIndex: Int,
-    newChecked: Boolean,
-    styleConfig: StyleConfig,
-  ): Boolean {
-    val text = textView.text
-    if (text !is Spannable) {
-      return false
-    }
-
-    val spannable = SpannableStringBuilder(text)
-    val targetSpans =
-      spannable
-        .getSpans(0, spannable.length, TaskListSpan::class.java)
-        .filter { it.taskIndex == targetIndex }
-    if (targetSpans.isEmpty()) {
-      return false
-    }
-
-    if (targetSpans.all { it.isChecked == newChecked }) {
-      return true
-    }
-
-    val itemDepth = targetSpans.first().depth
-    val spanStart = targetSpans.minOf { spannable.getSpanStart(it) }
-    val spanEnd = targetSpans.maxOf { spannable.getSpanEnd(it) }
-
-    val styleCache = SpanStyleCache(styleConfig)
-
-    fun toggledCopy(old: TaskListSpan): TaskListSpan =
-      TaskListSpan(
-        taskStyle = styleConfig.taskListStyle,
-        listStyle = styleConfig.listStyle,
-        depth = old.depth,
-        context = textView.context,
-        styleCache = styleCache,
-        taskIndex = targetIndex,
-        isChecked = newChecked,
-        drawsMarker = old.drawsMarker,
-        ancestorMarkerOffset = old.ancestorMarkerOffset,
-        markerExtraWidth = old.markerExtraWidth,
-        parentMarkerWidth = old.parentMarkerWidth,
-      )
-
-    // Layout draws leading margins in insertion order, and a re-added span moves to the end of it.
-    // Re-add the task's spans and everything attached after them (its ancestors) in their original
-    // order; the task's own nested items were attached first and stay where they are.
-    data class ListSpanState(
-      val span: BaseListSpan,
-      val start: Int,
-      val end: Int,
-      val flags: Int,
-    )
-
-    val coveringSpans = spannable.getSpans(spanStart, spanEnd, BaseListSpan::class.java)
-    val firstTarget = coveringSpans.indexOfFirst { it is TaskListSpan && it.taskIndex == targetIndex }
-    val listSpans =
-      coveringSpans.drop(firstTarget).map {
-        ListSpanState(it, spannable.getSpanStart(it), spannable.getSpanEnd(it), spannable.getSpanFlags(it))
-      }
-    listSpans.forEach { spannable.removeSpan(it.span) }
-    for ((old, start, end, flags) in listSpans) {
-      val replacement = if (old is TaskListSpan && old.taskIndex == targetIndex) toggledCopy(old) else old
-      spannable.setSpan(replacement, start, end, flags)
-    }
-
-    // The marker may be drawn by an anchor span wrapping an unattached copy
-    spannable
-      .getSpans(0, spannable.length, ListMarkerAnchorSpan::class.java)
-      .filter { (it.marker as? TaskListSpan)?.taskIndex == targetIndex }
-      .forEach { old ->
-        val start = spannable.getSpanStart(old)
-        val end = spannable.getSpanEnd(old)
-        spannable.removeSpan(old)
-        spannable.setSpan(
-          ListMarkerAnchorSpan(toggledCopy(old.marker as TaskListSpan)),
-          start,
-          end,
-          SPAN_FLAGS_EXCLUSIVE_EXCLUSIVE,
-        )
-      }
-
-    val taskStyle = styleConfig.taskListStyle
-    val checkedTextColor = taskStyle.checkedTextColor
-    val strikethrough = taskStyle.checkedStrikethrough
-
-    val excludedRanges =
-      (
-        spannable.getSpans(spanStart, spanEnd, BaseListSpan::class.java).filter { it.depth > itemDepth } +
-          spannable.getSpans(spanStart, spanEnd, CodeBlockSpan::class.java).toList()
-      ).map { spannable.getSpanStart(it) to spannable.getSpanEnd(it) }
-        .sortedBy { it.first }
-
-    applyDecorationsToRanges(
-      spannable = spannable,
-      spanStart = spanStart,
-      spanEnd = spanEnd,
-      excludedRanges = excludedRanges,
-      isChecked = newChecked,
-      checkedTextColor = checkedTextColor,
-      strikethrough = strikethrough,
-      styleConfig = styleConfig,
-    )
-
-    val imageSpans = text.getSpans(0, text.length, com.renderrichtext.spans.ImageSpan::class.java).toList()
-    val originalSpanStarts = imageSpans.associateWith { text.getSpanStart(it) }
-
-    textView.text = spannable
-
-    val newImageSpans = spannable.getSpans(0, spannable.length, com.renderrichtext.spans.ImageSpan::class.java)
-    imageSpans.forEach { originalSpan ->
-      val matchingSpan =
-        newImageSpans.firstOrNull {
-          it.imageUrl == originalSpan.imageUrl &&
-            spannable.getSpanStart(it) == originalSpanStarts[originalSpan]
-        }
-      (matchingSpan ?: originalSpan).registerTextView(textView)
-    }
-
-    textView.invalidate()
-
-    return true
-  }
-
-  private fun applyDecorationsToRanges(
-    spannable: Spannable,
-    spanStart: Int,
-    spanEnd: Int,
-    excludedRanges: List<Pair<Int, Int>>,
-    isChecked: Boolean,
-    checkedTextColor: Int,
-    strikethrough: Boolean,
-    styleConfig: StyleConfig,
-  ) {
-    var currentPos = spanStart
-    for ((start, end) in excludedRanges) {
-      if (start > currentPos) {
-        if (isChecked) {
-          applyCheckedSpans(spannable, currentPos, start, checkedTextColor, strikethrough)
-        } else {
-          removeCheckedSpans(spannable, currentPos, start, styleConfig)
-        }
-      }
-      currentPos = maxOf(currentPos, end)
-    }
-    if (currentPos < spanEnd) {
-      if (isChecked) {
-        applyCheckedSpans(spannable, currentPos, spanEnd, checkedTextColor, strikethrough)
-      } else {
-        removeCheckedSpans(spannable, currentPos, spanEnd, styleConfig)
-      }
-    }
-  }
-
-  private fun applyCheckedSpans(
-    spannable: Spannable,
-    start: Int,
-    end: Int,
-    color: Int,
-    strikethrough: Boolean,
-  ) {
-    if (color != 0) {
-      spannable.setSpan(ForegroundColorSpan(color), start, end, SPAN_FLAGS_EXCLUSIVE_EXCLUSIVE)
-    }
-    if (strikethrough) {
-      spannable.setSpan(StrikethroughSpan(), start, end, SPAN_FLAGS_EXCLUSIVE_EXCLUSIVE)
-    }
-  }
-
-  private fun removeCheckedSpans(
-    spannable: Spannable,
-    start: Int,
-    end: Int,
-    styleConfig: StyleConfig,
-  ) {
-    val strikethroughSpans = spannable.getSpans(start, end, StrikethroughSpan::class.java)
-    strikethroughSpans.forEach { spannable.removeSpan(it) }
-
-    val colorSpans = spannable.getSpans(start, end, ForegroundColorSpan::class.java)
-    colorSpans.forEach { spannable.removeSpan(it) }
-
-    val listStyleColor = styleConfig.listStyle.color
-    if (listStyleColor != 0) {
-      spannable.setSpan(
-        ForegroundColorSpan(listStyleColor),
-        start,
-        end,
-        Spannable.SPAN_EXCLUSIVE_EXCLUSIVE,
-      )
-    }
-  }
-}
+package com.renderrichtext.utils.text.interaction
+
+import android.text.Spannable
+import android.text.SpannableStringBuilder
+import android.text.Spanned
+import android.text.style.ForegroundColorSpan
+import android.text.style.StrikethroughSpan
+import android.widget.TextView
+import com.renderrichtext.renderer.SpanStyleCache
+import com.renderrichtext.spans.BaseListSpan
+import com.renderrichtext.spans.CodeBlockSpan
+import com.renderrichtext.spans.ListMarkerAnchorSpan
+import com.renderrichtext.spans.TaskListSpan
+import com.renderrichtext.styles.StyleConfig
+import com.renderrichtext.utils.text.span.SPAN_FLAGS_EXCLUSIVE_EXCLUSIVE
+
+data class TaskListHitTestResult(
+  val taskIndex: Int,
+  val checked: Boolean,
+  val itemText: String,
+)
+
+object TaskListToggleUtils {
+  private val TASK_PATTERN = Regex("""^([ \t]*[-*+][ \t]+)\[[ xX]]""", RegexOption.MULTILINE)
+
+  fun toggleAtIndex(
+    tiptap: String,
+    index: Int,
+    checked: Boolean,
+  ): String {
+    val matches = TASK_PATTERN.findAll(tiptap).toList()
+    if (index < 0 || index >= matches.size) return tiptap
+
+    val match = matches[index]
+    val prefix = match.groupValues[1]
+
+    val replacement = "$prefix[${if (checked) "x" else " "}]"
+
+    return tiptap.replaceRange(match.range, replacement)
+  }
+}
+
+object TaskListTapUtils {
+  fun hitTest(
+    textView: TextView,
+    rawX: Float,
+    rawY: Float,
+  ): TaskListHitTestResult? =
+    with(textView) {
+      val layout = layout ?: return null
+      val spannable = text as? Spanned ?: return null
+
+      val x = rawX.toInt() - totalPaddingLeft + scrollX
+      val y = rawY.toInt() - totalPaddingTop + scrollY
+
+      val line = layout.getLineForVertical(y)
+
+      val taskSpan =
+        spannable
+          .getSpans(
+            layout.getLineStart(line),
+            layout.getLineEnd(line),
+            TaskListSpan::class.java,
+          ).maxByOrNull { it.depth } ?: return null
+
+      val isRtl = layout.getParagraphDirection(line) == android.text.Layout.DIR_RIGHT_TO_LEFT
+      if (isRtl) {
+        val lineRight = layout.getLineRight(line).toInt()
+        val indentWidth = lineRight - layout.getParagraphRight(line).toInt()
+        if (x <= layout.width - indentWidth) return null
+      } else {
+        val lineLeft = layout.getLineLeft(line).toInt()
+        val indentWidth = layout.getParagraphLeft(line).toInt() - lineLeft
+        if (x >= indentWidth) return null
+      }
+
+      val spanStart = spannable.getSpanStart(taskSpan)
+      val spanEnd = spannable.getSpanEnd(taskSpan)
+
+      val itemText =
+        spannable
+          .subSequence(spanStart, spanEnd)
+          .toString()
+          .substringBefore('\n')
+          .trim()
+
+      return TaskListHitTestResult(
+        taskIndex = taskSpan.taskIndex,
+        checked = taskSpan.isChecked,
+        itemText = itemText,
+      )
+    }
+
+  fun updateTaskListItemCheckedState(
+    textView: TextView,
+    targetIndex: Int,
+    newChecked: Boolean,
+    styleConfig: StyleConfig,
+  ): Boolean {
+    val text = textView.text
+    if (text !is Spannable) {
+      return false
+    }
+
+    val spannable = SpannableStringBuilder(text)
+    val targetSpans =
+      spannable
+        .getSpans(0, spannable.length, TaskListSpan::class.java)
+        .filter { it.taskIndex == targetIndex }
+    if (targetSpans.isEmpty()) {
+      return false
+    }
+
+    if (targetSpans.all { it.isChecked == newChecked }) {
+      return true
+    }
+
+    val itemDepth = targetSpans.first().depth
+    val spanStart = targetSpans.minOf { spannable.getSpanStart(it) }
+    val spanEnd = targetSpans.maxOf { spannable.getSpanEnd(it) }
+
+    val styleCache = SpanStyleCache(styleConfig)
+
+    fun toggledCopy(old: TaskListSpan): TaskListSpan =
+      TaskListSpan(
+        taskStyle = styleConfig.taskListStyle,
+        listStyle = styleConfig.listStyle,
+        depth = old.depth,
+        context = textView.context,
+        styleCache = styleCache,
+        taskIndex = targetIndex,
+        isChecked = newChecked,
+        drawsMarker = old.drawsMarker,
+        ancestorMarkerOffset = old.ancestorMarkerOffset,
+        markerExtraWidth = old.markerExtraWidth,
+        parentMarkerWidth = old.parentMarkerWidth,
+      )
+
+    // Layout draws leading margins in insertion order, and a re-added span moves to the end of it.
+    // Re-add the task's spans and everything attached after them (its ancestors) in their original
+    // order; the task's own nested items were attached first and stay where they are.
+    data class ListSpanState(
+      val span: BaseListSpan,
+      val start: Int,
+      val end: Int,
+      val flags: Int,
+    )
+
+    val coveringSpans = spannable.getSpans(spanStart, spanEnd, BaseListSpan::class.java)
+    val firstTarget = coveringSpans.indexOfFirst { it is TaskListSpan && it.taskIndex == targetIndex }
+    val listSpans =
+      coveringSpans.drop(firstTarget).map {
+        ListSpanState(it, spannable.getSpanStart(it), spannable.getSpanEnd(it), spannable.getSpanFlags(it))
+      }
+    listSpans.forEach { spannable.removeSpan(it.span) }
+    for ((old, start, end, flags) in listSpans) {
+      val replacement = if (old is TaskListSpan && old.taskIndex == targetIndex) toggledCopy(old) else old
+      spannable.setSpan(replacement, start, end, flags)
+    }
+
+    // The marker may be drawn by an anchor span wrapping an unattached copy
+    spannable
+      .getSpans(0, spannable.length, ListMarkerAnchorSpan::class.java)
+      .filter { (it.marker as? TaskListSpan)?.taskIndex == targetIndex }
+      .forEach { old ->
+        val start = spannable.getSpanStart(old)
+        val end = spannable.getSpanEnd(old)
+        spannable.removeSpan(old)
+        spannable.setSpan(
+          ListMarkerAnchorSpan(toggledCopy(old.marker as TaskListSpan)),
+          start,
+          end,
+          SPAN_FLAGS_EXCLUSIVE_EXCLUSIVE,
+        )
+      }
+
+    val taskStyle = styleConfig.taskListStyle
+    val checkedTextColor = taskStyle.checkedTextColor
+    val strikethrough = taskStyle.checkedStrikethrough
+
+    val excludedRanges =
+      (
+        spannable.getSpans(spanStart, spanEnd, BaseListSpan::class.java).filter { it.depth > itemDepth } +
+          spannable.getSpans(spanStart, spanEnd, CodeBlockSpan::class.java).toList()
+      ).map { spannable.getSpanStart(it) to spannable.getSpanEnd(it) }
+        .sortedBy { it.first }
+
+    applyDecorationsToRanges(
+      spannable = spannable,
+      spanStart = spanStart,
+      spanEnd = spanEnd,
+      excludedRanges = excludedRanges,
+      isChecked = newChecked,
+      checkedTextColor = checkedTextColor,
+      strikethrough = strikethrough,
+      styleConfig = styleConfig,
+    )
+
+    val imageSpans = text.getSpans(0, text.length, com.renderrichtext.spans.ImageSpan::class.java).toList()
+    val originalSpanStarts = imageSpans.associateWith { text.getSpanStart(it) }
+
+    textView.text = spannable
+
+    val newImageSpans = spannable.getSpans(0, spannable.length, com.renderrichtext.spans.ImageSpan::class.java)
+    imageSpans.forEach { originalSpan ->
+      val matchingSpan =
+        newImageSpans.firstOrNull {
+          it.imageUrl == originalSpan.imageUrl &&
+            spannable.getSpanStart(it) == originalSpanStarts[originalSpan]
+        }
+      (matchingSpan ?: originalSpan).registerTextView(textView)
+    }
+
+    textView.invalidate()
+
+    return true
+  }
+
+  private fun applyDecorationsToRanges(
+    spannable: Spannable,
+    spanStart: Int,
+    spanEnd: Int,
+    excludedRanges: List<Pair<Int, Int>>,
+    isChecked: Boolean,
+    checkedTextColor: Int,
+    strikethrough: Boolean,
+    styleConfig: StyleConfig,
+  ) {
+    var currentPos = spanStart
+    for ((start, end) in excludedRanges) {
+      if (start > currentPos) {
+        if (isChecked) {
+          applyCheckedSpans(spannable, currentPos, start, checkedTextColor, strikethrough)
+        } else {
+          removeCheckedSpans(spannable, currentPos, start, styleConfig)
+        }
+      }
+      currentPos = maxOf(currentPos, end)
+    }
+    if (currentPos < spanEnd) {
+      if (isChecked) {
+        applyCheckedSpans(spannable, currentPos, spanEnd, checkedTextColor, strikethrough)
+      } else {
+        removeCheckedSpans(spannable, currentPos, spanEnd, styleConfig)
+      }
+    }
+  }
+
+  private fun applyCheckedSpans(
+    spannable: Spannable,
+    start: Int,
+    end: Int,
+    color: Int,
+    strikethrough: Boolean,
+  ) {
+    if (color != 0) {
+      spannable.setSpan(ForegroundColorSpan(color), start, end, SPAN_FLAGS_EXCLUSIVE_EXCLUSIVE)
+    }
+    if (strikethrough) {
+      spannable.setSpan(StrikethroughSpan(), start, end, SPAN_FLAGS_EXCLUSIVE_EXCLUSIVE)
+    }
+  }
+
+  private fun removeCheckedSpans(
+    spannable: Spannable,
+    start: Int,
+    end: Int,
+    styleConfig: StyleConfig,
+  ) {
+    val strikethroughSpans = spannable.getSpans(start, end, StrikethroughSpan::class.java)
+    strikethroughSpans.forEach { spannable.removeSpan(it) }
+
+    val colorSpans = spannable.getSpans(start, end, ForegroundColorSpan::class.java)
+    colorSpans.forEach { spannable.removeSpan(it) }
+
+    val listStyleColor = styleConfig.listStyle.color
+    if (listStyleColor != 0) {
+      spannable.setSpan(
+        ForegroundColorSpan(listStyleColor),
+        start,
+        end,
+        Spannable.SPAN_EXCLUSIVE_EXCLUSIVE,
+      )
+    }
+  }
+}

package/android/src/main/java/com/renderrichtext/utils/text/span/ApplyLineHeight.kt

@@ -1,39 +1,39 @@
-package com.renderrichtext.utils.text.span
-
-import android.graphics.Paint.FontMetricsInt
-import kotlin.math.ceil
-import kotlin.math.floor
-
-/**
- * Splits extra leading above and below the line, copied from RN
- * CustomLineHeightSpan so we do not depend on React Native internal span types.
- *
- * Mirrors CustomLineHeightSpan.chooseHeight:
- * https://github.com/react/react-native/blob/v0.86.2/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/views/text/internal/span/CustomLineHeightSpan.kt#L44-L57
- *
- * Unlike RN, [lineHeight] is a floor, not a clamp: taller content grows the
- * line instead of being clipped (for example, inline code taller than the paragraph).
- */
-internal fun applyLineHeight(
-  fm: FontMetricsInt,
-  lineHeight: Int,
-  start: Int,
-  end: Int,
-  textLength: Int,
-) {
-  val leading = lineHeight - ((-fm.ascent) + fm.descent)
-
-  // Use lineHeight as a floor: if the default line-height is greater, don't
-  // override it
-  if (leading > 0) {
-    fm.ascent -= ceil(leading / 2.0f).toInt()
-    fm.descent += floor(leading / 2.0f).toInt()
-  }
-
-  if (start == 0) {
-    fm.top = fm.ascent
-  }
-  if (end == textLength) {
-    fm.bottom = fm.descent
-  }
-}
+package com.renderrichtext.utils.text.span
+
+import android.graphics.Paint.FontMetricsInt
+import kotlin.math.ceil
+import kotlin.math.floor
+
+/**
+ * Splits extra leading above and below the line, copied from RN
+ * CustomLineHeightSpan so we do not depend on React Native internal span types.
+ *
+ * Mirrors CustomLineHeightSpan.chooseHeight:
+ * https://github.com/react/react-native/blob/v0.86.2/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/views/text/internal/span/CustomLineHeightSpan.kt#L44-L57
+ *
+ * Unlike RN, [lineHeight] is a floor, not a clamp: taller content grows the
+ * line instead of being clipped (for example, inline code taller than the paragraph).
+ */
+internal fun applyLineHeight(
+  fm: FontMetricsInt,
+  lineHeight: Int,
+  start: Int,
+  end: Int,
+  textLength: Int,
+) {
+  val leading = lineHeight - ((-fm.ascent) + fm.descent)
+
+  // Use lineHeight as a floor: if the default line-height is greater, don't
+  // override it
+  if (leading > 0) {
+    fm.ascent -= ceil(leading / 2.0f).toInt()
+    fm.descent += floor(leading / 2.0f).toInt()
+  }
+
+  if (start == 0) {
+    fm.top = fm.ascent
+  }
+  if (end == textLength) {
+    fm.bottom = fm.descent
+  }
+}