react-native-tvos 0.83.2-0 → 0.83.4-0

package/ReactAndroid/src/main/java/com/facebook/react/views/scroll/ReactHorizontalScrollView.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;
 
@@ -134,6 +135,7 @@ public class ReactHorizontalScrollView extends HorizontalScrollView
   private @Nullable MaintainVisibleScrollPositionHelper mMaintainVisibleContentPositionHelper;
   private int mFadingEdgeLengthStart = 0;
   private int mFadingEdgeLengthEnd = 0;
+  private int mSnapToItemPadding;
 
   public ReactHorizontalScrollView(Context context) {
     this(context, null);
@@ -382,6 +384,10 @@ public class ReactHorizontalScrollView extends HorizontalScrollView
     invalidate();
   }
 
+  public void setSnapToItemPadding(int snapToItemPadding) {
+    mSnapToItemPadding = snapToItemPadding;
+  }
+
   @Override
   protected float getLeftFadingEdgeStrength() {
     float max = Math.max(mFadingEdgeLengthStart, mFadingEdgeLengthEnd);
@@ -538,6 +544,40 @@ public class ReactHorizontalScrollView extends HorizontalScrollView
     }
   }
 
+  /**
+   * 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 viewportWidth = getWidth() - getPaddingLeft() - getPaddingRight();
+    int maxScrollX = Math.max(0, computeHorizontalScrollRange() - getWidth());
+
+    Integer targetOffset = ReactScrollViewHelper.computeScrollSnapOffset(
+        rect.left, rect.right, viewportWidth, alignment, mSnapInterval, mSnapToItemPadding, maxScrollX);
+    if (targetOffset == null) {
+      return false;
+    }
+
+    reactSmoothScrollTo(targetOffset, getScrollY());
+    return true;
+  }
+
   /**
    * Since ReactHorizontalScrollView handles layout changes on JS side, it does not call
    * super.onlayout due to which mIsLayoutDirty flag in HorizontalScrollView remains true and
@@ -547,8 +587,12 @@ public class ReactHorizontalScrollView extends HorizontalScrollView
    */
   @Override
   public void requestChildFocus(View child, View focused) {
-    if (focused != null && !mPagingEnabled) {
-      scrollToChild(focused);
+    if (focused != null) {
+      if (!tryScrollSnapToChild(focused)) {
+        if (!mPagingEnabled) {
+          scrollToChild(focused);
+        }
+      }
     }
     requestChildFocusWithoutScroll(child, focused);
   }
@@ -832,7 +876,7 @@ public class ReactHorizontalScrollView extends HorizontalScrollView
             && (mPagingEnabled
                 || mSnapInterval != 0
                 || mSnapOffsets != null
-                || mSnapToAlignment != SNAP_ALIGNMENT_DISABLED)) {
+                || (mSnapToAlignment != SNAP_ALIGNMENT_DISABLED && mSnapToAlignment != SNAP_ALIGNMENT_ITEM))) {
           // Cancel any pending runnable and reschedule
           if (mPostTouchRunnable != null) {
             removeCallbacks(mPostTouchRunnable);
@@ -1280,7 +1324,7 @@ public class ReactHorizontalScrollView extends HorizontalScrollView
     }
 
     // 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(velocityX);
       return;
     }
@@ -1324,7 +1368,7 @@ public class ReactHorizontalScrollView extends HorizontalScrollView
           }
         }
       }
-    } 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 =

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

@@ -157,6 +157,13 @@ constructor(private val fpsListener: FpsListener? = null) :
     view.setSnapToEnd(snapToEnd)
   }
 
