From b66c74092eee98ea5764b855cc27897c91a0f15e Mon Sep 17 00:00:00 2001
From: Jason Zheng <jasonqzheng@meta.com>
Date: Wed, 30 Sep 2026 00:32:18 -0700
Subject: [PATCH 1/3] Add TextInput example in ScrollViewExample (#58756)

Summary:

Add a new RNTester example in ScrollViewExample for using the component with TextInputs. This reproduces the issue where TextInputs on Android absorb scroll gestures when textAlign is set to "center" or "right". For TextInputs inside a ScrollView, starting a scroll gesture on the TextInput would not scroll the ScrollView. As this is a common use case, the example acts as a reference to show intended behavior and prevent future regressions.

Changelog: [Internal]

Differential Revision: D122199421
---
 .../examples/ScrollView/ScrollViewExample.js  | 144 +++++++++++++++++-
 1 file changed, 143 insertions(+), 1 deletion(-)

diff --git a/packages/rn-tester/js/examples/ScrollView/ScrollViewExample.js b/packages/rn-tester/js/examples/ScrollView/ScrollViewExample.js
index ef937f99089c..2d95829394f3 100644
--- a/packages/rn-tester/js/examples/ScrollView/ScrollViewExample.js
+++ b/packages/rn-tester/js/examples/ScrollView/ScrollViewExample.js
@@ -470,6 +470,22 @@ const examples: Array<RNTesterModuleExample> = [
       return <ChildrenWithTouchEventsOverflowingContainerHorizontal />;
     },
   },
+  {
+    title: '<ScrollView> TextInputs\n',
+    description:
+      'Vertical scroll gestures on a TextInput should scroll the ScrollView unless the input can also scroll vertically.',
+    render(): React.Node {
+      return <VerticalScrollTextInputs />;
+    },
+  },
+  {
+    title: '<ScrollView> TextInputs (horizontal = true)\n',
+    description:
+      'Horizontal scroll gestures on a TextInput should scroll the ScrollView unless the input can also scroll horizontally.',
+    render(): React.Node {
+      return <HorizontalScrollTextInputs />;
+    },
+  },
 ];
 
 if (Platform.OS === 'ios') {
@@ -611,6 +627,131 @@ const ScrollsChildToFocusExample = () => {
   );
 };
 
