react-native-tvos 0.85.2-0 → 0.86.0-0rc2

package/ReactAndroid/src/main/java/com/facebook/react/uimanager/events/SynchronousEventReceiver.kt

@@ -21,4 +21,32 @@ internal interface SynchronousEventReceiver {
       @EventCategoryDef eventCategory: Int,
       experimentalIsSynchronous: Boolean,
   )
+
+  /**
+   * Receives an event with a specific timestamp. The default implementation delegates to the
+   * non-timestamped version for backward compatibility with existing implementations.
+   *
+   * @param eventTimestamp timestamp when the event was triggered (in milliseconds since boot, from
+   *   SystemClock.uptimeMillis())
+   */
+  fun receiveEvent(
+      surfaceId: Int,
+      reactTag: Int,
+      eventName: String,
+      canCoalesceEvent: Boolean,
+      params: WritableMap?,
+      @EventCategoryDef eventCategory: Int,
+      experimentalIsSynchronous: Boolean,
+      eventTimestamp: Long,
+  ) {
+    receiveEvent(
+        surfaceId,
+        reactTag,
+        eventName,
+        canCoalesceEvent,
+        params,
+        eventCategory,
+        experimentalIsSynchronous,
+    )
+  }
 }

package/ReactAndroid/src/main/java/com/facebook/react/uimanager/events/TouchesHelper.kt

