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

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

@@ -1,135 +1,135 @@
-package com.renderrichtext.renderer
-
-import android.graphics.Paint
-import android.text.SpannableStringBuilder
-import android.text.Spanned
-import android.text.style.LineHeightSpan
-import com.renderrichtext.parser.TiptapASTNode
-import com.renderrichtext.spans.CodeBlockSpan
-import com.renderrichtext.spans.MarginBottomSpan
-import com.renderrichtext.spans.isLastDrawnLine
-import com.renderrichtext.utils.common.CodeBlockHighlighter
-import com.renderrichtext.utils.common.CodeBlockNode
-import com.renderrichtext.utils.text.span.SPAN_FLAGS_EXCLUSIVE_EXCLUSIVE
-import com.renderrichtext.utils.text.span.applyMarginTop
-
-class CodeBlockRenderer(
-  private val config: RendererConfig,
-) : NodeRenderer {
-  override fun render(
-    node: TiptapASTNode,
-    builder: SpannableStringBuilder,
-    onLinkPress: ((String) -> Unit)?,
-    onLinkLongPress: ((String) -> Unit)?,
-    onFactoidPress: ((String) -> Unit)?,
-    factory: RendererFactory,
-  ) {
-    if (builder.isNotEmpty() && builder.last() != '\n') {
-      builder.append("\n")
-    }
-
-    val start = builder.length
-    val style = config.style.codeBlockStyle
-    val context = factory.blockStyleContext
-
-    applyMarginTop(builder, start, style.marginTop)
-
-    // Content starts after the potential 1-character marginTop spacer
-    val contentStart = start + (if (style.marginTop > 0) 1 else 0)
-
-    context.setCodeBlockStyle(style)
-
-    try {
-      factory.renderChildren(node, builder, onLinkPress, onLinkLongPress, onFactoidPress)
-    } finally {
-      context.popBlockStyle()
-    }
-
-    if (builder.length == contentStart) return
-
-    CodeBlockHighlighter.highlight(
-      builder,
-      CodeBlockNode.extractCode(node),
-      CodeBlockNode.language(node),
-      style,
-      contentStart,
-    )
-
-    // Terminate the content so the margin newline below is its own line. Sharing
-    // the last code line makes that line's descent grow by marginBottom, and the
-    // background paints the whole line — the bottom edge is then the margin, and
-    // it is not recognized as the last line, so the bottom corners stay square.
-    if (builder.last() != '\n') {
-      builder.append('\n')
-    }
-
-    val end = builder.length
-    val padding = style.padding.toInt()
-
-    // Apply background, borders, and horizontal padding to content only
-    builder.setSpan(
-      CodeBlockSpan(
-        style,
-        factory.context,
-        factory.styleCache,
-        context.accumulatedIndent,
-        CodeBlockNode.extractCode(node),
-        CodeBlockNode.language(node) ?: "",
-      ),
-      contentStart,
-      end,
-      SPAN_FLAGS_EXCLUSIVE_EXCLUSIVE,
-    )
-
-    // Apply vertical padding via line height manipulation
-    builder.setSpan(
-      CodeBlockBoundaryPaddingSpan(padding),
-      contentStart,
-      end,
-      SPAN_FLAGS_EXCLUSIVE_EXCLUSIVE,
-    )
-
-    val marginStart = builder.length
-    builder.append("\n")
-    builder.setSpan(
-      MarginBottomSpan(style.marginBottom),
-      marginStart,
-      builder.length,
-      SPAN_FLAGS_EXCLUSIVE_EXCLUSIVE,
-    )
-  }
-
-  /**
-   * Internal span to handle top/bottom padding by modifying font metrics.
-   */
-  private class CodeBlockBoundaryPaddingSpan(
-    private val padding: Int,
-  ) : LineHeightSpan {
-    override fun chooseHeight(
-      text: CharSequence,
-      startLine: Int,
-      endLine: Int,
-      spanstartv: Int,
-      v: Int,
-      fm: Paint.FontMetricsInt,
-    ) {
-      if (text !is Spanned) return
-
-      val spanStart = text.getSpanStart(this)
-      val spanEnd = text.getSpanEnd(this)
-
-      // Adjust ascent/top for the first line to create internal top padding
-      if (startLine == spanStart) {
-        fm.ascent -= padding
-        fm.top -= padding
-      }
-
-      // Same last-line test as CodeBlockSpan, so the bottom padding lands on the
-      // line that draws the bottom corners.
-      if (isLastDrawnLine(text, endLine, spanEnd)) {
-        fm.descent += padding
-        fm.bottom += padding
-      }
-    }
-  }
-}
+package com.renderrichtext.renderer
+
+import android.graphics.Paint
+import android.text.SpannableStringBuilder
+import android.text.Spanned
+import android.text.style.LineHeightSpan
+import com.renderrichtext.parser.TiptapASTNode
+import com.renderrichtext.spans.CodeBlockSpan
+import com.renderrichtext.spans.MarginBottomSpan
+import com.renderrichtext.spans.isLastDrawnLine
+import com.renderrichtext.utils.common.CodeBlockHighlighter
+import com.renderrichtext.utils.common.CodeBlockNode
+import com.renderrichtext.utils.text.span.SPAN_FLAGS_EXCLUSIVE_EXCLUSIVE
+import com.renderrichtext.utils.text.span.applyMarginTop
+
+class CodeBlockRenderer(
+  private val config: RendererConfig,
+) : NodeRenderer {
+  override fun render(
+    node: TiptapASTNode,
+    builder: SpannableStringBuilder,
+    onLinkPress: ((String) -> Unit)?,
+    onLinkLongPress: ((String) -> Unit)?,
+    onFactoidPress: ((String) -> Unit)?,
+    factory: RendererFactory,
+  ) {
+    if (builder.isNotEmpty() && builder.last() != '\n') {
+      builder.append("\n")
+    }
+
+    val start = builder.length
+    val style = config.style.codeBlockStyle
+    val context = factory.blockStyleContext
+
+    applyMarginTop(builder, start, style.marginTop)
+
+    // Content starts after the potential 1-character marginTop spacer
+    val contentStart = start + (if (style.marginTop > 0) 1 else 0)
+
+    context.setCodeBlockStyle(style)
+
+    try {
+      factory.renderChildren(node, builder, onLinkPress, onLinkLongPress, onFactoidPress)
+    } finally {
+      context.popBlockStyle()
+    }
+
+    if (builder.length == contentStart) return
+
+    CodeBlockHighlighter.highlight(
+      builder,
+      CodeBlockNode.extractCode(node),
+      CodeBlockNode.language(node),
+      style,
+      contentStart,
+    )
+
+    // Terminate the content so the margin newline below is its own line. Sharing
+    // the last code line makes that line's descent grow by marginBottom, and the
+    // background paints the whole line — the bottom edge is then the margin, and
+    // it is not recognized as the last line, so the bottom corners stay square.
+    if (builder.last() != '\n') {
+      builder.append('\n')
+    }
+
+    val end = builder.length
+    val padding = style.padding.toInt()
+
+    // Apply background, borders, and horizontal padding to content only
+    builder.setSpan(
+      CodeBlockSpan(
+        style,
+        factory.context,
+        factory.styleCache,
+        context.accumulatedIndent,
+        CodeBlockNode.extractCode(node),
+        CodeBlockNode.language(node) ?: "",
+      ),
+      contentStart,
+      end,
+      SPAN_FLAGS_EXCLUSIVE_EXCLUSIVE,
+    )
+
+    // Apply vertical padding via line height manipulation
+    builder.setSpan(
+      CodeBlockBoundaryPaddingSpan(padding),
+      contentStart,
+      end,
+      SPAN_FLAGS_EXCLUSIVE_EXCLUSIVE,
+    )
+
+    val marginStart = builder.length
+    builder.append("\n")
+    builder.setSpan(
+      MarginBottomSpan(style.marginBottom),
+      marginStart,
+      builder.length,
+      SPAN_FLAGS_EXCLUSIVE_EXCLUSIVE,
+    )
+  }
+
+  /**
+   * Internal span to handle top/bottom padding by modifying font metrics.
+   */
+  private class CodeBlockBoundaryPaddingSpan(
+    private val padding: Int,
+  ) : LineHeightSpan {
+    override fun chooseHeight(
+      text: CharSequence,
+      startLine: Int,
+      endLine: Int,
+      spanstartv: Int,
+      v: Int,
+      fm: Paint.FontMetricsInt,
+    ) {
+      if (text !is Spanned) return
+
+      val spanStart = text.getSpanStart(this)
+      val spanEnd = text.getSpanEnd(this)
+
+      // Adjust ascent/top for the first line to create internal top padding
+      if (startLine == spanStart) {
+        fm.ascent -= padding
+        fm.top -= padding
+      }
+
+      // Same last-line test as CodeBlockSpan, so the bottom padding lands on the
+      // line that draws the bottom corners.
+      if (isLastDrawnLine(text, endLine, spanEnd)) {
+        fm.descent += padding
+        fm.bottom += padding
+      }
+    }
+  }
+}

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

