react-native-tvos 0.83.9-0 → 0.83.10-1

package/ReactAndroid/src/main/java/com/facebook/react/devsupport/inspector/FrameTimingsObserver.kt

@@ -103,6 +103,12 @@ internal class FrameTimingsObserver(
         if (!isTracing) {
           return@OnFrameMetricsAvailableListener
         }
+        // FrameMetrics#getMetric requires API 24 (N). This listener is only ever registered on
+        // API 24+ (see isSupported / the guarded construction in ReactHostImpl), so this is a
+        // defensive no-op that also makes the API level explicit to the linter.
+        if (Build.VERSION.SDK_INT < Build.VERSION_CODES.N) {
+          return@OnFrameMetricsAvailableListener
+        }
         val beginTimestamp = frameMetrics.getMetric(FrameMetrics.VSYNC_TIMESTAMP)
         val endTimestamp = beginTimestamp + frameMetrics.getMetric(FrameMetrics.TOTAL_DURATION)
         emitFrameTiming(beginTimestamp, endTimestamp)

package/ReactAndroid/src/main/java/com/facebook/react/devsupport/inspector/InspectorNetworkHelper.kt

@@ -55,7 +55,7 @@ internal object InspectorNetworkHelper {
               response.body().use { responseBody ->
                 if (responseBody != null) {
                   val inputStream = responseBody.byteStream()
-                  val chunkSize = 1024
+                  val chunkSize = 8 * 1024 // 8Kb
                   val buffer = ByteArray(chunkSize)
                   var bytesRead: Int
 

package/ReactAndroid/src/main/java/com/facebook/react/fabric/mounting/SurfaceMountingManager.java

@@ -1190,8 +1190,8 @@ public class SurfaceMountingManager {
       // If the view that went offscreen is still being touched, we can't delete it yet.
       // We have to delay the deletion till the touch is completed.
       // This is causing bugs like those otherwise:
-      // - https://github.com/facebook/react-native/issues/44610
-      // - https://github.com/facebook/react-native/issues/45126
+      // - https://github.com/react/react-native/issues/44610
+      // - https://github.com/react/react-native/issues/45126
       mViewsToDeleteAfterTouchFinishes.add(reactTag);
     } else {
       // To delete we simply remove the tag from the registry.

package/ReactAndroid/src/main/java/com/facebook/react/modules/core/JavaTimerManager.kt

@@ -326,7 +326,7 @@ public open class JavaTimerManager(
 
       // If the JS thread is busy for multiple frames we cancel any other pending runnable.
       // We also capture the idleCallbackRunnable to tentatively fix:
-      // https://github.com/facebook/react-native/issues/44842
+      // https://github.com/react/react-native/issues/44842
       currentIdleCallbackRunnable?.cancel()
       currentIdleCallbackRunnable = IdleCallbackRunnable(frameTimeNanos)
       reactApplicationContext.runOnJSQueueThread(currentIdleCallbackRunnable)

package/ReactAndroid/src/main/java/com/facebook/react/modules/core/ReactAndroidHWInputDeviceHelper.java

@@ -63,6 +63,7 @@ public class ReactAndroidHWInputDeviceHelper {
           .put(KeyEvent.KEYCODE_9, "9")
           .put(KeyEvent.KEYCODE_CHANNEL_DOWN, "channelDown")
           .put(KeyEvent.KEYCODE_CHANNEL_UP, "channelUp")
+          .put(KeyEvent.KEYCODE_DEL, "delete")
           .put(KeyEvent.KEYCODE_BOOKMARK, "bookmark")
           .put(KeyEvent.KEYCODE_AVR_INPUT, "avrInput")
           .put(KeyEvent.KEYCODE_AVR_POWER, "avrPower")

package/ReactAndroid/src/main/java/com/facebook/react/modules/i18nmanager/I18nManagerModule.kt

@@ -7,6 +7,7 @@
 
 package com.facebook.react.modules.i18nmanager
 
+import android.os.Build
 import com.facebook.fbreact.specs.NativeI18nManagerSpec
 import com.facebook.react.bridge.ReactApplicationContext
 import com.facebook.react.module.annotations.ReactModule
@@ -17,7 +18,13 @@ internal class I18nManagerModule(context: ReactApplicationContext?) :
     NativeI18nManagerSpec(context) {
   override fun getTypedExportedConstants(): Map<String, Any> {
     val context = reactApplicationContext
-    val locale = context.resources.configuration.locales[0]
+    val configuration = context.resources.configuration
+    val locale =
+        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.N) {
+          configuration.locales[0]
+        } else {
+          @Suppress("DEPRECATION") configuration.locale
+        }
 
     return mapOf(
         "isRTL" to I18nUtil.instance.isRTL(context),

package/ReactAndroid/src/main/java/com/facebook/react/modules/intent/IntentModule.kt

@@ -223,7 +223,7 @@ public open class IntentModule(reactContext: ReactApplicationContext) :
             }
             ReadableType.Number -> {
               // We cannot know from JS if is an Integer or Double
-              // See: https://github.com/facebook/react-native/issues/4141
+              // See: https://github.com/react/react-native/issues/4141
               // We might need to find a workaround if this is really an issue
               val number = map.getDouble(EXTRA_MAP_KEY_FOR_VALUE)
               intent.putExtra(name, number)

package/ReactAndroid/src/main/java/com/facebook/react/modules/network/NetworkingModule.kt

@@ -165,7 +165,7 @@ public class NetworkingModule(
 
   @Deprecated(
       """To be removed in a future release. See
-        https://github.com/facebook/react-native/pull/37798#pullrequestreview-1518338914"""
+        https://github.com/react/react-native/pull/37798#pullrequestreview-1518338914"""
   )
   public interface CustomClientBuilder : com.facebook.react.modules.network.CustomClientBuilder
 
@@ -479,7 +479,7 @@ public class NetworkingModule(
         } else {
           // Use getBytes() to convert the body into a byte[], preventing okhttp from
           // appending the character set to the Content-Type header when otherwise unspecified
-          // https://github.com/facebook/react-native/issues/8237
+          // https://github.com/react/react-native/issues/8237
           val charset =
               if (contentMediaType == null) {
                 StandardCharsets.UTF_8
@@ -636,7 +636,7 @@ public class NetworkingModule(
                     reactApplicationContext,
                     requestId,
                     devToolsRequestId,
-                    url,
+                    response.request().url().toString(),
                     response.code(),
                     NetworkEventUtil.okHttpHeadersToMap(response.headers()),
                     response.body()?.contentLength() ?: 0L,

package/ReactAndroid/src/main/java/com/facebook/react/modules/permissions/PermissionsModule.kt

@@ -8,7 +8,10 @@
 package com.facebook.react.modules.permissions
 
 import android.app.Activity
+import android.content.Context
 import android.content.pm.PackageManager
+import android.os.Build
+import android.os.Process
 import android.util.SparseArray
 import com.facebook.common.logging.FLog
 import com.facebook.fbreact.specs.NativePermissionsAndroidSpec
@@ -39,9 +42,20 @@ public class PermissionsModule(reactContext: ReactApplicationContext?) :
    */
   public override fun checkPermission(permission: String, promise: Promise) {
     val context = reactApplicationContext.baseContext
-    promise.resolve(context.checkSelfPermission(permission) == PackageManager.PERMISSION_GRANTED)
+    promise.resolve(checkSelfPermission(context, permission) == PackageManager.PERMISSION_GRANTED)
   }
 
+  /**
+   * [Context.checkSelfPermission] was introduced in API 23 (M). On older platforms permissions are
+   * granted at install time, so fall back to [Context.checkPermission] for the current process.
+   */
+  private fun checkSelfPermission(context: Context, permission: String): Int =
+      if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.M) {
+        context.checkSelfPermission(permission)
+      } else {
+        context.checkPermission(permission, Process.myPid(), Process.myUid())
+      }
+
   /**
    * Check whether the app should display a message explaining why a certain permission is needed.
    * successCallback is called with true if the app should display a message, false otherwise. This
@@ -66,7 +80,7 @@ public class PermissionsModule(reactContext: ReactApplicationContext?) :
    */
   public override fun requestPermission(permission: String, promise: Promise) {
     val context = reactApplicationContext.baseContext
-    if (context.checkSelfPermission(permission) == PackageManager.PERMISSION_GRANTED) {
+    if (checkSelfPermission(context, permission) == PackageManager.PERMISSION_GRANTED) {
       promise.resolve(GRANTED)
       return
     }
@@ -104,7 +118,7 @@ public class PermissionsModule(reactContext: ReactApplicationContext?) :
     val context = reactApplicationContext.baseContext
     for (i in 0 until permissions.size()) {
       val perm = permissions.getString(i) ?: continue
-      if (context.checkSelfPermission(perm) == PackageManager.PERMISSION_GRANTED) {
+      if (checkSelfPermission(context, perm) == PackageManager.PERMISSION_GRANTED) {
         grantedPermissions.putString(perm, GRANTED)
         checkedPermissionsCount++
       } else {

package/ReactAndroid/src/main/java/com/facebook/react/modules/systeminfo/ReactNativeVersion.kt

@@ -14,7 +14,7 @@ public object ReactNativeVersion {
   public val VERSION: Map<String, Any?> = mapOf(
     "major" to 0,
     "minor" to 83,
-    "patch" to 9,
-    "prerelease" to "0"
+    "patch" to 10,
+    "prerelease" to "1"
   )
 }

package/ReactAndroid/src/main/java/com/facebook/react/runtime/ReactHostImpl.kt

@@ -11,6 +11,7 @@ import android.app.Activity
 import android.content.Context
 import android.content.Intent
 import android.nfc.NfcAdapter
+import android.os.Build
 import android.os.Bundle
 import androidx.core.graphics.createBitmap
 import com.facebook.common.logging.FLog
@@ -1611,7 +1612,11 @@ public class ReactHostImpl(
           when (state) {
             TracingState.ENABLED_IN_BACKGROUND_MODE,
             TracingState.ENABLED_IN_CDP_MODE -> {
-              if (InspectorFlags.getFrameRecordingEnabled()) {
+              // FrameMetrics-based frame recording requires API 24 (N). FrameTimingsObserver's
+              // listener implements Window.OnFrameMetricsAvailableListener (an API-24 interface),
+              // which would crash at construction on older platforms.
+              if (InspectorFlags.getFrameRecordingEnabled() &&
+                  Build.VERSION.SDK_INT >= Build.VERSION_CODES.N) {
                 val observer =
                     FrameTimingsObserver(
                         _screenshotsEnabled,

package/ReactAndroid/src/main/java/com/facebook/react/runtime/ReactInstance.kt

@@ -563,7 +563,7 @@ internal class ReactInstance(
             // We need to null check here because some Java implementation of the
             // `ViewManagerOnDemandReactPackage` interface could still return null even
             // if the method is marked as returning a non-nullable collection in Kotlin.
-            // See https://github.com/facebook/react-native/issues/52014
+            // See https://github.com/react/react-native/issues/52014
             @Suppress("SENSELESS_COMPARISON")
             if (names == null) {
               RNLog.w(

package/ReactAndroid/src/main/java/com/facebook/react/uimanager/BaseViewManager.java

@@ -631,7 +631,7 @@ public abstract class BaseViewManager<T extends View, C extends LayoutShadowNode
       // The native Android implementation removed the screen density from the
       // calculation, so squaring and a normalization value of
       // sqrt(5) produces an exact replica with iOS.
-      // For more information, see https://github.com/facebook/react-native/pull/18302
+      // For more information, see https://github.com/react/react-native/pull/18302
       float normalizedCameraDistance =
           sanitizeFloatPropertyValue(
               scale * scale * cameraDistance * CAMERA_DISTANCE_NORMALIZATION_MULTIPLIER);

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

@@ -237,7 +237,8 @@ internal object UIManagerModuleConstantsHelper {
         // Since event maps are client based Map interface, it could be immutable
         if (destValue !is HashMap<*, *>) {
           destValue = HashMap(destValue)
-          dest.replace(key, destValue as MutableMap<*, *>)
+          // Map.replace requires API 24; the key is already present, so put (API 1) is equivalent.
+          dest[key] = destValue as MutableMap<*, *>
         }
         @Suppress("UNCHECKED_CAST")
         recursiveMerge(destValue as MutableMap<String, Any>, sourceValue as MutableMap<String, Any>)

package/ReactAndroid/src/main/java/com/facebook/react/uimanager/drawable/BackgroundDrawable.kt

@@ -16,7 +16,6 @@ import android.graphics.Path
 import android.graphics.PixelFormat
 import android.graphics.Rect
 import android.graphics.RectF
-import android.graphics.drawable.Drawable
 import com.facebook.react.uimanager.PixelUtil.dpToPx
 import com.facebook.react.uimanager.PixelUtil.pxToDp
 import com.facebook.react.uimanager.style.BorderInsets

package/ReactAndroid/src/main/java/com/facebook/react/uimanager/drawable/BackgroundImageDrawable.kt

@@ -15,7 +15,6 @@ import android.graphics.Path
 import android.graphics.PixelFormat
 import android.graphics.Rect
 import android.graphics.RectF
-import android.graphics.drawable.Drawable
 import com.facebook.react.uimanager.FloatUtil
 import com.facebook.react.uimanager.LengthPercentage
 import com.facebook.react.uimanager.LengthPercentageType

package/ReactAndroid/src/main/java/com/facebook/react/uimanager/drawable/BorderDrawable.kt

@@ -20,7 +20,6 @@ import android.graphics.PointF
 import android.graphics.Rect
 import android.graphics.RectF
 import android.graphics.Region
-import android.graphics.drawable.Drawable
 import android.os.Build
 import com.facebook.react.uimanager.FloatUtil.floatsEqual
 import com.facebook.react.uimanager.LengthPercentage

package/ReactAndroid/src/main/java/com/facebook/react/uimanager/drawable/CompositeBackgroundDrawable.kt

@@ -12,6 +12,9 @@ import android.graphics.Outline
 import android.graphics.Path
 import android.graphics.RectF
 import android.graphics.drawable.Drawable
+// Framework LayerDrawable, kept for LayerDrawable.PADDING_MODE_STACK and the Array<Drawable?> type.
+// The superclass below is the package-local proxy (fully qualified) so getLayoutDirection() is
+// runtime-safe on API 22 — see LayerDrawable.kt.
 import android.graphics.drawable.LayerDrawable
 import android.os.Build
 import com.facebook.react.common.annotations.UnstableReactNativeAPI
@@ -59,7 +62,7 @@ internal class CompositeBackgroundDrawable(
     // Holder value for currently set border radius
     var borderRadius: BorderRadiusStyle? = null,
 ) :
-    LayerDrawable(
+    com.facebook.react.uimanager.drawable.LayerDrawable(
         createLayersArray(
             originalBackground,
             outerShadows,

package/ReactAndroid/src/main/java/com/facebook/react/uimanager/drawable/Drawable.kt

@@ -0,0 +1,30 @@
+/*
+ * 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.
+ */
+
+package com.facebook.react.uimanager.drawable
+
+import android.annotation.TargetApi
+import android.os.Build
+import android.view.View
+
+/**
+ * Package-local base [android.graphics.drawable.Drawable] for React Native's drawable subsystem.
+ *
+ * [android.graphics.drawable.Drawable.getLayoutDirection] was only introduced in API 23 (M). The
+ * drawables in this package read `layoutDirection` internally, which would throw a
+ * [NoSuchMethodError] on API 22. By declaring the override here (and guarding the `super` call),
+ * subclasses that extend this proxy instead of the framework class stay runtime-safe on API 22.
+ */
+internal abstract class Drawable : android.graphics.drawable.Drawable() {
+  @TargetApi(Build.VERSION_CODES.M)
+  override fun getLayoutDirection(): Int =
+      if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.M) {
+        super.getLayoutDirection()
+      } else {
+        View.LAYOUT_DIRECTION_LTR
+      }
+}

package/ReactAndroid/src/main/java/com/facebook/react/uimanager/drawable/LayerDrawable.kt

@@ -0,0 +1,32 @@
+/*
+ * 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.
+ */
+
+package com.facebook.react.uimanager.drawable
+
+import android.annotation.TargetApi
+import android.os.Build
+import android.view.View
+
+/**
+ * Package-local base [android.graphics.drawable.LayerDrawable] for React Native's drawable
+ * subsystem.
+ *
+ * [android.graphics.drawable.Drawable.getLayoutDirection] was only introduced in API 23 (M).
+ * [CompositeBackgroundDrawable] reads `layoutDirection` internally, which would throw a
+ * [NoSuchMethodError] on API 22. By declaring the override here (and guarding the `super` call),
+ * it stays runtime-safe on API 22 while remaining a real framework [LayerDrawable].
+ */
+internal abstract class LayerDrawable(layers: Array<android.graphics.drawable.Drawable?>) :
+    android.graphics.drawable.LayerDrawable(layers) {
+  @TargetApi(Build.VERSION_CODES.M)
+  override fun getLayoutDirection(): Int =
+      if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.M) {
+        super.getLayoutDirection()
+      } else {
+        View.LAYOUT_DIRECTION_LTR
+      }
+}

package/ReactAndroid/src/main/java/com/facebook/react/uimanager/drawable/OutlineDrawable.kt

@@ -17,7 +17,6 @@ import android.graphics.Path
 import android.graphics.PathEffect
 import android.graphics.PixelFormat
 import android.graphics.RectF
-import android.graphics.drawable.Drawable
 import com.facebook.react.uimanager.PixelUtil.pxToDp
 import com.facebook.react.uimanager.style.BorderRadiusStyle
 import com.facebook.react.uimanager.style.ComputedBorderRadius

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

@@ -567,29 +567,39 @@ 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.
+   * Attempts to scroll-snap to the focused child based on snapToAlignment/scrollSnapAlign
+   * or scrollSnapOffset. 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);
+    kotlin.Triple<View, String, Integer> result =
+        ReactScrollViewHelper.findScrollSnap(focused, this);
     if (result == null) {
       return false;
     }
 
     View snapTarget = result.getFirst();
     String alignment = result.getSecond();
+    Integer snapOffset = result.getThird();
 
     Rect rect = new Rect();
     snapTarget.getDrawingRect(rect);
     offsetDescendantRectToMyCoords(snapTarget, rect);
 
-    int viewportWidth = getWidth() - getPaddingLeft() - getPaddingRight();
     int maxScrollX = Math.max(0, computeHorizontalScrollRange() - getWidth());
 
+    if (snapOffset != null) {
+      int targetOffset = ReactScrollViewHelper.computeScrollSnapTargetForOffset(
+          rect.left, snapOffset, mSnapInterval, maxScrollX);
+      reactSmoothScrollTo(targetOffset, getScrollY());
+      return true;
+    }
+
+    int viewportWidth = getWidth() - getPaddingLeft() - getPaddingRight();
+
     Integer targetOffset = ReactScrollViewHelper.computeScrollSnapOffset(
         rect.left, rect.right, viewportWidth, alignment, mSnapInterval, mSnapToItemPadding, maxScrollX);
     if (targetOffset == null) {

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

@@ -514,29 +514,39 @@ public class ReactScrollView extends ScrollView
   }
 
   /**
-   * Attempts to scroll-snap to the focused child based on snapToAlignment/scrollSnapAlign.
-   * Returns true if snap scrolling was performed, false otherwise.
+   * Attempts to scroll-snap to the focused child based on snapToAlignment/scrollSnapAlign
+   * or scrollSnapOffset. 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);
+    kotlin.Triple<View, String, Integer> result =
+        ReactScrollViewHelper.findScrollSnap(focused, this);
     if (result == null) {
       return false;
     }
 
     View snapTarget = result.getFirst();
     String alignment = result.getSecond();
+    Integer snapOffset = result.getThird();
 
     Rect rect = new Rect();
     snapTarget.getDrawingRect(rect);
     offsetDescendantRectToMyCoords(snapTarget, rect);
 
-    int viewportHeight = getHeight() - getPaddingTop() - getPaddingBottom();
     int maxScrollY = getMaxScrollY();
 
+    if (snapOffset != null) {
+      int targetOffset = ReactScrollViewHelper.computeScrollSnapTargetForOffset(
+          rect.top, snapOffset, mSnapInterval, maxScrollY);
+      reactSmoothScrollTo(getScrollX(), targetOffset);
+      return true;
+    }
+
+    int viewportHeight = getHeight() - getPaddingTop() - getPaddingBottom();
+
     Integer targetOffset = ReactScrollViewHelper.computeScrollSnapOffset(
         rect.top, rect.bottom, viewportHeight, alignment, mSnapInterval, mSnapToItemPadding, maxScrollY);
     if (targetOffset == null) {

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

@@ -12,11 +12,9 @@ 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
 import android.widget.OverScroller
-import androidx.annotation.RequiresApi
 import androidx.core.view.ViewCompat.FocusDirection
 import androidx.core.view.ViewCompat.FocusRealDirection
 import com.facebook.common.logging.FLog
@@ -248,7 +246,6 @@ public object ReactScrollViewHelper {
     scrollListeners.add(WeakReference(listener))
   }
 
-  @RequiresApi(Build.VERSION_CODES.N)
   @JvmStatic
   public fun removeScrollListener(listener: ScrollListener) {
     // Avoid using removeIf, only available in API 26+
@@ -267,7 +264,6 @@ public object ReactScrollViewHelper {
     layoutChangeListeners.add(WeakReference(listener))
   }
 
-  @RequiresApi(Build.VERSION_CODES.N)
   @JvmStatic
   public fun removeLayoutChangeListener(listener: LayoutChangeListener) {
     // Avoid using removeIf, only available in API 26+
@@ -576,27 +572,67 @@ public object ReactScrollViewHelper {
 
   /**
    * 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.
+   * either scrollSnapAlign or scrollSnapOffset set. Returns a Triple of (snapTarget,
+   * alignment, offsetPx) or null if neither marker was found. Exactly one of
+   * alignment/offsetPx is non-null on return.
+   *
+   * Walk is inner→outer, latest marker wins. On a single view declaring both,
+   * scrollSnapOffset wins as the more specific config.
    *
    * Shared by [ReactScrollView] and [ReactHorizontalScrollView].
    */
   @JvmStatic
-  public fun findScrollSnapAlign(focused: View, scrollView: ViewGroup): Pair<View, String>? {
+  public fun findScrollSnap(focused: View, scrollView: ViewGroup): Triple<View, String?, Int?>? {
     var view: View? = focused
     var snapTarget: View? = null
     var alignment: String? = null
+    var offset: Int? = null
     while (view != null && view !== scrollView) {
       if (view is ReactViewGroup) {
-        val snap = view.scrollSnapAlign
-        if (snap != null) {
-          alignment = snap
+        val o = view.scrollSnapOffset
+        val a = view.scrollSnapAlign
+        if (o != null) {
+          offset = o
+          alignment = null
+          snapTarget = view
+        } else if (a != null) {
+          alignment = a
+          offset = null
           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
+    return if (snapTarget != null && (alignment != null || offset != null))
+        Triple(snapTarget, alignment, offset) else null
+  }
+
+  /**
+   * Computes the target scroll offset for the per-item scrollSnapOffset path:
+   * land the snap target's leading edge at `snapOffset` pixels from the viewport origin.
+   *
+   * Returns the clamped target offset.
+   *
+   * Shared by [ReactScrollView] and [ReactHorizontalScrollView].
+   *
+   * @param focusedStart the start coordinate of the snap target in scroll view coordinates
+   * @param snapOffset the per-item pixel offset from the viewport origin
+   * @param snapInterval the snap interval (0 if not set)
+   * @param maxScrollOffset the maximum scroll offset for clamping
+   */
+  @JvmStatic
+  public fun computeScrollSnapTargetForOffset(
+      focusedStart: Int,
+      snapOffset: Int,
+      snapInterval: Int,
+      maxScrollOffset: Int,
+  ): Int {
+    var targetOffset = focusedStart - snapOffset
+    if (snapInterval > 0) {
+      targetOffset = (Math.floor(targetOffset.toDouble() / snapInterval) * snapInterval).toInt()
+    }
+    return Math.max(0, Math.min(targetOffset, maxScrollOffset))
   }
 
   /**

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

@@ -437,7 +437,7 @@ constructor(private val fpsListener: FpsListener? = null) :
     // 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://github.com/react/react-native/issues/35350
     //  - https://issuetracker.google.com/issues/287304310
     if (applyFix) {
       view.verticalScrollbarPosition = View.SCROLLBAR_POSITION_LEFT

package/ReactAndroid/src/main/java/com/facebook/react/views/text/ReactBaseTextShadowNode.kt

@@ -9,6 +9,7 @@
 
 package com.facebook.react.views.text
 
+import android.annotation.TargetApi
 import android.graphics.Color
 import android.os.Build
 import android.text.Layout
@@ -65,6 +66,9 @@ import com.facebook.yoga.YogaUnit
 @Deprecated(
     message = "This class is part of Legacy Architecture and will be removed in a future release"
 )
+// The break-strategy / hyphenation-frequency Layout constants used below were added in API 23 (M).
+// They are compile-time int constants (runtime-safe), and the pre-M fallbacks are inlined literals.
+@TargetApi(Build.VERSION_CODES.M)
 public abstract class ReactBaseTextShadowNode
 @JvmOverloads
 public constructor(
@@ -81,8 +85,10 @@ public constructor(
   protected var numberOfLines: Int = ReactConstants.UNSET
     private set
 
-  protected var textBreakStrategy: Int = Layout.BREAK_STRATEGY_HIGH_QUALITY
-  protected var hyphenationFrequency: Int = Layout.HYPHENATION_FREQUENCY_NONE
+  protected var textBreakStrategy: Int =
+      if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.M) Layout.BREAK_STRATEGY_HIGH_QUALITY else 0
+  protected var hyphenationFrequency: Int =
+      if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.M) Layout.HYPHENATION_FREQUENCY_NONE else 0
   protected var justificationMode: Int =
       if (Build.VERSION.SDK_INT < Build.VERSION_CODES.O) {
         0
@@ -408,6 +414,10 @@ public constructor(
 
   @ReactProp(name = ViewProps.TEXT_BREAK_STRATEGY)
   public open fun setTextBreakStrategy(textBreakStrategy: String?) {
+    // Layout break strategies were introduced in API 23 (M); they are unused before then.
+    if (Build.VERSION.SDK_INT < Build.VERSION_CODES.M) {
+      return
+    }
     this.textBreakStrategy =
         when (textBreakStrategy) {
           null,

package/ReactAndroid/src/main/java/com/facebook/react/views/text/ReactTextAnchorViewManager.kt

@@ -7,6 +7,7 @@
 
 package com.facebook.react.views.text
 
+import android.os.Build
 import android.text.Layout
 import android.text.TextUtils
 import android.text.util.Linkify
@@ -110,6 +111,10 @@ public abstract class ReactTextAnchorViewManager<
 
   @ReactProp(name = "android_hyphenationFrequency")
   internal fun setAndroidHyphenationFrequency(view: ReactTextView, frequency: String?) {
+    // Hyphenation frequency was introduced in API 23 (M).
+    if (Build.VERSION.SDK_INT < Build.VERSION_CODES.M) {
+      return
+    }
     when (frequency) {
       null,
       "none" -> view.hyphenationFrequency = Layout.HYPHENATION_FREQUENCY_NONE