+const VerticalScrollTextInputs = () => {
+  const _verticalScrollView =
+    useRef<?React.ElementRef<typeof ScrollView>>(null);
+  const [verticalScrolled, setVerticalScrolled] = useState(false);
+
+  return (
+    <View>
+      <RNTesterText style={styles.text}>
+        scrolled = {verticalScrolled ? 'true' : 'false'}
+      </RNTesterText>
+      <ScrollView
+        ref={_verticalScrollView}
+        style={{backgroundColor: '#eeeeee', height: 350}}
+        contentContainerStyle={{padding: 10, gap: 20}}
+        nestedScrollEnabled
+        onScroll={event => {
+          setVerticalScrolled(event.nativeEvent.contentOffset.y > 0);
+        }}>
+        <TextInput placeholder="TextInput" style={styles.textInput} />
+        <TextInput
+          placeholder="TextInput (center)"
+          style={styles.textInput}
+          textAlign="center"
+        />
+        <TextInput
+          placeholder="TextInput (right)"
+          style={styles.textInput}
+          textAlign="right"
+        />
+        <TextInput
+          defaultValue={
+            'A TextInput with a value that overflows the input width so it can be scrolled horizontally.'
+          }
+          placeholder="TextInput"
+          style={styles.textInput}
+        />
+        <TextInput
+          defaultValue={
+            'A multiline TextInput\nwith a value that\noverflows the input\nheight so it can be\nscrolled vertically.'
+          }
+          placeholder="TextInput"
+          style={styles.textInput}
+          multiline
+        />
+        <View
+          style={[styles.textInput, {backgroundColor: '#cccccc', height: 200}]}
+        />
+      </ScrollView>
+      <Button
+        label="Scroll to top"
+        onPress={() => {
+          nullthrows<$FlowFixMe>(_verticalScrollView.current).scrollTo({
+            y: 0,
+          });
+        }}
+      />
+    </View>
+  );
+};
+
+const HorizontalScrollTextInputs = () => {
+  const _horizontalScrollView =
+    useRef<?React.ElementRef<typeof ScrollView>>(null);
+  const [horizontalScrolled, setHorizontalScrolled] = useState(false);
+
+  return (
+    <View>
+      <RNTesterText style={styles.text} testID="horizontal_status">
+        scrolled = {horizontalScrolled ? 'true' : 'false'}
+      </RNTesterText>
+      <ScrollView
+        ref={_horizontalScrollView}
+        style={{backgroundColor: '#eeeeee'}}
+        contentContainerStyle={{padding: 10, gap: 20}}
+        nestedScrollEnabled
+        horizontal
+        onScroll={event => {
+          setHorizontalScrolled(event.nativeEvent.contentOffset.x > 0);
+        }}>
+        <View
+          style={[
+            styles.textInput,
+            {backgroundColor: '#cccccc', width: 100, height: '100%'},
+          ]}
+        />
+        <View style={{gap: 20}}>
+          <TextInput
+            placeholder="TextInput"
+            style={[styles.textInput, {width: 200}]}
+          />
+          <TextInput
+            defaultValue={
+              'A TextInput with a value that overflows the input width so it can be scrolled horizontally.'
+            }
+            placeholder="TextInput"
+            style={[styles.textInput, {width: 200}]}
+          />
+          <TextInput
+            defaultValue={
+              'A multiline TextInput\nwith a value that\noverflows the input\nheight so it can be\nscrolled vertically.'
+            }
+            placeholder="TextInput"
+            style={[styles.textInput, {width: 200}]}
+            multiline
+          />
+        </View>
+        <View
+          style={[
+            styles.textInput,
+            {backgroundColor: '#cccccc', width: 100, height: '100%'},
+          ]}
+        />
+      </ScrollView>
+      <Button
+        label="Scroll to start"
+        onPress={() => {
+          nullthrows<$FlowFixMe>(_horizontalScrollView.current).scrollTo({
+            x: 0,
+          });
+        }}
+      />
+    </View>
+  );
+};
+
 const HorizontalScrollView = (props: {
   direction: 'ltr' | 'rtl',
   itemCount?: number,
@@ -1554,8 +1695,9 @@ const styles = StyleSheet.create({
     alignSelf: 'center',
   },
   textInput: {
-    height: 40,
+    height: 48,
     borderColor: 'gray',
     borderWidth: 1,
+    paddingHorizontal: 10,
   },
 });

From 3d542f5e5b7e9ff747c18a1ba12cb133e5af95c6 Mon Sep 17 00:00:00 2001
From: Jason Zheng <jasonqzheng@meta.com>
Date: Wed, 30 Sep 2026 00:32:18 -0700
Subject: [PATCH 2/3] Fix TextInput absorbing scroll gestures on Android
 (#58678)

Summary:

Fixes the issue described in #25594 and #12167, where TextInputs on Android absorb scroll gestures when textAlign is set to "center" or "right". For TextInputs inside a ScrollView, starting a scroll gesture on the TextInput would not scroll the ScrollView.

### Root Cause

The root cause is the `onTouchEvent()` function introduced in [commit 372d001](https://github.com/react/react-native/commit/372d001a5d5e24b68d194e01c356d973642fac86). The smart scroll implementation checks if the TextInput can itself scroll in any direction. If it cannot, then the parent can intercept the gesture to apply normal scroll behavior.

However, when textAlign is set to "center" or "right", `canScrollHorizontally()` returns true, as Android treats the TextInput as capable of scrolling left/right. In these cases, the existing conditional logic blocks all scroll gestures, even if a vertical swipe is applied.

### This PR

Modify `ReactEditText` so that we only check to see if the TextInput can scroll in the direction of the provided touch gesture. If a TextInput can scroll horizontally but not vertically, vertical touch swipes will no longer interfere with the scroll gesture. Touch slop is also used to distinguish intentional swipe gestures from small micro-touch events.

Changelog: [Android][Fixed] Prevent TextInput from preventing scroll gestures

Differential Revision: D121519676
---
 .../react/views/textinput/ReactEditText.kt    | 37 ++++++++++++++-----
 .../examples/ScrollView/ScrollViewExample.js  | 20 +++++++++-
 2 files changed, 46 insertions(+), 11 deletions(-)

diff --git a/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/views/textinput/ReactEditText.kt b/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/views/textinput/ReactEditText.kt
index 754f10026624..2bed60a1e6a1 100644
--- a/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/views/textinput/ReactEditText.kt
+++ b/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/views/textinput/ReactEditText.kt
@@ -36,6 +36,7 @@ import android.view.Menu
 import android.view.MenuItem
 import android.view.MotionEvent
 import android.view.View
+import android.view.ViewConfiguration
 import android.view.ViewGroup
 import android.view.accessibility.AccessibilityNodeInfo
 import android.view.inputmethod.EditorInfo
@@ -91,6 +92,7 @@ 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 java.util.concurrent.CopyOnWriteArrayList
+import kotlin.math.abs
 import kotlin.math.max
 import kotlin.math.min
 
@@ -132,6 +134,9 @@ public open class ReactEditText public constructor(context: Context) : AppCompat
   private var scrollWatcher: ScrollWatcher?
   private var keyListener: InternalKeyListener? = null
   private var detectScrollMovement = false
+  private var touchDownX = 0f
+  private var touchDownY = 0f
+  private val touchSlop = ViewConfiguration.get(context).scaledTouchSlop
   private var onKeyPress = false
   private val textAttributes: TextAttributes
   private var typefaceDirty = false
@@ -316,6 +321,8 @@ public open class ReactEditText public constructor(context: Context) : AppCompat
   override fun onTouchEvent(ev: MotionEvent): Boolean {
     when (ev.action) {
       MotionEvent.ACTION_DOWN -> {
+        touchDownX = ev.x
+        touchDownY = ev.y
         detectScrollMovement = true
         // Disallow parent views to intercept touch events, until we can detect if we should be
         // capturing these touches or not.
@@ -324,21 +331,33 @@ public open class ReactEditText public constructor(context: Context) : AppCompat
 
       MotionEvent.ACTION_MOVE ->
           if (detectScrollMovement) {
-            if (
-                !canScrollVertically(-1) &&
-                    !canScrollVertically(1) &&
-                    !canScrollHorizontally(-1) &&
-                    !canScrollHorizontally(1)
-            ) {
-              // We cannot scroll, let parent views take care of these touches.
-              this.parent.requestDisallowInterceptTouchEvent(false)
+            val deltaX = ev.x - touchDownX
+            val deltaY = ev.y - touchDownY
+            val dominantAxisDistance = max(abs(deltaX), abs(deltaY))
+            if (dominantAxisDistance > touchSlop) {
+              if (!canScrollInGestureDirection(deltaX, deltaY)) {
+                // We cannot scroll, let parent views take care of these touches.
+                this.parent.requestDisallowInterceptTouchEvent(false)
+              }
+              detectScrollMovement = false
             }
-            detectScrollMovement = false
           }
     }
     return super.onTouchEvent(ev)
   }
 
+  private fun canScrollInGestureDirection(deltaX: Float, deltaY: Float): Boolean {
+    if (abs(deltaY) > abs(deltaX)) {
+      val canScrollUp = deltaY > 0 && canScrollVertically(-1)
+      val canScrollDown = deltaY <= 0 && canScrollVertically(1)
+      return canScrollUp || canScrollDown
+    } else {
+      val canScrollLeft = deltaX > 0 && canScrollHorizontally(-1)
+      val canScrollRight = deltaX <= 0 && canScrollHorizontally(1)
+      return canScrollLeft || canScrollRight
+    }
+  }
+
   // Consume 'Enter' key events: TextView tries to give focus to the next TextInput, but it can't
   // since we only allow JS to change focus, which in turn causes TextView to crash.
   override fun onKeyUp(keyCode: Int, event: KeyEvent): Boolean {
diff --git a/packages/rn-tester/js/examples/ScrollView/ScrollViewExample.js b/packages/rn-tester/js/examples/ScrollView/ScrollViewExample.js
index 2d95829394f3..72580d9c0485 100644
--- a/packages/rn-tester/js/examples/ScrollView/ScrollViewExample.js
+++ b/packages/rn-tester/js/examples/ScrollView/ScrollViewExample.js
@@ -471,6 +471,7 @@ const examples: Array<RNTesterModuleExample> = [
     },
   },
   {
+    name: 'scrollTextInputsVertical',
     title: '<ScrollView> TextInputs\n',
     description:
       'Vertical scroll gestures on a TextInput should scroll the ScrollView unless the input can also scroll vertically.',
@@ -479,6 +480,7 @@ const examples: Array<RNTesterModuleExample> = [
     },
   },
   {
+    name: 'scrollTextInputsHorizontal',
     title: '<ScrollView> TextInputs (horizontal = true)\n',
     description:
       'Horizontal scroll gestures on a TextInput should scroll the ScrollView unless the input can also scroll horizontally.',
@@ -634,7 +636,7 @@ const VerticalScrollTextInputs = () => {
 
   return (
     <View>
-      <RNTesterText style={styles.text}>
+      <RNTesterText style={styles.text} testID="vertical_status">
         scrolled = {verticalScrolled ? 'true' : 'false'}
       </RNTesterText>
       <ScrollView
@@ -645,16 +647,22 @@ const VerticalScrollTextInputs = () => {
         onScroll={event => {
           setVerticalScrolled(event.nativeEvent.contentOffset.y > 0);
         }}>
-        <TextInput placeholder="TextInput" style={styles.textInput} />
+        <TextInput
+          placeholder="TextInput"
+          style={styles.textInput}
+          testID="text_input_vertical"
+        />
         <TextInput
           placeholder="TextInput (center)"
           style={styles.textInput}
           textAlign="center"
+          testID="text_input_vertical_center"
         />
         <TextInput
           placeholder="TextInput (right)"
           style={styles.textInput}
           textAlign="right"
+          testID="text_input_vertical_right"
         />
         <TextInput
           defaultValue={
@@ -662,6 +670,7 @@ const VerticalScrollTextInputs = () => {
           }
           placeholder="TextInput"
           style={styles.textInput}
+          testID="text_input_vertical_overflow_width"
         />
         <TextInput
           defaultValue={
@@ -670,6 +679,7 @@ const VerticalScrollTextInputs = () => {
           placeholder="TextInput"
           style={styles.textInput}
           multiline
+          testID="text_input_vertical_overflow_height"
         />
         <View
           style={[styles.textInput, {backgroundColor: '#cccccc', height: 200}]}
@@ -682,6 +692,7 @@ const VerticalScrollTextInputs = () => {
             y: 0,
           });
         }}
+        testID="scroll_to_top_button"
       />
     </View>
   );
@@ -711,11 +722,13 @@ const HorizontalScrollTextInputs = () => {
             styles.textInput,
             {backgroundColor: '#cccccc', width: 100, height: '100%'},
           ]}
+          testID="left_filler"
         />
         <View style={{gap: 20}}>
           <TextInput
             placeholder="TextInput"
             style={[styles.textInput, {width: 200}]}
+            testID="text_input_horizontal"
           />
           <TextInput
             defaultValue={
@@ -723,6 +736,7 @@ const HorizontalScrollTextInputs = () => {
             }
             placeholder="TextInput"
             style={[styles.textInput, {width: 200}]}
+            testID="text_input_horizontal_overflow_width"
           />
           <TextInput
             defaultValue={
@@ -731,6 +745,7 @@ const HorizontalScrollTextInputs = () => {
             placeholder="TextInput"
             style={[styles.textInput, {width: 200}]}
             multiline
+            testID="text_input_horizontal_overflow_height"
           />
         </View>
         <View
@@ -747,6 +762,7 @@ const HorizontalScrollTextInputs = () => {
             x: 0,
           });
         }}
+        testID="scroll_to_start_button"
       />
     </View>
   );

From eb68505a2277e088057883ea42b4d7adcebd7e61 Mon Sep 17 00:00:00 2001
From: Jason Zheng <jasonqzheng@meta.com>
Date: Wed, 30 Sep 2026 00:32:18 -0700
Subject: [PATCH 3/3] Fix TextInput breaking nested scroll gestures on Android

Summary:
Fixes an Android-only bug where TextInputs can interfere with nested scroll gestures, causing scroll events to be performed on the outer parent instead of the inner ScrollView.

### Root Cause

This issue occurs when you have a TextInput inside an inner ScrollView with `nestedScrollEnabled = true` inside an outer ScrollView. When a scroll gesture is performed on a TextInput that can scroll, the TextInput intercepts the gesture as expected. However, the next scroll gesture applied anywhere in the inner ScrollView scrolls the outer parent instead of the inner ScrollView.

`inner.onInterceptTouchEvent()` calls `startNestedScroll()` on ACTION_DOWN and `stopNestedScroll()` on ACTION_UP. When the scroll gesture is on a scrollable TextInput, ReactEditText disallows parent views from intercepting touch events. This means on ACTION_UP, `inner.onInterceptTouchEvent()` and `stopNestedScroll()` is not triggered.

Without `stopNestedScroll()`, the subsequent `startNestedScroll()` on the next ACTION_DOWN becomes a no-op, and the outer ScrollView intercepts the scroll gesture instead of the inner ScrollView.

### This PR

Add a defensive `stopNestedScroll()` in `dispatchTouchEvent()` for ScrollViews. This matches the existing pattern already used by Android in `View.dispatchTouchEvent()` which includes the exact same defensive cleanup.

Changelog: [Android][Fixed] Prevent TextInputs from interfering with nested scroll gestures

Differential Revision: D122404118
---
 .../ReactAndroid/api/ReactAndroid.api         |  2 ++
 .../views/scroll/ReactHorizontalScrollView.kt |  8 +++++++
 .../views/scroll/ReactNestedScrollView.kt     | 10 +++++++-
 .../scroll/ReactNestedScrollViewManager.kt    | 24 ++++++++++---------
 .../react/views/scroll/ReactScrollView.kt     |  8 +++++++
 5 files changed, 40 insertions(+), 12 deletions(-)

diff --git a/packages/react-native/ReactAndroid/api/ReactAndroid.api b/packages/react-native/ReactAndroid/api/ReactAndroid.api
index 29a04dfbfc07..13665d1d2f2d 100644
--- a/packages/react-native/ReactAndroid/api/ReactAndroid.api
+++ b/packages/react-native/ReactAndroid/api/ReactAndroid.api
@@ -5476,6 +5476,7 @@ public class com/facebook/react/views/scroll/ReactHorizontalScrollView : android
 	public fun arrowScroll (I)Z
 	public fun canScrollHorizontally (I)Z
 	public fun dispatchGenericMotionEvent (Landroid/view/MotionEvent;)Z
+	public fun dispatchTouchEvent (Landroid/view/MotionEvent;)Z
 	public fun draw (Landroid/graphics/Canvas;)V
 	public fun executeKeyEvent (Landroid/view/KeyEvent;)Z
 	public fun flashScrollIndicators ()V
@@ -5624,6 +5625,7 @@ public class com/facebook/react/views/scroll/ReactScrollView : android/widget/Sc
 	public synthetic fun <init> (Landroid/content/Context;Lcom/facebook/react/views/scroll/FpsListener;ILkotlin/jvm/internal/DefaultConstructorMarker;)V
 	public fun abortAnimation ()V
 	public fun dispatchGenericMotionEvent (Landroid/view/MotionEvent;)Z
+	public fun dispatchTouchEvent (Landroid/view/MotionEvent;)Z
 	public fun draw (Landroid/graphics/Canvas;)V
 	public fun executeKeyEvent (Landroid/view/KeyEvent;)Z
 	public fun flashScrollIndicators ()V
diff --git a/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/views/scroll/ReactHorizontalScrollView.kt b/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/views/scroll/ReactHorizontalScrollView.kt
index 1bfb84f45368..bdc4922457a7 100644
--- a/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/views/scroll/ReactHorizontalScrollView.kt
+++ b/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/views/scroll/ReactHorizontalScrollView.kt
@@ -645,6 +645,14 @@ constructor(context: Context, private val fpsListener: FpsListener? = null) :
   override fun shouldDelayChildPressedState(): Boolean =
       hasChildPressedStateDelay ?: super.shouldDelayChildPressedState()
 
+  override fun dispatchTouchEvent(ev: MotionEvent): Boolean {
+    if (ev.actionMasked == MotionEvent.ACTION_DOWN) {
+      // Defensive cleanup for new gesture
+      stopNestedScroll()
+    }
+    return super.dispatchTouchEvent(ev)
+  }
+
   override fun onInterceptTouchEvent(ev: MotionEvent): Boolean {
     if (!scrollEnabled) return false
 
diff --git a/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/views/scroll/ReactNestedScrollView.kt b/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/views/scroll/ReactNestedScrollView.kt
index 45fee3cd19d1..98a1de5368da 100644
--- a/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/views/scroll/ReactNestedScrollView.kt
+++ b/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/views/scroll/ReactNestedScrollView.kt
@@ -4,7 +4,7 @@
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
  *
- * @generated SignedSource<<2f9a2ea0c223b08d9d1ea4517fd9671b>>
+ * @generated SignedSource<<a32e8eb823c728bdb2200b163b82efe3>>
  */
 
 /**
@@ -565,6 +565,14 @@ constructor(context: Context, private val fpsListener: FpsListener? = null) :
   override fun shouldDelayChildPressedState(): Boolean =
       hasChildPressedStateDelay ?: super.shouldDelayChildPressedState()
 
+  override fun dispatchTouchEvent(ev: MotionEvent): Boolean {
+    if (ev.actionMasked == MotionEvent.ACTION_DOWN) {
+      // Defensive cleanup for new gesture
+      stopNestedScroll()
+    }
+    return super.dispatchTouchEvent(ev)
+  }
+
   override fun onInterceptTouchEvent(ev: MotionEvent): Boolean {
     if (!scrollEnabled) return false
     if (!PointerEvents.canChildrenBeTouchTarget(pointerEvents)) return true
diff --git a/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/views/scroll/ReactNestedScrollViewManager.kt b/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/views/scroll/ReactNestedScrollViewManager.kt
index 50ec11cbe1e1..632c1d5c73f3 100644
--- a/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/views/scroll/ReactNestedScrollViewManager.kt
+++ b/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/views/scroll/ReactNestedScrollViewManager.kt
@@ -4,7 +4,7 @@
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
  *
- * @generated SignedSource<<3b339a7d81f8e32cf6b6ca93ae9a388b>>
+ * @generated SignedSource<<acbc1716191446a5c496c66dfa368b52>>
  */
 
 /**
@@ -461,15 +461,17 @@ constructor(private val fpsListener: FpsListener? = null) :
   companion object {
     const val REACT_CLASS: String = "RCTScrollView"
 
-    fun createExportedCustomDirectEventTypeConstants(): Map<String, Any> = mapOf(
-        getJSEventName(ScrollEventType.SCROLL) to mapOf("registrationName" to "onScroll"),
-        getJSEventName(ScrollEventType.BEGIN_DRAG) to
-            mapOf("registrationName" to "onScrollBeginDrag"),
-        getJSEventName(ScrollEventType.END_DRAG) to mapOf("registrationName" to "onScrollEndDrag"),
-        getJSEventName(ScrollEventType.MOMENTUM_BEGIN) to
-            mapOf("registrationName" to "onMomentumScrollBegin"),
-        getJSEventName(ScrollEventType.MOMENTUM_END) to
-            mapOf("registrationName" to "onMomentumScrollEnd"),
-    )
+    fun createExportedCustomDirectEventTypeConstants(): Map<String, Any> =
+        mapOf(
+            getJSEventName(ScrollEventType.SCROLL) to mapOf("registrationName" to "onScroll"),
+            getJSEventName(ScrollEventType.BEGIN_DRAG) to
+                mapOf("registrationName" to "onScrollBeginDrag"),
+            getJSEventName(ScrollEventType.END_DRAG) to
+                mapOf("registrationName" to "onScrollEndDrag"),
+            getJSEventName(ScrollEventType.MOMENTUM_BEGIN) to
+                mapOf("registrationName" to "onMomentumScrollBegin"),
+            getJSEventName(ScrollEventType.MOMENTUM_END) to
+                mapOf("registrationName" to "onMomentumScrollEnd"),
+        )
   }
 }
diff --git a/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/views/scroll/ReactScrollView.kt b/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/views/scroll/ReactScrollView.kt
index b553f6af997d..9e98f34feeb1 100644
--- a/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/views/scroll/ReactScrollView.kt
+++ b/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/views/scroll/ReactScrollView.kt
@@ -557,6 +557,14 @@ constructor(context: Context, private val fpsListener: FpsListener? = null) :
   override fun shouldDelayChildPressedState(): Boolean =
       hasChildPressedStateDelay ?: super.shouldDelayChildPressedState()
 
+  override fun dispatchTouchEvent(ev: MotionEvent): Boolean {
+    if (ev.actionMasked == MotionEvent.ACTION_DOWN) {
+      // Defensive cleanup for new gesture
+      stopNestedScroll()
+    }
+    return super.dispatchTouchEvent(ev)
+  }
+
   override fun onInterceptTouchEvent(ev: MotionEvent): Boolean {
     if (!scrollEnabled) return false
     if (!PointerEvents.canChildrenBeTouchTarget(pointerEvents)) return true