@depup/react-native 0.84.1-depup.2 → 0.85.0-depup.0

package/ReactAndroid/src/main/java/com/facebook/react/views/text/ReactTextViewManager.kt

@@ -5,37 +5,55 @@
  * LICENSE file in the root directory of this source tree.
  */
 
+@file:Suppress("DEPRECATION")
+
 package com.facebook.react.views.text
 
 import android.os.Build
+import android.text.Layout
 import android.text.Spannable
+import android.text.SpannableString
+import android.text.Spanned
+import android.text.TextUtils
+import android.text.util.Linkify
+import android.view.Gravity
+import com.facebook.common.logging.FLog
 import com.facebook.react.R
+import com.facebook.react.common.ReactConstants
 import com.facebook.react.common.annotations.UnstableReactNativeAPI
 import com.facebook.react.common.mapbuffer.MapBuffer
 import com.facebook.react.internal.SystraceSection
 import com.facebook.react.internal.featureflags.ReactNativeFeatureFlags
 import com.facebook.react.module.annotations.ReactModule
+import com.facebook.react.uimanager.BackgroundStyleApplicator
+import com.facebook.react.uimanager.BaseViewManager
 import com.facebook.react.uimanager.IViewManagerWithChildren
+import com.facebook.react.uimanager.LayoutShadowNode
+import com.facebook.react.uimanager.LengthPercentage
+import com.facebook.react.uimanager.LengthPercentageType
 import com.facebook.react.uimanager.ReactStylesDiffMap
+import com.facebook.react.uimanager.ReferenceStateWrapper
 import com.facebook.react.uimanager.StateWrapper
 import com.facebook.react.uimanager.ThemedReactContext
+import com.facebook.react.uimanager.ViewDefaults
+import com.facebook.react.uimanager.ViewProps
 import com.facebook.react.uimanager.annotations.ReactProp
-import com.facebook.react.views.text.internal.span.TextInlineImageSpan
+import com.facebook.react.uimanager.annotations.ReactPropGroup
+import com.facebook.react.uimanager.style.BorderRadiusProp
+import com.facebook.react.uimanager.style.BorderStyle.Companion.fromString
+import com.facebook.react.uimanager.style.LogicalEdge
+import com.facebook.react.views.text.DefaultStyleValuesUtil.getDefaultTextColorHighlight
 import java.util.HashMap
 
-/**
- * Concrete class for [ReactTextAnchorViewManager] which represents view managers of anchor `<Text>`
- * nodes.
- */
-@Suppress("DEPRECATION")
+/** View manager for `<Text>` nodes. */
 @ReactModule(name = ReactTextViewManager.REACT_CLASS)
 @OptIn(UnstableReactNativeAPI::class)
-public class ReactTextViewManager
+public open class ReactTextViewManager
 @JvmOverloads
 public constructor(
     protected var reactTextViewManagerCallback: ReactTextViewManagerCallback? = null
 ) :