@@ -1,37 +1,37 @@
-package com.renderrichtext.renderer
-
-import android.text.SpannableStringBuilder
-import com.renderrichtext.parser.TiptapASTNode
-import com.renderrichtext.spans.CodeBackgroundSpan
-import com.renderrichtext.spans.CodeSpan
-import com.renderrichtext.utils.text.span.SPAN_FLAGS_EXCLUSIVE_EXCLUSIVE
-
-class CodeRenderer(
-  private val config: RendererConfig,
-) : NodeRenderer {
-  override fun render(
-    node: TiptapASTNode,
-    builder: SpannableStringBuilder,
-    onLinkPress: ((String) -> Unit)?,
-    onLinkLongPress: ((String) -> Unit)?,
-    onFactoidPress: ((String) -> Unit)?,
-    factory: RendererFactory,
-  ) {
-    if (node.children.isEmpty() || node.children.all { it.content.isEmpty() }) return
-
-    factory.renderWithSpan(builder, { node.children.forEach { builder.append(it.content) } }) { start, end, blockStyle ->
-      builder.setSpan(
-        CodeSpan(factory.styleCache, blockStyle),
-        start,
-        end,
-        SPAN_FLAGS_EXCLUSIVE_EXCLUSIVE,
-      )
-      builder.setSpan(
-        CodeBackgroundSpan(config.style),
-        start,
-        end,
-        SPAN_FLAGS_EXCLUSIVE_EXCLUSIVE,
-      )
-    }
-  }
-}
+package com.renderrichtext.renderer
+
+import android.text.SpannableStringBuilder
+import com.renderrichtext.parser.TiptapASTNode
+import com.renderrichtext.spans.CodeBackgroundSpan
+import com.renderrichtext.spans.CodeSpan
+import com.renderrichtext.utils.text.span.SPAN_FLAGS_EXCLUSIVE_EXCLUSIVE
+
+class CodeRenderer(
+  private val config: RendererConfig,
+) : NodeRenderer {
+  override fun render(
+    node: TiptapASTNode,
+    builder: SpannableStringBuilder,
+    onLinkPress: ((String) -> Unit)?,
+    onLinkLongPress: ((String) -> Unit)?,
+    onFactoidPress: ((String) -> Unit)?,
+    factory: RendererFactory,
+  ) {
+    if (node.children.isEmpty() || node.children.all { it.content.isEmpty() }) return
+
+    factory.renderWithSpan(builder, { node.children.forEach { builder.append(it.content) } }) { start, end, blockStyle ->
+      builder.setSpan(
+        CodeSpan(factory.styleCache, blockStyle),
+        start,
+        end,
+        SPAN_FLAGS_EXCLUSIVE_EXCLUSIVE,
+      )
+      builder.setSpan(
+        CodeBackgroundSpan(config.style),
+        start,
+        end,
+        SPAN_FLAGS_EXCLUSIVE_EXCLUSIVE,
+      )
+    }
+  }
+}

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

