react-native-tvos 0.84.0-0rc5 → 0.85.0-0

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

@@ -0,0 +1,466 @@
+/*
+ * Copyright (c) Meta Platforms, Inc. and affiliates.
+ *
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
+ *
+ * @generated SignedSource<<585a90a2f11c5bba8b3e2d011912d302>>
+ */
+
+/**
+ * THIS FILE IS GENERATED - DO NOT EDIT DIRECTLY
+ * Source: ReactScrollViewManager.kt
+ * Run: node generate-nested-scroll-view.js
+ */
+
+package com.facebook.react.views.scroll
+
+import android.graphics.Color
+import android.view.View
+import androidx.core.view.ViewCompat
+import com.facebook.react.bridge.Dynamic
+import com.facebook.react.bridge.ReadableArray
+import com.facebook.react.bridge.ReadableMap
+import com.facebook.react.bridge.ReadableType
+import com.facebook.react.bridge.RetryableMountingLayerException
+import com.facebook.react.internal.featureflags.ReactNativeFeatureFlags
+import com.facebook.react.module.annotations.ReactModule
+import com.facebook.react.uimanager.BackgroundStyleApplicator.setBorderColor
+import com.facebook.react.uimanager.BackgroundStyleApplicator.setBorderRadius
+import com.facebook.react.uimanager.BackgroundStyleApplicator.setBorderStyle
+import com.facebook.react.uimanager.BackgroundStyleApplicator.setBorderWidth
+import com.facebook.react.uimanager.LengthPercentage
+import com.facebook.react.uimanager.LengthPercentageType
+import com.facebook.react.uimanager.PixelUtil.dpToPx
+import com.facebook.react.uimanager.PixelUtil.getDisplayMetricDensity
+import com.facebook.react.uimanager.PointerEvents.Companion.parsePointerEvents
+import com.facebook.react.uimanager.ReactClippingViewGroupHelper
+import com.facebook.react.uimanager.ReactStylesDiffMap
+import com.facebook.react.uimanager.StateWrapper
+import com.facebook.react.uimanager.ThemedReactContext
+import com.facebook.react.uimanager.ViewGroupManager
+import com.facebook.react.uimanager.ViewProps
+import com.facebook.react.uimanager.annotations.ReactProp
+import com.facebook.react.uimanager.annotations.ReactPropGroup
+import com.facebook.react.uimanager.style.BorderRadiusProp
+import com.facebook.react.uimanager.style.BorderStyle.Companion.fromString
+import com.facebook.react.uimanager.style.LogicalEdge
+import com.facebook.react.views.scroll.ReactScrollViewCommandHelper.Companion.receiveCommand
+import com.facebook.react.views.scroll.ReactScrollViewCommandHelper.ScrollCommandHandler
+import com.facebook.react.views.scroll.ReactScrollViewCommandHelper.ScrollToCommandData
+import com.facebook.react.views.scroll.ReactScrollViewCommandHelper.ScrollToEndCommandData
+import com.facebook.react.views.scroll.ReactScrollViewHelper.parseOverScrollMode
+import com.facebook.react.views.scroll.ReactScrollViewHelper.parseSnapToAlignment
+import com.facebook.react.views.scroll.ScrollEventType.Companion.getJSEventName
+
+/**
+ * View manager for [ReactNestedScrollView] components.
+ *
+ * Note that [ReactNestedScrollView] and [ReactHorizontalScrollView] are exposed to JS as a single
+ * ScrollView component, configured via the `horizontal` boolean property.
+ */
+@ReactModule(name = ReactNestedScrollViewManager.REACT_CLASS)
+internal open class ReactNestedScrollViewManager
+@JvmOverloads
+constructor(private val fpsListener: FpsListener? = null) :
+    ViewGroupManager<ReactNestedScrollView>(), ScrollCommandHandler<ReactNestedScrollView> {
+
+  init {
+    if (ReactNativeFeatureFlags.enableViewRecyclingForScrollView()) {
+      setupViewRecycling()
+    }
+  }
+
+  override fun prepareToRecycleView(
+      reactContext: ThemedReactContext,
+      view: ReactNestedScrollView,
+  ): ReactNestedScrollView? {
+    // BaseViewManager
+    val preparedView = super.prepareToRecycleView(reactContext, view)
+    if (preparedView != null) {
+      preparedView.recycleView()
+    }
+    return preparedView
+  }
+
+  override fun getName(): String = REACT_CLASS
+
+  public override fun createViewInstance(context: ThemedReactContext): ReactNestedScrollView =
+      ReactNestedScrollView(context, fpsListener)
+
+  @ReactProp(name = "scrollEnabled", defaultBoolean = true)
+  public fun setScrollEnabled(view: ReactNestedScrollView, value: Boolean) {
+    view.setScrollEnabled(value)
+
+    // Set focusable to match whether scroll is enabled. This improves keyboarding
+    // experience by not making scrollview a tab stop when you cannot interact with it.
+    view.isFocusable = value
+  }
+
+  @ReactProp(name = "showsVerticalScrollIndicator", defaultBoolean = true)
+  public fun setShowsVerticalScrollIndicator(view: ReactNestedScrollView, value: Boolean) {
+    view.isVerticalScrollBarEnabled = value
+  }
+
+  @ReactProp(name = "decelerationRate")
+  public fun setDecelerationRate(view: ReactNestedScrollView, decelerationRate: Float) {
+    view.setDecelerationRate(decelerationRate)
+  }
+
+  @ReactProp(name = "disableIntervalMomentum")
+  public fun setDisableIntervalMomentum(view: ReactNestedScrollView, disableIntervalMomentum: Boolean) {
+    view.setDisableIntervalMomentum(disableIntervalMomentum)
+  }
+
+  @ReactProp(name = "scrollsChildToFocus", defaultBoolean = true)
+  public fun setScrollsChildToFocus(view: ReactNestedScrollView, scrollsChildToFocus: Boolean) {
+    view.setScrollsChildToFocus(scrollsChildToFocus)
+  }
+
+  @ReactProp(name = "snapToInterval")
+  public fun setSnapToInterval(view: ReactNestedScrollView, snapToInterval: Float) {
+    // snapToInterval needs to be exposed as a float because of the Javascript interface.
+    val density = getDisplayMetricDensity()
+    view.setSnapInterval((snapToInterval * density).toInt())
+  }
+
+  @ReactProp(name = "snapToOffsets")
+  public fun setSnapToOffsets(view: ReactNestedScrollView, snapToOffsets: ReadableArray?) {
+    if (snapToOffsets == null || snapToOffsets.size() == 0) {
+      view.setSnapOffsets(null)
+      return
+    }
+
+    val density = getDisplayMetricDensity()
+    val offsets: MutableList<Int> = ArrayList()
+    for (i in 0 until snapToOffsets.size()) {
+      offsets.add((snapToOffsets.getDouble(i) * density).toInt())
+    }
+    view.setSnapOffsets(offsets)
+  }
+
+  @ReactProp(name = "snapToAlignment")
+  public fun setSnapToAlignment(view: ReactNestedScrollView, alignment: String?) {
+    view.setSnapToAlignment(parseSnapToAlignment(alignment))
+  }
+
+  @ReactProp(name = "snapToStart")
+  public fun setSnapToStart(view: ReactNestedScrollView, snapToStart: Boolean) {
+    view.setSnapToStart(snapToStart)
+  }
+
+  @ReactProp(name = "snapToEnd")
+  public fun setSnapToEnd(view: ReactNestedScrollView, snapToEnd: Boolean) {
+    view.setSnapToEnd(snapToEnd)
+  }
+
+  @ReactProp(name = ReactClippingViewGroupHelper.PROP_REMOVE_CLIPPED_SUBVIEWS)
+  public fun setRemoveClippedSubviews(view: ReactNestedScrollView, removeClippedSubviews: Boolean) {
+    view.removeClippedSubviews = removeClippedSubviews
+  }
+
+  /**
+   * Computing momentum events is potentially expensive since we post a runnable on the UI thread to
+   * see when it is done. We only do that if {@param sendMomentumEvents} is set to true. This is
+   * handled automatically in js by checking if there is a listener on the momentum events.
+   *
+   * @param view
+   * @param sendMomentumEvents
+   */
+  @ReactProp(name = "sendMomentumEvents")
+  public fun setSendMomentumEvents(view: ReactNestedScrollView, sendMomentumEvents: Boolean) {
+    view.setSendMomentumEvents(sendMomentumEvents)
+  }
+
+  /**
+   * Tag used for logging scroll performance on this scroll view. Will force momentum events to be
+   * turned on (see setSendMomentumEvents).
+   *
+   * @param view
+   * @param scrollPerfTag
+   */
+  @ReactProp(name = "scrollPerfTag")
+  public fun setScrollPerfTag(view: ReactNestedScrollView, scrollPerfTag: String?) {
+    view.setScrollPerfTag(scrollPerfTag)
+  }
+
+  @ReactProp(name = "pagingEnabled")
+  public fun setPagingEnabled(view: ReactNestedScrollView, pagingEnabled: Boolean) {
+    view.setPagingEnabled(pagingEnabled)
+  }
+
+  /**
+   * When set, fills the rest of the scrollview with a color to avoid setting a background and
+   * creating unnecessary overdraw.
+   *
+   * @param view
+   * @param color
+   */
+  @ReactProp(name = "endFillColor", defaultInt = Color.TRANSPARENT, customType = "Color")
+  public fun setBottomFillColor(view: ReactNestedScrollView, color: Int) {
+    view.setEndFillColor(color)
+  }
+
+  /** Controls overScroll behaviour */
+  @ReactProp(name = "overScrollMode")
+  public open fun setOverScrollMode(view: ReactNestedScrollView, value: String?) {
+    view.overScrollMode = parseOverScrollMode(value)
+  }
+
+  @ReactProp(name = "nestedScrollEnabled")
+  public fun setNestedScrollEnabled(view: ReactNestedScrollView?, value: Boolean) {
+    if (view != null) {
+      ViewCompat.setNestedScrollingEnabled(view, value)
+    }
+  }
+
+  override fun getCommandsMap(): Map<String, Int>? = ReactScrollViewCommandHelper.getCommandsMap()
+
+  @Deprecated(
+      message =
+          "ReceiveCommand with an int commandId param is deprecated. Use the overload where commandId is a string.",
+      ReplaceWith("receiveCommand(scrollView, commandId, args)"),
+  )
+  override fun receiveCommand(scrollView: ReactNestedScrollView, commandId: Int, args: ReadableArray?) {
+    receiveCommand(this, scrollView, commandId, args)
+  }
+
+  override fun receiveCommand(
+      scrollView: ReactNestedScrollView,
+      commandId: String,
+      args: ReadableArray?,
+  ) {
+    receiveCommand<ReactNestedScrollView>(this, scrollView, commandId, args)
+  }
+
+  override fun flashScrollIndicators(scrollView: ReactNestedScrollView) {
+    scrollView.flashScrollIndicators()
+  }
+
+  override fun scrollTo(scrollView: ReactNestedScrollView, data: ScrollToCommandData) {
+    scrollView.abortAnimation()
+    if (data.mAnimated) {
+      scrollView.reactSmoothScrollTo(data.mDestX, data.mDestY)
+    } else {
+      scrollView.scrollTo(data.mDestX, data.mDestY)
+    }
+  }
+
+  @ReactPropGroup(
+      names =
+          [
+              ViewProps.BORDER_RADIUS,
+              ViewProps.BORDER_TOP_LEFT_RADIUS,
+              ViewProps.BORDER_TOP_RIGHT_RADIUS,
+              ViewProps.BORDER_BOTTOM_RIGHT_RADIUS,
+              ViewProps.BORDER_BOTTOM_LEFT_RADIUS,
+          ],
+      defaultFloat = Float.NaN,
+  )
+  public fun setBorderRadius(view: ReactNestedScrollView?, index: Int, borderRadius: Float) {
+    if (view != null) {
+      val radius =
+          if (borderRadius.isNaN()) null
+          else LengthPercentage(borderRadius, LengthPercentageType.POINT)
+      setBorderRadius(view, BorderRadiusProp.entries[index], radius)
+    }
+  }
+
+  @ReactProp(name = "borderStyle")
+  public fun setBorderStyle(view: ReactNestedScrollView?, borderStyle: String?) {
+    if (view != null) {
+      val parsedBorderStyle = if (borderStyle == null) null else fromString(borderStyle)
+      setBorderStyle(view, parsedBorderStyle)
+    }
+  }
+
+  @ReactPropGroup(
+      names =
+          [
+              ViewProps.BORDER_WIDTH,
+              ViewProps.BORDER_LEFT_WIDTH,
+              ViewProps.BORDER_RIGHT_WIDTH,
+              ViewProps.BORDER_TOP_WIDTH,
+              ViewProps.BORDER_BOTTOM_WIDTH,
+          ],
+      defaultFloat = Float.NaN,
+  )
+  public fun setBorderWidth(view: ReactNestedScrollView?, index: Int, width: Float) {
+    if (view != null) {
+      setBorderWidth(view, LogicalEdge.entries[index], width)
+    }
+  }
+
+  @ReactPropGroup(
+      names =
+          [
+              "borderColor",
+              "borderLeftColor",
+              "borderRightColor",
+              "borderTopColor",
+              "borderBottomColor",
+          ],
+      customType = "Color",
+  )
+  @Suppress("UNUSED_PARAMETER")
+  public fun setBorderColor(view: ReactNestedScrollView?, index: Int, color: Int?) {
+    if (view != null) {
+      setBorderColor(view, LogicalEdge.ALL, color)
+    }
+  }
+
+  @ReactProp(name = "overflow")
+  public fun setOverflow(view: ReactNestedScrollView, overflow: String?) {
+    view.setOverflow(overflow)
+  }
+
+  override fun scrollToEnd(scrollView: ReactNestedScrollView, data: ScrollToEndCommandData) {
+    // ScrollView always has one child - the scrollable area. However, it's possible today that we
+    // execute this method as view command before the child view is mounted. Here we will retry the
+    // view commands as a workaround.
+    val child =
+        scrollView.getChildAt(0)
+            ?: throw RetryableMountingLayerException(
+                "scrollToEnd called on ScrollView without child"
+            )
+
+    // ScrollView always has one child - the scrollable area
+    val bottom = child.height + scrollView.paddingBottom
+    scrollView.abortAnimation()
+    if (data.mAnimated) {
+      scrollView.reactSmoothScrollTo(scrollView.scrollX, bottom)
+    } else {
+      scrollView.scrollTo(scrollView.scrollX, bottom)
+    }
+  }
+
+  @ReactProp(name = "persistentScrollbar")
+  public fun setPersistentScrollbar(view: ReactNestedScrollView, value: Boolean) {
+    view.isScrollbarFadingEnabled = !value
+  }
+
+  @ReactProp(name = "fadingEdgeLength")
+  public fun setFadingEdgeLength(view: ReactNestedScrollView, value: Dynamic) {
+    when (value.type) {
+      ReadableType.Number -> {
+        view.setFadingEdgeLengthStart(value.asInt())
+        view.setFadingEdgeLengthEnd(value.asInt())
+      }
+      ReadableType.Map -> {
+        value.asMap()?.let { map ->
+          var start = 0
+          var end = 0
+          if (map.hasKey("start") && map.getInt("start") > 0) {
+            start = map.getInt("start")
+          }
+          if (map.hasKey("end") && map.getInt("end") > 0) {
+            end = map.getInt("end")
+          }
+          view.setFadingEdgeLengthStart(start)
+          view.setFadingEdgeLengthEnd(end)
+        }
+      }
+      else -> {
+        // no-op
+      }
+    }
+    if (view.fadingEdgeLengthStart > 0 || view.fadingEdgeLengthEnd > 0) {
+      view.isVerticalFadingEdgeEnabled = true
+      view.setFadingEdgeLength(
+          Math.round(Math.max(view.fadingEdgeLengthStart, view.fadingEdgeLengthEnd).dpToPx())
+      )
+    } else {
+      view.isVerticalFadingEdgeEnabled = false
+      view.setFadingEdgeLength(0)
+    }
+  }
+
+  @ReactProp(name = "contentOffset", customType = "Point")
+  public fun setContentOffset(view: ReactNestedScrollView, value: ReadableMap?) {
+    view.setContentOffset(value)
+  }
+
+  @ReactProp(name = "maintainVisibleContentPosition")
+  public fun setMaintainVisibleContentPosition(view: ReactNestedScrollView, value: ReadableMap?) {
+    if (value != null) {
+      view.setMaintainVisibleContentPosition(
+          MaintainVisibleScrollPositionHelper.Config.fromReadableMap(value)
+      )
+    } else {
+      view.setMaintainVisibleContentPosition(null)
+    }
+  }
+
+  override fun updateState(
+      view: ReactNestedScrollView,
+      props: ReactStylesDiffMap,
+      stateWrapper: StateWrapper,
+  ): Any? {
+    view.setStateWrapper(stateWrapper)
+    if (
+        ReactNativeFeatureFlags.enableViewCulling() ||
+            ReactNativeFeatureFlags.useTraitHiddenOnAndroid()
+    ) {
+      ReactScrollViewHelper.loadFabricScrollState(view, stateWrapper)
+    }
+    return null
+  }
+
+  override fun getExportedCustomDirectEventTypeConstants(): Map<String, Any>? {
+    val baseEventTypeConstants = super.getExportedCustomDirectEventTypeConstants()
+    val eventTypeConstants = baseEventTypeConstants ?: HashMap()
+    eventTypeConstants.putAll(createExportedCustomDirectEventTypeConstants())
+    return eventTypeConstants
+  }
+
+  @ReactProp(name = ViewProps.POINTER_EVENTS)
+  public fun setPointerEvents(view: ReactNestedScrollView, pointerEventsStr: String?) {
+    view.pointerEvents = parsePointerEvents(pointerEventsStr)
+  }
+
+  @ReactProp(name = "scrollEventThrottle")
+  public fun setScrollEventThrottle(view: ReactNestedScrollView, scrollEventThrottle: Int) {
+    view.scrollEventThrottle = scrollEventThrottle
+  }
+
+  @ReactProp(name = "horizontal")
+  @Suppress("UNUSED_PARAMETER")
+  public fun setHorizontal(view: ReactNestedScrollView?, horizontal: Boolean) {
+    // Do Nothing: Align with static ViewConfigs
+  }
+
+  @ReactProp(name = "isInvertedVirtualizedList")
+  public fun setIsInvertedVirtualizedList(view: ReactNestedScrollView, applyFix: Boolean) {
+    // Usually when inverting the scroll view we are using scaleY: -1 on the list
+    // and on the parent container. HOWEVER, starting from android API 33 there is
+    // a bug that can cause an ANR due to that. Thus we are using different transform
+    // commands to circumvent the ANR. This however causes the vertical scrollbar to
+    // be on the wrong side. Thus we are moving it to the other side, when the list
+    // is inverted.
+    // See also:
+    //  - https://github.com/facebook/react-native/issues/35350
+    //  - https://issuetracker.google.com/issues/287304310
+    if (applyFix) {
+      view.verticalScrollbarPosition = View.SCROLLBAR_POSITION_LEFT
+    } else {
+      view.verticalScrollbarPosition = View.SCROLLBAR_POSITION_DEFAULT
+    }
+  }
+
+  public companion object {
+    public const val REACT_CLASS: String = "RCTScrollView"
+
+    public fun createExportedCustomDirectEventTypeConstants(): Map<String, Any> =
+        mapOf(
+            getJSEventName(ScrollEventType.SCROLL) to mapOf("registrationName" to "onScroll"),
+            getJSEventName(ScrollEventType.BEGIN_DRAG) to
+                mapOf("registrationName" to "onScrollBeginDrag"),
+            getJSEventName(ScrollEventType.END_DRAG) to
+                mapOf("registrationName" to "onScrollEndDrag"),
+            getJSEventName(ScrollEventType.MOMENTUM_BEGIN) to
+                mapOf("registrationName" to "onMomentumScrollBegin"),
+            getJSEventName(ScrollEventType.MOMENTUM_END) to
+                mapOf("registrationName" to "onMomentumScrollEnd"),
+        )
+  }
+}

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

