diff --git a/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/views/scroll/ReactHorizontalScrollView.java b/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/views/scroll/ReactHorizontalScrollView.java index 395da1ee0aa..c047578e968 100644 --- a/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/views/scroll/ReactHorizontalScrollView.java +++ b/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/views/scroll/ReactHorizontalScrollView.java @@ -135,6 +135,7 @@ public class ReactHorizontalScrollView extends HorizontalScrollView private @Nullable MaintainVisibleScrollPositionHelper mMaintainVisibleContentPositionHelper; private int mFadingEdgeLengthStart = 0; private int mFadingEdgeLengthEnd = 0; + private boolean mEmittedOverScrollSinceScrollBegin = false; public ReactHorizontalScrollView(Context context) { this(context, null); @@ -730,6 +731,7 @@ public class ReactHorizontalScrollView extends HorizontalScrollView } ReactScrollViewHelper.emitScrollBeginDragEvent(this); mDragging = true; + mEmittedOverScrollSinceScrollBegin = false; enableFpsListener(); getFlingAnimator().cancel(); } @@ -1076,6 +1078,13 @@ public class ReactHorizontalScrollView extends HorizontalScrollView // END FB SCROLLVIEW CHANGE } + if (ReactNativeFeatureFlags.shouldTriggerResponderTransferOnScrollAndroid() + && clampedX + && mEmittedOverScrollSinceScrollBegin == false) { + ReactScrollViewHelper.emitScrollEvent(this, 0f, 0f); + mEmittedOverScrollSinceScrollBegin = true; + } + super.onOverScrolled(scrollX, scrollY, clampedX, clampedY); } diff --git a/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/views/scroll/ReactScrollView.java b/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/views/scroll/ReactScrollView.java index 3f7469a5a38..df4270eaad7 100644 --- a/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/views/scroll/ReactScrollView.java +++ b/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/views/scroll/ReactScrollView.java @@ -132,6 +132,7 @@ public class ReactScrollView extends ScrollView private @Nullable MaintainVisibleScrollPositionHelper mMaintainVisibleContentPositionHelper; private int mFadingEdgeLengthStart; private int mFadingEdgeLengthEnd; + private boolean mEmittedOverScrollSinceScrollBegin; public ReactScrollView(Context context) { this(context, null); @@ -194,6 +195,7 @@ public class ReactScrollView extends ScrollView mMaintainVisibleContentPositionHelper = null; mFadingEdgeLengthStart = 0; mFadingEdgeLengthEnd = 0; + mEmittedOverScrollSinceScrollBegin = false; } /* package */ void recycleView() { @@ -621,6 +623,7 @@ public class ReactScrollView extends ScrollView } ReactScrollViewHelper.emitScrollBeginDragEvent(this); mDragging = true; + mEmittedOverScrollSinceScrollBegin = false; enableFpsListener(); getFlingAnimator().cancel(); } @@ -1280,6 +1283,13 @@ public class ReactScrollView extends ScrollView // END FB SCROLLVIEW CHANGE } + if (ReactNativeFeatureFlags.shouldTriggerResponderTransferOnScrollAndroid() + && clampedY + && mEmittedOverScrollSinceScrollBegin == false) { + ReactScrollViewHelper.emitScrollEvent(this, 0f, 0f); + mEmittedOverScrollSinceScrollBegin = true; + } + super.onOverScrolled(scrollX, scrollY, clampedX, clampedY); }