+  @ReactProp(name = "snapToItemPadding")
+  public fun setSnapToItemPadding(view: ReactHorizontalScrollView, value: Float) {
+    val density = getDisplayMetricDensity()
+    val px = (value * density).toInt()
+    view.setSnapToItemPadding(px)
+  }
+
   @ReactProp(name = ReactClippingViewGroupHelper.PROP_REMOVE_CLIPPED_SUBVIEWS)
   public fun setRemoveClippedSubviews(
       view: ReactHorizontalScrollView,

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;
 
@@ -132,6 +133,7 @@ public class ReactScrollView extends ScrollView
   private @Nullable MaintainVisibleScrollPositionHelper mMaintainVisibleContentPositionHelper;
   private int mFadingEdgeLengthStart;
   private int mFadingEdgeLengthEnd;
+  private int mSnapToItemPadding;
 
   public ReactScrollView(Context context) {
     this(context, null);
@@ -352,6 +354,10 @@ public class ReactScrollView extends ScrollView
     invalidate();
   }
 
+  public void setSnapToItemPadding(int snapToItemPadding) {
+    mSnapToItemPadding = snapToItemPadding;
+  }
+
   @Override
   protected float getTopFadingEdgeStrength() {
     float max = Math.max(mFadingEdgeLengthStart, mFadingEdgeLengthEnd);
@@ -499,6 +505,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
@@ -509,7 +549,9 @@ public class ReactScrollView extends ScrollView
   @Override
   public void requestChildFocus(View child, View focused) {
     if (focused != null) {
-      scrollToChild(focused);
+      if (!tryScrollSnapToChild(focused)) {
+        scrollToChild(focused);
+      }
     }
     requestChildFocusWithoutScroll(child, focused);
   }
@@ -686,7 +728,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);
@@ -1043,7 +1085,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;
     }
@@ -1082,7 +1124,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 =

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

@@ -11,6 +11,7 @@ import android.animation.Animator
 import android.animation.ValueAnimator
 import android.content.Context
 import android.graphics.Point
+import android.graphics.Rect
 import android.os.Build
 import android.view.View
 import android.view.ViewGroup
@@ -32,6 +33,7 @@ import com.facebook.react.uimanager.StateWrapper
 import com.facebook.react.uimanager.UIManagerHelper
 import com.facebook.react.uimanager.common.UIManagerType
 import com.facebook.react.uimanager.common.ViewUtil
+import com.facebook.react.views.view.ReactViewGroup
 import java.lang.ref.WeakReference
 import java.util.concurrent.CopyOnWriteArrayList
 import kotlin.math.abs
