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

package/android/src/main/java/com/renderrichtext/renderer/ListRenderer.kt

@@ -1,133 +1,133 @@
-package com.renderrichtext.renderer
-
-import android.text.SpannableStringBuilder
-import com.renderrichtext.parser.TiptapASTNode
-import com.renderrichtext.spans.ListItemSpacingSpan
-import com.renderrichtext.spans.MarginBottomSpan
-import com.renderrichtext.spans.OrderedListSpan
-import com.renderrichtext.styles.ListStyle
-import com.renderrichtext.utils.text.span.SPAN_FLAGS_EXCLUSIVE_EXCLUSIVE
-import com.renderrichtext.utils.text.span.applyLineHeightSkippingImages
-import com.renderrichtext.utils.text.span.applyMarginTop
-
-class ListRenderer(
-  private val config: RendererConfig,
-  private val isOrdered: Boolean,
-) : NodeRenderer {
-  override fun render(
-    node: TiptapASTNode,
-    builder: SpannableStringBuilder,
-    onLinkPress: ((String) -> Unit)?,
-    onLinkLongPress: ((String) -> Unit)?,
-    onFactoidPress: ((String) -> Unit)?,
-    factory: RendererFactory,
-  ) {
-    val start = builder.length
-    val listStyle = config.style.listStyle
-    val listType = if (isOrdered) BlockStyleContext.ListType.ORDERED else BlockStyleContext.ListType.UNORDERED
-
-    val startNumber =
-      if (isOrdered) {
-        node.getAttribute("start")?.toIntOrNull()?.coerceAtLeast(0) ?: 1
-      } else {
-        1
-      }
-
-    val markerExtraWidth = if (isOrdered) markerExtraWidth(node, listStyle, startNumber, factory) else 0f
-    val contextManager = ListContextManager(factory.blockStyleContext)
-    val entryState = contextManager.enterList(listType, listStyle, startNumber, markerExtraWidth)
-
-    // For top-level lists, insert marginTop spacer before rendering content
-    if (entryState.previousDepth == 0) {
-      applyMarginTop(builder, start, listStyle.marginTop)
-    }
-
-    // Track start index after the potential 1-character marginTop spacer
-    val contentStart = if (entryState.previousDepth == 0 && listStyle.marginTop > 0) start + 1 else start
-
-    // Ensure nested lists start on a new line if the parent hasn't provided one
-    if (entryState.previousDepth > 0 && builder.isNotEmpty() && builder.last() != '\n') {
-      builder.append("\n")
-    }
-
-    try {
-      factory.renderChildren(node, builder, onLinkPress, onLinkLongPress, onFactoidPress)
-    } finally {
-      contextManager.exitList(entryState)
-    }
-
-    if (builder.length > contentStart) {
-      applyListSpacing(builder, contentStart, entryState.previousDepth, listStyle, factory.blockStyleContext)
-    }
-  }
-
-  /** Lists under 100 keep the `99.` column, so only numbers from 100 on widen it. Task items draw a checkbox. */
-  private fun markerExtraWidth(
-    node: TiptapASTNode,
-    listStyle: ListStyle,
-    startNumber: Int,
-    factory: RendererFactory,
-  ): Float {
-    val wideNumbers = mutableListOf<Int>()
-    var number = startNumber
-    for (item in node.children) {
-      if (item.type != TiptapASTNode.NodeType.ListItem) continue
-      if (number >= 100 && item.attributes["isTask"] != "true") wideNumbers += number
-      number++
-    }
-    return OrderedListSpan.measureExtraWidth(listStyle, factory.context, wideNumbers)
-  }
-
-  private fun applyListSpacing(
-    builder: SpannableStringBuilder,
-    start: Int,
-    depth: Int,
-    style: ListStyle,
-    styleContext: BlockStyleContext,
-  ) {
-    // TODO: LineHeightSpan may also clip superscript/subscript glyphs that extend
-    // outside the normal line bounds. A similar "skip" strategy as for images may
-    // be needed here once super/subscript usage in practice is better understood.
-    applyLineHeightSkippingImages(builder, start, builder.length, style.lineHeight)
-
-    // Item spacing and external bottom margin are only handled by the root-level list
-    if (depth == 0) {
-      applyItemSpacing(builder, start, style.itemSpacing, styleContext)
-
-      builder.append("\n")
-      builder.setSpan(
-        MarginBottomSpan(style.marginBottom),
-        builder.length - 1,
-        builder.length,
-        SPAN_FLAGS_EXCLUSIVE_EXCLUSIVE,
-      )
-    }
-  }
-
-  // Inserts the vertical gap between consecutive items (including nested ones)
-  // by spanning the newline that precedes each item start. The first item of
-  // the root list gets no spacing above it.
-  private fun applyItemSpacing(
-    builder: SpannableStringBuilder,
-    start: Int,
-    itemSpacing: Float,
-    styleContext: BlockStyleContext,
-  ) {
-    if (itemSpacing <= 0f) return
-
-    val itemStarts =
-      styleContext.listItemStarts
-        .filter { it in start until builder.length }
-        .distinct()
-        .sorted()
-
-    for (itemStart in itemStarts.drop(1)) {
-      builder.setSpan(
-        ListItemSpacingSpan(itemSpacing),
-        itemStart - 1,
-        itemStart,
-        SPAN_FLAGS_EXCLUSIVE_EXCLUSIVE,
-      )
-    }
-  }
-}
+package com.renderrichtext.renderer
+
+import android.text.SpannableStringBuilder
+import com.renderrichtext.parser.TiptapASTNode
+import com.renderrichtext.spans.ListItemSpacingSpan
+import com.renderrichtext.spans.MarginBottomSpan
+import com.renderrichtext.spans.OrderedListSpan
+import com.renderrichtext.styles.ListStyle
+import com.renderrichtext.utils.text.span.SPAN_FLAGS_EXCLUSIVE_EXCLUSIVE
+import com.renderrichtext.utils.text.span.applyLineHeightSkippingImages
+import com.renderrichtext.utils.text.span.applyMarginTop
+
+class ListRenderer(
+  private val config: RendererConfig,
+  private val isOrdered: Boolean,
+) : NodeRenderer {
+  override fun render(
+    node: TiptapASTNode,
+    builder: SpannableStringBuilder,
+    onLinkPress: ((String) -> Unit)?,
+    onLinkLongPress: ((String) -> Unit)?,
+    onFactoidPress: ((String) -> Unit)?,
+    factory: RendererFactory,
+  ) {
+    val start = builder.length
+    val listStyle = config.style.listStyle
+    val listType = if (isOrdered) BlockStyleContext.ListType.ORDERED else BlockStyleContext.ListType.UNORDERED
+
+    val startNumber =
+      if (isOrdered) {
+        node.getAttribute("start")?.toIntOrNull()?.coerceAtLeast(0) ?: 1
+      } else {
+        1
+      }
+
+    val markerExtraWidth = if (isOrdered) markerExtraWidth(node, listStyle, startNumber, factory) else 0f
+    val contextManager = ListContextManager(factory.blockStyleContext)
+    val entryState = contextManager.enterList(listType, listStyle, startNumber, markerExtraWidth)
+
+    // For top-level lists, insert marginTop spacer before rendering content
+    if (entryState.previousDepth == 0) {
+      applyMarginTop(builder, start, listStyle.marginTop)
+    }
+
+    // Track start index after the potential 1-character marginTop spacer
+    val contentStart = if (entryState.previousDepth == 0 && listStyle.marginTop > 0) start + 1 else start
+
+    // Ensure nested lists start on a new line if the parent hasn't provided one
+    if (entryState.previousDepth > 0 && builder.isNotEmpty() && builder.last() != '\n') {
+      builder.append("\n")
+    }
+
+    try {
+      factory.renderChildren(node, builder, onLinkPress, onLinkLongPress, onFactoidPress)
+    } finally {
+      contextManager.exitList(entryState)
+    }
+
+    if (builder.length > contentStart) {
+      applyListSpacing(builder, contentStart, entryState.previousDepth, listStyle, factory.blockStyleContext)
+    }
+  }
+
+  /** Lists under 100 keep the `99.` column, so only numbers from 100 on widen it. Task items draw a checkbox. */
+  private fun markerExtraWidth(
+    node: TiptapASTNode,
+    listStyle: ListStyle,
+    startNumber: Int,
+    factory: RendererFactory,
+  ): Float {
+    val wideNumbers = mutableListOf<Int>()
+    var number = startNumber
+    for (item in node.children) {
+      if (item.type != TiptapASTNode.NodeType.ListItem) continue
+      if (number >= 100 && item.attributes["isTask"] != "true") wideNumbers += number
+      number++
+    }
+    return OrderedListSpan.measureExtraWidth(listStyle, factory.context, wideNumbers)
+  }
+
+  private fun applyListSpacing(
+    builder: SpannableStringBuilder,
+    start: Int,
+    depth: Int,
+    style: ListStyle,
+    styleContext: BlockStyleContext,
+  ) {
+    // TODO: LineHeightSpan may also clip superscript/subscript glyphs that extend
+    // outside the normal line bounds. A similar "skip" strategy as for images may
+    // be needed here once super/subscript usage in practice is better understood.
+    applyLineHeightSkippingImages(builder, start, builder.length, style.lineHeight)
+
+    // Item spacing and external bottom margin are only handled by the root-level list
+    if (depth == 0) {
+      applyItemSpacing(builder, start, style.itemSpacing, styleContext)
+
+      builder.append("\n")
+      builder.setSpan(
+        MarginBottomSpan(style.marginBottom),
+        builder.length - 1,
+        builder.length,
+        SPAN_FLAGS_EXCLUSIVE_EXCLUSIVE,
+      )
+    }
+  }
+
+  // Inserts the vertical gap between consecutive items (including nested ones)
+  // by spanning the newline that precedes each item start. The first item of
+  // the root list gets no spacing above it.
+  private fun applyItemSpacing(
+    builder: SpannableStringBuilder,
+    start: Int,
+    itemSpacing: Float,
+    styleContext: BlockStyleContext,
+  ) {
+    if (itemSpacing <= 0f) return
+
+    val itemStarts =
+      styleContext.listItemStarts
+        .filter { it in start until builder.length }
+        .distinct()
+        .sorted()
+
+    for (itemStart in itemStarts.drop(1)) {
+      builder.setSpan(
+        ListItemSpacingSpan(itemSpacing),
+        itemStart - 1,
+        itemStart,
+        SPAN_FLAGS_EXCLUSIVE_EXCLUSIVE,
+      )
+    }
+  }
+}

