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

package/android/src/main/java/com/renderrichtext/spans/LinkSpan.kt

@@ -1,68 +1,68 @@
-package com.renderrichtext.spans
-
-import android.content.Context
-import android.graphics.Color
-import android.text.TextPaint
-import android.text.style.ClickableSpan
-import android.view.View
-import com.renderrichtext.EnrichedTiptapText
-import com.renderrichtext.renderer.BlockStyle
-import com.renderrichtext.renderer.SpanStyleCache
-import com.renderrichtext.utils.text.extensions.applyBlockStyleFont
-
-class LinkSpan(
-  val url: String,
-  private val onLinkPress: ((String) -> Unit)?,
-  private val onLinkLongPress: ((String) -> Unit)?,
-  private val styleCache: SpanStyleCache,
-  private val blockStyle: BlockStyle,
-  private val context: Context,
-  val recognizedLink: Boolean = false,
-  // A recognized code span keeps its code font unless a link or variant font is set.
-  private val keepsCodeFont: Boolean = false,
-) : ClickableSpan() {
-  @Volatile
-  private var longPressTriggered = false
-
-  override fun onClick(widget: View) {
-    if (longPressTriggered) {
-      longPressTriggered = false
-      return
-    }
-
-    onLinkPress?.invoke(url) ?: (widget as? EnrichedTiptapText)?.emitOnLinkPress(url)
-  }
-
-  fun onLongClick(widget: View): Boolean {
-    longPressTriggered = true
-
-    (widget as? EnrichedTiptapText)?.emitOnLinkLongPress(url)
-
-    onLinkLongPress?.invoke(url)
-
-    return true
-  }
-
-  override fun updateDrawState(textPaint: TextPaint) {
-    super.updateDrawState(textPaint)
-
-    val variant = styleCache.resolvedVariantForUrl(url)
-
-    val fontFamily = variant?.fontFamily?.takeIf { it.isNotEmpty() } ?: styleCache.linkFontFamily
-    if (fontFamily.isNotEmpty()) {
-      textPaint.textSize = blockStyle.fontSize
-      textPaint.applyBlockStyleFont(blockStyle.copy(fontFamily = fontFamily), context)
-    } else if (!keepsCodeFont) {
-      textPaint.textSize = blockStyle.fontSize
-      textPaint.applyBlockStyleFont(blockStyle, context)
-    }
-
-    textPaint.color = variant?.color ?: styleCache.linkColor
-    textPaint.isUnderlineText = variant?.underline ?: styleCache.linkUnderline
-
-    val backgroundColor = variant?.backgroundColor ?: styleCache.linkBackgroundColor
-    if (Color.alpha(backgroundColor) > 0) {
-      textPaint.bgColor = backgroundColor
-    }
-  }
-}
+package com.renderrichtext.spans
+
+import android.content.Context
+import android.graphics.Color
+import android.text.TextPaint
+import android.text.style.ClickableSpan
+import android.view.View
+import com.renderrichtext.EnrichedTiptapText
+import com.renderrichtext.renderer.BlockStyle
+import com.renderrichtext.renderer.SpanStyleCache
+import com.renderrichtext.utils.text.extensions.applyBlockStyleFont
+
+class LinkSpan(
+  val url: String,
+  private val onLinkPress: ((String) -> Unit)?,
+  private val onLinkLongPress: ((String) -> Unit)?,
+  private val styleCache: SpanStyleCache,
+  private val blockStyle: BlockStyle,
+  private val context: Context,
+  val recognizedLink: Boolean = false,
+  // A recognized code span keeps its code font unless a link or variant font is set.
+  private val keepsCodeFont: Boolean = false,
+) : ClickableSpan() {
+  @Volatile
+  private var longPressTriggered = false
+
+  override fun onClick(widget: View) {
+    if (longPressTriggered) {
+      longPressTriggered = false
+      return
+    }
+
+    onLinkPress?.invoke(url) ?: (widget as? EnrichedTiptapText)?.emitOnLinkPress(url)
+  }
+
+  fun onLongClick(widget: View): Boolean {
+    longPressTriggered = true
+
+    (widget as? EnrichedTiptapText)?.emitOnLinkLongPress(url)
+
+    onLinkLongPress?.invoke(url)
+
+    return true
+  }
+
+  override fun updateDrawState(textPaint: TextPaint) {
+    super.updateDrawState(textPaint)
+
+    val variant = styleCache.resolvedVariantForUrl(url)
+
+    val fontFamily = variant?.fontFamily?.takeIf { it.isNotEmpty() } ?: styleCache.linkFontFamily
+    if (fontFamily.isNotEmpty()) {
+      textPaint.textSize = blockStyle.fontSize
+      textPaint.applyBlockStyleFont(blockStyle.copy(fontFamily = fontFamily), context)
+    } else if (!keepsCodeFont) {
+      textPaint.textSize = blockStyle.fontSize
+      textPaint.applyBlockStyleFont(blockStyle, context)
+    }
+
+    textPaint.color = variant?.color ?: styleCache.linkColor
+    textPaint.isUnderlineText = variant?.underline ?: styleCache.linkUnderline
+
+    val backgroundColor = variant?.backgroundColor ?: styleCache.linkBackgroundColor
+    if (Color.alpha(backgroundColor) > 0) {
+      textPaint.bgColor = backgroundColor
+    }
+  }
+}

