From 90017b5fd22e343ed1f2c71fef2356dc283ebbe6 Mon Sep 17 00:00:00 2001 From: Pieter De Baets Date: Tue, 21 Apr 2026 11:03:19 -0700 Subject: [PATCH] Remove no-op MaintainVisibleScrollPositionHelper#updateScrollPosition() (#56535) Summary: Pull Request resolved: https://github.com/facebook/react-native/pull/56535 Changelog: [Internal] Reviewed By: Abbondanzo Differential Revision: D101331886 fbshipit-source-id: fb655f3edab86ebf0cca5f19663337ab2dee7a9d --- .../views/scroll/MaintainVisibleScrollPositionHelper.kt | 8 -------- .../react/views/scroll/ReactHorizontalScrollView.java | 2 -- .../react/views/scroll/ReactNestedScrollView.java | 6 +----- .../com/facebook/react/views/scroll/ReactScrollView.java | 4 ---- 4 files changed, 1 insertion(+), 19 deletions(-) diff --git a/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/views/scroll/MaintainVisibleScrollPositionHelper.kt b/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/views/scroll/MaintainVisibleScrollPositionHelper.kt index a318fc87dcf..2bee605a15c 100644 --- a/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/views/scroll/MaintainVisibleScrollPositionHelper.kt +++ b/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/views/scroll/MaintainVisibleScrollPositionHelper.kt @@ -82,14 +82,6 @@ internal class MaintainVisibleScrollPositionHelper( uIManager.removeUIManagerEventListener(this) } - /** - * Update the scroll position of the managed ScrollView. This should be called after layout has - * been updated. - * - * On Fabric this will be called internally in `didMountItems`. - */ - fun updateScrollPosition() = Unit - private fun updateScrollPositionInternal() { val config = config ?: return val firstVisibleViewRef = firstVisibleViewRef ?: return 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 f7f3aae74ba..25d603fefff 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 @@ -1681,8 +1681,6 @@ public class ReactHorizontalScrollView extends HorizontalScrollView // does not work in RTL. if (v.getLayoutDirection() == LAYOUT_DIRECTION_RTL) { adjustPositionForContentChangeRTL(left, right, oldLeft, oldRight); - } else if (mMaintainVisibleContentPositionHelper != null) { - mMaintainVisibleContentPositionHelper.updateScrollPosition(); } ReactScrollViewHelper.emitLayoutChangeEvent(this); } diff --git a/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/views/scroll/ReactNestedScrollView.java b/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/views/scroll/ReactNestedScrollView.java index f09d335164f..696757752d0 100644 --- a/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/views/scroll/ReactNestedScrollView.java +++ b/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/views/scroll/ReactNestedScrollView.java @@ -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<> + * @generated SignedSource<<74209bb4a44619a1ce16d68cfeeb0653>> */ /** @@ -1466,10 +1466,6 @@ class ReactNestedScrollView extends NestedScrollView return; } - if (mMaintainVisibleContentPositionHelper != null) { - mMaintainVisibleContentPositionHelper.updateScrollPosition(); - } - if (isShown() && isContentReady()) { int currentScrollY = getScrollY(); int maxScrollY = getMaxScrollY(); 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 cd775c6741d..1375bfdc69c 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 @@ -1458,10 +1458,6 @@ public class ReactScrollView extends ScrollView return; } - if (mMaintainVisibleContentPositionHelper != null) { - mMaintainVisibleContentPositionHelper.updateScrollPosition(); - } - if (isShown() && isContentReady()) { int currentScrollY = getScrollY(); int maxScrollY = getMaxScrollY();