-    ReactTextAnchorViewManager<ReactTextShadowNode>(),
+    BaseViewManager<ReactTextView, LayoutShadowNode>(),
     IViewManagerWithChildren,
     ReactTextViewManagerCallback {
   init {
@@ -53,7 +71,7 @@ public constructor(
     if (preparedView != null) {
       // Resets background and borders
       preparedView.recycleView()
-      // Defaults from ReactTextAnchorViewManager
+      // Reset selection color to default
       setSelectionColor(preparedView, null)
     }
     return preparedView
@@ -75,17 +93,13 @@ public constructor(
   override fun updateExtraData(view: ReactTextView, extraData: Any) {
     SystraceSection("ReactTextViewManager.updateExtraData").use { s ->
       val update = extraData as ReactTextUpdate
-      val spannable: Spannable = update.text
-      @Suppress("DEPRECATION")
-      if (update.containsImages()) {
-        TextInlineImageSpan.possiblyUpdateInlineImageSpans(spannable, view)
-      }
+      val spanned: Spanned = update.text
       view.setText(update)
 
       // If this text view contains any clickable spans, set a view tag and reset the accessibility
       // delegate so that these can be picked up by the accessibility system.
       val accessibilityLinks: ReactTextViewAccessibilityDelegate.AccessibilityLinks =
-          ReactTextViewAccessibilityDelegate.AccessibilityLinks(spannable)
+          ReactTextViewAccessibilityDelegate.AccessibilityLinks(spanned)
       view.setTag(
           R.id.accessibility_links,
           if (accessibilityLinks.size() > 0) accessibilityLinks else null,
@@ -98,14 +112,13 @@ public constructor(
     }
   }
 
-  override fun createShadowNodeInstance(): ReactTextShadowNode =
-      ReactTextShadowNode(reactTextViewManagerCallback)
+  override fun createShadowNodeInstance(): LayoutShadowNode = LayoutShadowNode()
 
   public fun createShadowNodeInstance(
       reactTextViewManagerCallback: ReactTextViewManagerCallback?
-  ): ReactTextShadowNode = ReactTextShadowNode(reactTextViewManagerCallback)
+  ): LayoutShadowNode = LayoutShadowNode()
 
-  override fun getShadowNodeClass(): Class<ReactTextShadowNode> = ReactTextShadowNode::class.java
+  override fun getShadowNodeClass(): Class<LayoutShadowNode> = LayoutShadowNode::class.java
 
   override fun onAfterUpdateTransaction(view: ReactTextView) {
     super.onAfterUpdateTransaction(view)
@@ -120,6 +133,11 @@ public constructor(
       stateWrapper: StateWrapper,
   ): Any? {
     SystraceSection("ReactTextViewManager.updateState").use { s ->
+      val refState = (stateWrapper as? ReferenceStateWrapper)?.stateDataReference
+      if (refState is PreparedLayout) {
+        return getReactTextUpdateFromPreparedLayout(view, refState)
+      }
+
       val stateMapBuffer = stateWrapper.stateDataMapBuffer
       return if (stateMapBuffer != null) {
         getReactTextUpdate(view, props, stateMapBuffer)
@@ -149,6 +167,9 @@ public constructor(
         paragraphAttributes.getDouble(TextLayoutManager.PA_KEY_MINIMUM_FONT_SIZE).toFloat()
     view.setMinimumFontSize(minimumFontSize)
 
+    // Clear any stale PreparedLayout from a previous update
+    view.setPreparedLayout(null)
+
     val textBreakStrategy =
         TextAttributeProps.getTextBreakStrategy(
             paragraphAttributes.getString(TextLayoutManager.PA_KEY_TEXT_BREAK_STRATEGY)
@@ -159,13 +180,41 @@ public constructor(
     return ReactTextUpdate(
         spanned,
         -1, // UNUSED FOR TEXT
-        false, // TODO add this into local Data
         TextLayoutManager.getTextGravity(attributedString, spanned),
         textBreakStrategy,
         TextAttributeProps.getJustificationMode(props, currentJustificationMode),
     )
   }
 
+  /**
+   * Constructs a [ReactTextUpdate] from a [PreparedLayout] received via [ReferenceStateWrapper].
+   */
+  private fun getReactTextUpdateFromPreparedLayout(
+      view: ReactTextView,
+      preparedLayout: PreparedLayout,
+  ): ReactTextUpdate {
+    val layout = preparedLayout.layout
+    val text = layout.text
+    val spanned = if (text is Spannable) text else SpannableString(text)
+    view.setSpanned(spanned)
+    view.setPreparedLayout(preparedLayout)
+
+    val textAlign =
+        when (layout.alignment) {
+          Layout.Alignment.ALIGN_CENTER -> Gravity.CENTER_HORIZONTAL
+          Layout.Alignment.ALIGN_OPPOSITE -> Gravity.END
+          else -> Gravity.START
+        }
+
+    return ReactTextUpdate(
+        spanned,
+        -1,
+        textAlign,
+        preparedLayout.textBreakStrategy,
+        preparedLayout.justificationMode,
+    )
+  }
+
   override fun getExportedCustomDirectEventTypeConstants(): MutableMap<String, Any>? {
     val baseEventTypeConstants = super.getExportedCustomDirectEventTypeConstants()
     val eventTypeConstants = baseEventTypeConstants ?: HashMap()
@@ -186,6 +235,180 @@ public constructor(
     view.setOverflow(overflow)
   }
 
+  @ReactProp(name = "accessible")
+  public fun setAccessible(view: ReactTextView, accessible: Boolean) {
+    view.isFocusable = accessible
+  }
+
+  // maxLines can only be set in master view (block), doesn't really make sense to set in a span
+  @ReactProp(name = ViewProps.NUMBER_OF_LINES, defaultInt = ViewDefaults.NUMBER_OF_LINES)
+  public fun setNumberOfLines(view: ReactTextView, numberOfLines: Int) {
+    view.setNumberOfLines(numberOfLines)
+  }
+
+  @ReactProp(name = ViewProps.ELLIPSIZE_MODE)
+  public fun setEllipsizeMode(view: ReactTextView, ellipsizeMode: String?) {
+    when (ellipsizeMode) {
+      null,
+      "tail" -> view.setEllipsizeLocation(TextUtils.TruncateAt.END)
+      "head" -> view.setEllipsizeLocation(TextUtils.TruncateAt.START)
+      "middle" -> view.setEllipsizeLocation(TextUtils.TruncateAt.MIDDLE)
+      "clip" -> view.setEllipsizeLocation(null)
+      else -> {
+        FLog.w(ReactConstants.TAG, "Invalid ellipsizeMode: $ellipsizeMode")
+        view.setEllipsizeLocation(TextUtils.TruncateAt.END)
+      }
+    }
+  }
+
+  @ReactProp(name = ViewProps.ADJUSTS_FONT_SIZE_TO_FIT)
+  public fun setAdjustFontSizeToFit(view: ReactTextView, adjustsFontSizeToFit: Boolean) {
+    view.setAdjustFontSizeToFit(adjustsFontSizeToFit)
+  }
+
+  @ReactProp(name = ViewProps.FONT_SIZE)
+  public fun setFontSize(view: ReactTextView, fontSize: Float) {
+    view.setFontSize(fontSize)
+  }
+
+  @ReactProp(name = ViewProps.LETTER_SPACING, defaultFloat = 0f)
+  public fun setLetterSpacing(view: ReactTextView, letterSpacing: Float) {
+    view.letterSpacing = letterSpacing
+  }
+
+  @ReactProp(name = ViewProps.TEXT_ALIGN_VERTICAL)
+  public fun setTextAlignVertical(view: ReactTextView, textAlignVertical: String?) {
+    when (textAlignVertical) {
+      null,
+      "auto" -> view.setGravityVertical(Gravity.NO_GRAVITY)
+      "top" -> view.setGravityVertical(Gravity.TOP)
+      "bottom" -> view.setGravityVertical(Gravity.BOTTOM)
+      "center" -> view.setGravityVertical(Gravity.CENTER_VERTICAL)
+      else -> {
+        FLog.w(ReactConstants.TAG, "Invalid textAlignVertical: $textAlignVertical")
+        view.setGravityVertical(Gravity.NO_GRAVITY)
+      }
+    }
+  }
+
+  @ReactProp(name = "selectable")
+  public fun setSelectable(view: ReactTextView, isSelectable: Boolean) {
+    view.setTextIsSelectable(isSelectable)
+  }
+
+  @ReactProp(name = "selectionColor", customType = "Color")
+  public fun setSelectionColor(view: ReactTextView, color: Int?) {
+    view.highlightColor = color ?: getDefaultTextColorHighlight(view.context)
+  }
+
+  @ReactProp(name = "android_hyphenationFrequency")
+  public fun setAndroidHyphenationFrequency(view: ReactTextView, frequency: String?) {
+    when (frequency) {
+      null,
+      "none" -> view.hyphenationFrequency = Layout.HYPHENATION_FREQUENCY_NONE
+      "full" -> view.hyphenationFrequency = Layout.HYPHENATION_FREQUENCY_FULL
+      "normal" -> view.hyphenationFrequency = Layout.HYPHENATION_FREQUENCY_NORMAL
+      else -> {
+        FLog.w(ReactConstants.TAG, "Invalid android_hyphenationFrequency: $frequency")
+        view.hyphenationFrequency = Layout.HYPHENATION_FREQUENCY_NONE
+      }
+    }
+  }
+
+  @ReactPropGroup(
+      names =
+          [
+              ViewProps.BORDER_RADIUS,
+              ViewProps.BORDER_TOP_LEFT_RADIUS,
+              ViewProps.BORDER_TOP_RIGHT_RADIUS,
+              ViewProps.BORDER_BOTTOM_RIGHT_RADIUS,
+              ViewProps.BORDER_BOTTOM_LEFT_RADIUS,
+          ],
+      defaultFloat = Float.NaN,
+  )
+  public fun setBorderRadius(view: ReactTextView, index: Int, borderRadius: Float) {
+    val radius =
+        if (borderRadius.isNaN()) {
+          null
+        } else {
+          LengthPercentage(borderRadius, LengthPercentageType.POINT)
+        }
+    BackgroundStyleApplicator.setBorderRadius(view, BorderRadiusProp.values()[index], radius)
+  }
+
+  @ReactProp(name = "borderStyle")
+  public fun setBorderStyle(view: ReactTextView, borderStyle: String?) {
+    val parsedBorderStyle = if (borderStyle == null) null else fromString(borderStyle)
+    BackgroundStyleApplicator.setBorderStyle(view, parsedBorderStyle)
+  }
+
+  @ReactPropGroup(
+      names =
+          [
+              ViewProps.BORDER_WIDTH,
+              ViewProps.BORDER_LEFT_WIDTH,
+              ViewProps.BORDER_RIGHT_WIDTH,
+              ViewProps.BORDER_TOP_WIDTH,
+              ViewProps.BORDER_BOTTOM_WIDTH,
+              ViewProps.BORDER_START_WIDTH,
+              ViewProps.BORDER_END_WIDTH,
+          ],
+      defaultFloat = Float.NaN,
+  )
+  public fun setBorderWidth(view: ReactTextView, index: Int, width: Float) {
+    BackgroundStyleApplicator.setBorderWidth(view, LogicalEdge.values()[index], width)
+  }
+
+  @ReactPropGroup(
+      names =
+          [
+              "borderColor",
+              "borderLeftColor",
+              "borderRightColor",
+              "borderTopColor",
+              "borderBottomColor",
+          ],
+      customType = "Color",
+  )
+  public fun setBorderColor(view: ReactTextView, index: Int, color: Int?) {
+    BackgroundStyleApplicator.setBorderColor(view, LogicalEdge.values()[index], color)
+  }
+
+  @ReactProp(name = ViewProps.INCLUDE_FONT_PADDING, defaultBoolean = true)
+  public fun setIncludeFontPadding(view: ReactTextView, includepad: Boolean) {
+    view.includeFontPadding = includepad
+  }
+
+  @ReactProp(name = "disabled", defaultBoolean = false)
+  public fun setDisabled(view: ReactTextView, disabled: Boolean) {
+    view.isEnabled = !disabled
+  }
+
+  @ReactProp(name = "dataDetectorType")
+  public fun setDataDetectorType(view: ReactTextView, type: String?) {
+    when (type) {
+      "phoneNumber" -> {
+        view.setLinkifyMask(Linkify.PHONE_NUMBERS)
+        return
+      }
+      "link" -> {
+        view.setLinkifyMask(Linkify.WEB_URLS)
+        return
+      }
+      "email" -> {
+        view.setLinkifyMask(Linkify.EMAIL_ADDRESSES)
+        return
+      }
+      "all" -> {
+        @Suppress("DEPRECATION") view.setLinkifyMask(Linkify.ALL)
+        return
+      }
+    }
+
+    // "none" case, default, and null type are equivalent.
+    view.setLinkifyMask(0)
+  }
+
   public companion object {
     private const val TX_STATE_KEY_ATTRIBUTED_STRING: Short = 0
     private const val TX_STATE_KEY_PARAGRAPH_ATTRIBUTES: Short = 1

package/ReactAndroid/src/main/java/com/facebook/react/views/text/ReactTypefaceUtils.kt

@@ -9,7 +9,6 @@ package com.facebook.react.views.text
 
 import android.content.res.AssetManager
 import android.graphics.Typeface
-import android.text.TextUtils
 import com.facebook.react.bridge.ReadableArray
 import com.facebook.react.common.ReactConstants
 import com.facebook.react.common.assets.ReactFontManager
@@ -93,7 +92,7 @@ public object ReactTypefaceUtils {
         "stylistic-twenty" -> features.add("'ss20'")
       }
     }
-    return TextUtils.join(", ", features)
+    return features.joinToString(", ")
   }
 
   @JvmStatic

package/ReactAndroid/src/main/java/com/facebook/react/views/text/SelectableTextViewManager.kt

@@ -0,0 +1,29 @@
+/*
+ * Copyright (c) Meta Platforms, Inc. and affiliates.
+ *
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
+ */
+
+package com.facebook.react.views.text
+
+import com.facebook.react.common.annotations.UnstableReactNativeAPI
+
+/**
+ * A [ReactTextViewManager] registered under the name "RCTSelectableText". Used to route selectable
+ * text through [ReactTextView] (a real [android.widget.TextView]) instead of
+ * [PreparedLayoutTextView] when enablePreparedTextLayout is on, since [PreparedLayoutTextView] does
+ * not support native text selection.
+ */
+@UnstableReactNativeAPI
+public class SelectableTextViewManager
+@JvmOverloads
+public constructor(reactTextViewManagerCallback: ReactTextViewManagerCallback? = null) :
+    ReactTextViewManager(reactTextViewManagerCallback) {
+
+  override fun getName(): String = REACT_CLASS
+
+  public companion object {
+    public const val REACT_CLASS: String = "RCTSelectableText"
+  }
+}

package/ReactAndroid/src/main/java/com/facebook/react/views/text/TextAttributeProps.kt

@@ -9,7 +9,6 @@ package com.facebook.react.views.text
 
 import android.os.Build
 import android.text.Layout
-import android.text.TextUtils
 import android.text.TextUtils.TruncateAt
 import android.util.LayoutDirection
 import android.view.Gravity
@@ -238,7 +237,7 @@ public class TextAttributeProps private constructor() {
         }
       }
     }
-    fontFeatureSettings = TextUtils.join(", ", features)
+    fontFeatureSettings = features.joinToString(", ")
   }
 
   private fun setFontWeight(fontWeightString: String?) {

package/ReactAndroid/src/main/java/com/facebook/react/views/text/TextLayoutManager.kt

@@ -821,15 +821,16 @@ internal object TextLayoutManager {
     }
 
     return createLayout(
-        text,
-        paint,
-        attributedString,
-        paragraphAttributes,
-        width,
-        widthYogaMeasureMode,
-        height,
-        heightYogaMeasureMode,
-    )
+            text,
+            paint,
+            attributedString,
+            paragraphAttributes,
+            width,
+            widthYogaMeasureMode,
+            height,
+            heightYogaMeasureMode,
+        )
+        .layout
   }
 
   private fun createLayout(
@@ -841,7 +842,7 @@ internal object TextLayoutManager {
       widthYogaMeasureMode: YogaMeasureMode,
       height: Float,
       heightYogaMeasureMode: YogaMeasureMode,
-  ): Layout {
+  ): CreateLayoutResult {
     val boring = isBoring(text, paint)
 
     val textBreakStrategy =
@@ -899,19 +900,23 @@ internal object TextLayoutManager {
       )
     }
 
-    return createLayout(
-        text,
-        boring,
-        width,
-        widthYogaMeasureMode,
-        includeFontPadding,
+    return CreateLayoutResult(
+        createLayout(
+            text,
+            boring,
+            width,
+            widthYogaMeasureMode,
+            includeFontPadding,
+            textBreakStrategy,
+            hyphenationFrequency,
+            alignment,
+            justificationMode,
+            ellipsizeMode,
+            maximumNumberOfLines,
+            paint,
+        ),
         textBreakStrategy,
-        hyphenationFrequency,
-        alignment,
         justificationMode,
-        ellipsizeMode,
-        maximumNumberOfLines,
-        paint,
     )
   }
 
@@ -937,7 +942,7 @@ internal object TextLayoutManager {
         )
     val baseTextAttributes =
         TextAttributeProps.fromMapBuffer(attributedString.getMapBuffer(AS_KEY_BASE_ATTRIBUTES))
-    val layout =
+    val result =
         createLayout(
             text,
             newPaintWithAttributes(baseTextAttributes, context),
@@ -956,14 +961,21 @@ internal object TextLayoutManager {
 
     val verticalOffset =
         getVerticalOffset(
-            layout,
+            result.layout,
             paragraphAttributes,
             height,
             heightYogaMeasureMode,
             maximumNumberOfLines,
         )
 
-    return PreparedLayout(layout, maximumNumberOfLines, verticalOffset, reactTags)
+    return PreparedLayout(
+        result.layout,
+        maximumNumberOfLines,
+        verticalOffset,
+        reactTags,
+        result.textBreakStrategy,
+        result.justificationMode,
+    )
   }
 
   @JvmStatic
@@ -1307,63 +1319,22 @@ internal object TextLayoutManager {
     } else {
       val placeholderWidth = placeholder.width.toFloat()
       val placeholderHeight = placeholder.height.toFloat()
+
       // Calculate if the direction of the placeholder character is Right-To-Left.
       val isRtlChar = layout.isRtlCharAt(start)
       val isRtlParagraph = layout.getParagraphDirection(line) == Layout.DIR_RIGHT_TO_LEFT
-      var placeholderLeftPosition: Float
-      // There's a bug on Samsung devices where calling getPrimaryHorizontal on
-      // the last offset in the layout will result in an endless loop. Work around
-      // this bug by avoiding getPrimaryHorizontal in that case.
-      if (
-          !ReactNativeFeatureFlags.disableOldAndroidAttachmentMetricsWorkarounds() &&
-              start == text.length - 1
-      ) {
-        val endsWithNewLine = text.length > 0 && text[layout.getLineEnd(line) - 1] == '\n'
-        val lineWidth = if (endsWithNewLine) layout.getLineMax(line) else layout.getLineWidth(line)
-        placeholderLeftPosition =
-            if (
-                isRtlParagraph // Equivalent to `layout.getLineLeft(line)` but `getLineLeft` returns
-            // incorrect
-            // values when the paragraph is RTL and `setSingleLine(true)`.
-            )
-                ( // Equivalent to `layout.getLineLeft(line)` but `getLineLeft` returns
-                // incorrect
-                // values when the paragraph is RTL and `setSingleLine(true)`.
-                calculatedWidth - lineWidth)
-            else (layout.getLineRight(line) - placeholderWidth)
-      } else {
-        // The direction of the paragraph may not be exactly the direction the string is
-        // heading
-        // in at the
-        // position of the placeholder. So, if the direction of the character is the same
-        // as the
-        // paragraph
-        // use primary, secondary otherwise.
-        val characterAndParagraphDirectionMatch = isRtlParagraph == isRtlChar
-        placeholderLeftPosition =
-            if (characterAndParagraphDirectionMatch) layout.getPrimaryHorizontal(start)
-            else layout.getSecondaryHorizontal(start)
-        if (
-            !ReactNativeFeatureFlags.disableOldAndroidAttachmentMetricsWorkarounds() &&
-                isRtlParagraph &&
-                !isRtlChar
-        ) {
-          // Adjust `placeholderLeftPosition` to work around an Android bug.
-          // The bug is when the paragraph is RTL and `setSingleLine(true)`, some layout
-          // methods such as `getPrimaryHorizontal`, `getSecondaryHorizontal`, and
-          // `getLineRight` return incorrect values. Their return values seem to be off
-          // by the same number of pixels so subtracting these values cancels out the
-          // error.
-          //
-          // The result is equivalent to bugless versions of
-          // `getPrimaryHorizontal`/`getSecondaryHorizontal`.
-          placeholderLeftPosition =
-              calculatedWidth - (layout.getLineRight(line) - placeholderLeftPosition)
-        }
-        if (isRtlChar) {
-          placeholderLeftPosition -= placeholderWidth
-        }
+
+      // The direction of the paragraph may not be exactly the direction the string is heading in at
+      // the position of the placeholder. So, if the direction of the character is the same as the
+      // paragraph use primary, secondary otherwise.
+      val characterAndParagraphDirectionMatch = isRtlParagraph == isRtlChar
+      var placeholderLeftPosition =
+          if (characterAndParagraphDirectionMatch) layout.getPrimaryHorizontal(start)
+          else layout.getSecondaryHorizontal(start)
+      if (isRtlChar) {
+        placeholderLeftPosition -= placeholderWidth
       }
+
       // Vertically align the inline view to the baseline of the line of text.
       val placeholderTopPosition = layout.getLineBaseline(line) - placeholderHeight
 
@@ -1414,6 +1385,12 @@ internal object TextLayoutManager {
         BoringLayout.isBoring(text, paint, TextDirectionHeuristics.FIRSTSTRONG_LTR, true, null)
       }
 
+  private class CreateLayoutResult(
+      val layout: Layout,
+      val textBreakStrategy: Int,
+      val justificationMode: Int,
+  )
+
   private class AttachmentMetrics {
     var wasFound: Boolean = false
     var top: Float = 0f

package/ReactAndroid/src/main/java/com/facebook/react/views/text/internal/span/DrawCommandSpan.kt

@@ -0,0 +1,27 @@
+/*
+ * Copyright (c) Meta Platforms, Inc. and affiliates.
+ *
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
+ */
+
+package com.facebook.react.views.text.internal.span
+
+import android.graphics.Canvas
+import android.text.Layout
+import android.text.style.UpdateAppearance
+
+/**
+ * May be overriden to implement charater styles which are applied by [PreparedLayoutTextView]
+ * during the drawing of text, against the underlying Android canvas
+ */
+public abstract class DrawCommandSpan : UpdateAppearance, ReactSpan {
+  /**
+   * Called before the text is drawn. This happens after the Paragraph component has drawn its
+   * background, but may be called before text spans with their own background color are drawn.
+   */
+  public open fun onPreDraw(start: Int, end: Int, canvas: Canvas, layout: Layout): Unit = Unit
+
+  /** Called after the text is drawn, including some effects like text shadows */
+  public open fun onDraw(start: Int, end: Int, canvas: Canvas, layout: Layout): Unit = Unit
+}

package/ReactAndroid/src/main/java/com/facebook/react/views/text/internal/span/ReactClickableSpan.kt

@@ -42,7 +42,7 @@ internal class ReactClickableSpan(val reactTag: Int) : ClickableSpan(), ReactSpa
 
   override fun onClick(view: View) {
     val context = view.context as ReactContext
-    val eventDispatcher = UIManagerHelper.getEventDispatcherForReactTag(context, reactTag)
+    val eventDispatcher = UIManagerHelper.getEventDispatcher(context)
     eventDispatcher?.dispatchEvent(
         ViewGroupClickEvent(UIManagerHelper.getSurfaceId(context), reactTag)
     )

package/ReactAndroid/src/main/java/com/facebook/react/views/text/internal/span/ReactLinkSpan.kt

@@ -11,8 +11,10 @@ import android.text.TextPaint
 import android.text.style.ClickableSpan
 import android.view.View
 import com.facebook.react.bridge.ReactContext
+import com.facebook.react.common.annotations.UnstableReactNativeAPI
 import com.facebook.react.uimanager.UIManagerHelper
 import com.facebook.react.views.text.PreparedLayoutTextView
+import com.facebook.react.views.text.ReactTextView
 import com.facebook.react.views.text.TextLayoutManager
 import com.facebook.react.views.view.ViewGroupClickEvent
 
@@ -29,13 +31,18 @@ import com.facebook.react.views.view.ViewGroupClickEvent
  * </Text>
  * ```
  */
+@OptIn(UnstableReactNativeAPI::class)
 internal class ReactLinkSpan(val fragmentIndex: Int) : ClickableSpan(), ReactSpan {
   override fun onClick(view: View) {
     val context = view.context as ReactContext
-    val textView = view as? PreparedLayoutTextView ?: return
-    val preparedLayout = textView.preparedLayout ?: return
+    val preparedLayout =
+        when (view) {
+          is PreparedLayoutTextView -> view.preparedLayout
+          is ReactTextView -> view.preparedLayout
+          else -> null
+        } ?: return
     val reactTag = preparedLayout.reactTags[fragmentIndex]
-    val eventDispatcher = UIManagerHelper.getEventDispatcherForReactTag(context, reactTag)
+    val eventDispatcher = UIManagerHelper.getEventDispatcher(context)
     eventDispatcher?.dispatchEvent(
         ViewGroupClickEvent(UIManagerHelper.getSurfaceId(context), reactTag)
     )