react-native-tvos 0.84.1-0 → 0.85.0-0

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)
     )

package/ReactAndroid/src/main/java/com/facebook/react/views/textinput/ReactEditText.kt

@@ -14,7 +14,6 @@ import android.graphics.Canvas
 import android.graphics.Color
 import android.graphics.Paint
 import android.graphics.Rect
-import android.graphics.drawable.Drawable
 import android.os.Build
 import android.os.Bundle
 import android.text.Editable
@@ -86,7 +85,6 @@ import com.facebook.react.views.text.internal.span.ReactSpan
 import com.facebook.react.views.text.internal.span.ReactStrikethroughSpan
 import com.facebook.react.views.text.internal.span.ReactTextPaintHolderSpan
 import com.facebook.react.views.text.internal.span.ReactUnderlineSpan
-import com.facebook.react.views.text.internal.span.TextInlineImageSpan
 import java.util.concurrent.CopyOnWriteArrayList
 import kotlin.math.max
 import kotlin.math.min
@@ -119,7 +117,6 @@ public open class ReactEditText public constructor(context: Context) : AppCompat
   private var listeners: CopyOnWriteArrayList<TextWatcher>?
 
   public var stagedInputType: Int
-  protected var containsImages: Boolean = false
   public var submitBehavior: String? = null
   public var dragAndDropFilter: List<String>? = null
 
@@ -674,13 +671,13 @@ public open class ReactEditText public constructor(context: Context) : AppCompat
 
   public fun incrementAndGetEventCounter(): Int = ++nativeEventCount
 