@@ -10,6 +10,7 @@ package com.facebook.react.views.scroll;
 import static com.facebook.react.views.scroll.ReactScrollViewHelper.SNAP_ALIGNMENT_CENTER;
 import static com.facebook.react.views.scroll.ReactScrollViewHelper.SNAP_ALIGNMENT_DISABLED;
 import static com.facebook.react.views.scroll.ReactScrollViewHelper.SNAP_ALIGNMENT_END;
+import static com.facebook.react.views.scroll.ReactScrollViewHelper.SNAP_ALIGNMENT_ITEM;
 import static com.facebook.react.views.scroll.ReactScrollViewHelper.SNAP_ALIGNMENT_START;
 import static com.facebook.react.views.scroll.ReactScrollViewHelper.findNextFocusableView;
 
@@ -37,6 +38,7 @@ import androidx.core.view.ViewCompat.FocusDirection;
 import com.facebook.common.logging.FLog;
 import com.facebook.infer.annotation.Assertions;
 import com.facebook.infer.annotation.Nullsafe;
+import com.facebook.react.views.common.UiModeUtils;
 import com.facebook.react.R;
 import com.facebook.react.bridge.ReadableMap;
 import com.facebook.react.common.ReactConstants;
@@ -133,6 +135,10 @@ public class ReactScrollView extends ScrollView
   private int mFadingEdgeLengthStart;
   private int mFadingEdgeLengthEnd;
   private boolean mEmittedOverScrollSinceScrollBegin;
