react-native-tvos 0.87.0-0 → 0.87.1-0

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

@@ -42,6 +42,7 @@ import com.facebook.react.views.scroll.ReactScrollViewCommandHelper.Companion.re
 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.createScrollAnimationInterpolator
 import com.facebook.react.views.scroll.ReactScrollViewHelper.parseOverScrollMode
 import com.facebook.react.views.scroll.ReactScrollViewHelper.parseSnapToAlignment
 
@@ -174,6 +175,18 @@ constructor(private val fpsListener: FpsListener? = null) :
     view.scrollAnimationEnabled = value
   }
 
+  @ReactProp(name = "scrollAnimationDuration")
+  public fun setScrollAnimationDuration(view: ReactHorizontalScrollView, value: Float) {
+    // Exposed as a float because of the JavaScript interface, see `snapToInterval`.
+    view.scrollAnimationDuration = value.toInt()
+  }
+
+  @ReactProp(name = "scrollAnimationEasing")
+  public fun setScrollAnimationEasing(view: ReactHorizontalScrollView, value: ReadableArray?) {
+    // Resolved here rather than per frame: the curve only changes when the prop does.
+    view.scrollAnimationInterpolator = createScrollAnimationInterpolator(value)
+  }
+
   @ReactProp(name = ReactClippingViewGroupHelper.PROP_REMOVE_CLIPPED_SUBVIEWS)
   public fun setRemoveClippedSubviews(
       view: ReactHorizontalScrollView,

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

@@ -8,6 +8,7 @@
 package com.facebook.react.views.scroll
 
 import android.animation.ObjectAnimator
+import android.animation.TimeInterpolator
 import android.animation.ValueAnimator
 import android.content.Context
 import android.graphics.Canvas
@@ -207,6 +208,10 @@ constructor(context: Context, private val fpsListener: FpsListener? = null) :
   private var scrollsChildToFocus = true
   internal var snapToItemPadding: Int = 0
   internal var scrollAnimationEnabled: Boolean = true
+  /** Values <= 0 keep the platform default duration. */
+  internal var scrollAnimationDuration: Int = 0
+  /** `null` keeps the platform default curve. */
+  internal var scrollAnimationInterpolator: TimeInterpolator? = null
   private var blockScrollDelta: Boolean = false
 
   init {
@@ -264,6 +269,8 @@ constructor(context: Context, private val fpsListener: FpsListener? = null) :
     scrollsChildToFocus = true
     snapToItemPadding = 0
     scrollAnimationEnabled = true
+    scrollAnimationDuration = 0
+    scrollAnimationInterpolator = null
     blockScrollDelta = false
   }
 
@@ -505,12 +512,21 @@ constructor(context: Context, private val fpsListener: FpsListener? = null) :
       val currentFocused = findFocus()
       val nextFocused = FocusFinder.getInstance().findNextFocus(this, currentFocused, direction)
       if (nextFocused != null && nextFocused !== currentFocused && nextFocused !== this) {
-        nextFocused.requestFocus(direction)
+        if (nextFocused.requestFocus(direction)) {
+          ReactScrollViewHelper.playFocusNavigationSoundEffect(this, direction)
+        }
         return true
       }
       return false
     }