-  public fun maybeSetTextFromJS(reactTextUpdate: ReactTextUpdate) {
+  internal fun maybeSetTextFromJS(reactTextUpdate: ReactTextUpdate) {
     isSettingTextFromJS = true
     maybeSetText(reactTextUpdate)
     isSettingTextFromJS = false
   }
 
-  public fun maybeSetTextFromState(reactTextUpdate: ReactTextUpdate) {
+  internal fun maybeSetTextFromState(reactTextUpdate: ReactTextUpdate) {
     isSettingTextFromState = true
     maybeSetText(reactTextUpdate)
     isSettingTextFromState = false
@@ -714,9 +711,6 @@ public open class ReactEditText public constructor(context: Context) : AppCompat
     manageSpans(spannableStringBuilder)
     stripStyleEquivalentSpans(spannableStringBuilder)
 
-    @Suppress("DEPRECATION")
-    containsImages = reactTextUpdate.containsImages()
-
     // When we update text, we trigger onChangeText code that will
     // try to update state if the wrapper is available. Temporarily disable
     // to prevent an (asynchronous) infinite loop.
@@ -981,54 +975,6 @@ public open class ReactEditText public constructor(context: Context) : AppCompat
         }
   }
 
-  override fun verifyDrawable(drawable: Drawable): Boolean {
-    if (containsImages) {
-      val text: Spanned? = text
-      val spans = checkNotNull(text).getSpans(0, text.length, TextInlineImageSpan::class.java)
-      for (span in spans) {
-        if (span.drawable === drawable) {
-          return true
-        }
-      }
-    }
-    return super.verifyDrawable(drawable)
-  }
-
-  override fun invalidateDrawable(drawable: Drawable) {
-    if (containsImages) {
-      val text: Spanned? = text
-      val spans = checkNotNull(text).getSpans(0, text.length, TextInlineImageSpan::class.java)
-      for (span in spans) {
-        if (span.drawable === drawable) {
-          invalidate()
-        }
-      }
-    }
-    super.invalidateDrawable(drawable)
-  }
-
-  public override fun onDetachedFromWindow() {
-    super.onDetachedFromWindow()
-    if (containsImages) {
-      val text: Spanned? = text
-      val spans = checkNotNull(text).getSpans(0, text.length, TextInlineImageSpan::class.java)
-      for (span in spans) {
-        span.onDetachedFromWindow()
-      }
-    }
-  }
-
-  override fun onStartTemporaryDetach() {
-    super.onStartTemporaryDetach()
-    if (containsImages) {
-      val text: Spanned? = text
-      val spans = checkNotNull(text).getSpans(0, text.length, TextInlineImageSpan::class.java)
-      for (span in spans) {
-        span.onStartTemporaryDetach()
-      }
-    }
-  }
-
   public override fun onConfigurationChanged(newConfig: Configuration) {
     super.onConfigurationChanged(newConfig)
 
@@ -1054,14 +1000,6 @@ public open class ReactEditText public constructor(context: Context) : AppCompat
     // Restore the selection since `setTextIsSelectable` changed it.
     maybeSetSelection(selectionStart, selectionEnd)
 
-    if (containsImages) {
-      val text: Spanned? = text
-      val spans = checkNotNull(text).getSpans(0, text.length, TextInlineImageSpan::class.java)
-      for (span in spans) {
-        span.onAttachedToWindow()
-      }
-    }
-
     if (autoFocus && !didAttachToWindow) {
       requestFocusProgrammatically()
     }
@@ -1069,17 +1007,6 @@ public open class ReactEditText public constructor(context: Context) : AppCompat
     didAttachToWindow = true
   }
 
-  override fun onFinishTemporaryDetach() {
-    super.onFinishTemporaryDetach()
-    if (containsImages) {
-      val text: Spanned? = text
-      val spans = checkNotNull(text).getSpans(0, text.length, TextInlineImageSpan::class.java)
-      for (span in spans) {
-        span.onFinishTemporaryDetach()
-      }
-    }
-  }
-
   override fun setBackgroundColor(color: Int) {
     setBackgroundColor(this, color)
   }

package/ReactAndroid/src/main/java/com/facebook/react/views/textinput/ReactTextChangedEvent.kt

@@ -17,6 +17,8 @@ internal class ReactTextChangedEvent(
     viewId: Int,
     private val text: String,
     private val eventCount: Int,
+    private val selectionStart: Int,
+    private val selectionEnd: Int,
 ) : Event<ReactTextChangedEvent>(surfaceId, viewId) {
   override fun getEventName(): String = EVENT_NAME
 
@@ -25,6 +27,12 @@ internal class ReactTextChangedEvent(
       putString("text", text)
       putInt("eventCount", eventCount)
       putInt("target", viewTag)
+      val selectionData =
+          Arguments.createMap().apply {
+            putInt("start", selectionStart)
+            putInt("end", selectionEnd)
+          }
+      putMap("selection", selectionData)
     }
   }
 

package/ReactAndroid/src/main/java/com/facebook/react/views/textinput/ReactTextContentSizeWatcher.kt

@@ -20,7 +20,7 @@ internal class ReactTextContentSizeWatcher(private val editText: ReactEditText)
 
   init {
     val reactContext = UIManagerHelper.getReactContext(editText)
-    eventDispatcher = UIManagerHelper.getEventDispatcherForReactTag(reactContext, editText.id)
+    eventDispatcher = UIManagerHelper.getEventDispatcher(reactContext)
     surfaceId = UIManagerHelper.getSurfaceId(reactContext)
   }
 

package/ReactAndroid/src/main/java/com/facebook/react/views/textinput/ReactTextInputManager.kt

@@ -66,14 +66,12 @@ import com.facebook.react.views.scroll.ScrollEventType.Companion.getJSEventName
 import com.facebook.react.views.text.DefaultStyleValuesUtil.getDefaultTextColor
 import com.facebook.react.views.text.DefaultStyleValuesUtil.getDefaultTextColorHighlight
 import com.facebook.react.views.text.DefaultStyleValuesUtil.getDefaultTextColorHint
-import com.facebook.react.views.text.ReactBaseTextShadowNode
 import com.facebook.react.views.text.ReactTextUpdate
 import com.facebook.react.views.text.ReactTextUpdate.Companion.buildReactTextUpdateFromState
 import com.facebook.react.views.text.ReactTextViewManagerCallback
 import com.facebook.react.views.text.ReactTypefaceUtils.parseFontVariant
 import com.facebook.react.views.text.TextAttributeProps
 import com.facebook.react.views.text.TextLayoutManager
-import com.facebook.react.views.text.internal.span.TextInlineImageSpan.Companion.possiblyUpdateInlineImageSpans
 import java.util.LinkedList
 
 /** Manages instances of TextInput. */
@@ -101,14 +99,13 @@ public open class ReactTextInputManager public constructor() :
     return editText
   }
 
-  override fun createShadowNodeInstance(): ReactBaseTextShadowNode = ReactTextInputShadowNode()
+  override fun createShadowNodeInstance(): LayoutShadowNode = LayoutShadowNode()
 
   public fun createShadowNodeInstance(
       reactTextViewManagerCallback: ReactTextViewManagerCallback?
-  ): ReactBaseTextShadowNode = ReactTextInputShadowNode(reactTextViewManagerCallback)
+  ): LayoutShadowNode = LayoutShadowNode()
 
