react-native-enriched-markdown-scaffold 0.7.4-scaffold.9 → 1.0.2-scaffold.2

package/android/src/main/java/com/swmansion/enriched/markdown/EnrichedMarkdownManager.kt

@@ -4,7 +4,9 @@ import android.content.Context
 import com.facebook.react.bridge.ReadableArray
 import com.facebook.react.bridge.ReadableMap
 import com.facebook.react.module.annotations.ReactModule
+import com.facebook.react.uimanager.ReactStylesDiffMap
 import com.facebook.react.uimanager.SimpleViewManager
+import com.facebook.react.uimanager.StateWrapper
 import com.facebook.react.uimanager.ThemedReactContext
 import com.facebook.react.uimanager.ViewManagerDelegate
 import com.facebook.react.uimanager.annotations.ReactProp
@@ -12,14 +14,17 @@ import com.facebook.react.viewmanagers.EnrichedMarkdownManagerDelegate
 import com.facebook.react.viewmanagers.EnrichedMarkdownManagerInterface
 import com.facebook.yoga.YogaMeasureMode
 import com.swmansion.enriched.markdown.spoiler.SpoilerOverlay
+import com.swmansion.enriched.markdown.utils.common.CodeBlockStreamingMode
 import com.swmansion.enriched.markdown.utils.common.TableStreamingMode
 import com.swmansion.enriched.markdown.utils.common.emitContextMenuItemPress
+import com.swmansion.enriched.markdown.utils.common.emitCopyPress
 import com.swmansion.enriched.markdown.utils.common.emitLinkLongPress
 import com.swmansion.enriched.markdown.utils.common.emitLinkPress
 import com.swmansion.enriched.markdown.utils.common.emitTaskListItemPress
 import com.swmansion.enriched.markdown.utils.common.markdownEventTypeConstants
 import com.swmansion.enriched.markdown.utils.common.parseAccessibilityLabels
 import com.swmansion.enriched.markdown.utils.common.parseContextMenuItems
+import com.swmansion.enriched.markdown.utils.common.parseImageRequestHeaders
 import com.swmansion.enriched.markdown.utils.common.parseMd4cFlags
 import com.swmansion.enriched.markdown.utils.common.parseSelectionMenuConfig
 import com.swmansion.enriched.markdown.utils.text.interaction.TaskListToggleUtils
@@ -56,6 +61,10 @@ class EnrichedMarkdownManager :
       emitTaskListItemPress(view, taskIndex, newChecked, itemText)
     }
 
+    view.setOnCopyPressCallback { code, language ->
+      emitCopyPress(view, code, language)
+    }
+
     return view
   }
 
@@ -64,12 +73,23 @@ class EnrichedMarkdownManager :
     view.commitProps()
   }
 
+  override fun updateState(
+    view: EnrichedMarkdown,
+    props: ReactStylesDiffMap?,
+    stateWrapper: StateWrapper?,
+  ): Any? {
+    view.stateWrapper = stateWrapper
+    return super.updateState(view, props, stateWrapper)
+  }
+
   override fun onDropViewInstance(view: EnrichedMarkdown) {
     super.onDropViewInstance(view)
     view.cleanup()
     MeasurementStore.release(view.id)
     MeasurementStore.clearStreamingTableMode(view.id)
+    MeasurementStore.clearStreamingCodeBlockMode(view.id)
     MeasurementStore.clearBreakStrategy(view.id)
+    MeasurementStore.clearFontScalingSettings(view.id)
   }
 
   override fun getExportedCustomDirectEventTypeConstants(): MutableMap<String, Any> = markdownEventTypeConstants()
@@ -144,6 +164,14 @@ class EnrichedMarkdownManager :
     view?.setAllowTrailingMargin(allowTrailingMargin)
   }
 
+  @ReactProp(name = "contextMenuHidden", defaultBoolean = false)
+  override fun setContextMenuHidden(
+    view: EnrichedMarkdown?,
+    contextMenuHidden: Boolean,
+  ) {
+    view?.setContextMenuHidden(contextMenuHidden)
+  }
+
   @ReactProp(name = "enableLinkPreview", defaultBoolean = true)
   override fun setEnableLinkPreview(
     view: EnrichedMarkdown?,
@@ -152,6 +180,14 @@ class EnrichedMarkdownManager :
     // No-op on Android — only used on iOS
   }
 
