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

package/android/src/main/java/com/renderrichtext/utils/text/extensions/ParagraphUtils.kt

@@ -1,9 +1,9 @@
-package com.renderrichtext.utils.text.extensions
-
-import com.renderrichtext.parser.TiptapASTNode
-
-fun TiptapASTNode.containsBlockImage(): Boolean {
-  if (type != TiptapASTNode.NodeType.Paragraph) return false
-  val firstChild = children.firstOrNull()
-  return firstChild != null && children.size == 1 && firstChild.type == TiptapASTNode.NodeType.Image
-}
+package com.renderrichtext.utils.text.extensions
+
+import com.renderrichtext.parser.TiptapASTNode
+
+fun TiptapASTNode.containsBlockImage(): Boolean {
+  if (type != TiptapASTNode.NodeType.Paragraph) return false
+  val firstChild = children.firstOrNull()
+  return firstChild != null && children.size == 1 && firstChild.type == TiptapASTNode.NodeType.Image
+}

package/android/src/main/java/com/renderrichtext/utils/text/extensions/SpannableExtensions.kt

@@ -1,9 +1,9 @@
-package com.renderrichtext.utils.text.extensions
-
-import android.text.SpannableStringBuilder
-
-fun SpannableStringBuilder.isInlineImage(): Boolean {
-  if (isEmpty()) return false
-  val lastChar = last()
-  return lastChar != '\n' && lastChar != '\u200B'
-}
+package com.renderrichtext.utils.text.extensions
+
+import android.text.SpannableStringBuilder
+
+fun SpannableStringBuilder.isInlineImage(): Boolean {
+  if (isEmpty()) return false
+  val lastChar = last()
+  return lastChar != '\n' && lastChar != '\u200B'
+}

package/android/src/main/java/com/renderrichtext/utils/text/extensions/TextPaintExtensions.kt