-  override fun getShadowNodeClass(): Class<out LayoutShadowNode> =
-      ReactTextInputShadowNode::class.java
+  override fun getShadowNodeClass(): Class<out LayoutShadowNode> = LayoutShadowNode::class.java
 
   override fun getExportedCustomBubblingEventTypeConstants(): Map<String, Any> {
     val baseEventTypeConstants = super.getExportedCustomBubblingEventTypeConstants()
@@ -195,11 +192,6 @@ public open class ReactTextInputManager public constructor() :
     return ReactTextUpdate(
         sb,
         mostRecentEventCount,
-        false,
-        0f,
-        0f,
-        0f,
-        0f,
         Gravity.NO_GRAVITY,
         0,
         0,
@@ -208,31 +200,6 @@ public open class ReactTextInputManager public constructor() :
 
   override fun updateExtraData(view: ReactEditText, extraData: Any) {
     if (extraData is ReactTextUpdate) {
-      // TODO T58784068: delete this block of code, these are always unset in Fabric
-      val paddingLeft = extraData.paddingLeft.toInt()
-      val paddingTop = extraData.paddingTop.toInt()
-      val paddingRight = extraData.paddingRight.toInt()
-      val paddingBottom = extraData.paddingBottom.toInt()
-      if (
-          paddingLeft != UNSET ||
-              paddingTop != UNSET ||
-              paddingRight != UNSET ||
-              paddingBottom != UNSET
-      ) {
-        view.setPadding(
-            if (paddingLeft != UNSET) paddingLeft else view.paddingLeft,
-            if (paddingTop != UNSET) paddingTop else view.paddingTop,
-            if (paddingRight != UNSET) paddingRight else view.paddingRight,
-            if (paddingBottom != UNSET) paddingBottom else view.paddingBottom,
-        )
-      }
-
-      @Suppress("DEPRECATION")
-      if (extraData.containsImages()) {
-        val spannable = extraData.text
-        possiblyUpdateInlineImageSpans(spannable, view)
-      }
-
       // Ensure that selection is handled correctly on text update
       val isCurrentSelectionEmpty = view.selectionStart == view.selectionEnd
       var selectionStart = UNSET
@@ -357,7 +324,7 @@ public open class ReactTextInputManager public constructor() :
   }
 
   // Sets the letter spacing as an absolute point size.
-  // This extra handling, on top of what ReactBaseTextShadowNode already does, is required for the
+  // This extra handling is required for the
   // correct display of spacing in placeholder (hint) text.
   @ReactProp(name = ViewProps.LETTER_SPACING, defaultFloat = 0f)
   public fun setLetterSpacing(view: ReactEditText, letterSpacing: Float) {
@@ -1184,6 +1151,6 @@ public open class ReactTextInputManager public constructor() :
     private fun getEventDispatcher(
         reactContext: ReactContext,
         editText: ReactEditText,
-    ): EventDispatcher? = UIManagerHelper.getEventDispatcherForReactTag(reactContext, editText.id)
+    ): EventDispatcher? = UIManagerHelper.getEventDispatcher(reactContext)
   }
 }

package/ReactAndroid/src/main/java/com/facebook/react/views/textinput/ReactTextInputTextWatcher.kt

@@ -19,8 +19,7 @@ internal class ReactTextInputTextWatcher(
     reactContext: ReactContext,
     private val editText: ReactEditText,
 ) : TextWatcher {
-  private val eventDispatcher: EventDispatcher? =
-      UIManagerHelper.getEventDispatcherForReactTag(reactContext, editText.id)
+  private val eventDispatcher: EventDispatcher? = UIManagerHelper.getEventDispatcher(reactContext)
   private val surfaceId = UIManagerHelper.getSurfaceId(reactContext)
   private var previousText: String? = null
 
@@ -63,6 +62,8 @@ internal class ReactTextInputTextWatcher(
             editText.id,
             s.toString(),
             editText.incrementAndGetEventCounter(),
+            editText.selectionStart,
+            editText.selectionEnd,
         )
     )
   }

package/ReactAndroid/src/main/java/com/facebook/react/views/textinput/ReactTextScrollWatcher.kt

@@ -20,7 +20,7 @@ internal class ReactTextScrollWatcher(private val editText: ReactEditText) : Scr
 
   init {
     val reactContext = UIManagerHelper.getReactContext(editText)
-    eventDispatcher = UIManagerHelper.getEventDispatcherForReactTag(reactContext, editText.id)
+    eventDispatcher = UIManagerHelper.getEventDispatcher(reactContext)
     surfaceId = UIManagerHelper.getSurfaceId(reactContext)
   }
 

package/ReactAndroid/src/main/java/com/facebook/react/views/textinput/ReactTextSelectionWatcher.kt

@@ -20,7 +20,7 @@ internal class ReactTextSelectionWatcher(private val editText: ReactEditText) :
 
   init {
     val reactContext = UIManagerHelper.getReactContext(editText)
-    eventDispatcher = UIManagerHelper.getEventDispatcherForReactTag(reactContext, editText.id)
+    eventDispatcher = UIManagerHelper.getEventDispatcher(reactContext)
     surfaceId = UIManagerHelper.getSurfaceId(reactContext)
   }