package/android/src/main/java/com/renderrichtext/renderer/MentionRenderer.kt

@@ -1,85 +1,85 @@
-package com.renderrichtext.renderer
-
-import android.text.SpannableStringBuilder
-import com.facebook.react.uimanager.PixelUtil
-import com.renderrichtext.parser.TiptapASTNode
-import com.renderrichtext.spans.MentionChipSpan
-import com.renderrichtext.spans.MentionSpan
-import com.renderrichtext.spans.TextSpan
-import com.renderrichtext.utils.text.span.SPAN_FLAGS_EXCLUSIVE_EXCLUSIVE
-
-/**
- * Tiptap mention atom. The node has no children; the visible text is `@` plus
- * `label`, or `id` when `label` is blank. That is the suggestion character the
- * Mention extension inserts.
- *
- * Weight is medium (`500`), the Android face used for a name inside body text.
- * iOS uses semibold for the same role.
- */
-class MentionRenderer(
-  private val config: RendererConfig,
-) : NodeRenderer {
-  override fun render(
-    node: TiptapASTNode,
-    builder: SpannableStringBuilder,
-    onLinkPress: ((String) -> Unit)?,
-    onLinkLongPress: ((String) -> Unit)?,
-    onFactoidPress: ((String) -> Unit)?,
-    factory: RendererFactory,
-  ) {
-    val mentionId = node.getAttribute("id").orEmpty()
-    val label = node.getAttribute("label").orEmpty()
-    val name = label.ifBlank { mentionId }
-    val text = "@$name"
-    val mentionStyle = config.style.mentionStyle
-    val block = factory.blockStyleContext.currentBlockStyleOrNull()
-    val fontSize = block?.fontSize ?: config.style.paragraphStyle.fontSize
-    val fontFamily = block?.fontFamily ?: config.style.paragraphStyle.fontFamily
-
-    val start = builder.length
-    builder.append(text)
-    val end = builder.length
-    builder.setSpan(
-      TextSpan(
-        BlockStyle(
-          fontSize = fontSize,
-          fontFamily = fontFamily,
-          fontWeight = "500",
-          color = mentionStyle.color,
-        ),
-        factory.context,
-      ),
-      start,
-      end,
-      SPAN_FLAGS_EXCLUSIVE_EXCLUSIVE,
-    )
-    builder.setSpan(
-      MentionSpan(
-        mentionId,
-        label,
-        mentionStyle.color,
-        factory.onMentionPress,
-        factory.onMentionLongPress,
-      ),
-      start,
-      end,
-      SPAN_FLAGS_EXCLUSIVE_EXCLUSIVE,
-    )
-    builder.setSpan(
-      MentionChipSpan(
-        backgroundColor = mentionStyle.backgroundColor,
-        textColor = mentionStyle.color,
-        paddingX = PixelUtil.toPixelFromDIP(PADDING_X_DP),
-        paddingY = PixelUtil.toPixelFromDIP(PADDING_Y_DP),
-      ),
-      start,
-      end,
-      SPAN_FLAGS_EXCLUSIVE_EXCLUSIVE,
-    )
-  }
-
-  companion object {
-    private const val PADDING_X_DP = 3f
-    private const val PADDING_Y_DP = 1f
-  }
-}
+package com.renderrichtext.renderer
+
+import android.text.SpannableStringBuilder
+import com.facebook.react.uimanager.PixelUtil
+import com.renderrichtext.parser.TiptapASTNode
+import com.renderrichtext.spans.MentionChipSpan
+import com.renderrichtext.spans.MentionSpan
+import com.renderrichtext.spans.TextSpan
+import com.renderrichtext.utils.text.span.SPAN_FLAGS_EXCLUSIVE_EXCLUSIVE
+
+/**
+ * Tiptap mention atom. The node has no children; the visible text is `@` plus
+ * `label`, or `id` when `label` is blank. That is the suggestion character the
+ * Mention extension inserts.
+ *
+ * Weight is medium (`500`), the Android face used for a name inside body text.
+ * iOS uses semibold for the same role.
+ */
+class MentionRenderer(
+  private val config: RendererConfig,
+) : NodeRenderer {
+  override fun render(
+    node: TiptapASTNode,
+    builder: SpannableStringBuilder,
+    onLinkPress: ((String) -> Unit)?,
+    onLinkLongPress: ((String) -> Unit)?,
+    onFactoidPress: ((String) -> Unit)?,
+    factory: RendererFactory,
+  ) {
+    val mentionId = node.getAttribute("id").orEmpty()
+    val label = node.getAttribute("label").orEmpty()
+    val name = label.ifBlank { mentionId }
+    val text = "@$name"
+    val mentionStyle = config.style.mentionStyle
+    val block = factory.blockStyleContext.currentBlockStyleOrNull()
+    val fontSize = block?.fontSize ?: config.style.paragraphStyle.fontSize
+    val fontFamily = block?.fontFamily ?: config.style.paragraphStyle.fontFamily
+
+    val start = builder.length
+    builder.append(text)
+    val end = builder.length
+    builder.setSpan(
+      TextSpan(
+        BlockStyle(
+          fontSize = fontSize,
+          fontFamily = fontFamily,
+          fontWeight = "500",
+          color = mentionStyle.color,
+        ),
+        factory.context,
+      ),
+      start,
+      end,
+      SPAN_FLAGS_EXCLUSIVE_EXCLUSIVE,
+    )
+    builder.setSpan(
+      MentionSpan(
+        mentionId,
+        label,
+        mentionStyle.color,
+        factory.onMentionPress,
+        factory.onMentionLongPress,
+      ),
+      start,
+      end,
+      SPAN_FLAGS_EXCLUSIVE_EXCLUSIVE,
+    )
+    builder.setSpan(
+      MentionChipSpan(
+        backgroundColor = mentionStyle.backgroundColor,
+        textColor = mentionStyle.color,
+        paddingX = PixelUtil.toPixelFromDIP(PADDING_X_DP),
+        paddingY = PixelUtil.toPixelFromDIP(PADDING_Y_DP),
+      ),
+      start,
+      end,
+      SPAN_FLAGS_EXCLUSIVE_EXCLUSIVE,
+    )
+  }
+
+  companion object {
+    private const val PADDING_X_DP = 3f
+    private const val PADDING_Y_DP = 1f
+  }
+}