@@ -1,28 +1,28 @@
-package com.renderrichtext.renderer
-
-import android.text.SpannableStringBuilder
-import com.renderrichtext.parser.TiptapASTNode
-import com.renderrichtext.spans.EmphasisSpan
-import com.renderrichtext.utils.text.span.SPAN_FLAGS_EXCLUSIVE_EXCLUSIVE
-
-class EmphasisRenderer(
-  private val config: RendererConfig,
-) : NodeRenderer {
-  override fun render(
-    node: TiptapASTNode,
-    builder: SpannableStringBuilder,
-    onLinkPress: ((String) -> Unit)?,
-    onLinkLongPress: ((String) -> Unit)?,
-    onFactoidPress: ((String) -> Unit)?,
-    factory: RendererFactory,
-  ) {
-    factory.renderWithSpan(builder, { factory.renderChildren(node, builder, onLinkPress, onLinkLongPress, onFactoidPress) }) { start, end, blockStyle ->
-      builder.setSpan(
-        EmphasisSpan(factory.styleCache, blockStyle),
-        start,
-        end,
-        SPAN_FLAGS_EXCLUSIVE_EXCLUSIVE,
-      )
-    }
-  }
-}
+package com.renderrichtext.renderer
+
+import android.text.SpannableStringBuilder
+import com.renderrichtext.parser.TiptapASTNode
+import com.renderrichtext.spans.EmphasisSpan
+import com.renderrichtext.utils.text.span.SPAN_FLAGS_EXCLUSIVE_EXCLUSIVE
+
+class EmphasisRenderer(
+  private val config: RendererConfig,
+) : NodeRenderer {
+  override fun render(
+    node: TiptapASTNode,
+    builder: SpannableStringBuilder,
+    onLinkPress: ((String) -> Unit)?,
+    onLinkLongPress: ((String) -> Unit)?,
+    onFactoidPress: ((String) -> Unit)?,
+    factory: RendererFactory,
+  ) {
+    factory.renderWithSpan(builder, { factory.renderChildren(node, builder, onLinkPress, onLinkLongPress, onFactoidPress) }) { start, end, blockStyle ->
+      builder.setSpan(
+        EmphasisSpan(factory.styleCache, blockStyle),
+        start,
+        end,
+        SPAN_FLAGS_EXCLUSIVE_EXCLUSIVE,
+      )
+    }
+  }
+}

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