-    return super.arrowScroll(direction)
+
+    val focusedBeforeScroll = findFocus()
+    val handled = super.arrowScroll(direction)
+    // super.arrowScroll() can scroll without moving focus, so only click when focus moved.
+    if (handled && findFocus() !== focusedBeforeScroll) {
+      ReactScrollViewHelper.playFocusNavigationSoundEffect(this, direction)
+    }
+    return handled
   }
 
   /**
@@ -1374,7 +1390,13 @@ constructor(context: Context, private val fpsListener: FpsListener? = null) :
 
   override fun startFlingAnimator(start: Int, end: Int) {
     defaultFlingAnimator.cancel()
-    val duration = ReactScrollViewHelper.getDefaultScrollAnimationDuration(context)
+    // The animator is reused, so the interpolator must be re-applied on every call to undo whatever
+    // a previous `scrollAnimationEasing` left on it.
+    val duration =
+        if (scrollAnimationDuration > 0) scrollAnimationDuration
+        else ReactScrollViewHelper.getDefaultScrollAnimationDuration(context)
+    defaultFlingAnimator.interpolator =
+        scrollAnimationInterpolator ?: ReactScrollViewHelper.getDefaultScrollAnimationInterpolator()
     defaultFlingAnimator.setDuration(duration.toLong()).setIntValues(start, end)
     defaultFlingAnimator.start()
 

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

@@ -8,19 +8,24 @@
 package com.facebook.react.views.scroll
 
 import android.animation.Animator
+import android.animation.TimeInterpolator
 import android.animation.ValueAnimator
 import android.content.Context
 import android.graphics.Point
 import android.graphics.Rect
 import android.os.Build
+import android.view.SoundEffectConstants
 import android.view.View
 import android.view.ViewGroup
+import android.view.animation.AccelerateDecelerateInterpolator
+import android.view.animation.PathInterpolator
 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
 import com.facebook.react.bridge.ReactContext
+import com.facebook.react.bridge.ReadableArray
 import com.facebook.react.bridge.WritableMap
 import com.facebook.react.bridge.WritableNativeMap
 import com.facebook.react.common.ReactConstants
@@ -67,6 +72,11 @@ public object ReactScrollViewHelper {
   private var SMOOTH_SCROLL_DURATION = 250
   private var smoothScrollDurationInitialized = false
 
+  // The curve `ValueAnimator` applies when no interpolator is set, kept here so the reused fling
+  // animator can be reset to it once a custom `scrollAnimationEasing` is cleared.
+  private val defaultScrollAnimationInterpolator: TimeInterpolator =
+      AccelerateDecelerateInterpolator()
+
   /** Shared by [ReactScrollView] and [ReactHorizontalScrollView]. */
   @JvmStatic
   public fun <T> emitScrollEvent(scrollView: T, xVelocity: Float, yVelocity: Float)
@@ -225,6 +235,35 @@ public object ReactScrollViewHelper {
     return SMOOTH_SCROLL_DURATION
   }
 