package/android/src/main/java/com/renderrichtext/spans/ListItemSpacingSpan.kt

@@ -1,33 +1,33 @@
-package com.renderrichtext.spans
-
-import android.graphics.Paint
-import android.text.Spanned
-import android.text.style.LineHeightSpan
-
-/**
- * Adds vertical spacing between list items using LineHeightSpan.
- *
- * Attached over the newline that separates two items; extends only the line
- * ending at that newline so the gap appears below the preceding item.
- *
- * @param spacing The spacing in pixels to add below the line (0 = no spacing)
- */
-class ListItemSpacingSpan(
-  val spacing: Float,
-) : LineHeightSpan {
-  override fun chooseHeight(
-    text: CharSequence,
-    start: Int,
-    end: Int,
-    spanstartv: Int,
-    lineHeight: Int,
-    fm: Paint.FontMetricsInt,
-  ) {
-    val spanEnd = (text as? Spanned)?.getSpanEnd(this) ?: return
-    if (end != spanEnd) return
-
-    val spacingPixels = spacing.toInt()
-    fm.descent += spacingPixels
-    fm.bottom += spacingPixels
-  }
-}
+package com.renderrichtext.spans
+
+import android.graphics.Paint
+import android.text.Spanned
+import android.text.style.LineHeightSpan
+
+/**
+ * Adds vertical spacing between list items using LineHeightSpan.
+ *
+ * Attached over the newline that separates two items; extends only the line
+ * ending at that newline so the gap appears below the preceding item.
+ *
+ * @param spacing The spacing in pixels to add below the line (0 = no spacing)
+ */
+class ListItemSpacingSpan(
+  val spacing: Float,
+) : LineHeightSpan {
+  override fun chooseHeight(
+    text: CharSequence,
+    start: Int,
+    end: Int,
+    spanstartv: Int,
+    lineHeight: Int,
+    fm: Paint.FontMetricsInt,
+  ) {
+    val spanEnd = (text as? Spanned)?.getSpanEnd(this) ?: return
+    if (end != spanEnd) return
+
+    val spacingPixels = spacing.toInt()
+    fm.descent += spacingPixels
+    fm.bottom += spacingPixels
+  }
+}

package/android/src/main/java/com/renderrichtext/spans/ListMarkerAnchorSpan.kt

@@ -1,38 +1,38 @@
-package com.renderrichtext.spans
-
-import android.graphics.Canvas
-import android.graphics.Paint
-import android.text.Layout
-import android.text.Spanned
-import android.text.style.LeadingMarginSpan
-
-// Draws a list marker on a line owned by another block (code block, nested
-// sublist) without contributing any margin of its own.
-class ListMarkerAnchorSpan(
-  internal val marker: BaseListSpan,
-) : LeadingMarginSpan {
-  override fun getLeadingMargin(first: Boolean): Int = 0
-
-  override fun drawLeadingMargin(
-    c: Canvas,
-    p: Paint,
-    x: Int,
-    dir: Int,
-    top: Int,
-    baseline: Int,
-    bottom: Int,
-    text: CharSequence?,
-    start: Int,
-    end: Int,
-    first: Boolean,
-    layout: Layout?,
-  ) {
-    if (!first) return
-    if (text is Spanned && text.getSpanStart(this) != start) return
-
-    // Pass the paragraph origin: drawMarker reconstructs its offset from depth,
-    // matching the x its own span would receive on a plain text line.
-    val originX = if (dir > 0) 0 else layout?.width ?: 0
-    marker.drawMarkerAt(c, p, originX, dir, top, baseline, bottom, layout, start)
-  }
-}
+package com.renderrichtext.spans
+
+import android.graphics.Canvas
+import android.graphics.Paint
+import android.text.Layout
+import android.text.Spanned
+import android.text.style.LeadingMarginSpan
+
+// Draws a list marker on a line owned by another block (code block, nested
+// sublist) without contributing any margin of its own.
+class ListMarkerAnchorSpan(
+  internal val marker: BaseListSpan,
+) : LeadingMarginSpan {
+  override fun getLeadingMargin(first: Boolean): Int = 0
+
+  override fun drawLeadingMargin(
+    c: Canvas,
+    p: Paint,
+    x: Int,
+    dir: Int,
+    top: Int,
+    baseline: Int,
+    bottom: Int,
+    text: CharSequence?,
+    start: Int,
+    end: Int,
+    first: Boolean,
+    layout: Layout?,
+  ) {
+    if (!first) return
+    if (text is Spanned && text.getSpanStart(this) != start) return
+
+    // Pass the paragraph origin: drawMarker reconstructs its offset from depth,
+    // matching the x its own span would receive on a plain text line.
+    val originX = if (dir > 0) 0 else layout?.width ?: 0
+    marker.drawMarkerAt(c, p, originX, dir, top, baseline, bottom, layout, start)
+  }
+}