@@ -1,81 +1,81 @@
-package com.renderrichtext.renderer
-
-import android.text.SpannableStringBuilder
-import android.text.style.AlignmentSpan
-import com.renderrichtext.parser.TiptapASTNode
-import com.renderrichtext.spans.HeadingSpan
-import com.renderrichtext.utils.text.span.SPAN_FLAGS_EXCLUSIVE_EXCLUSIVE
-import com.renderrichtext.utils.text.span.SPAN_FLAGS_EXCLUSIVE_EXCLUSIVE_PRIORITY
-import com.renderrichtext.utils.text.span.applyLinkPillLineHeight
-import com.renderrichtext.utils.text.span.applyMarginBottom
-import com.renderrichtext.utils.text.span.applyMarginTop
-import com.renderrichtext.utils.text.span.createLineHeightSpan
-
-class HeadingRenderer(
-  private val config: RendererConfig,
-) : NodeRenderer {
-  override fun render(
-    node: TiptapASTNode,
-    builder: SpannableStringBuilder,
-    onLinkPress: ((String) -> Unit)?,
-    onLinkLongPress: ((String) -> Unit)?,
-    onFactoidPress: ((String) -> Unit)?,
-    factory: RendererFactory,
-  ) {
-    if (builder.isNotEmpty() && builder.last() != '\n') {
-      builder.append("\n")
-    }
-
-    val level = node.getAttribute("level")?.toIntOrNull() ?: 1
-    val start = builder.length
-
-    val headingStyle = config.style.headingStyles[level]!!
-    val blockStyleContext = factory.blockStyleContext
-    blockStyleContext.setHeadingStyle(headingStyle, level)
-
-    try {
-      factory.renderChildren(node, builder, onLinkPress, onLinkLongPress, onFactoidPress)
-    } finally {
-      blockStyleContext.popBlockStyle()
-    }
-
-    val end = builder.length
-    val contentLength = end - start
-
-    if (contentLength > 0) {
-      // Set after the children, so top priority makes it apply first and the
-      // inline spans inside the heading (code, links, strong, emphasis) win.
-      builder.setSpan(
-        HeadingSpan(
-          level,
-          config.style,
-        ),
-        start,
-        end,
-        SPAN_FLAGS_EXCLUSIVE_EXCLUSIVE_PRIORITY,
-      )
-
-      builder.setSpan(
-        createLineHeightSpan(headingStyle.lineHeight),
-        start,
-        end,
-        SPAN_FLAGS_EXCLUSIVE_EXCLUSIVE,
-      )
-      applyLinkPillLineHeight(builder, start, end)
-
-      // Only apply AlignmentSpan for non-default alignments (Center/Right).
-      // Justify is handled at the TextView level (API 26+).
-      if (headingStyle.textAlign.needsAlignmentSpan) {
-        builder.setSpan(
-          AlignmentSpan.Standard(headingStyle.textAlign.layoutAlignment),
-          start,
-          end,
-          SPAN_FLAGS_EXCLUSIVE_EXCLUSIVE,
-        )
-      }
-
-      applyMarginTop(builder, start, headingStyle.marginTop)
-      applyMarginBottom(builder, headingStyle.marginBottom)
-    }
-  }
-}
+package com.renderrichtext.renderer
+
+import android.text.SpannableStringBuilder
+import android.text.style.AlignmentSpan
+import com.renderrichtext.parser.TiptapASTNode
+import com.renderrichtext.spans.HeadingSpan
+import com.renderrichtext.utils.text.span.SPAN_FLAGS_EXCLUSIVE_EXCLUSIVE
+import com.renderrichtext.utils.text.span.SPAN_FLAGS_EXCLUSIVE_EXCLUSIVE_PRIORITY
+import com.renderrichtext.utils.text.span.applyLinkPillLineHeight
+import com.renderrichtext.utils.text.span.applyMarginBottom
+import com.renderrichtext.utils.text.span.applyMarginTop
+import com.renderrichtext.utils.text.span.createLineHeightSpan
+
+class HeadingRenderer(
+  private val config: RendererConfig,
+) : NodeRenderer {
+  override fun render(
+    node: TiptapASTNode,
+    builder: SpannableStringBuilder,
+    onLinkPress: ((String) -> Unit)?,
+    onLinkLongPress: ((String) -> Unit)?,
+    onFactoidPress: ((String) -> Unit)?,
+    factory: RendererFactory,
+  ) {
+    if (builder.isNotEmpty() && builder.last() != '\n') {
+      builder.append("\n")
+    }
+
+    val level = node.getAttribute("level")?.toIntOrNull() ?: 1
+    val start = builder.length
+
+    val headingStyle = config.style.headingStyles[level]!!
+    val blockStyleContext = factory.blockStyleContext
+    blockStyleContext.setHeadingStyle(headingStyle, level)
+
+    try {
+      factory.renderChildren(node, builder, onLinkPress, onLinkLongPress, onFactoidPress)
+    } finally {
+      blockStyleContext.popBlockStyle()
+    }
+
+    val end = builder.length
+    val contentLength = end - start
+
+    if (contentLength > 0) {
+      // Set after the children, so top priority makes it apply first and the
+      // inline spans inside the heading (code, links, strong, emphasis) win.
+      builder.setSpan(
+        HeadingSpan(
+          level,
+          config.style,
+        ),
+        start,
+        end,
+        SPAN_FLAGS_EXCLUSIVE_EXCLUSIVE_PRIORITY,
+      )
+
+      builder.setSpan(
+        createLineHeightSpan(headingStyle.lineHeight),
+        start,
+        end,
+        SPAN_FLAGS_EXCLUSIVE_EXCLUSIVE,
+      )
+      applyLinkPillLineHeight(builder, start, end)
+
+      // Only apply AlignmentSpan for non-default alignments (Center/Right).
+      // Justify is handled at the TextView level (API 26+).
+      if (headingStyle.textAlign.needsAlignmentSpan) {
+        builder.setSpan(
+          AlignmentSpan.Standard(headingStyle.textAlign.layoutAlignment),
+          start,
+          end,
+          SPAN_FLAGS_EXCLUSIVE_EXCLUSIVE,
+        )
+      }
+
+      applyMarginTop(builder, start, headingStyle.marginTop)
+      applyMarginBottom(builder, headingStyle.marginBottom)
+    }
+  }
+}

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