@@ -54,6 +56,7 @@ public object ReactScrollViewHelper {
   public const val SNAP_ALIGNMENT_START: Int = 1
   public const val SNAP_ALIGNMENT_CENTER: Int = 2
   public const val SNAP_ALIGNMENT_END: Int = 3
+  public const val SNAP_ALIGNMENT_ITEM: Int = 4
 
   // Support global native listeners for scroll events
   private val scrollListeners = CopyOnWriteArrayList<WeakReference<ScrollListener>>()
@@ -209,6 +212,8 @@ public object ReactScrollViewHelper {
       SNAP_ALIGNMENT_CENTER
     } else if ("end" == alignment) {
       SNAP_ALIGNMENT_END
+    } else if ("item".equals(alignment, ignoreCase = true)) {
+      SNAP_ALIGNMENT_ITEM
     } else {
       FLog.w(ReactConstants.TAG, "wrong snap alignment value: $alignment")
       SNAP_ALIGNMENT_DISABLED
@@ -569,6 +574,70 @@ public object ReactScrollViewHelper {
     return host.findViewById(nextFocusableViewId)
   }
 
+  /**
+   * Walks up the view hierarchy from the focused view to find a ReactViewGroup with
+   * scrollSnapAlign set. Returns a Pair of (snapTarget, alignment) or null if not found.
+   *
+   * Shared by [ReactScrollView] and [ReactHorizontalScrollView].
+   */
+  @JvmStatic
+  public fun findScrollSnapAlign(focused: View, scrollView: ViewGroup): Pair<View, String>? {
+    var view: View? = focused
+    var snapTarget: View? = null
+    var alignment: String? = null
+    while (view != null && view !== scrollView) {
+      if (view is ReactViewGroup) {
+        val snap = view.scrollSnapAlign
+        if (snap != null) {
+          alignment = snap
+          snapTarget = view
+        }
+      }
+      val parent = view.parent
+      view = if (parent is View) parent else null
+    }
+    return if (alignment != null && snapTarget != null) Pair(snapTarget, alignment) else null
+  }
+
+  /**
+   * Computes the target scroll offset for scroll-snap based on the focused view's position,
+   * alignment, snap interval, scroll padding, and maximum scroll range.
+   *
+   * Returns the clamped target offset, or null if the alignment is unknown.
+   *
+   * Shared by [ReactScrollView] and [ReactHorizontalScrollView].
+   *
+   * @param focusedStart the start coordinate of the snap target in scroll view coordinates
+   * @param focusedEnd the end coordinate of the snap target in scroll view coordinates
+   * @param viewportSize the visible viewport size on the scroll axis
+   * @param alignment the scrollSnapAlign value ("start", "center", or "end")
+   * @param snapInterval the snap interval (0 if not set)
+   * @param snapToItemPadding the snap-to-item padding value
+   * @param maxScrollOffset the maximum scroll offset for clamping
+   */
+  @JvmStatic
+  public fun computeScrollSnapOffset(
+      focusedStart: Int,
+      focusedEnd: Int,
+      viewportSize: Int,
+      alignment: String,
+      snapInterval: Int,
+      snapToItemPadding: Int,
+      maxScrollOffset: Int,
+  ): Int? {
+    val focusedCenter = (focusedStart + focusedEnd) / 2
+    var targetOffset = when (alignment) {
+      "start" -> focusedStart - snapToItemPadding
+      "center" -> focusedCenter - (viewportSize / 2) + (snapToItemPadding / 2)
+      "end" -> focusedEnd - viewportSize + snapToItemPadding
+      else -> return null
+    }
+    if (snapInterval > 0) {
+      targetOffset = (Math.floor(targetOffset.toDouble() / snapInterval) * snapInterval).toInt()
+    }
+    return Math.max(0, Math.min(targetOffset, maxScrollOffset))
+  }
+
   @JvmStatic
   public fun resolveAbsoluteDirection(
       @FocusRealDirection direction: Int,

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

@@ -141,6 +141,13 @@ constructor(private val fpsListener: FpsListener? = null) :
     view.setSnapToEnd(snapToEnd)
   }
 
+  @ReactProp(name = "snapToItemPadding")
+  public fun setSnapToItemPadding(view: ReactScrollView, value: Float) {
+    val density = getDisplayMetricDensity()
+    val px = (value * density).toInt()
+    view.setSnapToItemPadding(px)
+  }
+
   @ReactProp(name = ReactClippingViewGroupHelper.PROP_REMOVE_CLIPPED_SUBVIEWS)
   public fun setRemoveClippedSubviews(view: ReactScrollView, removeClippedSubviews: Boolean) {
     view.removeClippedSubviews = removeClippedSubviews

package/ReactAndroid/src/main/java/com/facebook/react/views/view/ReactViewGroup.kt

@@ -173,6 +173,7 @@ public open class ReactViewGroup public constructor(context: Context?) :
   private var childrenLayoutChangeListener: ChildrenLayoutChangeListener? = null
   private var onInterceptTouchEventListener: OnInterceptTouchEventListener? = null
   private var needsOffscreenAlphaCompositing = false
+  public var scrollSnapAlign: String? = null
   private var backfaceOpacity = 0f
   private var backfaceVisible = false
   private var childrenRemovedWhileTransitioning: MutableSet<Int>? = null

package/ReactAndroid/src/main/java/com/facebook/react/views/view/ReactViewManager.kt

@@ -190,6 +190,10 @@ public open class ReactViewManager : ReactClippingViewManager<ReactViewGroup>()
     view.setTrapFocusRight(enabled)
   }
 
+  @ReactProp(name = "scrollSnapAlign")
+  public open fun setScrollSnapAlign(view: ReactViewGroup, value: String?) {
+    view.scrollSnapAlign = value
+  }
 
   @ReactProp(name = ViewProps.BACKGROUND_IMAGE, customType = "BackgroundImage")
   public open fun setBackgroundImage(view: ReactViewGroup, backgroundImage: ReadableArray?) {

package/ReactCommon/cxxreact/ReactNativeVersion.h

@@ -14,14 +14,14 @@
 
 #define REACT_NATIVE_VERSION_MAJOR 0
 #define REACT_NATIVE_VERSION_MINOR 83
-#define REACT_NATIVE_VERSION_PATCH 2
+#define REACT_NATIVE_VERSION_PATCH 4
 
 namespace facebook::react {
 
 constexpr struct {
   int32_t Major = 0;
   int32_t Minor = 83;
-  int32_t Patch = 2;
+  int32_t Patch = 4;
   std::string_view Prerelease = "0";
 } ReactNativeVersion;
 

package/ReactCommon/react/renderer/components/scrollview/BaseScrollViewProps.cpp

@@ -32,6 +32,15 @@ BaseScrollViewProps::BaseScrollViewProps(
                     "showsScrollIndex",
                     sourceProps.showsScrollIndex,
                     {})),
+      snapToItemPadding(
+          ReactNativeFeatureFlags::enableCppPropsIteratorSetter()
+              ? sourceProps.snapToItemPadding
+              : convertRawProp(
+                    context,
+                    rawProps,
+                    "snapToItemPadding",
+                    sourceProps.snapToItemPadding,
+                    (Float)0)),
 #endif
       alwaysBounceHorizontal(
           ReactNativeFeatureFlags::enableCppPropsIteratorSetter()
@@ -400,6 +409,7 @@ void BaseScrollViewProps::setProp(
   switch (hash) {
 #if TARGET_OS_TV
     RAW_SET_PROP_SWITCH_CASE_BASIC(showsScrollIndex);
+    RAW_SET_PROP_SWITCH_CASE_BASIC(snapToItemPadding);
 #endif
     RAW_SET_PROP_SWITCH_CASE_BASIC(alwaysBounceHorizontal);
     RAW_SET_PROP_SWITCH_CASE_BASIC(alwaysBounceVertical);

package/ReactCommon/react/renderer/components/scrollview/BaseScrollViewProps.h

@@ -31,6 +31,7 @@ class BaseScrollViewProps : public ViewProps {
 
 #if TARGET_OS_TV
   bool showsScrollIndex{true};
+  Float snapToItemPadding{0};
 #endif
   bool alwaysBounceHorizontal{};
   bool alwaysBounceVertical{};

package/ReactCommon/react/renderer/components/scrollview/conversions.h

@@ -30,6 +30,10 @@ inline void fromRawValue(const PropsParserContext &context, const RawValue &valu
     result = ScrollViewSnapToAlignment::End;
     return;
   }
+  if (string == "item") {
+    result = ScrollViewSnapToAlignment::Item;
+    return;
+  }
   abort();
 }
 
@@ -117,6 +121,8 @@ inline std::string toString(const ScrollViewSnapToAlignment &value)
       return "center";
     case ScrollViewSnapToAlignment::End:
       return "end";
+    case ScrollViewSnapToAlignment::Item:
+      return "item";
   }
 }
 

package/ReactCommon/react/renderer/components/scrollview/platform/android/react/renderer/components/scrollview/HostPlatformScrollViewProps.cpp

@@ -65,7 +65,16 @@ HostPlatformScrollViewProps::HostPlatformScrollViewProps(
                     rawProps,
                     "endFillColor",
                     sourceProps.endFillColor,
-                    clearColor())) {}
+                    clearColor())),
+      snapToItemPadding(
+          ReactNativeFeatureFlags::enableCppPropsIteratorSetter()
+              ? sourceProps.snapToItemPadding
+              : convertRawProp(
+                    context,
+                    rawProps,
+                    "snapToItemPadding",
+                    sourceProps.snapToItemPadding,
+                    {})) {}
 
 void HostPlatformScrollViewProps::setProp(
     const PropsParserContext& context,
@@ -85,6 +94,7 @@ void HostPlatformScrollViewProps::setProp(
     RAW_SET_PROP_SWITCH_CASE_BASIC(fadingEdgeLength);
     RAW_SET_PROP_SWITCH_CASE_BASIC(overScrollMode);
     RAW_SET_PROP_SWITCH_CASE_BASIC(endFillColor);
+    RAW_SET_PROP_SWITCH_CASE_BASIC(snapToItemPadding);
   }
 }
 
@@ -327,6 +337,9 @@ folly::dynamic HostPlatformScrollViewProps::getDiffProps(
       case ScrollViewSnapToAlignment::End:
         result["snapToAlignment"] = "end";
         break;
+      case ScrollViewSnapToAlignment::Item:
+        result["snapToAlignment"] = "item";
+        break;
     }
   }
 