@@ -132,15 +132,14 @@ internal object TouchesHelper {
       }
 
       for (touchData in changedTouches) {
-        val eventData =
-            touchData?.let { td ->
-              val ed = td.copy()
-              val changedTouchesArray = getWritableArray(/* copyObjects */ true, changedTouches)
-              val touchesArray = getWritableArray(/* copyObjects */ true, touches)
-              ed.putArray(CHANGED_TOUCHES_KEY, changedTouchesArray)
-              ed.putArray(TOUCHES_KEY, touchesArray)
-              ed
-            }
+        val eventData = touchData?.let { td ->
+          val ed = td.copy()
+          val changedTouchesArray = getWritableArray(/* copyObjects */ true, changedTouches)
+          val touchesArray = getWritableArray(/* copyObjects */ true, touches)
+          ed.putArray(CHANGED_TOUCHES_KEY, changedTouchesArray)
+          ed.putArray(TOUCHES_KEY, touchesArray)
+          ed
+        }
 
         eventEmitter.receiveEvent(
             event.surfaceId,
@@ -150,6 +149,7 @@ internal object TouchesHelper {
             0,
             eventData,
             event.getEventCategory(),
+            event.timestampMs,
         )
       }
     } finally {

package/ReactAndroid/src/main/java/com/facebook/react/util/AndroidVersion.kt

@@ -14,10 +14,34 @@ import android.os.Build
 internal object AndroidVersion {
 
   /**
-   * This is the version code for Android 16 (SDK Level 36). Delete it once we bump up the default
-   * compile SDK version to 36.
+   * This is the version code for Android 15 (SDK Level 35). Internally at Meta this code is also
+   * compiled against SDK 34, so we need to retain this constant instead of using
+   * [Build.VERSION_CODES.VANILLA_ICE_CREAM] directly.
    */
-  private const val VERSION_CODE_BAKLAVA: Int = 36
+  internal const val VERSION_CODE_VANILLA_ICE_CREAM: Int = 35
+
+  /**
+   * This is the version code for Android 16 (SDK Level 36). Internally at Meta this code is also
+   * compiled against SDK 34, so we need to retain this constant instead of using
+   * [Build.VERSION_CODES.BAKLAVA] directly.
+   */
+  internal const val VERSION_CODE_BAKLAVA: Int = 36
+
+  /**
+   * android.R.attr.windowOptOutEdgeToEdgeEnforcement added in API 35. Internally at Meta this code
+   * is compiled against an SDK that may not have this attribute defined.
+   * https://cs.android.com/android/platform/superproject/main/+/main:frameworks/base/core/res/res/values/public-final.xml;l=3848
+   */
+  internal const val ATTR_WINDOW_OPT_OUT_EDGE_TO_EDGE_ENFORCEMENT: Int = 0x0101069a
+
+  /**
+   * This method is used to check if the current device is running Android 15 (SDK Level 35) or
+   * higher and the app is targeting Android 15 (SDK Level 35) or higher.
+   */
+  @JvmStatic
+  internal fun isAtLeastTargetSdk35(context: Context): Boolean =
+      Build.VERSION.SDK_INT >= VERSION_CODE_VANILLA_ICE_CREAM &&
+          context.applicationInfo.targetSdkVersion >= VERSION_CODE_VANILLA_ICE_CREAM
 
   /**
    * This method is used to check if the current device is running Android 16 (SDK Level 36) or

package/ReactAndroid/src/main/java/com/facebook/react/views/modal/ReactModalHostView.kt

@@ -197,6 +197,9 @@ public class ReactModalHostView(context: ThemedReactContext) :
 
     dialog?.let { nonNullDialog ->
       if (nonNullDialog.isShowing) {
+        nonNullDialog.window?.let { window ->
+          (context as ThemedReactContext).onExtraWindowDestroy(window)
+        }
         val dialogContext =
             ContextUtils.findContextOfType(nonNullDialog.context, Activity::class.java)
         if (dialogContext == null || !dialogContext.isFinishing) {
@@ -363,6 +366,7 @@ public class ReactModalHostView(context: ThemedReactContext) :
       newDialog.show()
       updateSystemAppearance()
       window.clearFlags(WindowManager.LayoutParams.FLAG_NOT_FOCUSABLE)
+      (context as ThemedReactContext).onExtraWindowCreate(window)
     }
   }
 

package/ReactAndroid/src/main/java/com/facebook/react/views/scroll/MaintainVisibleScrollPositionHelper.kt

@@ -18,7 +18,6 @@ import com.facebook.react.bridge.UiThreadUtil.runOnUiThread
 import com.facebook.react.common.annotations.UnstableReactNativeAPI
 import com.facebook.react.uimanager.UIManagerHelper
 import com.facebook.react.uimanager.common.UIManagerType
-import com.facebook.react.uimanager.common.ViewUtil.getUIManagerType
 import com.facebook.react.views.scroll.ReactScrollViewHelper.HasSmoothScroll
 import com.facebook.react.views.view.ReactViewGroup
 import java.lang.ref.WeakReference
@@ -47,7 +46,7 @@ internal class MaintainVisibleScrollPositionHelper<ScrollViewT>(
         checkNotNull(
             UIManagerHelper.getUIManager(
                 checkNotNull(scrollView?.context as ReactContext?),
-                getUIManagerType(scrollView?.id ?: 0),
+                UIManagerType.FABRIC,
             )
         )
 
@@ -83,18 +82,6 @@ internal class MaintainVisibleScrollPositionHelper<ScrollViewT>(
     uIManager.removeUIManagerEventListener(this)
   }
 
-  /**
-   * Update the scroll position of the managed ScrollView. This should be called after layout has
-   * been updated.
-   */
-  fun updateScrollPosition() {
-    // On Fabric this will be called internally in `didMountItems`.
-    if (scrollView == null || getUIManagerType(scrollView.id) == UIManagerType.FABRIC) {
-      return
-    }
-    updateScrollPositionInternal()
-  }
-
   private fun updateScrollPositionInternal() {
     val config = config ?: return
     val firstVisibleViewRef = firstVisibleViewRef ?: return

package/ReactAndroid/src/main/java/com/facebook/react/views/scroll/ReactHorizontalScrollContainerViewManager.kt

@@ -8,11 +8,7 @@
 package com.facebook.react.views.scroll
 
 import com.facebook.react.module.annotations.ReactModule
-import com.facebook.react.uimanager.ReactStylesDiffMap
-import com.facebook.react.uimanager.StateWrapper
 import com.facebook.react.uimanager.ThemedReactContext
-import com.facebook.react.uimanager.common.UIManagerType
-import com.facebook.react.uimanager.common.ViewUtil
 import com.facebook.react.views.view.ReactViewGroup
 import com.facebook.react.views.view.ReactViewManager
 
@@ -21,28 +17,11 @@ import com.facebook.react.views.view.ReactViewManager
 public class ReactHorizontalScrollContainerViewManager : ReactViewManager() {
   public override fun getName(): String = REACT_CLASS
 
-  protected override fun createViewInstance(
-      reactTag: Int,
-      context: ThemedReactContext,
-      initialProps: ReactStylesDiffMap?,
-      stateWrapper: StateWrapper?,
-  ): ReactViewGroup {
-    check(uiManagerType == null)
-    uiManagerType = ViewUtil.getUIManagerType(reactTag)
-    val view = super.createViewInstance(reactTag, context, initialProps, stateWrapper)
-    uiManagerType = null
-    return view
-  }
-
   public override fun createViewInstance(context: ThemedReactContext): ReactViewGroup {
-    return when (checkNotNull(uiManagerType)) {
-      UIManagerType.FABRIC -> ReactViewGroup(context)
-      else -> ReactHorizontalScrollContainerLegacyView(context)
-    }
+    return ReactViewGroup(context)
   }
 
   public companion object {
     public const val REACT_CLASS: String = "AndroidHorizontalScrollContentView"
-    @UIManagerType private var uiManagerType: Int? = null
   }
 }

package/ReactAndroid/src/main/java/com/facebook/react/views/scroll/ReactHorizontalScrollView.java

@@ -103,6 +103,7 @@ public class ReactHorizontalScrollView extends HorizontalScrollView
   private final VelocityHelper mVelocityHelper = new VelocityHelper();
   private final Rect mTempRect = new Rect();
   private final ValueAnimator DEFAULT_FLING_ANIMATOR = ObjectAnimator.ofInt(this, "scrollX", 0, 0);
+  private final @Nullable FpsListener mFpsListener;
 
   private Rect mOverflowInset = new Rect();
   private @Nullable VirtualViewContainerState mVirtualViewContainerState;
@@ -115,7 +116,6 @@ public class ReactHorizontalScrollView extends HorizontalScrollView
   private boolean mRemoveClippedSubviews;
   private boolean mScrollEnabled = true;
   private boolean mSendMomentumEvents;
-  private @Nullable FpsListener mFpsListener = null;
   private @Nullable String mScrollPerfTag;
   private @Nullable Drawable mEndBackground;
   private int mEndFillColor = Color.TRANSPARENT;
@@ -163,7 +163,7 @@ public class ReactHorizontalScrollView extends HorizontalScrollView
   /**
    * Set all default values here as opposed to in the constructor or field defaults. It is important
    * that these properties are set during the constructor, but also on-demand whenever an existing
-   * ReactTextView is recycled.
+   * ReactHorizontalScrollView is recycled.
    */
   private void initView() {
     mOverflowInset = new Rect();
@@ -182,7 +182,6 @@ public class ReactHorizontalScrollView extends HorizontalScrollView
     mRemoveClippedSubviews = false;
     mScrollEnabled = true;
     mSendMomentumEvents = false;
-    mFpsListener = null;
     mScrollPerfTag = null;
     mEndBackground = null;
     mEndFillColor = Color.TRANSPARENT;
@@ -245,6 +244,7 @@ public class ReactHorizontalScrollView extends HorizontalScrollView
     }
   }
 
+  @Override
   public boolean getScrollEnabled() {
     return mScrollEnabled;
   }
@@ -495,14 +495,6 @@ public class ReactHorizontalScrollView extends HorizontalScrollView
     return mOverflowInset;
   }
 
-  @Override
-  public boolean getClipToPadding() {
-    if (ReactNativeFeatureFlags.syncAndroidClipToPaddingWithOverflow()) {
-      return mOverflow != Overflow.VISIBLE;
-    }
-    return super.getClipToPadding();
-  }
-
   @Override
   public void onDraw(Canvas canvas) {
     if (mOverflow != Overflow.VISIBLE) {
@@ -621,7 +613,7 @@ public class ReactHorizontalScrollView extends HorizontalScrollView
 
   /**
    * Since ReactHorizontalScrollView handles layout changes on JS side, it does not call
-   * super.onlayout due to which mIsLayoutDirty flag in HorizontalScrollView remains true and
+   * super.onLayout due to which mIsLayoutDirty flag in HorizontalScrollView remains true and
    * prevents scrolling to child when requestChildFocus is called. Overriding this method and
    * scrolling to child without checking any layout dirty flag. This will fix focus navigation issue
    * for KeyEvents which are not handled in HorizontalScrollView, for example: KEYCODE_TAB.
@@ -641,7 +633,7 @@ public class ReactHorizontalScrollView extends HorizontalScrollView
   /**
    * In rare cases where an app overrides the built-in ReactScrollView by overriding it, and also
    * needs to customize scroll into view on focus behaviors, this protected method can be used to
-   * unblocks such customization.
+   * unblock such customization.
    */
   protected void requestChildFocusWithoutScroll(View child, View focused) {
     // Temporarily block HorizontalScrollView's internal scrollToChild from running
@@ -963,6 +955,7 @@ public class ReactHorizontalScrollView extends HorizontalScrollView
       float hScroll = ev.getAxisValue(MotionEvent.AXIS_HSCROLL);
       if (hScroll != 0) {
         // Perform the scroll
+        enableFpsListener();
         boolean result = super.dispatchGenericMotionEvent(ev);
         // Schedule snap alignment to run after scrolling stops
         if (result
@@ -970,9 +963,10 @@ public class ReactHorizontalScrollView extends HorizontalScrollView
                 || mSnapInterval != 0
                 || mSnapOffsets != null
                 || (mSnapToAlignment != SNAP_ALIGNMENT_DISABLED && mSnapToAlignment != SNAP_ALIGNMENT_ITEM))) {
-          // Cancel any pending runnable and reschedule
+          // Cancel any pending post-touch runnable and reschedule
           if (mPostTouchRunnable != null) {
             removeCallbacks(mPostTouchRunnable);
+            mPostTouchRunnable = null;
           }
           mPostTouchRunnable =
               new Runnable() {
@@ -986,9 +980,12 @@ public class ReactHorizontalScrollView extends HorizontalScrollView
                     velocityX = 0;
                   }
                   flingAndSnap(velocityX);
+                  handlePostTouchScrolling(velocityX, 0);
                 }
               };
           postOnAnimationDelayed(mPostTouchRunnable, ReactScrollViewHelper.MOMENTUM_DELAY);
+        } else {
+          handlePostTouchScrolling(0, 0);
         }
         return result;
       }
@@ -1105,10 +1102,10 @@ public class ReactHorizontalScrollView extends HorizontalScrollView
         return nextFocus;
       }
 
