diff --git a/ReactAndroid/src/main/java/com/facebook/react/views/scroll/ReactHorizontalScrollView.java b/ReactAndroid/src/main/java/com/facebook/react/views/scroll/ReactHorizontalScrollView.java index c46a1ea24..bf6c3bd51 100644 --- a/ReactAndroid/src/main/java/com/facebook/react/views/scroll/ReactHorizontalScrollView.java +++ b/ReactAndroid/src/main/java/com/facebook/react/views/scroll/ReactHorizontalScrollView.java @@ -608,7 +608,7 @@ public class ReactHorizontalScrollView extends HorizontalScrollView implements double interval = (double) getSnapInterval(); double ratio = (double) targetOffset / interval; smallerOffset = (int) (Math.floor(ratio) * interval); - largerOffset = (int) (Math.ceil(ratio) * interval); + largerOffset = Math.min((int) (Math.ceil(ratio) * interval), maximumOffset); } // Calculate the nearest offset diff --git a/ReactAndroid/src/main/java/com/facebook/react/views/scroll/ReactScrollView.java b/ReactAndroid/src/main/java/com/facebook/react/views/scroll/ReactScrollView.java index 36d02457a..f10bd47eb 100644 --- a/ReactAndroid/src/main/java/com/facebook/react/views/scroll/ReactScrollView.java +++ b/ReactAndroid/src/main/java/com/facebook/react/views/scroll/ReactScrollView.java @@ -569,7 +569,7 @@ public class ReactScrollView extends ScrollView implements ReactClippingViewGrou double interval = (double) getSnapInterval(); double ratio = (double) targetOffset / interval; smallerOffset = (int) (Math.floor(ratio) * interval); - largerOffset = (int) (Math.ceil(ratio) * interval); + largerOffset = Math.min((int) (Math.ceil(ratio) * interval), maximumOffset); } // Calculate the nearest offset