+  private boolean mScrollsChildToFocus = true;
+  private int mSnapToItemPadding;
+  private boolean mScrollAnimationEnabled = true;
+  private boolean mBlockScrollDelta = false;
 
   public ReactScrollView(Context context) {
     this(context, null);
@@ -196,6 +202,7 @@ public class ReactScrollView extends ScrollView
     mFadingEdgeLengthStart = 0;
     mFadingEdgeLengthEnd = 0;
     mEmittedOverScrollSinceScrollBegin = false;
+    mScrollsChildToFocus = true;
   }
 
   /* package */ void recycleView() {
@@ -298,6 +305,10 @@ public class ReactScrollView extends ScrollView
     mPagingEnabled = pagingEnabled;
   }
 
+  public void setScrollsChildToFocus(boolean scrollsChildToFocus) {
+    mScrollsChildToFocus = scrollsChildToFocus;
+  }
+
   public void setDecelerationRate(float decelerationRate) {
     getReactScrollViewScrollState().setDecelerationRate(decelerationRate);
 
@@ -354,6 +365,14 @@ public class ReactScrollView extends ScrollView
     invalidate();
   }
 
+  public void setSnapToItemPadding(int snapToItemPadding) {
+    mSnapToItemPadding = snapToItemPadding;
+  }
+
+  public void setScrollAnimationEnabled(boolean scrollAnimationEnabled) {
+    mScrollAnimationEnabled = scrollAnimationEnabled;
+  }
+
   @Override
   protected float getTopFadingEdgeStrength() {
     float max = Math.max(mFadingEdgeLengthStart, mFadingEdgeLengthEnd);
@@ -475,9 +494,6 @@ public class ReactScrollView extends ScrollView
     if (mMaintainVisibleContentPositionHelper != null) {
       mMaintainVisibleContentPositionHelper.stop();
     }
-    if (mVirtualViewContainerState != null) {
-      mVirtualViewContainerState.cleanup();
-    }
   }
 
   @Override