package/android/src/main/java/com/renderrichtext/spans/MarginBottomSpan.kt

@@ -1,76 +1,76 @@
-package com.renderrichtext.spans
-
-import android.graphics.Paint
-import android.text.style.LineHeightSpan
-
-/**
- * Adds bottom margin to a block element (paragraphs/headings) using LineHeightSpan.
- *
- * For spacer lines (single newline), sets the line height to exactly marginBottom.
- * For regular lines, adds marginBottom only at paragraph boundaries to preserve lineHeight.
- *
- * @param marginBottom The margin in pixels to add below the block (0 = no margin)
- */
-class MarginBottomSpan(
-  val marginBottom: Float,
-) : LineHeightSpan {
-  override fun chooseHeight(
-    text: CharSequence,
-    start: Int,
-    end: Int,
-    spanstartv: Int,
-    lineHeight: Int,
-    fm: Paint.FontMetricsInt,
-  ) {
-    // Only process lines that end with a newline
-    if (end <= start || text[end - 1] != '\n') {
-      return
-    }
-
-    val marginPixels = marginBottom.toInt()
-
-    // Handle spacer lines (single newline character)
-    if (end - start == 1 && text[start] == '\n') {
-      if (hasContentAfter(text, end)) {
-        // Set line height to exactly marginBottom for spacer lines
-        fm.top = 0
-        fm.ascent = 0
-        fm.descent = marginPixels
-        fm.bottom = marginPixels
-      } else {
-        // No content after - collapse the spacer line to zero height
-        fm.top = 0
-        fm.ascent = 0
-        fm.descent = 0
-        fm.bottom = 0
-      }
-      return
-    }
-
-    // For regular lines, add spacing only if there's content after
-    if (hasContentAfter(text, end)) {
-      fm.descent += marginPixels
-      fm.bottom += marginPixels
-    }
-  }
-
-  /**
-   * Checks if there's non-newline content after the given position.
-   * Used to determine if spacing should be applied (between items) or skipped (after last item).
-   */
-  private fun hasContentAfter(
-    text: CharSequence,
-    pos: Int,
-  ): Boolean {
-    if (pos >= text.length) return false
-
-    // If the next character is a newline, check the character after that
-    if (text[pos] == '\n') {
-      val nextPos = pos + 1
-      if (nextPos >= text.length) return false
-      return text[nextPos] != '\n' // Non-newline = content exists
-    }
-
-    return true // Non-newline content immediately after
-  }
-}
+package com.renderrichtext.spans
+
+import android.graphics.Paint
+import android.text.style.LineHeightSpan
+
+/**
+ * Adds bottom margin to a block element (paragraphs/headings) using LineHeightSpan.
+ *
+ * For spacer lines (single newline), sets the line height to exactly marginBottom.
+ * For regular lines, adds marginBottom only at paragraph boundaries to preserve lineHeight.
+ *
+ * @param marginBottom The margin in pixels to add below the block (0 = no margin)
+ */
+class MarginBottomSpan(
+  val marginBottom: Float,
+) : LineHeightSpan {
+  override fun chooseHeight(
+    text: CharSequence,
+    start: Int,
+    end: Int,
+    spanstartv: Int,
+    lineHeight: Int,
+    fm: Paint.FontMetricsInt,
+  ) {
+    // Only process lines that end with a newline
+    if (end <= start || text[end - 1] != '\n') {
+      return
+    }
+
+    val marginPixels = marginBottom.toInt()
+
+    // Handle spacer lines (single newline character)
+    if (end - start == 1 && text[start] == '\n') {
+      if (hasContentAfter(text, end)) {
+        // Set line height to exactly marginBottom for spacer lines
+        fm.top = 0
+        fm.ascent = 0
+        fm.descent = marginPixels
+        fm.bottom = marginPixels
+      } else {
+        // No content after - collapse the spacer line to zero height
+        fm.top = 0
+        fm.ascent = 0
+        fm.descent = 0
+        fm.bottom = 0
+      }
+      return
+    }
+
+    // For regular lines, add spacing only if there's content after
+    if (hasContentAfter(text, end)) {
+      fm.descent += marginPixels
+      fm.bottom += marginPixels
+    }
+  }
+
+  /**
+   * Checks if there's non-newline content after the given position.
+   * Used to determine if spacing should be applied (between items) or skipped (after last item).
+   */
+  private fun hasContentAfter(
+    text: CharSequence,
+    pos: Int,
+  ): Boolean {
+    if (pos >= text.length) return false
+
+    // If the next character is a newline, check the character after that
+    if (text[pos] == '\n') {
+      val nextPos = pos + 1
+      if (nextPos >= text.length) return false
+      return text[nextPos] != '\n' // Non-newline = content exists
+    }
+
+    return true // Non-newline content immediately after
+  }
+}