react-native-tvos 0.81.1-2 → 0.82.0-0rc0

package/ReactAndroid/src/main/java/com/facebook/react/views/scroll/VirtualViewContainer.kt

@@ -0,0 +1,165 @@
+/*
+ * 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.scroll
+
+import android.graphics.Rect
+import android.view.ViewGroup
+import android.view.ViewTreeObserver
+import com.facebook.common.logging.FLog
+import com.facebook.react.common.build.ReactBuildConfig
+import com.facebook.react.internal.featureflags.ReactNativeFeatureFlags
+import com.facebook.react.views.virtual.VirtualViewMode
+import java.util.*
+
+internal interface VirtualViewContainer {
+  public val virtualViewContainerState: VirtualViewContainerState
+}
+
+public interface VirtualView {
+  public val virtualViewID: String
+
+  public val containerRelativeRect: Rect
+
+  public fun onModeChange(newMode: VirtualViewMode, thresholdRect: Rect): Unit
+}
+
+/**
+ * Checks whether one Rect overlaps with another Rect.
+ *
+ * This is different from [Rect.intersects] because a Rect representing a line or a point is
+ * considered to overlap with another Rect if the line or point is within the rect bounds. However,
+ * two Rects are not considered to overlap if they only share a boundary.
+ */
+private fun rectsOverlap(rect1: Rect, rect2: Rect): Boolean {
+  if (rect1.top >= rect2.bottom || rect2.top >= rect1.bottom) {
+    // No overlap on the y-axis.
+    return false
+  }
+  if (rect1.left >= rect2.right || rect2.left >= rect1.right) {
+    // No overlap on the x-axis.
+    return false
+  }
+  return true
+}
+
+internal class VirtualViewContainerState {
+
+  private val prerenderRatio: Double = ReactNativeFeatureFlags.virtualViewPrerenderRatio()
+
+  private val virtualViews: MutableSet<VirtualView> = mutableSetOf()
+  private val emptyRect: Rect = Rect()
+  private val visibleRect: Rect = Rect()
+  private val prerenderRect: Rect = Rect()
+  private val onWindowFocusChangeListener =
+      if (ReactNativeFeatureFlags.enableVirtualViewWindowFocusDetection()) {
+        ViewTreeObserver.OnWindowFocusChangeListener {
+          debugLog("onWindowFocusChanged")
+          updateModes()
+        }
+      } else {
+        null
+      }
+
+  private val scrollView: ViewGroup
+
+  constructor(scrollView: ViewGroup) {
+    this.scrollView = scrollView
+    if (onWindowFocusChangeListener != null) {
+      scrollView.viewTreeObserver.addOnWindowFocusChangeListener(onWindowFocusChangeListener)
+    }
+  }
+
+  public fun cleanup() {
+    if (onWindowFocusChangeListener != null) {
+      scrollView.viewTreeObserver.removeOnWindowFocusChangeListener(onWindowFocusChangeListener)
+    }
+  }
+
+  public fun onChange(virtualView: VirtualView) {
+    if (virtualViews.add(virtualView)) {
+      debugLog("add", { "virtualViewID=${virtualView.virtualViewID}" })
+    } else {
+      debugLog("update", { "virtualViewID=${virtualView.virtualViewID}" })
+    }
+    updateModes(virtualView)
+  }
+
+  public fun remove(virtualView: VirtualView) {
+    assert(virtualViews.remove(virtualView)) {
+      "Attempting to remove non-existent VirtualView: ${virtualView.virtualViewID}"
+    }
+    debugLog("remove", { "virtualViewID=${virtualView.virtualViewID}" })
+  }
+
+  // Called on ScrollView onLayout or onScroll
+  public fun updateState() {
+    debugLog("updateState")
+    updateModes()
+  }
+
+  private fun updateModes(virtualView: VirtualView? = null) {
+    scrollView.getDrawingRect(visibleRect)
+
+    // This happens because ScrollView content isn't ready yet. The danger here is if ScrollView
+    // intentionally goes but curently ScrollView and v1 Fling use this check to determine if
+    // "content ready"
+    if (visibleRect.isEmpty()) {
+      debugLog("updateModes", { "scrollView visibleRect is empty" })
+      return
+    }
+
+    prerenderRect.set(visibleRect)
+    prerenderRect.inset(
+        (-prerenderRect.width() * prerenderRatio).toInt(),
+        (-prerenderRect.height() * prerenderRatio).toInt(),
+    )
+
+    val virtualViewsIt = if (virtualView != null) listOf(virtualView) else virtualViews
+    virtualViewsIt.forEach { vv ->
+      val rect = vv.containerRelativeRect
+
+      var mode = VirtualViewMode.Hidden
+      var thresholdRect = emptyRect
+      when {
+        rectsOverlap(rect, visibleRect) -> {
+          thresholdRect = visibleRect
+          if (onWindowFocusChangeListener != null) {
+            if (scrollView.hasWindowFocus()) {
+              mode = VirtualViewMode.Visible
+            } else {
+              mode = VirtualViewMode.Prerender
+            }
+          } else {
+            mode = VirtualViewMode.Visible
+          }
+        }
+        rectsOverlap(rect, prerenderRect) -> {
+          mode = VirtualViewMode.Prerender
+          thresholdRect = prerenderRect
+        }
+        else -> {}
+      }
+
+      debugLog(
+          "updateModes",
+          { "virtualView=${vv.virtualViewID} mode=$mode  rect=$rect thresholdRect=$thresholdRect" },
+      )
+      vv.onModeChange(mode, thresholdRect)
+    }
+  }
+}
+
+private const val DEBUG_TAG: String = "VirtualViewContainerState"
+private val IS_DEBUG_BUILD =
+    ReactBuildConfig.DEBUG || ReactBuildConfig.IS_INTERNAL_BUILD || ReactBuildConfig.ENABLE_PERFETTO
+
+internal inline fun debugLog(subtag: String, block: () -> String = { "" }) {
+  if (IS_DEBUG_BUILD && ReactNativeFeatureFlags.enableVirtualViewDebugFeatures()) {
+    FLog.d("$DEBUG_TAG:$subtag", block())
+  }
+}