package/android/src/main/java/com/renderrichtext/renderer/ParagraphRenderer.kt

@@ -1,91 +1,91 @@
-package com.renderrichtext.renderer
-
-import android.text.SpannableStringBuilder
-import android.text.style.AlignmentSpan
-import com.renderrichtext.parser.TiptapASTNode
-import com.renderrichtext.styles.ParagraphStyle
-import com.renderrichtext.utils.text.extensions.containsBlockImage
-import com.renderrichtext.utils.text.span.SPAN_FLAGS_EXCLUSIVE_EXCLUSIVE
-import com.renderrichtext.utils.text.span.applyLineHeightSkippingImages
-import com.renderrichtext.utils.text.span.applyMarginBottom
-import com.renderrichtext.utils.text.span.applyMarginTop
-
-class ParagraphRenderer(
-  private val config: RendererConfig,
-) : NodeRenderer {
-  override fun render(
-    node: TiptapASTNode,
-    builder: SpannableStringBuilder,
-    onLinkPress: ((String) -> Unit)?,
-    onLinkLongPress: ((String) -> Unit)?,
-    onFactoidPress: ((String) -> Unit)?,
-    factory: RendererFactory,
-  ) {
-    val context = factory.blockStyleContext
-
-    // Inside a list, render tight with a single newline - lists own their item spacing.
-    if (context.listDepth > 0) {
-      factory.renderChildren(node, builder, onLinkPress, onLinkLongPress, onFactoidPress)
-      builder.append("\n")
-      return
-    }
-
-    val start = builder.length
-    val style = config.style.paragraphStyle
-
-    // Inside a blockquote, keep the quote's block style (font/color) and line height
-    // - applied by BlockquoteTextRenderer.postProcess - but still emit block margins so
-    // spacing between blocks matches the top-level document (a heading defaults to
-    // marginTop 0, so the gap before it comes from the preceding paragraph's marginBottom).
-    if (context.blockquoteDepth > 0) {
-      factory.renderChildren(node, builder, onLinkPress, onLinkLongPress, onFactoidPress)
-      if (builder.length > start) {
-        val marginTop = if (node.containsBlockImage()) config.style.imageStyle.marginTop else style.marginTop
-        applyMarginTop(builder, start, marginTop)
-        val marginBottom = if (node.containsBlockImage()) config.style.imageStyle.marginBottom else style.marginBottom
-        applyMarginBottom(builder, marginBottom)
-      }
-      return
-    }
-
-    context.setParagraphStyle(style)
-    try {
-      factory.renderChildren(node, builder, onLinkPress, onLinkLongPress, onFactoidPress)
-    } finally {
-      context.popBlockStyle()
-    }
-
-    if (builder.length > start) {
-      builder.applySpans(node, style, start)
-    }
-  }
-
-  private fun SpannableStringBuilder.applySpans(
-    node: TiptapASTNode,
-    style: ParagraphStyle,
-    start: Int,
-  ) {
-    val end = length
-
-    // TODO: LineHeightSpan may also clip superscript/subscript glyphs that extend
-    // outside the normal line bounds. A similar "skip" strategy as for images may
-    // be needed here once super/subscript usage in practice is better understood.
-    applyLineHeightSkippingImages(this, start, end, style.lineHeight)
-
-    // Only apply AlignmentSpan for non-default alignments (Center/Right)
-    if (style.textAlign.needsAlignmentSpan) {
-      setSpan(
-        AlignmentSpan.Standard(style.textAlign.layoutAlignment),
-        start,
-        end,
-        SPAN_FLAGS_EXCLUSIVE_EXCLUSIVE,
-      )
-    }
-
-    val marginTop = if (node.containsBlockImage()) config.style.imageStyle.marginTop else style.marginTop
-    applyMarginTop(this, start, marginTop)
-
-    val marginBottom = if (node.containsBlockImage()) config.style.imageStyle.marginBottom else style.marginBottom
-    applyMarginBottom(this, marginBottom)
-  }
-}
+package com.renderrichtext.renderer
+
+import android.text.SpannableStringBuilder
+import android.text.style.AlignmentSpan
+import com.renderrichtext.parser.TiptapASTNode
+import com.renderrichtext.styles.ParagraphStyle
+import com.renderrichtext.utils.text.extensions.containsBlockImage
+import com.renderrichtext.utils.text.span.SPAN_FLAGS_EXCLUSIVE_EXCLUSIVE
+import com.renderrichtext.utils.text.span.applyLineHeightSkippingImages
+import com.renderrichtext.utils.text.span.applyMarginBottom
+import com.renderrichtext.utils.text.span.applyMarginTop
+
+class ParagraphRenderer(
+  private val config: RendererConfig,
+) : NodeRenderer {
+  override fun render(
+    node: TiptapASTNode,
+    builder: SpannableStringBuilder,
+    onLinkPress: ((String) -> Unit)?,
+    onLinkLongPress: ((String) -> Unit)?,
+    onFactoidPress: ((String) -> Unit)?,
+    factory: RendererFactory,
+  ) {
+    val context = factory.blockStyleContext
+
+    // Inside a list, render tight with a single newline - lists own their item spacing.
+    if (context.listDepth > 0) {
+      factory.renderChildren(node, builder, onLinkPress, onLinkLongPress, onFactoidPress)
+      builder.append("\n")
+      return
+    }
+
+    val start = builder.length
+    val style = config.style.paragraphStyle
+
+    // Inside a blockquote, keep the quote's block style (font/color) and line height
+    // - applied by BlockquoteTextRenderer.postProcess - but still emit block margins so
+    // spacing between blocks matches the top-level document (a heading defaults to
+    // marginTop 0, so the gap before it comes from the preceding paragraph's marginBottom).
+    if (context.blockquoteDepth > 0) {
+      factory.renderChildren(node, builder, onLinkPress, onLinkLongPress, onFactoidPress)
+      if (builder.length > start) {
+        val marginTop = if (node.containsBlockImage()) config.style.imageStyle.marginTop else style.marginTop
+        applyMarginTop(builder, start, marginTop)
+        val marginBottom = if (node.containsBlockImage()) config.style.imageStyle.marginBottom else style.marginBottom
+        applyMarginBottom(builder, marginBottom)
+      }
+      return
+    }
+
+    context.setParagraphStyle(style)
+    try {
+      factory.renderChildren(node, builder, onLinkPress, onLinkLongPress, onFactoidPress)
+    } finally {
+      context.popBlockStyle()
+    }
+
+    if (builder.length > start) {
+      builder.applySpans(node, style, start)
+    }
+  }
+
+  private fun SpannableStringBuilder.applySpans(
+    node: TiptapASTNode,
+    style: ParagraphStyle,
+    start: Int,
+  ) {
+    val end = length
+
+    // TODO: LineHeightSpan may also clip superscript/subscript glyphs that extend
+    // outside the normal line bounds. A similar "skip" strategy as for images may
+    // be needed here once super/subscript usage in practice is better understood.
+    applyLineHeightSkippingImages(this, start, end, style.lineHeight)
+
+    // Only apply AlignmentSpan for non-default alignments (Center/Right)
+    if (style.textAlign.needsAlignmentSpan) {
+      setSpan(
+        AlignmentSpan.Standard(style.textAlign.layoutAlignment),
+        start,
+        end,
+        SPAN_FLAGS_EXCLUSIVE_EXCLUSIVE,
+      )
+    }
+
+    val marginTop = if (node.containsBlockImage()) config.style.imageStyle.marginTop else style.marginTop
+    applyMarginTop(this, start, marginTop)
+
+    val marginBottom = if (node.containsBlockImage()) config.style.imageStyle.marginBottom else style.marginBottom
+    applyMarginBottom(this, marginBottom)
+  }
+}