@@ -1,76 +1,76 @@
-package com.renderrichtext.utils.text.extensions
-
-import android.content.Context
-import android.graphics.Typeface
-import android.text.TextPaint
-import com.facebook.react.common.ReactConstants
-import com.facebook.react.views.text.ReactTypefaceUtils.applyStyles
-import com.facebook.react.views.text.ReactTypefaceUtils.parseFontWeight
-import com.renderrichtext.renderer.BlockStyle
-import com.renderrichtext.styles.CodeBlockStyle
-
-fun TextPaint.applyColorPreserving(
-  color: Int,
-  vararg preserveColors: Int,
-) {
-  if (this.color !in preserveColors) {
-    this.color = color
-  }
-}
-
-private val typefaceCache = mutableMapOf<String, Typeface>()
-private val fontWeightCache = mutableMapOf<String?, Int>()
-
-fun TextPaint.applyBlockStyleFont(
-  blockStyle: BlockStyle,
-  context: Context,
-) {
-  val cacheKey = "${blockStyle.fontFamily}|${blockStyle.fontWeight}"
-
-  val cachedTypeface = typefaceCache[cacheKey]
-  if (cachedTypeface != null) {
-    this.typeface = cachedTypeface
-    return
-  }
-
-  val fontWeight =
-    fontWeightCache.getOrPut(blockStyle.fontWeight) {
-      parseFontWeight(blockStyle.fontWeight)
-    }
-
-  // Pass null as base typeface - this matches React Native Text behavior
-  // applyStyles will use ReactFontManager to load custom fonts from assets
-  val newTypeface =
-    applyStyles(
-      null, // Let applyStyles handle font loading from assets
-      ReactConstants.UNSET,
-      fontWeight,
-      blockStyle.fontFamily.takeIf { it.isNotEmpty() },
-      context.assets,
-    )
-
-  typefaceCache[cacheKey] = newTypeface
-  this.typeface = newTypeface
-}
-
-/**
- * Code block text sizing and font, shared by both flavors (CodeBlockSpan for
- * commonmark, CodeBlockContainerView for github) so the code always renders
- * and measures with the same paint. Color is applied by the callers: the span
- * needs color preserving, the view colors via the text view.
- */
-fun TextPaint.applyCodeBlockTextStyle(
-  style: CodeBlockStyle,
-  context: Context,
-) {
-  textSize = style.fontSize
-  applyBlockStyleFont(
-    BlockStyle(
-      fontSize = style.fontSize,
-      fontFamily = style.fontFamily,
-      fontWeight = style.fontWeight,
-      color = style.color,
-    ),
-    context,
-  )
-}
+package com.renderrichtext.utils.text.extensions
+
+import android.content.Context
+import android.graphics.Typeface
+import android.text.TextPaint
+import com.facebook.react.common.ReactConstants
+import com.facebook.react.views.text.ReactTypefaceUtils.applyStyles
+import com.facebook.react.views.text.ReactTypefaceUtils.parseFontWeight
+import com.renderrichtext.renderer.BlockStyle
+import com.renderrichtext.styles.CodeBlockStyle
+
+fun TextPaint.applyColorPreserving(
+  color: Int,
+  vararg preserveColors: Int,
+) {
+  if (this.color !in preserveColors) {
+    this.color = color
+  }
+}
+
+private val typefaceCache = mutableMapOf<String, Typeface>()
+private val fontWeightCache = mutableMapOf<String?, Int>()
+
+fun TextPaint.applyBlockStyleFont(
+  blockStyle: BlockStyle,
+  context: Context,
+) {
+  val cacheKey = "${blockStyle.fontFamily}|${blockStyle.fontWeight}"
+
+  val cachedTypeface = typefaceCache[cacheKey]
+  if (cachedTypeface != null) {
+    this.typeface = cachedTypeface
+    return
+  }
+
+  val fontWeight =
+    fontWeightCache.getOrPut(blockStyle.fontWeight) {
+      parseFontWeight(blockStyle.fontWeight)
+    }
+
+  // Pass null as base typeface - this matches React Native Text behavior
+  // applyStyles will use ReactFontManager to load custom fonts from assets
+  val newTypeface =
+    applyStyles(
+      null, // Let applyStyles handle font loading from assets
+      ReactConstants.UNSET,
+      fontWeight,
+      blockStyle.fontFamily.takeIf { it.isNotEmpty() },
+      context.assets,
+    )
+
+  typefaceCache[cacheKey] = newTypeface
+  this.typeface = newTypeface
+}
+
+/**
+ * Code block text sizing and font, shared by both flavors (CodeBlockSpan for
+ * commonmark, CodeBlockContainerView for github) so the code always renders
+ * and measures with the same paint. Color is applied by the callers: the span
+ * needs color preserving, the view colors via the text view.
+ */
+fun TextPaint.applyCodeBlockTextStyle(
+  style: CodeBlockStyle,
+  context: Context,
+) {
+  textSize = style.fontSize
+  applyBlockStyleFont(
+    BlockStyle(
+      fontSize = style.fontSize,
+      fontFamily = style.fontFamily,
+      fontWeight = style.fontWeight,
+      color = style.color,
+    ),
+    context,
+  )
+}

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