+  /** Curve used by the fling animator when `scrollAnimationEasing` is not set. */
+  @JvmStatic
+  public fun getDefaultScrollAnimationInterpolator(): TimeInterpolator =
+      defaultScrollAnimationInterpolator
+
+  /**
+   * Builds the `scrollAnimationEasing` curve from the CSS cubic-bezier control points `[x1, y1, x2,
+   * y2]` sent by JS. Returns `null` when the value is missing or does not describe a usable curve,
+   * so callers fall back to [getDefaultScrollAnimationInterpolator].
+   */
+  @JvmStatic
+  public fun createScrollAnimationInterpolator(controlPoints: ReadableArray?): TimeInterpolator? {
+    if (controlPoints == null || controlPoints.size() != 4) {
+      return null
+    }
+    return try {
+      PathInterpolator(
+          controlPoints.getDouble(0).toFloat(),
+          controlPoints.getDouble(1).toFloat(),
+          controlPoints.getDouble(2).toFloat(),
+          controlPoints.getDouble(3).toFloat(),
+      )
+    } catch (e: IllegalArgumentException) {
+      // PathInterpolator rejects curves that leave 0..1 on x or loop back on themselves.
+      FLog.w(ReactConstants.TAG, e, "Invalid scrollAnimationEasing control points")
+      null
+    }
+  }
+
   /**
    * Adds a scroll listener.
    *
@@ -574,6 +613,29 @@ public object ReactScrollViewHelper {
     return host.findViewById(nextFocusableViewId)
   }
 
+  /**
+   * Plays the system focus navigation sound for a D-pad move the scroll view handled itself.
+   *
+   * ViewRootImpl only sonifies focus moves it performs, so any key event a scroll view consumes
+   * (which it does as soon as its content is scrollable) navigates silently. Call this after a
+   * successful requestFocus to keep the click consistent. It is a no-op when the user has system
+   * sounds off.
+   */
+  @JvmStatic
+  public fun playFocusNavigationSoundEffect(view: View, @FocusDirection direction: Int) {
+    val soundConstant =
+        when (direction) {
+          View.FOCUS_UP,
+          View.FOCUS_BACKWARD -> SoundEffectConstants.NAVIGATION_UP
+          View.FOCUS_DOWN,
+          View.FOCUS_FORWARD -> SoundEffectConstants.NAVIGATION_DOWN
+          View.FOCUS_LEFT -> SoundEffectConstants.NAVIGATION_LEFT
+          View.FOCUS_RIGHT -> SoundEffectConstants.NAVIGATION_RIGHT
+          else -> return
+        }
+    view.playSoundEffect(soundConstant)
+  }
+
   /**
    * Walks up the view hierarchy from the focused view to find a ReactViewGroup with
    * either scrollSnapAlign or scrollSnapOffset set. Returns a Triple of (snapTarget,

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

@@ -41,6 +41,7 @@ import com.facebook.react.views.scroll.ReactScrollViewCommandHelper.Companion.re
 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.createScrollAnimationInterpolator
 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
@@ -158,6 +159,18 @@ constructor(private val fpsListener: FpsListener? = null) :
     view.scrollAnimationEnabled = value
   }
 
+  @ReactProp(name = "scrollAnimationDuration")
+  public fun setScrollAnimationDuration(view: ReactScrollView, value: Float) {
+    // Exposed as a float because of the JavaScript interface, see `snapToInterval`.
+    view.scrollAnimationDuration = value.toInt()
+  }
+
+  @ReactProp(name = "scrollAnimationEasing")
+  public fun setScrollAnimationEasing(view: ReactScrollView, value: ReadableArray?) {
+    // Resolved here rather than per frame: the curve only changes when the prop does.
+    view.scrollAnimationInterpolator = createScrollAnimationInterpolator(value)
+  }
+
   @ReactProp(name = ReactClippingViewGroupHelper.PROP_REMOVE_CLIPPED_SUBVIEWS)
   public fun setRemoveClippedSubviews(view: ReactScrollView, removeClippedSubviews: Boolean) {
     view.removeClippedSubviews = removeClippedSubviews

package/ReactCommon/cxxreact/ReactNativeVersion.h

@@ -14,14 +14,14 @@
 
 #define REACT_NATIVE_VERSION_MAJOR 0
 #define REACT_NATIVE_VERSION_MINOR 87
-#define REACT_NATIVE_VERSION_PATCH 0
+#define REACT_NATIVE_VERSION_PATCH 1
 
 namespace facebook::react {
 
 struct ReactNativeVersionType {
   int32_t Major = 0;
   int32_t Minor = 87;
-  int32_t Patch = 0;
+  int32_t Patch = 1;
   std::string_view Prerelease = "0";
 };
 

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

@@ -55,6 +55,18 @@ HostPlatformScrollViewProps::HostPlatformScrollViewProps(
           rawProps,
           "snapToItemPadding",
           sourceProps.snapToItemPadding,
+          {})),
+      scrollAnimationDuration(convertRawProp(
+          context,
+          rawProps,
+          "scrollAnimationDuration",
+          sourceProps.scrollAnimationDuration,
+          {})),
+      scrollAnimationEasing(convertRawProp(
+          context,
+          rawProps,
+          "scrollAnimationEasing",
+          sourceProps.scrollAnimationEasing,
           {})) {}
 
 void HostPlatformScrollViewProps::setProp(
@@ -76,6 +88,8 @@ void HostPlatformScrollViewProps::setProp(
     RAW_SET_PROP_SWITCH_CASE_BASIC(overScrollMode);
     RAW_SET_PROP_SWITCH_CASE_BASIC(endFillColor);
     RAW_SET_PROP_SWITCH_CASE_BASIC(snapToItemPadding);
+    RAW_SET_PROP_SWITCH_CASE_BASIC(scrollAnimationDuration);
+    RAW_SET_PROP_SWITCH_CASE_BASIC(scrollAnimationEasing);
   }
 }
 
@@ -394,6 +408,18 @@ folly::dynamic HostPlatformScrollViewProps::getDiffProps(
     result["snapToItemPadding"] = snapToItemPadding;
   }
 
+  if (scrollAnimationDuration != oldProps->scrollAnimationDuration) {
+    result["scrollAnimationDuration"] = scrollAnimationDuration;
+  }
+
+  if (scrollAnimationEasing != oldProps->scrollAnimationEasing) {
+    auto scrollAnimationEasingArray = folly::dynamic::array();
+    for (const auto& controlPoint : scrollAnimationEasing) {
+      scrollAnimationEasingArray.push_back(controlPoint);
+    }
+    result["scrollAnimationEasing"] = scrollAnimationEasingArray;
+  }
+
   return result;
 }
 

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

@@ -35,6 +35,9 @@ class HostPlatformScrollViewProps : public BaseScrollViewProps {
 
   Float snapToItemPadding{0};
 
+  Float scrollAnimationDuration{0};
+  std::vector<Float> scrollAnimationEasing{};
+
 #pragma mark - DebugStringConvertible
 
 #if RN_DEBUG_STRING_CONVERTIBLE

package/ReactCommon/react/renderer/textlayoutmanager/platform/ios/react/renderer/textlayoutmanager/RCTFontUtils.mm

@@ -361,7 +361,7 @@ UIFont *RCTFontWithFontProperties(RCTFontProperties fontProperties)
       font = [UIFont fontWithName:fontProperties.family size:effectiveFontSize];
       if (font != nullptr) {
         fontNames = [UIFont fontNamesForFamilyName:font.familyName];
-        fontWeight = (fontWeight != 0.0) ?: RCTGetFontWeight(font);
+        fontWeight = (fontWeight != 0.0) ? fontWeight : RCTGetFontWeight(font);
       } else {
         // Failback to system font.
         font = RCTDefaultFontWithFontProperties(fontProperties);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "react-native-tvos",
-  "version": "0.87.0-0",
+  "version": "0.87.1-0",
   "description": "A framework for building native apps using React",
   "license": "MIT",
   "repository": {
@@ -155,18 +155,18 @@
     }
   },
   "dependencies": {
-    "@react-native/asset-utils": "0.87.0",
-    "@react-native/codegen": "0.87.0",
-    "@react-native/community-cli-plugin": "0.87.0",
-    "@react-native/gradle-plugin": "0.87.0",
-    "@react-native/normalize-colors": "0.87.0",
+    "@react-native/asset-utils": "0.87.1",
+    "@react-native/codegen": "0.87.1",
+    "@react-native/community-cli-plugin": "0.87.1",
+    "@react-native/gradle-plugin": "0.87.1",
+    "@react-native/normalize-colors": "0.87.1",
     "anser": "^1.4.9",
     "ansi-regex": "^5.0.0",
     "babel-plugin-syntax-hermes-parser": "0.36.1",
     "base64-js": "^1.5.1",
     "commander": "^12.0.0",
     "flow-enums-runtime": "^0.0.6",
-    "hermes-compiler": "250829098.0.16",
+    "hermes-compiler": "250829098.0.17",
     "invariant": "^2.2.4",
     "memoize-one": "^5.0.0",
     "metro-runtime": "^0.87.0",
@@ -184,7 +184,7 @@
     "whatwg-fetch": "^3.0.0",
     "ws": "^7.5.10",
     "yargs": "^17.6.2",
-    "@react-native-tvos/virtualized-lists": "0.87.0-0"
+    "@react-native-tvos/virtualized-lists": "0.87.1-0"
   },
   "codegenConfig": {
     "libraries": [

package/scripts/cocoapods/rndependencies.rb

@@ -6,7 +6,6 @@
 require "json"
 require 'net/http'
 require 'rexml/document'
-require 'shellwords'
 
 require_relative './utils.rb'
 
@@ -34,38 +33,26 @@ def add_rn_third_party_dependencies(s)
             s.dependency "RCT-Folly/Fabric"
         end
 
-        header_search_paths = current_pod_target_xcconfig["HEADER_SEARCH_PATHS"] || []
-
-        if header_search_paths.is_a?(String)
-            header_search_paths = Shellwords.shellsplit(header_search_paths)
-        end
-
-        header_search_paths << "$(PODS_ROOT)/glog"
-        header_search_paths << "$(PODS_ROOT)/boost"
-        header_search_paths << "$(PODS_ROOT)/DoubleConversion"
-        header_search_paths << "$(PODS_ROOT)/fast_float/include"
-        header_search_paths << "$(PODS_ROOT)/fmt/include"
-        header_search_paths << "$(PODS_ROOT)/SocketRocket"
-        header_search_paths << "$(PODS_ROOT)/RCT-Folly"
-
-        # uniq so a second call on the same spec can't duplicate entries.
-        current_pod_target_xcconfig["HEADER_SEARCH_PATHS"] = header_search_paths.uniq
+        ReactNativeDependenciesUtils.append_header_search_paths(current_pod_target_xcconfig, [
+            "$(PODS_ROOT)/glog",
+            "$(PODS_ROOT)/boost",
+            "$(PODS_ROOT)/DoubleConversion",
+            "$(PODS_ROOT)/fast_float/include",
+            "$(PODS_ROOT)/fmt/include",
+            "$(PODS_ROOT)/SocketRocket",
+            "$(PODS_ROOT)/RCT-Folly",
+        ])
     else
         # Prebuilt-deps mode: this pod SELF-SERVES the third-party headers from its
         # own xcframework (incl. SocketRocket - sole supplier in this mode). See
         # scripts/cocoapods/__docs__/prebuilt-deps.md for the full contract.
         s.dependency "ReactNativeDependencies"
 
-        header_search_paths = current_pod_target_xcconfig["HEADER_SEARCH_PATHS"] || []
-        if header_search_paths.is_a?(String)
-            header_search_paths = Shellwords.shellsplit(header_search_paths)
-        end
         # Artifact headers are flattened into the pod-local Headers/ by the podspec
         # prepare_command (see __docs__/prebuilt-deps.md).
-        header_search_paths << "$(PODS_ROOT)/ReactNativeDependencies/Headers"
-
-        # uniq so a second call on the same spec can't duplicate entries.
-        current_pod_target_xcconfig["HEADER_SEARCH_PATHS"] = header_search_paths.uniq
+        ReactNativeDependenciesUtils.append_header_search_paths(current_pod_target_xcconfig, [
+            "$(PODS_ROOT)/ReactNativeDependencies/Headers",
+        ])
     end
 
     s.pod_target_xcconfig = current_pod_target_xcconfig
@@ -148,6 +135,25 @@ class ReactNativeDependenciesUtils
         end
     end
 
+    # Xcode splits HEADER_SEARCH_PATHS on whitespace, so every path we add is
+    # quoted - PODS_ROOT can expand to a directory with spaces in its name.
+    # Paths already in the xcconfig are left untouched: they carry the podspec
+    # author's own quoting, and re-quoting them would break it.
+    def self.append_header_search_paths(xcconfig, paths)
+        quoted = paths.map { |path| "\"#{path}\"" }
+        existing = xcconfig["HEADER_SEARCH_PATHS"]
+
+        # reject so a second call on the same spec can't duplicate entries.
+        case existing
+        when nil
+            xcconfig["HEADER_SEARCH_PATHS"] = quoted
+        when Array
+            xcconfig["HEADER_SEARCH_PATHS"] = existing + quoted.reject { |path| existing.include?(path) }
+        else
+            xcconfig["HEADER_SEARCH_PATHS"] = ([existing] + quoted.reject { |path| existing.include?(path) }).join(" ")
+        end
+    end
+
     def self.abort_if_use_local_rndeps_with_no_file()
       if !File.exist?(ENV["RCT_USE_LOCAL_RN_DEP"])
         abort("RCT_USE_LOCAL_RN_DEP is set to #{ENV["RCT_USE_LOCAL_RN_DEP"]} but the file does not exist!")

package/scripts/replace-rncore-version.js

@@ -18,6 +18,9 @@ const yargs = require('yargs');
 
 const LAST_BUILD_FILENAME = 'React-Core-prebuilt/.last_build_configuration';
 
+// Not a valid configuration, so finding it means the swap did not finish.
+const REPLACEMENT_IN_PROGRESS = 'in-progress';
+
 function validateBuildConfiguration(configuration /*: string */) {
   if (!['Debug', 'Release'].includes(configuration)) {
     throw new Error(`Invalid configuration ${configuration}`);
@@ -42,10 +45,12 @@ function shouldReplaceRnCoreConfiguration(configuration /*: string */) {
       );
       return false;
     }
+    return true;
   }
 