@@ -396,6 +409,10 @@ folly::dynamic HostPlatformScrollViewProps::getDiffProps(
     result["endFillColor"] = *endFillColor;
   }
 
+  if (snapToItemPadding != oldProps->snapToItemPadding) {
+    result["snapToItemPadding"] = snapToItemPadding;
+  }
+
   return result;
 }
 

package/ReactCommon/react/renderer/components/scrollview/platform/android/react/renderer/components/scrollview/HostPlatformScrollViewProps.h

@@ -33,6 +33,8 @@ class HostPlatformScrollViewProps : public BaseScrollViewProps {
   std::string overScrollMode{"auto"};
   SharedColor endFillColor{clearColor()};
 
+  Float snapToItemPadding{0};
+
 #pragma mark - DebugStringConvertible
 
 #if RN_DEBUG_STRING_CONVERTIBLE

package/ReactCommon/react/renderer/components/scrollview/primitives.h

@@ -12,7 +12,7 @@
 
 namespace facebook::react {
 
-enum class ScrollViewSnapToAlignment { Start, Center, End };
+enum class ScrollViewSnapToAlignment { Start, Center, End, Item };
 
 enum class ScrollViewIndicatorStyle { Default, Black, White };
 

package/ReactCommon/react/renderer/components/view/BaseViewProps.cpp

@@ -447,7 +447,16 @@ BaseViewProps::BaseViewProps(
                     rawProps,
                     "removeClippedSubviews",
                     sourceProps.removeClippedSubviews,
-                    false)) {}
+                    false))
+#if TARGET_OS_TV
+      ,scrollSnapAlign(ReactNativeFeatureFlags::enableCppPropsIteratorSetter() ? sourceProps.scrollSnapAlign : convertRawProp(
+          context,
+          rawProps,
+          "scrollSnapAlign",
+          sourceProps.scrollSnapAlign,
+          {}))
+#endif
+      {}
 
 #define VIEW_EVENT_CASE(eventType)                      \
   case CONSTEXPR_RAW_PROPS_KEY_HASH("on" #eventType): { \
@@ -518,6 +527,7 @@ void BaseViewProps::setProp(
     RAW_SET_PROP_SWITCH_CASE_BASIC(trapFocusDown);
     RAW_SET_PROP_SWITCH_CASE_BASIC(trapFocusLeft);
     RAW_SET_PROP_SWITCH_CASE_BASIC(trapFocusRight);
+    RAW_SET_PROP_SWITCH_CASE_BASIC(scrollSnapAlign);
 #endif
     // events field
     VIEW_EVENT_CASE(PointerEnter);

package/ReactCommon/react/renderer/components/view/BaseViewProps.h

@@ -124,6 +124,10 @@ class BaseViewProps : public YogaStylableProps, public AccessibilityProps {
 
   bool removeClippedSubviews{false};
 
+#if TARGET_OS_TV
+  std::optional<std::string> scrollSnapAlign;
+#endif
+
 #pragma mark - Convenience Methods
 
   CascadedBorderWidths getBorderWidths() const;

package/ReactCommon/react/renderer/components/view/platform/android/react/renderer/components/view/HostPlatformViewProps.cpp

@@ -99,6 +99,15 @@ HostPlatformViewProps::HostPlatformViewProps(
           "trapFocusRight",
           sourceProps.trapFocusRight,
           false)),
+      scrollSnapAlign(
+          ReactNativeFeatureFlags::enableCppPropsIteratorSetter()
+              ? sourceProps.scrollSnapAlign
+              : convertRawProp(
+                    context,
+                    rawProps,
+                    "scrollSnapAlign",
+                    sourceProps.scrollSnapAlign,
+                    {})),
       needsOffscreenAlphaCompositing(
           ReactNativeFeatureFlags::enableCppPropsIteratorSetter()
               ? sourceProps.needsOffscreenAlphaCompositing
@@ -201,6 +210,7 @@ void HostPlatformViewProps::setProp(
     RAW_SET_PROP_SWITCH_CASE(nativeForeground, "nativeForegroundAndroid");
     RAW_SET_PROP_SWITCH_CASE_BASIC(focusable);
     RAW_SET_PROP_SWITCH_CASE_BASIC(hasTVPreferredFocus);
+    RAW_SET_PROP_SWITCH_CASE_BASIC(scrollSnapAlign);
     RAW_SET_PROP_SWITCH_CASE_BASIC(needsOffscreenAlphaCompositing);
     RAW_SET_PROP_SWITCH_CASE_BASIC(renderToHardwareTextureAndroid);
     RAW_SET_PROP_SWITCH_CASE_BASIC(screenReaderFocusable);
@@ -1105,6 +1115,14 @@ folly::dynamic HostPlatformViewProps::getDiffProps(
     }
   }
 
+  if (scrollSnapAlign != oldProps->scrollSnapAlign) {
+    if (scrollSnapAlign.has_value()) {
+      result["scrollSnapAlign"] = scrollSnapAlign.value();
+    } else {
+      result["scrollSnapAlign"] = folly::dynamic(nullptr);
+    }
+  }
+
   return result;
 }
 

package/ReactCommon/react/renderer/components/view/platform/android/react/renderer/components/view/HostPlatformViewProps.h

@@ -47,6 +47,7 @@ class HostPlatformViewProps : public BaseViewProps {
   bool trapFocusDown{false};
   bool trapFocusLeft{false};
   bool trapFocusRight{false};
+  std::optional<std::string> scrollSnapAlign{};
 
   bool needsOffscreenAlphaCompositing{false};
   bool renderToHardwareTextureAndroid{false};

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "react-native-tvos",
-  "version": "0.83.2-0",
+  "version": "0.83.4-0",
   "description": "A framework for building native apps using React",
   "license": "MIT",
   "repository": {
@@ -165,12 +165,12 @@
   },
   "dependencies": {
     "@jest/create-cache-key-function": "^29.7.0",
-    "@react-native/assets-registry": "0.83.2",
-    "@react-native/codegen": "0.83.2",
-    "@react-native/community-cli-plugin": "0.83.2",
-    "@react-native/gradle-plugin": "0.83.2",
-    "@react-native/js-polyfills": "0.83.2",
-    "@react-native/normalize-colors": "0.83.2",
+    "@react-native/assets-registry": "0.83.4",
+    "@react-native/codegen": "0.83.4",
+    "@react-native/community-cli-plugin": "0.83.4",
+    "@react-native/gradle-plugin": "0.83.4",
+    "@react-native/js-polyfills": "0.83.4",
+    "@react-native/normalize-colors": "0.83.4",
     "abort-controller": "^3.0.0",
     "anser": "^1.4.9",
     "ansi-regex": "^5.0.0",
@@ -198,7 +198,7 @@
     "whatwg-fetch": "^3.0.0",
     "ws": "^7.5.10",
     "yargs": "^17.6.2",
-    "@react-native-tvos/virtualized-lists": "0.83.2-0"
+    "@react-native-tvos/virtualized-lists": "0.83.4-0"
   },
   "codegenConfig": {
     "libraries": [