+  @ReactProp(name = "enableTaskListItemToggle", defaultBoolean = true)
+  override fun setEnableTaskListItemToggle(
+    view: EnrichedMarkdown?,
+    enableTaskListItemToggle: Boolean,
+  ) {
+    view?.enableTaskListItemToggle = enableTaskListItemToggle
+  }
+
   @ReactProp(name = "lineBreakStrategyIOS")
   override fun setLineBreakStrategyIOS(
     view: EnrichedMarkdown?,
@@ -188,6 +224,11 @@ class EnrichedMarkdownManager :
         else -> TableStreamingMode.PROGRESSIVE
       }
     view.tableStreamingMode = tableMode
+    view.codeBlockStreamingMode =
+      when (config?.getString("codeBlockMode")) {
+        "hidden" -> CodeBlockStreamingMode.HIDDEN
+        else -> CodeBlockStreamingMode.PROGRESSIVE
+      }
   }
 
   @ReactProp(name = "spoilerOverlay")
@@ -215,6 +256,15 @@ class EnrichedMarkdownManager :
     view.setContextMenuItems(parseContextMenuItems(value))
   }
 
+  @ReactProp(name = "imageRequestHeaders")
+  override fun setImageRequestHeaders(
+    view: EnrichedMarkdown?,
+    value: ReadableArray?,
+  ) {
+    if (view == null) return
+    view.setImageRequestHeaders(parseImageRequestHeaders(value))
+  }
+
   @ReactProp(name = "selectionMenuConfig")
   override fun setSelectionMenuConfig(
     view: EnrichedMarkdown?,

package/android/src/main/java/com/swmansion/enriched/markdown/EnrichedMarkdownText.kt

@@ -9,8 +9,11 @@ import android.os.Looper
 import android.text.Layout
 import android.util.AttributeSet
 import android.util.Log
+import android.util.TypedValue
+import android.view.ActionMode
 import android.view.MotionEvent
 import com.facebook.react.bridge.ReadableMap
+import com.facebook.react.uimanager.StateWrapper
 import com.swmansion.enriched.markdown.accessibility.AccessibilityLabels
 import com.swmansion.enriched.markdown.accessibility.AccessibleMarkdownTextView
 import com.swmansion.enriched.markdown.parser.Md4cFlags
@@ -60,6 +63,9 @@ class EnrichedMarkdownText
 
     val layoutManager = EnrichedMarkdownTextLayoutManager(this)
 
+    // used to force a Yoga re-measure when a block image resolves its box height
+    var stateWrapper: StateWrapper? = null
+
     private var contextMenuItemTexts: List<String> = emptyList()
     var onContextMenuItemPressCallback: ((itemText: String, selectedText: String, selectionStart: Int, selectionEnd: Int) -> Unit)? = null
 
@@ -78,6 +84,7 @@ class EnrichedMarkdownText
     private var allowFontScaling: Boolean = true
     private var maxFontSizeMultiplier: Float = 0f
     private var allowTrailingMargin: Boolean = false
+    private var imageRequestHeaders: Map<String, String> = emptyMap()
 
     private var streamingAnimation: Boolean = false
     private var previousTextLength: Int = 0
@@ -91,6 +98,8 @@ class EnrichedMarkdownText
     private var selectionColor: Int? = null
     private var selectionHandleColor: Int? = null
     private var selectionMenuConfig = SelectionMenuConfig()
+    private var contextMenuHidden = false
+    private var activeActionMode: ActionMode? = null
 
     init {
       setupAsMarkdownTextView()
@@ -99,12 +108,23 @@ class EnrichedMarkdownText
           this,
           getCustomItemTexts = { contextMenuItemTexts },
           getSelectionMenuConfig = { selectionMenuConfig },
+          isContextMenuHidden = { contextMenuHidden },
+          onActionModeChanged = { activeActionMode = it },
           onCustomItemPress = { itemText, selectedText, start, end ->
             onContextMenuItemPressCallback?.invoke(itemText, selectedText, start, end)
           },
         )
     }
 