package/ReactAndroid/src/main/java/com/facebook/react/views/swiperefresh/SwipeRefreshLayoutManager.kt

@@ -42,19 +42,19 @@ internal open class SwipeRefreshLayoutManager :
   override fun getName(): String = REACT_CLASS
 
   @ReactProp(name = ViewProps.ENABLED, defaultBoolean = true)
-  override fun setEnabled(view: ReactSwipeRefreshLayout, enabled: Boolean) {
-    view.isEnabled = enabled
+  override fun setEnabled(view: ReactSwipeRefreshLayout, value: Boolean) {
+    view.isEnabled = value
   }
 
   @ReactProp(name = "colors", customType = "ColorArray")
-  override fun setColors(view: ReactSwipeRefreshLayout, colors: ReadableArray?) {
-    if (colors != null) {
-      val colorValues = IntArray(colors.size())
-      for (i in 0..<colors.size()) {
-        if (colors.getType(i) == ReadableType.Map) {
-          colorValues[i] = ColorPropConverter.getColor(colors.getMap(i), view.context, 0)
+  override fun setColors(view: ReactSwipeRefreshLayout, value: ReadableArray?) {
+    if (value != null) {
+      val colorValues = IntArray(value.size())
+      for (i in 0..<value.size()) {
+        if (value.getType(i) == ReadableType.Map) {
+          colorValues[i] = ColorPropConverter.getColor(value.getMap(i), view.context, 0)
         } else {
-          colorValues[i] = colors.getInt(i)
+          colorValues[i] = value.getInt(i)
         }
       }
       view.setColorSchemeColors(*colorValues)
@@ -64,8 +64,8 @@ internal open class SwipeRefreshLayoutManager :
   }
 
   @ReactProp(name = "progressBackgroundColor", customType = "Color")
-  override fun setProgressBackgroundColor(view: ReactSwipeRefreshLayout, color: Int?) {
-    view.setProgressBackgroundColorSchemeColor(color ?: Color.TRANSPARENT)
+  override fun setProgressBackgroundColor(view: ReactSwipeRefreshLayout, value: Int?) {
+    view.setProgressBackgroundColorSchemeColor(value ?: Color.TRANSPARENT)
   }
 
   // TODO(T46143833): Remove this method once the 'size' prop has been migrated to String in JS.
@@ -73,13 +73,13 @@ internal open class SwipeRefreshLayoutManager :
     view.setSize(value)
   }
 
-  override fun setSize(view: ReactSwipeRefreshLayout, size: String?) {
-    if (size == null || size.equals("default")) {
+  override fun setSize(view: ReactSwipeRefreshLayout, value: String?) {
+    if (value == null || value.equals("default")) {
       view.setSize(SwipeRefreshLayout.DEFAULT)
-    } else if (size.equals("large")) {
+    } else if (value.equals("large")) {
       view.setSize(SwipeRefreshLayout.LARGE)
     } else {
-      throw IllegalArgumentException("Size must be 'default' or 'large', received: $size")
+      throw IllegalArgumentException("Size must be 'default' or 'large', received: $value")
     }
   }
 
@@ -97,13 +97,13 @@ internal open class SwipeRefreshLayoutManager :
   }
 
   @ReactProp(name = "refreshing")
-  override fun setRefreshing(view: ReactSwipeRefreshLayout, refreshing: Boolean) {
-    view.isRefreshing = refreshing
+  override fun setRefreshing(view: ReactSwipeRefreshLayout, value: Boolean) {
+    view.isRefreshing = value
   }
 
   @ReactProp(name = "progressViewOffset", defaultFloat = 0f)
-  override fun setProgressViewOffset(view: ReactSwipeRefreshLayout, offset: Float) {
-    view.setProgressViewOffset(offset)
+  override fun setProgressViewOffset(view: ReactSwipeRefreshLayout, value: Float) {
+    view.setProgressViewOffset(value)
   }
 
   override fun setNativeRefreshing(view: ReactSwipeRefreshLayout, value: Boolean) {
@@ -121,13 +121,17 @@ internal open class SwipeRefreshLayoutManager :
       mutableMapOf(
           "SIZE" to
               mutableMapOf(
-                  "DEFAULT" to SwipeRefreshLayout.DEFAULT, "LARGE" to SwipeRefreshLayout.LARGE))
+                  "DEFAULT" to SwipeRefreshLayout.DEFAULT,
+                  "LARGE" to SwipeRefreshLayout.LARGE,
+              )
+      )
 
   override fun getExportedCustomDirectEventTypeConstants(): MutableMap<String, Any> {
     val baseEventTypeConstants = super.getExportedCustomDirectEventTypeConstants()
     val eventTypeConstants: MutableMap<String, Any> = baseEventTypeConstants ?: HashMap()
     eventTypeConstants.putAll(
-        mutableMapOf("topRefresh" to mutableMapOf("registrationName" to "onRefresh")))
+        mutableMapOf("topRefresh" to mutableMapOf("registrationName" to "onRefresh"))
+    )
     return eventTypeConstants
   }
 

package/ReactAndroid/src/main/java/com/facebook/react/views/switchview/ReactSwitch.kt

@@ -49,7 +49,7 @@ internal class ReactSwitch(context: Context) : SwitchCompat(context) {
     if (color == null) {
       drawable.clearColorFilter()
     } else {
-      drawable.setColorFilter(PorterDuffColorFilter(color, PorterDuff.Mode.MULTIPLY))
+      drawable.colorFilter = PorterDuffColorFilter(color, PorterDuff.Mode.MULTIPLY)
     }
   }
 

package/ReactAndroid/src/main/java/com/facebook/react/views/switchview/ReactSwitchEvent.kt

@@ -18,7 +18,8 @@ internal class ReactSwitchEvent(surfaceId: Int, viewId: Int, private val isCheck
 
   @Deprecated(
       "Use the constructor with surfaceId, viewId and isChecked parameters.",
-      replaceWith = ReplaceWith("ReactSwitchEvent(surfaceId, viewId, isChecked)"))
+      replaceWith = ReplaceWith("ReactSwitchEvent(surfaceId, viewId, isChecked)"),
+  )
   constructor(viewId: Int, isChecked: Boolean) : this(ViewUtil.NO_SURFACE_ID, viewId, isChecked)
 
   override fun getEventName(): String = EVENT_NAME

package/ReactAndroid/src/main/java/com/facebook/react/views/switchview/ReactSwitchManager.kt

@@ -25,6 +25,7 @@ import com.facebook.react.viewmanagers.AndroidSwitchManagerInterface
 import com.facebook.yoga.YogaMeasureMode
 import com.facebook.yoga.YogaMeasureOutput
 
+@Suppress("DEPRECATION")
 internal class ReactSwitchManager :
     BaseViewManager<ReactSwitch, ReactSwitchShadowNode>(),
     AndroidSwitchManagerInterface<ReactSwitch> {
@@ -46,18 +47,18 @@ internal class ReactSwitchManager :
   }
 
   @ReactProp(name = "disabled", defaultBoolean = false)
-  override fun setDisabled(view: ReactSwitch, disabled: Boolean) {
-    view.isEnabled = !disabled
+  override fun setDisabled(view: ReactSwitch, value: Boolean) {
+    view.isEnabled = !value
   }
 
   @ReactProp(name = ViewProps.ENABLED, defaultBoolean = true)
-  override fun setEnabled(view: ReactSwitch, enabled: Boolean) {
-    view.isEnabled = enabled
+  override fun setEnabled(view: ReactSwitch, value: Boolean) {
+    view.isEnabled = value
   }
 
   @ReactProp(name = ViewProps.ON)
-  override fun setOn(view: ReactSwitch, on: Boolean) {
-    setValueInternal(view, on)
+  override fun setOn(view: ReactSwitch, value: Boolean) {
+    setValueInternal(view, value)
   }
 
   @ReactProp(name = "value")
@@ -66,28 +67,28 @@ internal class ReactSwitchManager :
   }
 
   @ReactProp(name = "thumbTintColor", customType = "Color")
-  override fun setThumbTintColor(view: ReactSwitch, color: Int?) {
-    setThumbColor(view, color)
+  override fun setThumbTintColor(view: ReactSwitch, value: Int?) {
+    setThumbColor(view, value)
   }
 
   @ReactProp(name = "thumbColor", customType = "Color")
-  override fun setThumbColor(view: ReactSwitch, color: Int?) {
-    view.setThumbColor(color)
+  override fun setThumbColor(view: ReactSwitch, value: Int?) {
+    view.setThumbColor(value)
   }
 
   @ReactProp(name = "trackColorForFalse", customType = "Color")
-  override fun setTrackColorForFalse(view: ReactSwitch, color: Int?) {
-    view.setTrackColorForFalse(color)
+  override fun setTrackColorForFalse(view: ReactSwitch, value: Int?) {
+    view.setTrackColorForFalse(value)
   }
 
   @ReactProp(name = "trackColorForTrue", customType = "Color")
-  override fun setTrackColorForTrue(view: ReactSwitch, color: Int?) {
-    view.setTrackColorForTrue(color)
+  override fun setTrackColorForTrue(view: ReactSwitch, value: Int?) {
+    view.setTrackColorForTrue(value)
   }
 
   @ReactProp(name = "trackTintColor", customType = "Color")
-  override fun setTrackTintColor(view: ReactSwitch, color: Int?) {
-    view.setTrackColor(color)
+  override fun setTrackTintColor(view: ReactSwitch, value: Int?) {
+    view.setTrackColor(value)
   }
 
   override fun setNativeValue(view: ReactSwitch, value: Boolean) {
@@ -113,14 +114,15 @@ internal class ReactSwitchManager :
       widthMode: YogaMeasureMode,
       height: Float,
       heightMode: YogaMeasureMode,
-      attachmentsPositions: FloatArray?
+      attachmentsPositions: FloatArray?,
   ): Long {
     val view = ReactSwitch(context).apply { showText = false }
     val measureSpec = View.MeasureSpec.makeMeasureSpec(0, View.MeasureSpec.UNSPECIFIED)
     view.measure(measureSpec, measureSpec)
     return YogaMeasureOutput.make(
         PixelUtil.toDIPFromPixel(view.measuredWidth.toFloat()),
-        PixelUtil.toDIPFromPixel(view.measuredHeight.toFloat()))
+        PixelUtil.toDIPFromPixel(view.measuredHeight.toFloat()),
+    )
   }
 
   private fun setValueInternal(view: ReactSwitch, value: Boolean) {
@@ -139,7 +141,8 @@ internal class ReactSwitchManager :
           val reactTag = buttonView.id
           UIManagerHelper.getEventDispatcherForReactTag(reactContext, reactTag)
               ?.dispatchEvent(
-                  ReactSwitchEvent(UIManagerHelper.getSurfaceId(reactContext), reactTag, isChecked))
+                  ReactSwitchEvent(UIManagerHelper.getSurfaceId(reactContext), reactTag, isChecked)
+              )
         }
   }
 }

package/ReactAndroid/src/main/java/com/facebook/react/views/switchview/ReactSwitchShadowNode.kt

@@ -12,15 +12,20 @@ import com.facebook.react.common.annotations.LegacyArchitectureShadowNodeWithCxx
 import com.facebook.react.common.annotations.internal.LegacyArchitecture
 import com.facebook.react.common.annotations.internal.LegacyArchitectureLogLevel
 import com.facebook.react.common.annotations.internal.LegacyArchitectureLogger
-import com.facebook.react.uimanager.LayoutShadowNode
 import com.facebook.yoga.YogaMeasureFunction
 import com.facebook.yoga.YogaMeasureMode
 import com.facebook.yoga.YogaMeasureOutput
 import com.facebook.yoga.YogaNode
 
+@Suppress("DEPRECATION")
 @LegacyArchitecture(logLevel = LegacyArchitectureLogLevel.ERROR)
+@Deprecated(
+    message = "This class is part of Legacy Architecture and will be removed in a future release",
+    level = DeprecationLevel.WARNING,
+)
 @LegacyArchitectureShadowNodeWithCxxImpl
-internal class ReactSwitchShadowNode : LayoutShadowNode(), YogaMeasureFunction {
+internal class ReactSwitchShadowNode :
+    com.facebook.react.uimanager.LayoutShadowNode(), YogaMeasureFunction {
   private var width = 0
   private var height = 0
   private var measured = false
@@ -38,7 +43,7 @@ internal class ReactSwitchShadowNode : LayoutShadowNode(), YogaMeasureFunction {
       width: Float,
       widthMode: YogaMeasureMode,
       height: Float,
-      heightMode: YogaMeasureMode
+      heightMode: YogaMeasureMode,
   ): Long {
     if (!measured) {
       // Create a switch with the default config and measure it; since we don't (currently)
@@ -59,7 +64,9 @@ internal class ReactSwitchShadowNode : LayoutShadowNode(), YogaMeasureFunction {
   companion object {
     init {
       LegacyArchitectureLogger.assertLegacyArchitecture(
-          "ReactSwitchShadowNode", LegacyArchitectureLogLevel.ERROR)
+          "ReactSwitchShadowNode",
+          LegacyArchitectureLogLevel.ERROR,
+      )
     }
   }
 }

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

@@ -34,12 +34,20 @@ internal object FontMetricsUtil {
 
     val capHeightBounds = Rect()
     paintCopy.getTextBounds(
-        CAP_HEIGHT_MEASUREMENT_TEXT, 0, CAP_HEIGHT_MEASUREMENT_TEXT.length, capHeightBounds)
+        CAP_HEIGHT_MEASUREMENT_TEXT,
+        0,
+        CAP_HEIGHT_MEASUREMENT_TEXT.length,
+        capHeightBounds,
+    )
     val capHeight = capHeightBounds.height() / AMPLIFICATION_FACTOR / dm.density
 
     val xHeightBounds = Rect()
     paintCopy.getTextBounds(
-        X_HEIGHT_MEASUREMENT_TEXT, 0, X_HEIGHT_MEASUREMENT_TEXT.length, xHeightBounds)
+        X_HEIGHT_MEASUREMENT_TEXT,
+        0,
+        X_HEIGHT_MEASUREMENT_TEXT.length,
+        xHeightBounds,
+    )
     val xHeight = xHeightBounds.height() / AMPLIFICATION_FACTOR / dm.density
 
     for (i in 0 until layout.lineCount) {

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

@@ -18,5 +18,6 @@ import com.facebook.proguard.annotations.DoNotStrip
 internal class PreparedLayout(
     val layout: Layout,
     val maximumNumberOfLines: Int,
-    val verticalOffset: Float
+    val verticalOffset: Float,
+    val reactTags: IntArray,
 )

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

@@ -27,7 +27,7 @@ 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 com.facebook.react.views.text.internal.span.ReactFragmentIndexSpan
 import kotlin.collections.ArrayList
 import kotlin.math.roundToInt
 
@@ -50,7 +50,10 @@ internal class PreparedLayoutTextView(context: Context) : ViewGroup(context), Re
         if (lastSelection != null) {
           if (value != null && field?.layout?.text.toString() == value.layout.text.toString()) {
             value.layout.getSelectionPath(
-                lastSelection.start, lastSelection.end, lastSelection.path)
+                lastSelection.start,
+                lastSelection.end,
+                lastSelection.path,
+            )
           } else {
             clearSelection()
           }
@@ -105,13 +108,15 @@ internal class PreparedLayoutTextView(context: Context) : ViewGroup(context), Re
 
     super.onDraw(canvas)
     canvas.translate(
-        paddingLeft.toFloat(), paddingTop.toFloat() + (preparedLayout?.verticalOffset ?: 0f))
+        paddingLeft.toFloat(),
+        paddingTop.toFloat() + (preparedLayout?.verticalOffset ?: 0f),
+    )
 
     val layout = preparedLayout?.layout
     if (layout != null) {
       if (selection != null) {
-        selectionPaint.setColor(
-            selectionColor ?: DefaultStyleValuesUtil.getDefaultTextColorHighlight(context))
+        selectionPaint.color =
+            selectionColor ?: DefaultStyleValuesUtil.getDefaultTextColorHighlight(context)
       }
 
       if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.UPSIDE_DOWN_CAKE) {
@@ -130,7 +135,8 @@ internal class PreparedLayoutTextView(context: Context) : ViewGroup(context), Re
     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}")
+          "setSelection start and end are not in valid range. start: $start, end: $end, text length: ${layout.text.length}"
+      )
     }
 
     val textSelection = selection
@@ -205,15 +211,19 @@ internal class PreparedLayoutTextView(context: Context) : ViewGroup(context), Re
     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) {
+          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) {
+          if (
+              (spanFlags and Spanned.SPAN_INCLUSIVE_INCLUSIVE) != 0 ||
+                  (spanFlags and Spanned.SPAN_EXCLUSIVE_INCLUSIVE) != 0
+          ) {
             spanned.getSpanEnd(span)
           } else {
             spanned.getSpanEnd(span) - 1
@@ -282,15 +292,17 @@ internal class PreparedLayoutTextView(context: Context) : ViewGroup(context), Re
   public override fun onFocusChanged(
       gainFocus: Boolean,
       direction: Int,
-      previouslyFocusedRect: Rect?
+      previouslyFocusedRect: Rect?,
   ) {
     if (clickableSpans.isNotEmpty() && !gainFocus) {
       clearSelection()
     }
     super.onFocusChanged(gainFocus, direction, previouslyFocusedRect)
     val accessibilityDelegateCompat = ViewCompat.getAccessibilityDelegate(this)
-    if (accessibilityDelegateCompat != null &&
-        accessibilityDelegateCompat is ReactTextViewAccessibilityDelegate) {
+    if (
+        accessibilityDelegateCompat != null &&
+            accessibilityDelegateCompat is ReactTextViewAccessibilityDelegate
+    ) {
       accessibilityDelegateCompat.onFocusChanged(gainFocus, direction, previouslyFocusedRect)
     }
   }
@@ -310,8 +322,9 @@ internal class PreparedLayoutTextView(context: Context) : ViewGroup(context), Re
   override fun hasOverlappingRendering(): Boolean = false
 
   override fun reactTagForTouch(touchX: Float, touchY: Float): Int =
-      getSpanInCoords(touchX.roundToInt(), touchY.roundToInt(), ReactTagSpan::class.java)?.reactTag
-          ?: id
+      getSpanInCoords(touchX.roundToInt(), touchY.roundToInt(), ReactFragmentIndexSpan::class.java)
+          ?.fragmentIndex
+          ?.let { preparedLayout?.reactTags[it] } ?: id
 
   @RequiresApi(api = Build.VERSION_CODES.UPSIDE_DOWN_CAKE)
   private object Api34Utils {

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

@@ -5,6 +5,8 @@
  * LICENSE file in the root directory of this source tree.
  */
 
+@file:Suppress("DEPRECATION")
+
 package com.facebook.react.views.text
 
 import android.text.Spannable
@@ -48,7 +50,7 @@ internal class PreparedLayoutTextViewManager :
 
   override fun prepareToRecycleView(
       reactContext: ThemedReactContext,
-      view: PreparedLayoutTextView
+      view: PreparedLayoutTextView,
   ): PreparedLayoutTextView? {
     val preparedView = super.prepareToRecycleView(reactContext, view)
     preparedView?.recycleView()
@@ -59,7 +61,10 @@ internal class PreparedLayoutTextViewManager :
 
   override fun updateViewAccessibility(view: PreparedLayoutTextView) {
     ReactTextViewAccessibilityDelegate.setDelegate(
-        view, view.isFocusable, view.importantForAccessibility)
+        view,
+        view.isFocusable,
+        view.importantForAccessibility,
+    )
   }
 
   public override fun createViewInstance(context: ThemedReactContext): PreparedLayoutTextView =
@@ -77,9 +82,13 @@ internal class PreparedLayoutTextViewManager :
         val accessibilityLinks = AccessibilityLinks(spannedText)
         view.setTag(
             R.id.accessibility_links,
-            if (accessibilityLinks.size() > 0) accessibilityLinks else null)
+            if (accessibilityLinks.size() > 0) accessibilityLinks else null,
+        )
         ReactTextViewAccessibilityDelegate.resetDelegate(
-            view, view.isFocusable, view.importantForAccessibility)
+            view,
+            view.isFocusable,
+            view.importantForAccessibility,
+        )
       }
     }
   }
@@ -87,7 +96,7 @@ internal class PreparedLayoutTextViewManager :
   override fun updateState(
       view: PreparedLayoutTextView,
       props: ReactStylesDiffMap,
-      stateWrapper: StateWrapper
+      stateWrapper: StateWrapper,
   ): Any? = (stateWrapper as? ReferenceStateWrapper)?.stateDataReference
 
   override fun getExportedCustomDirectEventTypeConstants(): MutableMap<String, Any> {
@@ -129,8 +138,10 @@ internal class PreparedLayoutTextViewManager :
               ViewProps.BORDER_TOP_LEFT_RADIUS,
               ViewProps.BORDER_TOP_RIGHT_RADIUS,
               ViewProps.BORDER_BOTTOM_RIGHT_RADIUS,
-              ViewProps.BORDER_BOTTOM_LEFT_RADIUS],
-      defaultFloat = Float.NaN)
+              ViewProps.BORDER_BOTTOM_LEFT_RADIUS,
+          ],
+      defaultFloat = Float.NaN,
+  )
   fun setBorderRadius(view: PreparedLayoutTextView, index: Int, borderRadius: Float): Unit {
     val radius =
         if (borderRadius.isNaN()) null
@@ -153,8 +164,10 @@ internal class PreparedLayoutTextViewManager :
               ViewProps.BORDER_TOP_WIDTH,
               ViewProps.BORDER_BOTTOM_WIDTH,
               ViewProps.BORDER_START_WIDTH,
-              ViewProps.BORDER_END_WIDTH],
-      defaultFloat = Float.NaN)
+              ViewProps.BORDER_END_WIDTH,
+          ],
+      defaultFloat = Float.NaN,
+  )
   fun setBorderWidth(view: PreparedLayoutTextView, index: Int, width: Float): Unit {
     BackgroundStyleApplicator.setBorderWidth(view, LogicalEdge.values()[index], width)
   }
@@ -173,14 +186,15 @@ internal class PreparedLayoutTextViewManager :
               ViewProps.BORDER_BLOCK_END_COLOR,
               ViewProps.BORDER_BLOCK_START_COLOR,
           ],
-      customType = "Color")
+      customType = "Color",
+  )
   fun setBorderColor(view: PreparedLayoutTextView, index: Int, color: Int?): Unit {
     BackgroundStyleApplicator.setBorderColor(view, LogicalEdge.values()[index], color)
   }
 
   @ReactProp(name = "disabled", defaultBoolean = false)
   fun setDisabled(view: PreparedLayoutTextView, disabled: Boolean): Unit {
-    view.setEnabled(!disabled)
+    view.isEnabled = !disabled
   }
 
   override fun setPadding(
@@ -188,7 +202,7 @@ internal class PreparedLayoutTextViewManager :
       left: Int,
       top: Int,
       right: Int,
-      bottom: Int
+      bottom: Int,
   ): Unit {
     view.setPadding(left, top, right, bottom)
   }