@@ -501,6 +517,40 @@ public class ReactScrollView extends ScrollView
     return nextFocus;
   }
 
+  /**
+   * Attempts to scroll-snap to the focused child based on snapToAlignment/scrollSnapAlign.
+   * Returns true if snap scrolling was performed, false otherwise.
+   */
+  private boolean tryScrollSnapToChild(View focused) {
+    if (mSnapToAlignment != SNAP_ALIGNMENT_ITEM) {
+      return false;
+    }
+
+    kotlin.Pair<View, String> result = ReactScrollViewHelper.findScrollSnapAlign(focused, this);
+    if (result == null) {
+      return false;
+    }
+
+    View snapTarget = result.getFirst();
+    String alignment = result.getSecond();
+
+    Rect rect = new Rect();
+    snapTarget.getDrawingRect(rect);
+    offsetDescendantRectToMyCoords(snapTarget, rect);
+
+    int viewportHeight = getHeight() - getPaddingTop() - getPaddingBottom();
+    int maxScrollY = getMaxScrollY();
+
+    Integer targetOffset = ReactScrollViewHelper.computeScrollSnapOffset(
+        rect.top, rect.bottom, viewportHeight, alignment, mSnapInterval, mSnapToItemPadding, maxScrollY);
+    if (targetOffset == null) {
+      return false;
+    }
+
+    reactSmoothScrollTo(getScrollX(), targetOffset);
+    return true;
+  }
+
   /**
    * Since ReactScrollView handles layout changes on JS side, it does not call super.onlayout due to
    * which mIsLayoutDirty flag in ScrollView remains true and prevents scrolling to child when
@@ -510,8 +560,10 @@ public class ReactScrollView extends ScrollView
    */
   @Override
   public void requestChildFocus(View child, View focused) {
-    if (focused != null) {
-      scrollToChild(focused);
+    if (focused != null && mScrollsChildToFocus) {
+      if (!tryScrollSnapToChild(focused)) {
+        scrollToChild(focused);
+      }
     }
     requestChildFocusWithoutScroll(child, focused);
   }
@@ -522,7 +574,17 @@ public class ReactScrollView extends ScrollView
    * unblocks such customization.
    */
   protected void requestChildFocusWithoutScroll(View child, View focused) {
+    mBlockScrollDelta = true;
     super.requestChildFocus(child, focused);
+    mBlockScrollDelta = false;
+  }
+
+  @Override
+  public boolean requestChildRectangleOnScreen(View child, Rect rectangle, boolean immediate) {
+    if (!mScrollsChildToFocus) {
+      return false;
+    }
+    return super.requestChildRectangleOnScreen(child, rectangle, immediate);
   }
 
   private int getScrollDelta(View descendent) {
@@ -566,9 +628,24 @@ public class ReactScrollView extends ScrollView
     }
   }
 