+    fun setContextMenuHidden(hidden: Boolean) {
+      if (contextMenuHidden == hidden) return
+      contextMenuHidden = hidden
+      // Rebuild a toolbar that is already on screen; without this the flip
+      // would only take effect on the next selection, leaving a working Copy
+      // menu up after the app asked for it to be hidden.
+      activeActionMode?.invalidate()
+    }
+
     fun setMarkdownContent(markdown: String) {
       if (currentMarkdown == markdown) return
       currentMarkdown = markdown
@@ -116,12 +136,20 @@ class EnrichedMarkdownText
       // Register font scaling settings when style is set (view should have ID by now)
       updateMeasurementStoreFontScaling()
       val newStyle = style?.let { StyleConfig(it, context, allowFontScaling, maxFontSizeMultiplier) }
+      newStyle?.imageRequestHeaders = imageRequestHeaders
       if (markdownStyle == newStyle) return
       markdownStyle = newStyle
       updateJustificationMode(newStyle)
       scheduleRender()
     }
 
+    fun setImageRequestHeaders(headers: Map<String, String>) {
+      if (imageRequestHeaders == headers) return
+      imageRequestHeaders = headers
+      markdownStyle?.imageRequestHeaders = headers
+      scheduleRenderIfNeeded()
+    }
+
     override fun onConfigurationChanged(newConfig: Configuration) {
       super.onConfigurationChanged(newConfig)
 
@@ -177,6 +205,10 @@ class EnrichedMarkdownText
       }
     }
 
+    fun commitProps() {
+      updateMeasurementStoreFontScaling()
+    }
+
     private fun updateMeasurementStoreFontScaling() {
       MeasurementStore.updateFontScalingSettings(id, allowFontScaling, maxFontSizeMultiplier)
     }
@@ -189,7 +221,10 @@ class EnrichedMarkdownText
 
     private fun recreateStyleConfig() {
       markdownStyleMap?.let { styleMap ->
-        markdownStyle = StyleConfig(styleMap, context, allowFontScaling, maxFontSizeMultiplier)
+        markdownStyle =
+          StyleConfig(styleMap, context, allowFontScaling, maxFontSizeMultiplier).also {
+            it.imageRequestHeaders = imageRequestHeaders
+          }
         updateJustificationMode(markdownStyle)
       }
     }
@@ -242,6 +277,10 @@ class EnrichedMarkdownText
     private fun applyRenderedText(styledText: CharSequence) {
       val tailStart = previousTextLength
 
+      markdownStyle?.paragraphStyle?.fontSize?.let {
+        setTextSize(TypedValue.COMPLEX_UNIT_PX, it)
+      }
+
       text = styledText
 
       if (movementMethod !is LinkLongPressMovementMethod) {
@@ -268,6 +307,10 @@ class EnrichedMarkdownText
       applySelectionColors(selectionColor, selectionHandleColor)
     }
 
+    // Trailing bottom margin included in the shadow-node measurement — must be
+    // mirrored when re-storing the measurement from the display text.
+    fun trailingMarginBottomPx(): Float = if (allowTrailingMargin) renderer.getLastElementMarginBottom() else 0f
+
     fun setContextMenuItems(items: List<String>) {
       contextMenuItemTexts = items
     }
@@ -326,6 +369,10 @@ class EnrichedMarkdownText
       checkboxTouchHelper.onCheckboxTap = callback
     }
 
