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 49f7326f0a2241..80b64893a2a2cd 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 @@ -28,6 +28,7 @@ import android.view.accessibility.AccessibilityNodeInfo; import android.widget.OverScroller; import android.widget.ScrollView; +import androidx.core.widget.NestedScrollView; import androidx.annotation.NonNull; import androidx.annotation.Nullable; import androidx.core.view.ViewCompat; @@ -62,7 +63,7 @@ *
ReactScrollView only supports vertical scrolling. For horizontal scrolling, use {@link * ReactHorizontalScrollView}. */ -public class ReactScrollView extends ScrollView +public class ReactScrollView extends NestedScrollView implements ReactClippingViewGroup, ViewGroup.OnHierarchyChangeListener, View.OnLayoutChangeListener, @@ -156,7 +157,7 @@ private OverScroller getOverScrollerFromParent() { if (!sTriedToGetScrollerField) { sTriedToGetScrollerField = true; try { - sScrollerField = ScrollView.class.getDeclaredField("mScroller"); + sScrollerField = NestedScrollView.class.getDeclaredField("mScroller"); sScrollerField.setAccessible(true); } catch (NoSuchFieldException e) { FLog.w( @@ -317,7 +318,7 @@ protected void onSizeChanged(int w, int h, int oldw, int oldh) { } @Override - protected void onAttachedToWindow() { + public void onAttachedToWindow() { super.onAttachedToWindow(); if (mRemoveClippedSubviews) { updateClippingRect();