@@ -1,61 +1,61 @@
-package com.renderrichtext.utils.text.interaction
-
-import android.view.MotionEvent
-import android.view.ViewConfiguration
-import android.widget.TextView
-import com.renderrichtext.utils.text.interaction.TaskListHitTestResult
-import com.renderrichtext.utils.text.interaction.TaskListTapUtils
-import kotlin.math.abs
-
-class CheckboxTouchHelper(
-  private val textView: TextView,
-) {
-  var onCheckboxTap: ((taskIndex: Int, checked: Boolean, itemText: String) -> Unit)? = null
-
-  /**
-   * When false, checkbox taps are ignored: hit-testing is skipped and no
-   * gesture is consumed, so the tap falls through to the text view unchanged.
-   */
-  var isEnabled: Boolean = true
-
-  private var touchDownX = 0f
-  private var touchDownY = 0f
-  private var pendingHit: TaskListHitTestResult? = null
-  private val touchSlop: Int by lazy { ViewConfiguration.get(textView.context).scaledTouchSlop }
-
-  /** Returns `true` if the event was consumed by a checkbox gesture. */
-  fun onTouchEvent(event: MotionEvent): Boolean {
-    if (!isEnabled) return false
-    when (event.actionMasked) {
-      MotionEvent.ACTION_DOWN -> {
-        val hit = TaskListTapUtils.hitTest(textView, event.x, event.y) ?: return false
-        touchDownX = event.x
-        touchDownY = event.y
-        pendingHit = hit
-        return true
-      }
-
-      MotionEvent.ACTION_MOVE -> {
-        if (pendingHit != null && isExceedingSlop(event)) {
-          pendingHit = null
-        }
-      }
-
-      MotionEvent.ACTION_UP -> {
-        val hit = pendingHit ?: return false
-        pendingHit = null
-        if (!isExceedingSlop(event)) {
-          onCheckboxTap?.invoke(hit.taskIndex, hit.checked, hit.itemText)
-        }
-        return true
-      }
-
-      MotionEvent.ACTION_CANCEL -> {
-        pendingHit = null
-      }
-    }
-    return pendingHit != null
-  }
-
-  private fun isExceedingSlop(event: MotionEvent): Boolean = abs(event.x - touchDownX) > touchSlop || abs(event.y - touchDownY) > touchSlop
-}
+package com.renderrichtext.utils.text.interaction
+
+import android.view.MotionEvent
+import android.view.ViewConfiguration
+import android.widget.TextView
+import com.renderrichtext.utils.text.interaction.TaskListHitTestResult
+import com.renderrichtext.utils.text.interaction.TaskListTapUtils
+import kotlin.math.abs
+
+class CheckboxTouchHelper(
+  private val textView: TextView,
+) {
+  var onCheckboxTap: ((taskIndex: Int, checked: Boolean, itemText: String) -> Unit)? = null
+
+  /**
+   * When false, checkbox taps are ignored: hit-testing is skipped and no
+   * gesture is consumed, so the tap falls through to the text view unchanged.
+   */
+  var isEnabled: Boolean = true
+
+  private var touchDownX = 0f
+  private var touchDownY = 0f
+  private var pendingHit: TaskListHitTestResult? = null
+  private val touchSlop: Int by lazy { ViewConfiguration.get(textView.context).scaledTouchSlop }
+
+  /** Returns `true` if the event was consumed by a checkbox gesture. */
+  fun onTouchEvent(event: MotionEvent): Boolean {
+    if (!isEnabled) return false
+    when (event.actionMasked) {
+      MotionEvent.ACTION_DOWN -> {
+        val hit = TaskListTapUtils.hitTest(textView, event.x, event.y) ?: return false
+        touchDownX = event.x
+        touchDownY = event.y
+        pendingHit = hit
+        return true
+      }
+
+      MotionEvent.ACTION_MOVE -> {
+        if (pendingHit != null && isExceedingSlop(event)) {
+          pendingHit = null
+        }
+      }
+
+      MotionEvent.ACTION_UP -> {
+        val hit = pendingHit ?: return false
+        pendingHit = null
+        if (!isExceedingSlop(event)) {
+          onCheckboxTap?.invoke(hit.taskIndex, hit.checked, hit.itemText)
+        }
+        return true
+      }
+
+      MotionEvent.ACTION_CANCEL -> {
+        pendingHit = null
+      }
+    }
+    return pendingHit != null
+  }
+
+  private fun isExceedingSlop(event: MotionEvent): Boolean = abs(event.x - touchDownX) > touchSlop || abs(event.y - touchDownY) > touchSlop
+}