+    fun setEnableTaskListItemToggle(enabled: Boolean) {
+      checkboxTouchHelper.isEnabled = enabled
+    }
+
     override fun onAttachedToWindow() {
       super.onAttachedToWindow()
       pendingStyledText?.let {

package/android/src/main/java/com/swmansion/enriched/markdown/EnrichedMarkdownTextLayoutManager.kt

@@ -1,12 +1,21 @@
 package com.swmansion.enriched.markdown
 
+import com.facebook.react.bridge.Arguments
+
 class EnrichedMarkdownTextLayoutManager(
   private val view: EnrichedMarkdownText,
 ) {
+  private var forceHeightRecalculationCounter = 0
+
   fun invalidateLayout() {
     val text = view.text
     val paint = view.paint
-    MeasurementStore.store(view.id, text, paint)
+    val heightChanged = MeasurementStore.store(view.id, text, paint, view.trailingMarginBottomPx())
+    if (!heightChanged) return
+    val stateWrapper = view.stateWrapper ?: return
+    val state = Arguments.createMap()
+    state.putInt("forceHeightRecalculationCounter", ++forceHeightRecalculationCounter)
+    stateWrapper.updateState(state)
   }
 
   fun releaseMeasurementStore() {

package/android/src/main/java/com/swmansion/enriched/markdown/EnrichedMarkdownTextManager.kt

@@ -4,7 +4,9 @@ import android.content.Context
 import com.facebook.react.bridge.ReadableArray
 import com.facebook.react.bridge.ReadableMap
 import com.facebook.react.module.annotations.ReactModule
+import com.facebook.react.uimanager.ReactStylesDiffMap
 import com.facebook.react.uimanager.SimpleViewManager
+import com.facebook.react.uimanager.StateWrapper
 import com.facebook.react.uimanager.ThemedReactContext
 import com.facebook.react.uimanager.ViewManagerDelegate
 import com.facebook.react.uimanager.annotations.ReactProp
@@ -19,6 +21,7 @@ import com.swmansion.enriched.markdown.utils.common.emitTaskListItemPress
 import com.swmansion.enriched.markdown.utils.common.markdownEventTypeConstants
 import com.swmansion.enriched.markdown.utils.common.parseAccessibilityLabels
 import com.swmansion.enriched.markdown.utils.common.parseContextMenuItems
+import com.swmansion.enriched.markdown.utils.common.parseImageRequestHeaders
 import com.swmansion.enriched.markdown.utils.common.parseMd4cFlags
 import com.swmansion.enriched.markdown.utils.common.parseSelectionMenuConfig
 import com.swmansion.enriched.markdown.utils.text.interaction.TaskListTapUtils
@@ -69,6 +72,20 @@ class EnrichedMarkdownTextManager :
     return view
   }
 
+  override fun onAfterUpdateTransaction(view: EnrichedMarkdownText) {
+    super.onAfterUpdateTransaction(view)
+    view.commitProps()
+  }
+
+  override fun updateState(
+    view: EnrichedMarkdownText,
+    props: ReactStylesDiffMap?,
+    stateWrapper: StateWrapper?,
+  ): Any? {
+    view.stateWrapper = stateWrapper
+    return super.updateState(view, props, stateWrapper)
+  }
+
   override fun onDropViewInstance(view: EnrichedMarkdownText) {
     super.onDropViewInstance(view)
     MeasurementStore.clearFontScalingSettings(view.id)
@@ -148,6 +165,14 @@ class EnrichedMarkdownTextManager :
     view?.setAllowTrailingMargin(allowTrailingMargin)
   }
 
+  @ReactProp(name = "contextMenuHidden", defaultBoolean = false)
+  override fun setContextMenuHidden(
+    view: EnrichedMarkdownText?,
+    contextMenuHidden: Boolean,
+  ) {
+    view?.setContextMenuHidden(contextMenuHidden)
+  }
+
   @ReactProp(name = "enableLinkPreview", defaultBoolean = true)
   override fun setEnableLinkPreview(
     view: EnrichedMarkdownText?,
@@ -156,6 +181,14 @@ class EnrichedMarkdownTextManager :
     // No-op on Android — only used on iOS
   }
 
+  @ReactProp(name = "enableTaskListItemToggle", defaultBoolean = true)
+  override fun setEnableTaskListItemToggle(
+    view: EnrichedMarkdownText?,
+    enableTaskListItemToggle: Boolean,
+  ) {
+    view?.setEnableTaskListItemToggle(enableTaskListItemToggle)
+  }
+
   @ReactProp(name = "lineBreakStrategyIOS")
   override fun setLineBreakStrategyIOS(
     view: EnrichedMarkdownText?,
@@ -213,6 +246,15 @@ class EnrichedMarkdownTextManager :
     view.setContextMenuItems(parseContextMenuItems(value))
   }
 
+  @ReactProp(name = "imageRequestHeaders")
+  override fun setImageRequestHeaders(
+    view: EnrichedMarkdownText?,
+    value: ReadableArray?,
+  ) {
+    if (view == null) return
+    view.setImageRequestHeaders(parseImageRequestHeaders(value))
+  }
+
   @ReactProp(name = "selectionMenuConfig")
   override fun setSelectionMenuConfig(
     view: EnrichedMarkdownText?,

package/android/src/main/java/com/swmansion/enriched/markdown/MeasurementStore.kt

@@ -19,16 +19,21 @@ import com.swmansion.enriched.markdown.spans.MathMetrics
 import com.swmansion.enriched.markdown.spans.MathRenderMode
 import com.swmansion.enriched.markdown.styles.StyleConfig
 import com.swmansion.enriched.markdown.utils.common.BreakStrategyUtils
+import com.swmansion.enriched.markdown.utils.common.CodeBlockStreamingMode
 import com.swmansion.enriched.markdown.utils.common.FeatureFlags
 import com.swmansion.enriched.markdown.utils.common.MarkdownSegmentRenderer
 import com.swmansion.enriched.markdown.utils.common.RenderedSegment
 import com.swmansion.enriched.markdown.utils.common.StreamingMarkdownFilter
 import com.swmansion.enriched.markdown.utils.common.TableStreamingMode
+import com.swmansion.enriched.markdown.utils.common.getArrayOrNull
 import com.swmansion.enriched.markdown.utils.common.getBooleanOrDefault
+import com.swmansion.enriched.markdown.utils.common.getFloatOrDefault
 import com.swmansion.enriched.markdown.utils.common.getMapOrNull
 import com.swmansion.enriched.markdown.utils.common.getStringOrDefault
+import com.swmansion.enriched.markdown.utils.common.parseImageRequestHeaders
 import com.swmansion.enriched.markdown.utils.common.splitASTIntoSegments
 import com.swmansion.enriched.markdown.utils.text.extensions.replaceMathSpansWithPlaceholders
+import com.swmansion.enriched.markdown.views.CodeBlockContainerView
 import com.swmansion.enriched.markdown.views.TableContainerView
 import java.util.concurrent.ConcurrentHashMap
 import kotlin.math.ceil
@@ -67,6 +72,8 @@ object MeasurementStore {
 
   private val streamingTableModes = ConcurrentHashMap<Int, TableStreamingMode>()
 
+  private val streamingCodeBlockModes = ConcurrentHashMap<Int, CodeBlockStreamingMode>()
+
   private fun resolveFontScalingSettings(
     viewId: Int?,
     props: ReadableMap?,
@@ -95,6 +102,7 @@ object MeasurementStore {
     id: Int,
     spannable: CharSequence?,
     paint: TextPaint,
+    trailingMarginBottomPx: Float = 0f,
   ): Boolean {
     val cached = data[id]
     val width = cached?.cachedWidth ?: 0f
@@ -102,7 +110,14 @@ object MeasurementStore {
     val existingHash = cached?.markdownHash ?: 0
     val paintParams = PaintParams(paint.typeface ?: Typeface.DEFAULT, paint.textSize)
 
-    val newSize = measure(width, spannable, paint, id)
+    var newSize = measure(width, spannable, paint, id)
+    if (trailingMarginBottomPx > 0f) {
+      newSize =
+        YogaMeasureOutput.make(
+          YogaMeasureOutput.getWidth(newSize),
+          YogaMeasureOutput.getHeight(newSize) + PixelUtil.toDIPFromPixel(trailingMarginBottomPx),
+        )
+    }
     data[id] = MeasurementParams(width, newSize, spannable, paintParams, existingHash)
     return oldSize != newSize
   }
@@ -151,7 +166,11 @@ object MeasurementStore {
     allowFontScaling: Boolean,
     maxFontSizeMultiplier: Float,
   ) {
+    val previous = fontScalingSettings[viewId]
     fontScalingSettings[viewId] = FontScalingSettings(allowFontScaling, maxFontSizeMultiplier)
+    if (previous != null && (previous.allowFontScaling != allowFontScaling || previous.maxFontSizeMultiplier != maxFontSizeMultiplier)) {
+      data.remove(viewId)
+    }
   }
 
   fun clearFontScalingSettings(viewId: Int) {
@@ -182,6 +201,17 @@ object MeasurementStore {
     streamingTableModes.remove(viewId)
   }
 
+  fun updateStreamingCodeBlockMode(
+    viewId: Int,
+    mode: CodeBlockStreamingMode,
+  ) {
+    streamingCodeBlockModes[viewId] = mode
+  }
+
+  fun clearStreamingCodeBlockMode(viewId: Int) {
+    streamingCodeBlockModes.remove(viewId)
+  }
+
   private fun getMeasureByIdInternal(
     context: Context,
     id: Int?,
@@ -237,6 +267,7 @@ object MeasurementStore {
     val styleMap = props.getMapOrNull("markdownStyle")
     val md4cFlagsMap = props.getMapOrNull("md4cFlags")
     val allowTrailingMargin = props.getBooleanOrDefault("allowTrailingMargin", false)
+    val imageRequestHeaders = parseImageRequestHeaders(props.getArrayOrNull("imageRequestHeaders"))
     var result = markdown.hashCode()
     result = 31 * result + (styleMap?.hashCode() ?: 0)
     result = 31 * result + (md4cFlagsMap?.hashCode() ?: 0)
@@ -244,6 +275,7 @@ object MeasurementStore {
     result = 31 * result + allowFontScaling.hashCode()
     result = 31 * result + maxFontSizeMultiplier.toBits()
     result = 31 * result + allowTrailingMargin.hashCode()
+    result = 31 * result + imageRequestHeaders.hashCode()
     return result
   }
 
@@ -292,13 +324,23 @@ object MeasurementStore {
         superscript = props.getMapOrNull("md4cFlags").getBooleanOrDefault("superscript", false),
         subscript = props.getMapOrNull("md4cFlags").getBooleanOrDefault("subscript", false),
         highlight = props.getMapOrNull("md4cFlags").getBooleanOrDefault("highlight", false),
+        hardSoftBreaks = props.getMapOrNull("md4cFlags").getBooleanOrDefault("hardSoftBreaks", false),
       )
 
     val fontSize = getInitialFontSize(styleMap, context, allowFontScaling, fontScale, maxFontSizeMultiplier)
     val propsHash = computePropsHash(props, allowFontScaling, fontScale, maxFontSizeMultiplier)
 
     // 2. Render & Measure
-    val spannable = tryRenderMarkdown(markdown, styleMap, context, md4cFlags, allowFontScaling, maxFontSizeMultiplier)
+    measurePaint.textSize = fontSize
+    val imageRequestHeaders = parseImageRequestHeaders(props.getArrayOrNull("imageRequestHeaders"))
+    val spannable =
+      tryRenderMarkdown(markdown, styleMap, context, md4cFlags, allowFontScaling, maxFontSizeMultiplier, imageRequestHeaders)
+    // Placeholders must be built with the same inlineMath.paddingVertical the real spans use,
+    // or the measured line box won't match the drawn one.
+    spannable?.replaceMathSpansWithPlaceholders(
+      context,
+      PixelUtil.toPixelFromDIP(styleMap.getMapOrNull("inlineMath").getFloatOrDefault("paddingVertical", 0f)),
+    )
     val textToMeasure = spannable ?: markdown
     val (size, _) = measureWithLayout(width, textToMeasure, measurePaint, id)
 
@@ -343,9 +385,17 @@ object MeasurementStore {
       } else {
         TableStreamingMode.PROGRESSIVE
       }
+    val codeBlockMode =
+      if (isStreaming) {
+        id?.let {
+          streamingCodeBlockModes[it]
+        } ?: CodeBlockStreamingMode.PROGRESSIVE
+      } else {
+        CodeBlockStreamingMode.PROGRESSIVE
+      }
     val markdown =
       if (isStreaming) {
-        StreamingMarkdownFilter.renderableMarkdownForStreaming(rawMarkdown, tableMode)
+        StreamingMarkdownFilter.renderableMarkdownForStreaming(rawMarkdown, tableMode, codeBlockMode).markdown
       } else {
         rawMarkdown
       }
@@ -371,6 +421,7 @@ object MeasurementStore {
         superscript = props.getMapOrNull("md4cFlags").getBooleanOrDefault("superscript", false),
         subscript = props.getMapOrNull("md4cFlags").getBooleanOrDefault("subscript", false),
         highlight = props.getMapOrNull("md4cFlags").getBooleanOrDefault("highlight", false),
+        hardSoftBreaks = props.getMapOrNull("md4cFlags").getBooleanOrDefault("hardSoftBreaks", false),
       )
     val allowTrailingMargin = props.getBooleanOrDefault("allowTrailingMargin", false)
     val fontSize = getInitialFontSize(styleMap, context, allowFontScaling, fontScale, maxFontSizeMultiplier)
@@ -381,6 +432,7 @@ object MeasurementStore {
           ?: return YogaMeasureOutput.make(PixelUtil.toDIPFromPixel(width), 0f)
 
       val style = StyleConfig(styleMap, context, allowFontScaling, maxFontSizeMultiplier)
+      style.imageRequestHeaders = parseImageRequestHeaders(props.getArrayOrNull("imageRequestHeaders"))
       val segments = splitASTIntoSegments(ast)
       val renderedSegments = MarkdownSegmentRenderer.render(segments, style, context, null, null)
 
@@ -449,6 +501,15 @@ object MeasurementStore {
               totalHeightPx += style.mathStyle.marginBottom
             }
           }
+
+          is RenderedSegment.CodeBlock -> {
+            totalHeightPx += style.codeBlockStyle.marginTop
+            totalHeightPx += CodeBlockContainerView.measureCodeBlockNodeHeight(segment.node, style, context, width)
+            maxContentWidthPx = width
+            if (includeBottomMargin) {
+              totalHeightPx += style.codeBlockStyle.marginBottom
+            }
+          }
         }
       }
 
@@ -466,6 +527,18 @@ object MeasurementStore {
     }
   }
 
+  private fun prepareImageSpansForMeasurement(
+    text: CharSequence?,
+    widthPx: Int,
+  ) {
+    // widthPx == 1 is the coerceAtLeast(1) fallback for a not-yet-measured view
+    if (widthPx <= 1) return
+    val spanned = text as? android.text.Spanned ?: return
+    spanned
+      .getSpans(0, spanned.length, com.swmansion.enriched.markdown.spans.ImageSpan::class.java)
+      .forEach { it.prepareForMeasurement(spanned, widthPx) }
+  }
+
   private fun createStaticLayout(
     text: CharSequence,
     fontSize: Float,
@@ -473,6 +546,7 @@ object MeasurementStore {
     viewId: Int?,
   ): StaticLayout {
     measurePaint.textSize = fontSize
+    prepareImageSpansForMeasurement(text, widthPx)
     return StaticLayout.Builder
       .obtain(text, 0, text.length, measurePaint, widthPx)
       .setIncludePad(false)
@@ -495,12 +569,14 @@ object MeasurementStore {
     md4cFlags: Md4cFlags,
     allowFontScaling: Boolean,
     maxFontSizeMultiplier: Float,
+    imageRequestHeaders: Map<String, String> = emptyMap(),
   ): SpannableString? {
     if (styleMap == null) return null
 
     return try {
       val ast = Parser.shared.parseMarkdown(markdown, md4cFlags) ?: return null
       val style = StyleConfig(styleMap, context, allowFontScaling, maxFontSizeMultiplier)
+      style.imageRequestHeaders = imageRequestHeaders
       measureRenderer.configure(style, context)
       measureRenderer.renderDocument(ast, null).apply {
         replaceMathSpansWithPlaceholders(context, style.inlineMathStyle.paddingVertical)
@@ -518,7 +594,7 @@ object MeasurementStore {
     fontScale: Float,
     maxFontSizeMultiplier: Float,
   ): Float {
-    val fontSizeSp = styleMap?.getMap("paragraph")?.getDouble("fontSize")?.toFloat() ?: 16f
+    val fontSizeSp = styleMap.getMapOrNull("paragraph").getFloatOrDefault("fontSize", 16f)
     val density = context.resources.displayMetrics.density
 
     if (!allowFontScaling) {
@@ -554,6 +630,7 @@ object MeasurementStore {
   ): Long {
     val content = text ?: ""
     val safeWidth = ceil(maxWidth).toInt().coerceAtLeast(1)
+    prepareImageSpansForMeasurement(content, safeWidth)
 
     val builder =
       StaticLayout.Builder
@@ -593,6 +670,7 @@ object MeasurementStore {
   ): Pair<Long, StaticLayout> {
     val content = text ?: ""
     val widthPx = ceil(maxWidth).toInt().coerceAtLeast(1)
+    prepareImageSpansForMeasurement(content, widthPx)
 
     val layout =
       StaticLayout.Builder

package/android/src/main/java/com/swmansion/enriched/markdown/events/CopyPressEvent.kt

@@ -0,0 +1,24 @@
+package com.swmansion.enriched.markdown.events
+
+import com.facebook.react.bridge.Arguments
+import com.facebook.react.bridge.WritableMap
+import com.facebook.react.uimanager.events.Event
+
+class CopyPressEvent(
+  surfaceId: Int,
+  viewId: Int,
+  private val code: String,
+  private val language: String,
+) : Event<CopyPressEvent>(surfaceId, viewId) {
+  override fun getEventName(): String = EVENT_NAME
+
+  override fun getEventData(): WritableMap =
+    Arguments.createMap().apply {
+      putString("code", code)
+      putString("language", language)
+    }
+
+  companion object {
+    const val EVENT_NAME: String = "onCopyPress"
+  }
+}