+  @Override
+  public void computeScroll() {
+    if (UiModeUtils.isTVDevice(getContext())
+        && !mScrollAnimationEnabled
+        && mScroller != null
+        && !mScroller.isFinished()) {
+      // When scroll animation is disabled, just abort any in-flight smooth scroll.
+      // The correct position has already been set synchronously by
+      // requestChildFocus → tryScrollSnapToChild/scrollToChild.
+      mScroller.forceFinished(true);
+      return;
+    }
+    super.computeScroll();
+  }
+
   @Override
   protected int computeScrollDeltaToGetChildRectOnScreen(Rect rect) {
-    if (!mScrollEnabled) {
+    if (!mScrollEnabled || mBlockScrollDelta) {
       return 0;
     }
     return super.computeScrollDeltaToGetChildRectOnScreen(rect);
@@ -673,6 +750,11 @@ public class ReactScrollView extends ScrollView
 
   @Override
   public boolean dispatchGenericMotionEvent(MotionEvent ev) {
+    // Ignore generic motion events (joystick, mouse wheel, trackpad) if scrolling is disabled
+    if (!mScrollEnabled) {
+      return false;
+    }
+
     // We do not dispatch the motion event if its children are not supposed to receive it
     if (!PointerEvents.canChildrenBeTouchTarget(mPointerEvents)) {
       return false;
@@ -689,7 +771,7 @@ public class ReactScrollView extends ScrollView
             && (mPagingEnabled
                 || mSnapInterval != 0
                 || mSnapOffsets != null
-                || mSnapToAlignment != SNAP_ALIGNMENT_DISABLED)) {
+                || (mSnapToAlignment != SNAP_ALIGNMENT_DISABLED && mSnapToAlignment != SNAP_ALIGNMENT_ITEM))) {
           // Cancel any pending post-touch runnable and reschedule
           if (mPostTouchRunnable != null) {
             removeCallbacks(mPostTouchRunnable);
@@ -771,6 +853,14 @@ 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));
@@ -1051,7 +1141,7 @@ public class ReactScrollView extends ScrollView
     }
 
     // pagingEnabled only allows snapping one interval at a time
-    if (mSnapInterval == 0 && mSnapOffsets == null && mSnapToAlignment == SNAP_ALIGNMENT_DISABLED) {
+    if (mSnapInterval == 0 && mSnapOffsets == null && (mSnapToAlignment == SNAP_ALIGNMENT_DISABLED || mSnapToAlignment == SNAP_ALIGNMENT_ITEM)) {
       smoothScrollAndSnap(velocityY);
       return;
     }
@@ -1090,7 +1180,7 @@ public class ReactScrollView extends ScrollView
         }
       }
 
-    } else if (mSnapToAlignment != SNAP_ALIGNMENT_DISABLED) {
+    } else if (mSnapToAlignment != SNAP_ALIGNMENT_DISABLED && mSnapToAlignment != SNAP_ALIGNMENT_ITEM) {
       if (mSnapInterval > 0) {
         double ratio = (double) targetOffset / mSnapInterval;
         smallerOffset =
@@ -1330,7 +1420,11 @@ public class ReactScrollView extends ScrollView
    * scroll view and state. Calling raw `smoothScrollTo` doesn't update state.
    */
   public void reactSmoothScrollTo(int x, int y) {
-    ReactScrollViewHelper.smoothScrollTo(this, x, y);
+    if (mScrollAnimationEnabled || !UiModeUtils.isTVDevice(getContext())) {
+      ReactScrollViewHelper.smoothScrollTo(this, x, y);
+    } else {
+      scrollTo(x, y);
+    }
     setPendingContentOffsets(x, y);
   }