-  // Assumption: if there is no stored last build, we assume that it was build for debug.
-  if (!fileExists && configuration === 'Debug') {
+  // With no marker the on-disk flavor is Debug: the podspec installs the debug
+  // tarball (see resolve_podspec_source in scripts/cocoapods/rncore.rb).
+  if (configuration === 'Debug') {
     console.log(
       'No previous build detected, but Debug Configuration. No need to replace React-Core-prebuilt',
     );
@@ -130,6 +135,10 @@ function updateLastBuildConfiguration(configuration /*: string */) {
   fs.writeFileSync(LAST_BUILD_FILENAME, configuration);
 }
 
+function markReplacementInProgress() /*: void */ {
+  fs.writeFileSync(LAST_BUILD_FILENAME, REPLACEMENT_IN_PROGRESS);
+}
+
 function main(
   configuration /*: string */,
   version /*: string */,
@@ -139,9 +148,16 @@ function main(
   validateVersion(version);
 
   if (!shouldReplaceRnCoreConfiguration(configuration)) {
+    // A fresh install leaves no marker; record the flavor we skipped on.
+    if (!fs.existsSync(LAST_BUILD_FILENAME)) {
+      updateLastBuildConfiguration(configuration);
+    }
     return;
   }
 
+  // Invalidate before touching the framework so an interrupted swap is
+  // detectable on the next run.
+  markReplacementInProgress();
   replaceRNCoreConfiguration(configuration, version, podsRoot);
   updateLastBuildConfiguration(configuration);
   console.log('Done replacing React Native prebuilt');

package/scripts/setup-apple-spm.js

@@ -44,8 +44,10 @@
  * directing you to `--deintegrate`).
  *
  * Options:
- *   --version <ver>             React Native version (default: the resolved
- *                               node_modules/react-native version).
+ *   --version <ver>             React Native version. Pinned into
+ *                               .spm-injected.json and reused by later runs
+ *                               until a new one is passed (default: the
+ *                               resolved node_modules/react-native version).
  *   --yes                       Skip the dirty-pbxproj confirmation prompt.
  *   [add] --xcodeproj <path>    Which .xcodeproj to inject into (when several).
  *   [add] --product-name <name> Which app target to inject into (when several).
@@ -96,6 +98,7 @@ const {
   cleanupLeftoverPodsGroup,
   findInjectedXcodeproj,
   injectSpmIntoExistingXcodeproj,
+  readArtifactsVersionOverride,
   readPinnedConfigCommand,
   removeSpmInjection,
 } = require('./spm/generate-spm-xcodeproj');
@@ -153,7 +156,7 @@ function parseArgs(argv /*: Array<string> */) /*: SetupArgs */ {
     .option('version', {
       type: 'string',
       describe:
-        'React Native version (e.g. 0.80.0). Defaults to the version in node_modules/react-native/package.json',
+        'React Native version (e.g. 0.80.0). Sticks: later runs reuse it until you pass a new one. Defaults to the version in node_modules/react-native/package.json',
     })
     .option('yes', {
       type: 'boolean',
@@ -377,19 +380,31 @@ function resolveReactNativeRoot(
   return reactNativeRoot;
 }
 
+// Explicit `--version` → the version an earlier `--version` pinned into the
+// injection marker → node_modules/react-native/package.json. The pin makes
+// `--version` stick for later flagless runs, which would otherwise re-point the
+// project at a different artifact slot than the one it was wired to.
 function determineVersion(
   args /*: SetupArgs */,
   reactNativeRoot /*: string */,
+  appRoot /*: string */,
 ) /*: string */ {
-  let version = args.version;
-  if (version == null) {
-    // $FlowFixMe[incompatible-type] JSON.parse returns any
-    const pkgJson /*: {version: string} */ = JSON.parse(
-      fs.readFileSync(path.join(reactNativeRoot, 'package.json'), 'utf8'),
+  if (args.version != null) {
+    return args.version;
+  }
+  const pinned = readArtifactsVersionOverride(appRoot);
+  if (pinned != null) {
+    log(
+      `Using version ${pinned} pinned in ${SPM_INJECTED_MARKER} by an earlier ` +
+        '--version. Pass --version to change it.',
     );
-    version = pkgJson.version;
+    return pinned;
   }
-  return version;
+  // $FlowFixMe[incompatible-type] JSON.parse returns any
+  const pkgJson /*: {version: string} */ = JSON.parse(
+    fs.readFileSync(path.join(reactNativeRoot, 'package.json'), 'utf8'),
+  );
+  return pkgJson.version;
 }
 
 function runCodegenStep(
@@ -442,7 +457,7 @@ async function runScaffold(
   // a comment — that's how SPM's manifest hash bumps on slot transitions.
   let cacheSlotLabel /*: ?string */ = null;
   try {
-    const rawVersion = args.version ?? determineVersion(args, reactNativeRoot);
+    const rawVersion = determineVersion(args, reactNativeRoot, appRoot);
     const slotVersion = await resolveCacheSlotVersion(rawVersion);
     cacheSlotLabel = `${slotVersion}/dual-flavor`;
   } catch {
@@ -1094,7 +1109,7 @@ async function main(argv /*:: ?: Array<string> */) /*: Promise<void> */ {
     autolinkingConfigResult,
     projectRoot,
   );
-  const version = determineVersion(args, reactNativeRoot);
+  const version = determineVersion(args, reactNativeRoot, appRoot);
   log(`React Native version: ${version}`);
 
   // Resolve remote SPM mode ONCE up front. remotePackageConfig throws
@@ -1256,6 +1271,7 @@ if (require.main === module) {
 module.exports = {
   main,
   detectStandardRnLayoutRedirect,
+  determineVersion,
   findInjectedXcodeproj,
   generateAutolinkingConfigOrFailClosed,
   parseArgs,