-      @Nullable View nextfocusableView = findNextFocusableView(this, focused, direction);
+      @Nullable View nextFocusableView = findNextFocusableView(this, focused, direction);
 
-      if (nextfocusableView != null) {
-        return nextfocusableView;
+      if (nextFocusableView != null) {
+        return nextFocusableView;
       }
     }
 
@@ -1316,6 +1313,7 @@ public class ReactHorizontalScrollView extends HorizontalScrollView
                 }
                 ReactScrollViewHelper.notifyUserDrivenScrollEnded_internal(
                     ReactHorizontalScrollView.this);
+                disableFpsListener();
               } else {
                 if (mPagingEnabled && !mSnappingToPage) {
                   // If we have pagingEnabled and we have not snapped to the page
@@ -1696,6 +1694,7 @@ public class ReactHorizontalScrollView extends HorizontalScrollView
    * <p>`smoothScrollTo` changes `contentOffset` and we need to keep `contentOffset` in sync between
    * scroll view and state. Calling raw `smoothScrollTo` doesn't update state.
    */
+  @Override
   public void reactSmoothScrollTo(int x, int y) {
     if (mScrollAnimationEnabled || !UiModeUtils.isTVDevice(getContext())) {
       ReactScrollViewHelper.smoothScrollTo(this, x, y);
@@ -1780,8 +1779,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);
   }
@@ -1801,7 +1798,7 @@ public class ReactHorizontalScrollView extends HorizontalScrollView
 
     if (mScroller != null && !mScroller.isFinished()) {
       // Calculate the velocity and position of the fling animation at the time of this layout
-      // event, which may be later than the last ScrollView tick. These values are not commited to
+      // event, which may be later than the last ScrollView tick. These values are not committed to
       // the underlying ScrollView, which will recalculate positions on its next tick.
       int scrollerXBeforeTick = mScroller.getCurrX();
       boolean hasMoreTicks = mScroller.computeScrollOffset();
@@ -1843,6 +1840,7 @@ public class ReactHorizontalScrollView extends HorizontalScrollView
   }
 
   @Nullable
+  @Override
   public StateWrapper getStateWrapper() {
     return mStateWrapper;
   }

package/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<<fefaf14f0291216b635ea0c356e9929c>>
+ * @generated SignedSource<<2aa191314924bd0f969fba0e64b86142>>
  */
 
 /**
@@ -106,6 +106,7 @@ class ReactNestedScrollView extends NestedScrollView
   private final VelocityHelper mVelocityHelper = new VelocityHelper();
   private final Rect mTempRect = new Rect();
   private final ValueAnimator DEFAULT_FLING_ANIMATOR = ObjectAnimator.ofInt(this, "scrollY", 0, 0);
+  private final @Nullable FpsListener mFpsListener;
 
   private Rect mOverflowInset;
   private @Nullable VirtualViewContainerState mVirtualViewContainerState;
@@ -118,7 +119,6 @@ class ReactNestedScrollView extends NestedScrollView
   private boolean mRemoveClippedSubviews;
   private boolean mScrollEnabled;
   private boolean mSendMomentumEvents;
-  private @Nullable FpsListener mFpsListener;
   private @Nullable String mScrollPerfTag;
   private @Nullable Drawable mEndBackground;
   private int mEndFillColor;
@@ -300,6 +300,7 @@ class ReactNestedScrollView extends NestedScrollView
     mScrollEnabled = scrollEnabled;
   }
 
+  @Override
   public boolean getScrollEnabled() {
     return mScrollEnabled;
   }
@@ -699,6 +700,7 @@ class ReactNestedScrollView extends NestedScrollView
       float vScroll = ev.getAxisValue(MotionEvent.AXIS_VSCROLL);
       if (vScroll != 0) {
         // Perform the scroll
+        enableFpsListener();
         boolean result = super.dispatchGenericMotionEvent(ev);
         // Schedule snap alignment to run after scrolling stops
         if (result
@@ -709,6 +711,7 @@ class ReactNestedScrollView extends NestedScrollView
           // Cancel any pending post-touch runnable and reschedule
           if (mPostTouchRunnable != null) {
             removeCallbacks(mPostTouchRunnable);
+            mPostTouchRunnable = null;
           }
           mPostTouchRunnable =
               new Runnable() {
@@ -722,9 +725,12 @@ class ReactNestedScrollView extends NestedScrollView
                     velocityY = 0;
                   }
                   flingAndSnap(velocityY);
+                  handlePostTouchScrolling(0, velocityY);
                 }
               };
           postOnAnimationDelayed(mPostTouchRunnable, ReactScrollViewHelper.MOMENTUM_DELAY);
+        } else {
+          handlePostTouchScrolling(0, 0);
         }
         return result;
       }
@@ -787,14 +793,6 @@ class ReactNestedScrollView extends NestedScrollView
     }
   }
 
-  @Override
-  public boolean getClipToPadding() {
-    if (ReactNativeFeatureFlags.syncAndroidClipToPaddingWithOverflow()) {
-      return mOverflow != Overflow.VISIBLE;
-    }
-    return super.getClipToPadding();
-  }
-
   @Override
   public void getClippingRect(Rect outClippingRect) {
     outClippingRect.set(Assertions.assertNotNull(mClippingRect));
@@ -888,6 +886,7 @@ class ReactNestedScrollView extends NestedScrollView
   }
 
   @Nullable
+  @Override
   public StateWrapper getStateWrapper() {
     return mStateWrapper;
   }
@@ -1353,6 +1352,7 @@ class ReactNestedScrollView extends NestedScrollView
    * <p>`smoothScrollTo` changes `contentOffset` and we need to keep `contentOffset` in sync between
    * scroll view and state. Calling raw `smoothScrollTo` doesn't update state.
    */
+  @Override
   public void reactSmoothScrollTo(int x, int y) {
     ReactScrollViewHelper.smoothScrollTo(this, x, y);
     setPendingContentOffsets(x, y);
@@ -1463,10 +1463,6 @@ class ReactNestedScrollView extends NestedScrollView
       return;
     }
 
-    if (mMaintainVisibleContentPositionHelper != null) {
-      mMaintainVisibleContentPositionHelper.updateScrollPosition();
-    }
-
     if (isShown() && isContentReady()) {
       int currentScrollY = getScrollY();
       int maxScrollY = getMaxScrollY();
@@ -1524,11 +1520,12 @@ class ReactNestedScrollView extends NestedScrollView
    * and that you are **not** overriding the NestedScrollView content view to pass in a `translateY`
    * style. `translateY` must never be set from ReactJS while using this feature!
    */
-  public void setScrollAwayTopPaddingEnabledUnstable(int topPadding) {
-    setScrollAwayTopPaddingEnabledUnstable(topPadding, true);
+  public void setScrollAwayPaddingEnabledUnstable(int topPadding, int bottomPadding) {
+    setScrollAwayPaddingEnabledUnstable(topPadding, bottomPadding, true);
   }
 
-  public void setScrollAwayTopPaddingEnabledUnstable(int topPadding, boolean updateState) {
+  public void setScrollAwayPaddingEnabledUnstable(
+      int topPadding, int bottomPadding, boolean updateState) {
     int count = getChildCount();
 
     Assertions.assertCondition(
@@ -1545,17 +1542,18 @@ class ReactNestedScrollView extends NestedScrollView
       // Add the topPadding value as the bottom padding for the NestedScrollView.
       // Otherwise, we'll push down the contents of the scroll view down too
       // far off screen.
-      setPadding(0, 0, 0, topPadding);
+      setPadding(0, 0, 0, topPadding + bottomPadding);
     }
 
     if (updateState) {
-      updateScrollAwayState(topPadding);
+      updateScrollAwayState(topPadding, bottomPadding);
     }
     setRemoveClippedSubviews(mRemoveClippedSubviews);
   }
 
-  private void updateScrollAwayState(int scrollAwayPaddingTop) {
+  private void updateScrollAwayState(int scrollAwayPaddingTop, int scrollAwayPaddingBottom) {
     getReactScrollViewScrollState().setScrollAwayPaddingTop(scrollAwayPaddingTop);
+    getReactScrollViewScrollState().setScrollAwayPaddingBottom(scrollAwayPaddingBottom);
     ReactScrollViewHelper.forceUpdateState(this);
   }
 
@@ -1564,7 +1562,8 @@ class ReactNestedScrollView extends NestedScrollView
     mReactScrollViewScrollState = scrollState;
     if (ReactNativeFeatureFlags.enableViewCulling()
         || ReactNativeFeatureFlags.useTraitHiddenOnAndroid()) {
-      setScrollAwayTopPaddingEnabledUnstable(scrollState.getScrollAwayPaddingTop(), false);
+      setScrollAwayPaddingEnabledUnstable(
+          scrollState.getScrollAwayPaddingTop(), scrollState.getScrollAwayPaddingBottom(), false);
 
       Point scrollPosition = scrollState.getLastStateUpdateScroll();
       scrollTo(scrollPosition.x, scrollPosition.y);

package/ReactAndroid/src/main/java/com/facebook/react/views/scroll/ReactScrollView.java

@@ -101,6 +101,7 @@ public class ReactScrollView extends ScrollView
   private final VelocityHelper mVelocityHelper = new VelocityHelper();
   private final Rect mTempRect = new Rect();
   private final ValueAnimator DEFAULT_FLING_ANIMATOR = ObjectAnimator.ofInt(this, "scrollY", 0, 0);
+  private final @Nullable FpsListener mFpsListener;
 
   private Rect mOverflowInset;
   private @Nullable VirtualViewContainerState mVirtualViewContainerState;
@@ -113,7 +114,6 @@ public class ReactScrollView extends ScrollView
   private boolean mRemoveClippedSubviews;
   private boolean mScrollEnabled;
   private boolean mSendMomentumEvents;
-  private @Nullable FpsListener mFpsListener;
   private @Nullable String mScrollPerfTag;
   private @Nullable Drawable mEndBackground;
   private int mEndFillColor;
@@ -298,6 +298,7 @@ public class ReactScrollView extends ScrollView
     mScrollEnabled = scrollEnabled;
   }
 
+  @Override
   public boolean getScrollEnabled() {
     return mScrollEnabled;
   }
@@ -783,6 +784,7 @@ public class ReactScrollView extends ScrollView
       float vScroll = ev.getAxisValue(MotionEvent.AXIS_VSCROLL);
       if (vScroll != 0) {
         // Perform the scroll
+        enableFpsListener();
         boolean result = super.dispatchGenericMotionEvent(ev);
         // Schedule snap alignment to run after scrolling stops
         if (result
@@ -793,6 +795,7 @@ public class ReactScrollView extends ScrollView
           // Cancel any pending post-touch runnable and reschedule
           if (mPostTouchRunnable != null) {
             removeCallbacks(mPostTouchRunnable);
+            mPostTouchRunnable = null;
           }
           mPostTouchRunnable =
               new Runnable() {
@@ -806,9 +809,12 @@ public class ReactScrollView extends ScrollView
                     velocityY = 0;
                   }
                   flingAndSnap(velocityY);
+                  handlePostTouchScrolling(0, velocityY);
                 }
               };
           postOnAnimationDelayed(mPostTouchRunnable, ReactScrollViewHelper.MOMENTUM_DELAY);
+        } else {
+          handlePostTouchScrolling(0, 0);
         }
         return result;
       }
@@ -871,14 +877,6 @@ public class ReactScrollView extends ScrollView
     }
   }
 
-  @Override
-  public boolean getClipToPadding() {
-    if (ReactNativeFeatureFlags.syncAndroidClipToPaddingWithOverflow()) {
-      return mOverflow != Overflow.VISIBLE;
-    }
-    return super.getClipToPadding();
-  }
-
   @Override
   public void getClippingRect(Rect outClippingRect) {
     outClippingRect.set(Assertions.assertNotNull(mClippingRect));
@@ -972,6 +970,7 @@ public class ReactScrollView extends ScrollView
   }
 
   @Nullable
+  @Override
   public StateWrapper getStateWrapper() {
     return mStateWrapper;
   }
@@ -1437,6 +1436,7 @@ public class ReactScrollView extends ScrollView
    * <p>`smoothScrollTo` changes `contentOffset` and we need to keep `contentOffset` in sync between
    * scroll view and state. Calling raw `smoothScrollTo` doesn't update state.
    */
+  @Override
   public void reactSmoothScrollTo(int x, int y) {
     if (mScrollAnimationEnabled || !UiModeUtils.isTVDevice(getContext())) {
       ReactScrollViewHelper.smoothScrollTo(this, x, y);
@@ -1551,10 +1551,6 @@ public class ReactScrollView extends ScrollView
       return;
     }
 
-    if (mMaintainVisibleContentPositionHelper != null) {
-      mMaintainVisibleContentPositionHelper.updateScrollPosition();
-    }
-
     if (isShown() && isContentReady()) {
       int currentScrollY = getScrollY();
       int maxScrollY = getMaxScrollY();
@@ -1612,11 +1608,12 @@ public class ReactScrollView extends ScrollView
    * and that you are **not** overriding the ScrollView content view to pass in a `translateY`
    * style. `translateY` must never be set from ReactJS while using this feature!
    */
-  public void setScrollAwayTopPaddingEnabledUnstable(int topPadding) {
-    setScrollAwayTopPaddingEnabledUnstable(topPadding, true);
+  public void setScrollAwayPaddingEnabledUnstable(int topPadding, int bottomPadding) {
+    setScrollAwayPaddingEnabledUnstable(topPadding, bottomPadding, true);
   }
 
-  public void setScrollAwayTopPaddingEnabledUnstable(int topPadding, boolean updateState) {
+  public void setScrollAwayPaddingEnabledUnstable(
+      int topPadding, int bottomPadding, boolean updateState) {
     int count = getChildCount();
 
     Assertions.assertCondition(
@@ -1633,17 +1630,18 @@ public class ReactScrollView extends ScrollView
       // Add the topPadding value as the bottom padding for the ScrollView.
       // Otherwise, we'll push down the contents of the scroll view down too
       // far off screen.
-      setPadding(0, 0, 0, topPadding);
+      setPadding(0, 0, 0, topPadding + bottomPadding);
     }
 
     if (updateState) {
-      updateScrollAwayState(topPadding);
+      updateScrollAwayState(topPadding, bottomPadding);
     }
     setRemoveClippedSubviews(mRemoveClippedSubviews);
   }
 
-  private void updateScrollAwayState(int scrollAwayPaddingTop) {
+  private void updateScrollAwayState(int scrollAwayPaddingTop, int scrollAwayPaddingBottom) {
     getReactScrollViewScrollState().setScrollAwayPaddingTop(scrollAwayPaddingTop);
+    getReactScrollViewScrollState().setScrollAwayPaddingBottom(scrollAwayPaddingBottom);
     ReactScrollViewHelper.forceUpdateState(this);
   }
 
@@ -1652,7 +1650,8 @@ public class ReactScrollView extends ScrollView
     mReactScrollViewScrollState = scrollState;
     if (ReactNativeFeatureFlags.enableViewCulling()
         || ReactNativeFeatureFlags.useTraitHiddenOnAndroid()) {
-      setScrollAwayTopPaddingEnabledUnstable(scrollState.getScrollAwayPaddingTop(), false);
+      setScrollAwayPaddingEnabledUnstable(
+          scrollState.getScrollAwayPaddingTop(), scrollState.getScrollAwayPaddingBottom(), false);
 
       Point scrollPosition = scrollState.getLastStateUpdateScroll();
       scrollTo(scrollPosition.x, scrollPosition.y);