react-native-tvos 0.80.1-0 → 0.81.0-0

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

@@ -22,9 +22,14 @@ import android.view.ViewGroup
 import androidx.annotation.ColorInt
 import androidx.annotation.DoNotInline
 import androidx.annotation.RequiresApi
+import androidx.core.view.ViewCompat
+import com.facebook.proguard.annotations.DoNotStrip
 import com.facebook.react.uimanager.BackgroundStyleApplicator
+import com.facebook.react.uimanager.ReactCompoundView
 import com.facebook.react.uimanager.style.Overflow
+import com.facebook.react.views.text.internal.span.ReactTagSpan
 import kotlin.collections.ArrayList
+import kotlin.math.roundToInt
 
 /**
  * A custom version of Android's TextView, providing React Native with lower-level hooks for text
@@ -32,29 +37,26 @@ import kotlin.collections.ArrayList
  * existing layout, previously generated for measurement by Fabric, to ensure consistency of
  * measurements, and avoid duplicate work.
  */
-internal class PreparedLayoutTextView(context: Context) : ViewGroup(context) {
+@DoNotStrip
+internal class PreparedLayoutTextView(context: Context) : ViewGroup(context), ReactCompoundView {
 
   private var clickableSpans: List<ClickableSpan> = emptyList()
   private var selection: TextSelection? = null
 
-  public var layout: Layout? = null
+  var preparedLayout: PreparedLayout? = null
     set(value) {
       if (field != value) {
         val lastSelection = selection
         if (lastSelection != null) {
-          if (value != null && field?.text.toString() == value.text.toString()) {
-            value.getSelectionPath(lastSelection.start, lastSelection.end, lastSelection.path)
+          if (value != null && field?.layout?.text.toString() == value.layout.text.toString()) {
+            value.layout.getSelectionPath(
+                lastSelection.start, lastSelection.end, lastSelection.path)
           } else {
             clearSelection()
           }
         }
 
-        clickableSpans = value?.text?.let { filterClickableSpans(it) } ?: emptyList()
-
-        // T221698736: This and `accessible` prop can clobber each other, and ShadowTree does not
-        // know
-        // about this. Need to figure out desired behavior for controlling implicit focusability.
-        isFocusable = clickableSpans.isNotEmpty()
+        clickableSpans = value?.layout?.text?.let { filterClickableSpans(it) } ?: emptyList()
 
         field = value
         invalidate()
@@ -63,7 +65,7 @@ internal class PreparedLayoutTextView(context: Context) : ViewGroup(context) {
 
   // T221698007: This is closest to existing behavior, but does not align with web. We may want to
   // change in the future if not too breaking.
-  public var overflow: Overflow = Overflow.HIDDEN
+  var overflow: Overflow = Overflow.HIDDEN
     set(value) {
       if (field != value) {
         field = value
@@ -71,10 +73,12 @@ internal class PreparedLayoutTextView(context: Context) : ViewGroup(context) {
       }
     }
 
-  public @ColorInt var selectionColor: Int? = null
+  @ColorInt var selectionColor: Int? = null
 
-  public val text: CharSequence?
-    get() = layout?.text
+  val text: CharSequence?
+    // Avoid mangling the getter name, to allow black box E2E tests to read text content via
+    // reflection
+    @DoNotStrip get() = preparedLayout?.layout?.text
 
   init {
     initView()
@@ -85,13 +89,12 @@ internal class PreparedLayoutTextView(context: Context) : ViewGroup(context) {
   private fun initView() {
     clickableSpans = emptyList()
     selection = null
-    layout = null
+    preparedLayout = null
   }
 
-  public fun recycleView(): Unit {
+  fun recycleView(): Unit {
     initView()
     BackgroundStyleApplicator.reset(this)
-    isFocusable = false
     overflow = Overflow.HIDDEN
   }
 
@@ -101,19 +104,20 @@ internal class PreparedLayoutTextView(context: Context) : ViewGroup(context) {
     }
 
     super.onDraw(canvas)
-    canvas.translate(paddingLeft.toFloat(), paddingTop.toFloat())
+    canvas.translate(
+        paddingLeft.toFloat(), paddingTop.toFloat() + (preparedLayout?.verticalOffset ?: 0f))
 
-    val textLayout = layout
-    if (textLayout != null) {
+    val layout = preparedLayout?.layout
+    if (layout != null) {
       if (selection != null) {
         selectionPaint.setColor(
             selectionColor ?: DefaultStyleValuesUtil.getDefaultTextColorHighlight(context))
       }
 
       if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.UPSIDE_DOWN_CAKE) {
-        Api34Utils.draw(textLayout, canvas, selection?.path, selectionPaint)
+        Api34Utils.draw(layout, canvas, selection?.path, selectionPaint)
       } else {
-        textLayout.draw(canvas, selection?.path, selectionPaint, 0)
+        layout.draw(canvas, selection?.path, selectionPaint, 0)
       }
     }
   }
@@ -122,31 +126,32 @@ internal class PreparedLayoutTextView(context: Context) : ViewGroup(context) {
     // No-op
   }
 
-  private fun setSelection(span: ClickableSpan) {
-    val textLayout = checkNotNull(layout)
-    val start = (textLayout.text as Spanned).getSpanStart(span)
-    val end = (textLayout.text as Spanned).getSpanEnd(span)
+  fun setSelection(start: Int, end: Int) {
+    val layout = checkNotNull(preparedLayout).layout
+    if (start < 0 || end > layout.text.length || start >= end) {
+      throw IllegalArgumentException(
+          "setSelection start and end are not in valid range. start: $start, end: $end, text length: ${layout.text.length}")
+    }
 
     val textSelection = selection
     if (textSelection == null) {
       val selectionPath = Path()
-      textLayout.getSelectionPath(start, end, selectionPath)
+      layout.getSelectionPath(start, end, selectionPath)
       selection = TextSelection(start, end, selectionPath)
     } else {
       textSelection.start = start
       textSelection.end = end
-      textLayout.getSelectionPath(start, end, textSelection.path)
+      layout.getSelectionPath(start, end, textSelection.path)
     }
 
     invalidate()
   }
 
-  private fun clearSelection() {
+  fun clearSelection() {
     selection = null
     invalidate()
   }
 
-  // T222163602: We should reconcile this hit testing with ReactCompoundView hit testing
   override fun onTouchEvent(event: MotionEvent): Boolean {
     if (!isEnabled || clickableSpans.isEmpty()) {
       return super.onTouchEvent(event)
@@ -161,32 +166,27 @@ internal class PreparedLayoutTextView(context: Context) : ViewGroup(context) {
     val x = event.x.toInt()
     val y = event.y.toInt()
 
-    val clickedSpan = getClickableSpanInCoords(x, y)
+    val clickableSpan = getSpanInCoords(x, y, ClickableSpan::class.java)
 
-    if (clickedSpan == null) {
+    if (clickableSpan == null) {
       clearSelection()
       return super.onTouchEvent(event)
     }
 
     if (action == MotionEvent.ACTION_UP) {
       clearSelection()
-      clickedSpan.onClick(this)
+      clickableSpan.onClick(this)
     } else if (action == MotionEvent.ACTION_DOWN) {
-      setSelection(clickedSpan)
+      val layout = checkNotNull(preparedLayout).layout
+      val start = (layout.text as Spanned).getSpanStart(clickableSpan)
+      val end = (layout.text as Spanned).getSpanEnd(clickableSpan)
+      setSelection(start, end)
     }
 
     return true
   }
 
-  /**
-   * Get the clickable span that is at the exact coordinates
-   *
-   * @param x x-position of the click
-   * @param y y-position of the click
-   * @return a clickable span that's located where the click occurred, or: `null` if no clickable
-   *   span was located there
-   */
-  private fun getClickableSpanInCoords(x: Int, y: Int): ClickableSpan? {
+  private fun <T> getSpanInCoords(x: Int, y: Int, clazz: Class<T>): T? {
     val offset = getTextOffsetAt(x, y)
     if (offset < 0) {
       return null
@@ -194,28 +194,56 @@ internal class PreparedLayoutTextView(context: Context) : ViewGroup(context) {
 
     val spanned = text as? Spanned ?: return null
 
-    val clickableSpans = spanned.getSpans(offset, offset, ClickableSpan::class.java)
-    if (clickableSpans.isNotEmpty()) {
-      return clickableSpans[0]
+    val spans = spanned.getSpans(offset, offset, clazz)
+    if (spans.isEmpty()) {
+      return null
+    }
+
+    // When we have multiple spans marked with SPAN_EXCLUSIVE_INCLUSIVE next to each other, both
+    // spans are returned by getSpans
+    check(spans.size <= 2)
+    for (span in spans) {
+      val spanFlags = spanned.getSpanFlags(span)
+      val inclusiveStart =
+          if ((spanFlags and Spanned.SPAN_INCLUSIVE_INCLUSIVE) != 0 ||
+              (spanFlags and Spanned.SPAN_INCLUSIVE_EXCLUSIVE) != 0) {
+            spanned.getSpanStart(span)
+          } else {
+            spanned.getSpanStart(span) + 1
+          }
+      val inclusiveEnd =
+          if ((spanFlags and Spanned.SPAN_INCLUSIVE_INCLUSIVE) != 0 ||
+              (spanFlags and Spanned.SPAN_EXCLUSIVE_INCLUSIVE) != 0) {
+            spanned.getSpanEnd(span)
+          } else {
+            spanned.getSpanEnd(span) - 1
+          }
+
+      if (offset >= inclusiveStart && offset <= inclusiveEnd) {
+        return span
+      }
     }
 
     return null
   }
 
   private fun getTextOffsetAt(x: Int, y: Int): Int {
-    val textLayout = layout ?: return -1
-    val line = textLayout.getLineForVertical(y)
+    val layoutX = x - paddingLeft
+    val layoutY = y - (paddingTop + (preparedLayout?.verticalOffset?.roundToInt() ?: 0))
+
+    val layout = preparedLayout?.layout ?: return -1
+    val line = layout.getLineForVertical(layoutY)
 
     val left: Float
     val right: Float
 
-    if (textLayout.alignment == Layout.Alignment.ALIGN_CENTER) {
+    if (layout.alignment == Layout.Alignment.ALIGN_CENTER) {
       /**
        * [Layout#getLineLeft] and [Layout#getLineRight] properly account for paragraph margins on
        * centered text.
        */
-      left = textLayout.getLineLeft(line)
-      right = textLayout.getLineRight(line)
+      left = layout.getLineLeft(line)
+      right = layout.getLineRight(line)
     } else {
       /**
        * [Layout#getLineLeft] and [Layout#getLineRight] do NOT properly account for paragraph
@@ -227,19 +255,19 @@ internal class PreparedLayoutTextView(context: Context) : ViewGroup(context) {
        * [Layout#getLineMax] gives the extent *plus* the leading margin, so we can figure out the
        * rest from there.
        */
-      val rtl = textLayout.getParagraphDirection(line) == Layout.DIR_RIGHT_TO_LEFT
+      val rtl = layout.getParagraphDirection(line) == Layout.DIR_RIGHT_TO_LEFT
       left =
-          if (rtl) (textLayout.width - textLayout.getLineMax(line))
-          else textLayout.getParagraphLeft(line).toFloat()
-      right = if (rtl) textLayout.getParagraphRight(line).toFloat() else textLayout.getLineMax(line)
+          if (rtl) (layout.width - layout.getLineMax(line))
+          else layout.getParagraphLeft(line).toFloat()
+      right = if (rtl) layout.getParagraphRight(line).toFloat() else layout.getLineMax(line)
     }
 
-    if (x < left || x > right) {
+    if (layoutX < left || layoutX > right) {
       return -1
     }
 
     return try {
-      textLayout.getOffsetForHorizontal(line, x.toFloat())
+      layout.getOffsetForHorizontal(line, layoutX.toFloat())
     } catch (e: ArrayIndexOutOfBoundsException) {
       // This happens for bidi text on Android 7-8.
       // See
@@ -249,7 +277,6 @@ internal class PreparedLayoutTextView(context: Context) : ViewGroup(context) {
   }
 
   public override fun dispatchHoverEvent(event: MotionEvent): Boolean =
-      // TODO T221698305: Dispatch to AccessibilityDelegate
       super.dispatchHoverEvent(event)
 
   public override fun onFocusChanged(
@@ -261,100 +288,30 @@ internal class PreparedLayoutTextView(context: Context) : ViewGroup(context) {
       clearSelection()
     }
     super.onFocusChanged(gainFocus, direction, previouslyFocusedRect)
-    // TODO T221698305: Dispatch to AccessibilityDelegate
-  }
-
-  override fun dispatchKeyEvent(event: KeyEvent): Boolean =
-      // TODO T221698305: Dispatch to AccessibilityDelegate
-      super.dispatchKeyEvent(event)
-
-  override fun onKeyUp(keyCode: Int, event: KeyEvent): Boolean {
-    if (isEnabled &&
-        clickableSpans.isNotEmpty() &&
-        selection == null &&
-        (isDirectionKey(keyCode) || keyCode == KeyEvent.KEYCODE_TAB)) {
-      // View just received focus due to keyboard navigation. Nothing is currently selected,
-      // let's select first span according to the navigation direction.
-      var targetSpan: ClickableSpan? = null
-      if (isDirectionKey(keyCode) && event.hasNoModifiers()) {
-        if (keyCode == KeyEvent.KEYCODE_DPAD_RIGHT || keyCode == KeyEvent.KEYCODE_DPAD_DOWN) {
-          targetSpan = clickableSpans[0]
-        } else if (keyCode == KeyEvent.KEYCODE_DPAD_LEFT || keyCode == KeyEvent.KEYCODE_DPAD_UP) {
-          targetSpan = clickableSpans[clickableSpans.size - 1]
-        }
-      }
-
-      if (keyCode == KeyEvent.KEYCODE_TAB) {
-        if (event.hasNoModifiers()) {
-          targetSpan = clickableSpans[0]
-        } else if (event.hasModifiers(KeyEvent.META_SHIFT_ON)) {
-          targetSpan = clickableSpans[clickableSpans.size - 1]
-        }
-      }
-
-      if (targetSpan != null) {
-        setSelection(targetSpan)
-        return true
-      }
+    val accessibilityDelegateCompat = ViewCompat.getAccessibilityDelegate(this)
+    if (accessibilityDelegateCompat != null &&
+        accessibilityDelegateCompat is ReactTextViewAccessibilityDelegate) {
+      accessibilityDelegateCompat.onFocusChanged(gainFocus, direction, previouslyFocusedRect)
     }
-
-    return super.onKeyUp(keyCode, event)
   }
 
-  override fun onKeyDown(keyCode: Int, event: KeyEvent): Boolean {
-    if (isEnabled &&
-        clickableSpans.isNotEmpty() &&
-        (isDirectionKey(keyCode) || isConfirmKey(keyCode)) &&
-        event.hasNoModifiers()) {
-      val selectedSpanIndex = selectedSpanIndex()
-      if (selectedSpanIndex == -1) {
-        return super.onKeyDown(keyCode, event)
-      }
-
-      if (isDirectionKey(keyCode)) {
-        val direction =
-            if (keyCode == KeyEvent.KEYCODE_DPAD_RIGHT || keyCode == KeyEvent.KEYCODE_DPAD_DOWN) {
-              1
-            } else {
-              // keyCode == KeyEvent.KEYCODE_DPAD_LEFT || keyCode == KeyEvent.KEYCODE_DPAD_UP
-              -1
-            }
-        val repeatCount = 1 + event.repeatCount
-        val targetIndex = selectedSpanIndex + direction * repeatCount
-        if (targetIndex >= 0 && targetIndex < clickableSpans.size) {
-          setSelection(clickableSpans[targetIndex])
-          return true
-        }
-      }
-
-      if (isConfirmKey(keyCode) && event.repeatCount == 0) {
-        clearSelection()
-        clickableSpans[selectedSpanIndex].onClick(this)
-        return true
-      }
-    }
+  override fun dispatchKeyEvent(event: KeyEvent): Boolean {
+    val accessibilityDelegateCompat = ViewCompat.getAccessibilityDelegate(this)
+    val delegateHandled =
+        accessibilityDelegateCompat is ReactTextViewAccessibilityDelegate &&
+            accessibilityDelegateCompat.dispatchKeyEvent(event)
 
-    return super.onKeyDown(keyCode, event)
+    return delegateHandled || super.dispatchKeyEvent(event)
   }
 
-  private fun selectedSpanIndex(): Int {
-    val spanned = text as? Spanned ?: return -1
-    val textSelection = selection ?: return -1
+  // This potentially a lie, to avoid clipping outside of layout bounds when we are translucent, at
+  // the cost of incorrect alpha blending.
+  // TODO T225199534: Add support for "needsOffscreenAlphaCompositing" to Text
+  override fun hasOverlappingRendering(): Boolean = false
 
-    if (clickableSpans.isEmpty()) {
-      return -1
-    }
-
-    for (i in clickableSpans.indices) {
-      val span = clickableSpans[i]
-      val spanStart = spanned.getSpanStart(span)
-      val spanEnd = spanned.getSpanEnd(span)
-      if (spanStart == textSelection.start && spanEnd == textSelection.end) {
-        return i
-      }
-    }
-    return -1
-  }
+  override fun reactTagForTouch(touchX: Float, touchY: Float): Int =
+      getSpanInCoords(touchX.roundToInt(), touchY.roundToInt(), ReactTagSpan::class.java)?.reactTag
+          ?: id
 
   @RequiresApi(api = Build.VERSION_CODES.UPSIDE_DOWN_CAKE)
   private object Api34Utils {
@@ -386,21 +343,8 @@ internal class PreparedLayoutTextView(context: Context) : ViewGroup(context) {
   private companion object {
     private val selectionPaint = Paint()
 
-    private fun isDirectionKey(keyCode: Int): Boolean =
-        keyCode == KeyEvent.KEYCODE_DPAD_LEFT ||
-            keyCode == KeyEvent.KEYCODE_DPAD_RIGHT ||
-            keyCode == KeyEvent.KEYCODE_DPAD_UP ||
-            keyCode == KeyEvent.KEYCODE_DPAD_DOWN
-
-    private fun isConfirmKey(keyCode: Int): Boolean =
-        keyCode == KeyEvent.KEYCODE_DPAD_CENTER ||
-            keyCode == KeyEvent.KEYCODE_ENTER ||
-            keyCode == KeyEvent.KEYCODE_SPACE ||
-            keyCode == KeyEvent.KEYCODE_NUMPAD_ENTER
-
     private fun filterClickableSpans(text: CharSequence): List<ClickableSpan> {
-      if (text !is Spanned ||
-          text.nextSpanTransition(0, text.length, ClickableSpan::class.java) == text.length) {
+      if (text !is Spanned) {
         return emptyList()
       }
 

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

@@ -7,7 +7,7 @@
 
 package com.facebook.react.views.text
 
-import android.text.Layout
+import android.text.Spannable
 import android.text.Spanned
 import android.view.View
 import com.facebook.react.R
@@ -35,10 +35,14 @@ import java.util.HashMap
 
 @ReactModule(name = PreparedLayoutTextViewManager.REACT_CLASS)
 internal class PreparedLayoutTextViewManager :
-    BaseViewManager<PreparedLayoutTextView, LayoutShadowNode>(),
-    IViewGroupManager<PreparedLayoutTextView> {
-
-  init {
+    BaseViewManager<PreparedLayoutTextView, LayoutShadowNode>,
+    IViewGroupManager<PreparedLayoutTextView>,
+    ReactTextViewManagerCallback {
+  private val reactTextViewManagerCallback: ReactTextViewManagerCallback?
+
+  @JvmOverloads
+  constructor(reactTextViewManagerCallback: ReactTextViewManagerCallback? = null) : super() {
+    this.reactTextViewManagerCallback = reactTextViewManagerCallback
     setupViewRecycling()
   }
 
@@ -63,13 +67,13 @@ internal class PreparedLayoutTextViewManager :
 
   override fun updateExtraData(view: PreparedLayoutTextView, extraData: Any) {
     SystraceSection("PreparedLayoutTextViewManager.updateExtraData").use { _ ->
-      val layout = extraData as Layout
-      view.layout = layout
+      val preparedLayout = extraData as PreparedLayout
+      view.preparedLayout = preparedLayout
 
       // 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.
-      if (layout.text is Spanned) {
-        val spannedText = layout.text as Spanned
+      if (preparedLayout.layout.text is Spanned) {
+        val spannedText = preparedLayout.layout.text as Spanned
         val accessibilityLinks = AccessibilityLinks(spannedText)
         view.setTag(
             R.id.accessibility_links,
@@ -86,7 +90,7 @@ internal class PreparedLayoutTextViewManager :
       stateWrapper: StateWrapper
   ): Any? = (stateWrapper as? ReferenceStateWrapper)?.stateDataReference
 
-  override fun getExportedCustomDirectEventTypeConstants(): MutableMap<String, Any>? {
+  override fun getExportedCustomDirectEventTypeConstants(): MutableMap<String, Any> {
     val baseEventTypeConstants = super.getExportedCustomDirectEventTypeConstants()
     val eventTypeConstants = baseEventTypeConstants ?: HashMap()
     eventTypeConstants.put("topTextLayout", mapOf("registrationName" to "onTextLayout"))
@@ -94,23 +98,23 @@ internal class PreparedLayoutTextViewManager :
   }
 
   @ReactProp(name = "overflow")
-  public fun setOverflow(view: PreparedLayoutTextView, overflow: String?): Unit {
+  fun setOverflow(view: PreparedLayoutTextView, overflow: String?): Unit {
     view.overflow = overflow?.let { Overflow.fromString(it) } ?: Overflow.HIDDEN
   }
 
   @ReactProp(name = "accessible")
-  public fun setAccessible(view: PreparedLayoutTextView, accessible: Boolean): Unit {
+  fun setAccessible(view: PreparedLayoutTextView, accessible: Boolean): Unit {
     view.isFocusable = accessible
   }
 
   @ReactProp(name = "selectable", defaultBoolean = false)
-  public fun setSelectable(view: PreparedLayoutTextView, isSelectable: Boolean): Unit {
+  fun setSelectable(view: PreparedLayoutTextView, isSelectable: Boolean): Unit {
     // T222052152: Implement fine-grained text selection for PreparedLayoutTextView
     // view.setTextIsSelectable(isSelectable);
   }
 
   @ReactProp(name = "selectionColor", customType = "Color")
-  public fun setSelectionColor(view: PreparedLayoutTextView, color: Int?): Unit {
+  fun setSelectionColor(view: PreparedLayoutTextView, color: Int?): Unit {
     if (color == null) {
       view.selectionColor = DefaultStyleValuesUtil.getDefaultTextColorHighlight(view.context)
     } else {
@@ -127,7 +131,7 @@ internal class PreparedLayoutTextViewManager :
               ViewProps.BORDER_BOTTOM_RIGHT_RADIUS,
               ViewProps.BORDER_BOTTOM_LEFT_RADIUS],
       defaultFloat = Float.NaN)
-  public fun setBorderRadius(view: PreparedLayoutTextView, index: Int, borderRadius: Float): Unit {
+  fun setBorderRadius(view: PreparedLayoutTextView, index: Int, borderRadius: Float): Unit {
     val radius =
         if (borderRadius.isNaN()) null
         else LengthPercentage(borderRadius, LengthPercentageType.POINT)
@@ -135,7 +139,7 @@ internal class PreparedLayoutTextViewManager :
   }
 
   @ReactProp(name = "borderStyle")
-  public fun setBorderStyle(view: PreparedLayoutTextView, borderStyle: String?): Unit {
+  fun setBorderStyle(view: PreparedLayoutTextView, borderStyle: String?): Unit {
     val parsedBorderStyle = if (borderStyle == null) null else BorderStyle.fromString(borderStyle)
     BackgroundStyleApplicator.setBorderStyle(view, parsedBorderStyle)
   }
@@ -151,7 +155,7 @@ internal class PreparedLayoutTextViewManager :
               ViewProps.BORDER_START_WIDTH,
               ViewProps.BORDER_END_WIDTH],
       defaultFloat = Float.NaN)
-  public fun setBorderWidth(view: PreparedLayoutTextView, index: Int, width: Float): Unit {
+  fun setBorderWidth(view: PreparedLayoutTextView, index: Int, width: Float): Unit {
     BackgroundStyleApplicator.setBorderWidth(view, LogicalEdge.values()[index], width)
   }
 
@@ -170,12 +174,12 @@ internal class PreparedLayoutTextViewManager :
               ViewProps.BORDER_BLOCK_START_COLOR,
           ],
       customType = "Color")
-  public fun setBorderColor(view: PreparedLayoutTextView, index: Int, color: Int?): Unit {
+  fun setBorderColor(view: PreparedLayoutTextView, index: Int, color: Int?): Unit {
     BackgroundStyleApplicator.setBorderColor(view, LogicalEdge.values()[index], color)
   }
 
   @ReactProp(name = "disabled", defaultBoolean = false)
-  public fun setDisabled(view: PreparedLayoutTextView, disabled: Boolean): Unit {
+  fun setDisabled(view: PreparedLayoutTextView, disabled: Boolean): Unit {
     view.setEnabled(!disabled)
   }
 
@@ -206,7 +210,11 @@ internal class PreparedLayoutTextViewManager :
 
   override fun needsCustomLayoutForChildren(): Boolean = false
 
-  public companion object {
-    public const val REACT_CLASS: String = "RCTText"
+  override fun onPostProcessSpannable(text: Spannable) {
+    reactTextViewManagerCallback?.onPostProcessSpannable(text)
+  }
+
+  companion object {
+    const val REACT_CLASS: String = "RCTText"
   }
 }

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

@@ -23,6 +23,7 @@ import com.facebook.react.bridge.ReadableArray;
 import com.facebook.react.bridge.ReadableMap;
 import com.facebook.react.common.ReactConstants;
 import com.facebook.react.common.annotations.internal.LegacyArchitecture;
+import com.facebook.react.common.annotations.internal.LegacyArchitectureLogLevel;
 import com.facebook.react.uimanager.IllegalViewOperationException;
 import com.facebook.react.uimanager.LayoutShadowNode;
 import com.facebook.react.uimanager.NativeViewHierarchyOptimizer;
@@ -66,7 +67,7 @@ import java.util.Map;
  * <p>This also node calculates {@link Spannable} object based on subnodes of the same type, which
  * can be used in concrete classes to feed native views and compute layout.
  */
-@LegacyArchitecture
+@LegacyArchitecture(logLevel = LegacyArchitectureLogLevel.ERROR)
 @Nullsafe(Nullsafe.Mode.LOCAL)
 public abstract class ReactBaseTextShadowNode extends LayoutShadowNode {
 
@@ -109,7 +110,7 @@ public abstract class ReactBaseTextShadowNode extends LayoutShadowNode {
       if (child instanceof ReactRawTextShadowNode) {
         String childText = ((ReactRawTextShadowNode) child).getText();
         if (childText != null) {
-          sb.append(TextTransform.applyNonNull(childText, textAttributes.getTextTransform()));
+          sb.append(TextTransform.apply(childText, textAttributes.textTransform));
         }
       } else if (child instanceof ReactBaseTextShadowNode) {
         buildSpannedFromShadowNode(
@@ -264,8 +265,7 @@ public abstract class ReactBaseTextShadowNode extends LayoutShadowNode {
     if (text != null) {
       // Handle text that is provided via a prop (e.g. the `value` and `defaultValue` props on
       // TextInput).
-      sb.append(
-          TextTransform.applyNonNull(text, textShadowNode.mTextAttributes.getTextTransform()));
+      sb.append(TextTransform.apply(text, textShadowNode.mTextAttributes.textTransform));
     }
 
     buildSpannedFromShadowNode(textShadowNode, sb, ops, null, supportsInlineViews, inlineViews, 0);
@@ -633,20 +633,21 @@ public abstract class ReactBaseTextShadowNode extends LayoutShadowNode {
 
   @ReactProp(name = PROP_TEXT_TRANSFORM)
   public void setTextTransform(@Nullable String textTransform) {
+    TextTransform textTransformEnum = TextTransform.UNSET;
     if (textTransform == null) {
-      mTextAttributes.setTextTransform(TextTransform.UNSET);
+      textTransformEnum = TextTransform.UNSET;
     } else if ("none".equals(textTransform)) {
-      mTextAttributes.setTextTransform(TextTransform.NONE);
+      textTransformEnum = TextTransform.NONE;
     } else if ("uppercase".equals(textTransform)) {
-      mTextAttributes.setTextTransform(TextTransform.UPPERCASE);
+      textTransformEnum = TextTransform.UPPERCASE;
     } else if ("lowercase".equals(textTransform)) {
-      mTextAttributes.setTextTransform(TextTransform.LOWERCASE);
+      textTransformEnum = TextTransform.LOWERCASE;
     } else if ("capitalize".equals(textTransform)) {
-      mTextAttributes.setTextTransform(TextTransform.CAPITALIZE);
+      textTransformEnum = TextTransform.CAPITALIZE;
     } else {
       FLog.w(ReactConstants.TAG, "Invalid textTransform: " + textTransform);
-      mTextAttributes.setTextTransform(TextTransform.UNSET);
     }
+    mTextAttributes.textTransform = textTransformEnum;
     markUpdated();
   }
 

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

@@ -8,6 +8,8 @@
 package com.facebook.react.views.text
 
 import android.view.View
+import com.facebook.react.common.annotations.internal.LegacyArchitecture
+import com.facebook.react.common.annotations.internal.LegacyArchitectureLogLevel
 import com.facebook.react.module.annotations.ReactModule
 import com.facebook.react.uimanager.ThemedReactContext
 import com.facebook.react.uimanager.ViewManager
@@ -17,6 +19,7 @@ import com.facebook.react.uimanager.ViewManager
  * nodes, any type of native view operation will throw an [IllegalStateException].
  */
 @ReactModule(name = ReactRawTextManager.REACT_CLASS)
+@LegacyArchitecture(logLevel = LegacyArchitectureLogLevel.ERROR)
 internal class ReactRawTextManager : ViewManager<View, ReactRawTextShadowNode>() {
 
   override fun getName(): String {
@@ -26,7 +29,7 @@ internal class ReactRawTextManager : ViewManager<View, ReactRawTextShadowNode>()
   public override fun createViewInstance(context: ThemedReactContext): ReactTextView =
       throw IllegalStateException("Attempt to create a native view for RCTRawText")
 
-  override fun prepareToRecycleView(reactContext: ThemedReactContext, view: View): View? =
+  override fun prepareToRecycleView(reactContext: ThemedReactContext, view: View): View =
       throw IllegalStateException("Attempt to recycle a native view for RCTRawText")
 
   override fun updateExtraData(view: View, extraData: Any): Unit = Unit