@@ -1,26 +1,26 @@
-package com.renderrichtext.renderer
-
-import android.text.SpannableStringBuilder
-import com.renderrichtext.parser.TiptapASTNode
-import com.renderrichtext.spans.HighlightSpan
-import com.renderrichtext.utils.text.span.SPAN_FLAGS_EXCLUSIVE_EXCLUSIVE
-
-class HighlightRenderer : NodeRenderer {
-  override fun render(
-    node: TiptapASTNode,
-    builder: SpannableStringBuilder,
-    onLinkPress: ((String) -> Unit)?,
-    onLinkLongPress: ((String) -> Unit)?,
-    onFactoidPress: ((String) -> Unit)?,
-    factory: RendererFactory,
-  ) {
-    factory.renderWithSpan(builder, { factory.renderChildren(node, builder, onLinkPress, onLinkLongPress, onFactoidPress) }) { start, end, blockStyle ->
-      builder.setSpan(
-        HighlightSpan(factory.styleCache, blockStyle),
-        start,
-        end,
-        SPAN_FLAGS_EXCLUSIVE_EXCLUSIVE,
-      )
-    }
-  }
-}
+package com.renderrichtext.renderer
+
+import android.text.SpannableStringBuilder
+import com.renderrichtext.parser.TiptapASTNode
+import com.renderrichtext.spans.HighlightSpan
+import com.renderrichtext.utils.text.span.SPAN_FLAGS_EXCLUSIVE_EXCLUSIVE
+
+class HighlightRenderer : NodeRenderer {
+  override fun render(
+    node: TiptapASTNode,
+    builder: SpannableStringBuilder,
+    onLinkPress: ((String) -> Unit)?,
+    onLinkLongPress: ((String) -> Unit)?,
+    onFactoidPress: ((String) -> Unit)?,
+    factory: RendererFactory,
+  ) {
+    factory.renderWithSpan(builder, { factory.renderChildren(node, builder, onLinkPress, onLinkLongPress, onFactoidPress) }) { start, end, blockStyle ->
+      builder.setSpan(
+        HighlightSpan(factory.styleCache, blockStyle),
+        start,
+        end,
+        SPAN_FLAGS_EXCLUSIVE_EXCLUSIVE,
+      )
+    }
+  }
+}

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

@@ -1,17 +1,17 @@
-package com.renderrichtext.renderer
-
-import android.text.SpannableStringBuilder
-import com.renderrichtext.parser.TiptapASTNode
-
-class LineBreakRenderer : NodeRenderer {
-  override fun render(
-    node: TiptapASTNode,
-    builder: SpannableStringBuilder,
-    onLinkPress: ((String) -> Unit)?,
-    onLinkLongPress: ((String) -> Unit)?,
-    onFactoidPress: ((String) -> Unit)?,
-    factory: RendererFactory,
-  ) {
-    builder.append("\n")
-  }
-}
+package com.renderrichtext.renderer
+
+import android.text.SpannableStringBuilder
+import com.renderrichtext.parser.TiptapASTNode
+
+class LineBreakRenderer : NodeRenderer {
+  override fun render(
+    node: TiptapASTNode,
+    builder: SpannableStringBuilder,
+    onLinkPress: ((String) -> Unit)?,
+    onLinkLongPress: ((String) -> Unit)?,
+    onFactoidPress: ((String) -> Unit)?,
+    factory: RendererFactory,
+  ) {
+    builder.append("\n")
+  }
+}