react-native-tvos 0.86.2-0 → 0.87.0-0

package/ReactCommon/react/nativemodule/featureflags/NativeReactNativeFeatureFlags.h

@@ -4,7 +4,7 @@
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
  *
- * @generated SignedSource<<1df283aec4b56f36271a187341e7103d>>
+ * @generated SignedSource<<86a4b76371a4005f7083c3806d53cc87>>
  */
 
 /**
@@ -60,6 +60,8 @@ class NativeReactNativeFeatureFlags
 
   bool enableAccumulatedUpdatesInRawPropsAndroid(jsi::Runtime& runtime);
 
+  bool enableAndroidFontWeightAdjustment(jsi::Runtime& runtime);
+
   bool enableAndroidTextMeasurementOptimizations(jsi::Runtime& runtime);
 
   bool enableBridgelessArchitecture(jsi::Runtime& runtime);
@@ -70,12 +72,8 @@ class NativeReactNativeFeatureFlags
 
   bool enableDestroyShadowTreeRevisionAsync(jsi::Runtime& runtime);
 
-  bool enableDifferentiatorMutationVectorPreallocation(jsi::Runtime& runtime);
-
   bool enableDoubleMeasurementFixAndroid(jsi::Runtime& runtime);
 
-  bool enableEagerMainQueueModulesOnIOS(jsi::Runtime& runtime);
-
   bool enableEagerRootViewAttachment(jsi::Runtime& runtime);
 
   bool enableExclusivePropsUpdateAndroid(jsi::Runtime& runtime);
@@ -84,10 +82,12 @@ class NativeReactNativeFeatureFlags
 
   bool enableFabricLogs(jsi::Runtime& runtime);
 
-  bool enableFabricRenderer(jsi::Runtime& runtime);
+  bool enableFlexboxAutoMinSizeInStrictMode(jsi::Runtime& runtime);
 
   bool enableFontScaleChangesUpdatingLayout(jsi::Runtime& runtime);
 
+  bool enableIOSCompressedTextFrameAdjustment(jsi::Runtime& runtime);
+
   bool enableIOSTextBaselineOffsetPerLine(jsi::Runtime& runtime);
 
   bool enableIOSViewClipToPaddingBox(jsi::Runtime& runtime);
@@ -108,22 +108,20 @@ class NativeReactNativeFeatureFlags
 
   bool enableLayoutAnimationsOnIOS(jsi::Runtime& runtime);
 
-  bool enableMainQueueCoordinatorOnIOS(jsi::Runtime& runtime);
-
   bool enableModuleArgumentNSNullConversionIOS(jsi::Runtime& runtime);
 
   bool enableMutationObserverByDefault(jsi::Runtime& runtime);
 
   bool enableNativeCSSParsing(jsi::Runtime& runtime);
 
-  bool enableNativeViewPropTransformations(jsi::Runtime& runtime);
-
   bool enableNetworkEventReporting(jsi::Runtime& runtime);
 
   bool enablePreparedTextLayout(jsi::Runtime& runtime);
 
   bool enablePropsUpdateReconciliationAndroid(jsi::Runtime& runtime);
 
+  bool enableRuntimeSchedulerQueueClearingOnError(jsi::Runtime& runtime);
+
   bool enableSchedulerDelegateInvalidation(jsi::Runtime& runtime);
 
   bool enableSwiftUIBasedFilters(jsi::Runtime& runtime);
@@ -142,12 +140,8 @@ class NativeReactNativeFeatureFlags
 
   bool enableVirtualViewContainerStateExperimental(jsi::Runtime& runtime);
 
-  bool enableVirtualViewDebugFeatures(jsi::Runtime& runtime);
-
   bool fixDifferentiatorParentTagForUnflattenCase(jsi::Runtime& runtime);
 
-  bool fixFindShadowNodeByTagRaceCondition(jsi::Runtime& runtime);
-
   bool fixMappingOfEventPrioritiesBetweenFabricAndReact(jsi::Runtime& runtime);
 
   bool fixYogaFlexBasisFitContentInMainAxis(jsi::Runtime& runtime);
@@ -162,7 +156,7 @@ class NativeReactNativeFeatureFlags
 
   bool fuseboxScreenshotCaptureEnabled(jsi::Runtime& runtime);
 
-  bool hideOffscreenVirtualViewsOnIOS(jsi::Runtime& runtime);
+  bool optimizedAnimatedPropUpdates(jsi::Runtime& runtime);
 
   bool overrideBySynchronousMountPropsAtMountingAndroid(jsi::Runtime& runtime);
 
@@ -196,28 +190,22 @@ class NativeReactNativeFeatureFlags
 
   bool useFabricInterop(jsi::Runtime& runtime);
 
-  bool useLISAlgorithmInDifferentiator(jsi::Runtime& runtime);
-
   bool useNativeViewConfigsInBridgelessMode(jsi::Runtime& runtime);
 
   bool useNestedScrollViewAndroid(jsi::Runtime& runtime);
 
-  bool useOptimizedViewRegistryOnAndroid(jsi::Runtime& runtime);
-
   bool useSharedAnimatedBackend(jsi::Runtime& runtime);
 
   bool useTraitHiddenOnAndroid(jsi::Runtime& runtime);
 
   bool useTurboModuleInterop(jsi::Runtime& runtime);
 
-  bool useTurboModules(jsi::Runtime& runtime);
-
-  bool useUnorderedMapInDifferentiator(jsi::Runtime& runtime);
-
   double viewCullingOutsetRatio(jsi::Runtime& runtime);
 
   bool viewTransitionEnabled(jsi::Runtime& runtime);
 
+  bool viewTransitionUseHardwareBitmapAndroid(jsi::Runtime& runtime);
+
   double virtualViewPrerenderRatio(jsi::Runtime& runtime);
 };
 

package/ReactCommon/react/nativemodule/featureflags/React-featureflagsnativemodule.podspec

@@ -8,7 +8,7 @@ require "json"
 package = JSON.parse(File.read(File.join(__dir__, "..", "..", "..", "..", "package.json")))
 version = package['version']
 
-source = { :git => 'https://github.com/react/react-native.git' }
+source = { :git => 'https://github.com/facebook/react-native.git' }
 if version == '1000.0.0'
   # This is an unpublished version, use the latest commit hash of the react-native repo, which we’re presumably in.
   source[:commit] = `git rev-parse HEAD`.strip if system("git rev-parse --git-dir > /dev/null 2>&1")

package/ReactCommon/react/nativemodule/idlecallbacks/React-idlecallbacksnativemodule.podspec

@@ -8,7 +8,7 @@ require "json"
 package = JSON.parse(File.read(File.join(__dir__, "..", "..", "..", "..", "package.json")))
 version = package['version']
 
-source = { :git => 'https://github.com/react/react-native.git' }
+source = { :git => 'https://github.com/facebook/react-native.git' }
 if version == '1000.0.0'
   # This is an unpublished version, use the latest commit hash of the react-native repo, which we’re presumably in.
   source[:commit] = `git rev-parse HEAD`.strip if system("git rev-parse --git-dir > /dev/null 2>&1")
@@ -48,6 +48,7 @@ Pod::Spec.new do |s|
   add_rncore_dependency(s)
 
   s.dependency "ReactCommon/turbomodule/core"
+  s.dependency "React-bridging"
   s.dependency "React-runtimescheduler"
   add_dependency(s, "React-RCTFBReactNativeSpec")
   add_dependency(s, "React-runtimeexecutor", :additional_framework_paths => ["platform/ios"])

package/ReactCommon/react/nativemodule/intersectionobserver/React-intersectionobservernativemodule.podspec

@@ -8,7 +8,7 @@ require "json"
 package = JSON.parse(File.read(File.join(__dir__, "..", "..", "..", "..", "package.json")))
 version = package['version']
 
-source = { :git => 'https://github.com/react/react-native.git' }
+source = { :git => 'https://github.com/facebook/react-native.git' }
 if version == '1000.0.0'
   # This is an unpublished version, use the latest commit hash of the react-native repo, which we're presumably in.
   source[:commit] = `git rev-parse HEAD`.strip if system("git rev-parse --git-dir > /dev/null 2>&1")
@@ -55,6 +55,7 @@ Pod::Spec.new do |s|
   add_rncore_dependency(s)
 
   s.dependency "ReactCommon/turbomodule/core"
+  s.dependency "React-bridging"
 
   s.dependency "React-Fabric"
   s.dependency "React-Fabric/bridging"

package/ReactCommon/react/nativemodule/microtasks/React-microtasksnativemodule.podspec

@@ -8,7 +8,7 @@ require "json"
 package = JSON.parse(File.read(File.join(__dir__, "..", "..", "..", "..", "package.json")))
 version = package['version']
 
-source = { :git => 'https://github.com/react/react-native.git' }
+source = { :git => 'https://github.com/facebook/react-native.git' }
 if version == '1000.0.0'
   # This is an unpublished version, use the latest commit hash of the react-native repo, which we’re presumably in.
   source[:commit] = `git rev-parse HEAD`.strip if system("git rev-parse --git-dir > /dev/null 2>&1")

package/ReactCommon/react/nativemodule/mutationobserver/NativeMutationObserver.cpp

@@ -143,8 +143,11 @@ void NativeMutationObserver::notifyMutationObserversIfNecessary() {
 
   if (dispatchNotification) {
     TraceSection s("NativeMutationObserver::notifyObservers");
+#ifndef RCT_REMOVE_LEGACY_ARCH
     if (ReactNativeFeatureFlags::enableBridgelessArchitecture()) {
+#endif
       runtime_->queueMicrotask(notifyMutationObservers_.value());
+#ifndef RCT_REMOVE_LEGACY_ARCH
     } else {
       jsInvoker_->invokeAsync([&](jsi::Runtime& runtime) {
         // It's possible that the last observer was disconnected before we could
@@ -154,6 +157,7 @@ void NativeMutationObserver::notifyMutationObserversIfNecessary() {
         }
       });
     }
+#endif
   }
 }
 

package/ReactCommon/react/nativemodule/mutationobserver/React-mutationobservernativemodule.podspec

@@ -8,7 +8,7 @@ require "json"
 package = JSON.parse(File.read(File.join(__dir__, "..", "..", "..", "..", "package.json")))
 version = package['version']
 
-source = { :git => 'https://github.com/react/react-native.git' }
+source = { :git => 'https://github.com/facebook/react-native.git' }
 if version == '1000.0.0'
   # This is an unpublished version, use the latest commit hash of the react-native repo, which we're presumably in.
   source[:commit] = `git rev-parse HEAD`.strip if system("git rev-parse --git-dir > /dev/null 2>&1")
@@ -55,6 +55,7 @@ Pod::Spec.new do |s|
   add_rncore_dependency(s)
 
   s.dependency "ReactCommon/turbomodule/core"
+  s.dependency "React-bridging"
 
   s.dependency "React-Fabric"
   s.dependency "React-Fabric/bridging"

package/ReactCommon/react/nativemodule/samples/ReactCommon-Samples.podspec

@@ -8,7 +8,7 @@ require "json"
 package = JSON.parse(File.read(File.join(__dir__, "..", "..", "..", "..", "package.json")))
 version = package['version']
 
-source = { :git => 'https://github.com/react/react-native.git' }
+source = { :git => 'https://github.com/facebook/react-native.git' }
 if version == '1000.0.0'
   # This is an unpublished version, use the latest commit hash of the react-native repo, which we’re presumably in.
   source[:commit] = `git rev-parse HEAD`.strip if system("git rev-parse --git-dir > /dev/null 2>&1")

package/ReactCommon/react/nativemodule/samples/platform/ios/ReactCommon/RCTSampleTurboModule.h

@@ -7,7 +7,7 @@
 
 #import <Foundation/Foundation.h>
 
-#import "RCTNativeSampleTurboModuleSpec.h"
+#import <FBReactNativeSpec/FBReactNativeSpec.h>
 
 /**
  * Sample iOS-specific impl of a TurboModule, conforming to the spec protocol.

package/ReactCommon/react/nativemodule/viewtransition/React-viewtransitionnativemodule.podspec

@@ -8,7 +8,7 @@ require "json"
 package = JSON.parse(File.read(File.join(__dir__, "..", "..", "..", "..", "package.json")))
 version = package['version']
 
-source = { :git => 'https://github.com/react/react-native.git' }
+source = { :git => 'https://github.com/facebook/react-native.git' }
 if version == '1000.0.0'
   # This is an unpublished version, use the latest commit hash of the react-native repo, which we're presumably in.
   source[:commit] = `git rev-parse HEAD`.strip if system("git rev-parse --git-dir > /dev/null 2>&1")

package/ReactCommon/react/nativemodule/webperformance/React-webperformancenativemodule.podspec

@@ -8,7 +8,7 @@ require "json"
 package = JSON.parse(File.read(File.join(__dir__, "..", "..", "..", "..", "package.json")))
 version = package['version']
 
-source = { :git => 'https://github.com/react/react-native.git' }
+source = { :git => 'https://github.com/facebook/react-native.git' }
 if version == '1000.0.0'
   # This is an unpublished version, use the latest commit hash of the react-native repo, which we’re presumably in.
   source[:commit] = `git rev-parse HEAD`.strip if system("git rev-parse --git-dir > /dev/null 2>&1")
@@ -52,6 +52,7 @@ Pod::Spec.new do |s|
   add_rncore_dependency(s)
 
   s.dependency "ReactCommon/turbomodule/core"
+  s.dependency "React-bridging"
 
   add_dependency(s, "React-RCTFBReactNativeSpec")
   add_dependency(s, "React-performancetimeline")

package/ReactCommon/react/networking/React-networking.podspec

@@ -8,7 +8,7 @@ require "json"
 package = JSON.parse(File.read(File.join(__dir__, "..", "..", "..", "package.json")))
 version = package['version']
 
-source = { :git => 'https://github.com/react/react-native.git' }
+source = { :git => 'https://github.com/facebook/react-native.git' }
 if version == '1000.0.0'
   # This is an unpublished version, use the latest commit hash of the react-native repo, which we’re presumably in.
   source[:commit] = `git rev-parse HEAD`.strip if system("git rev-parse --git-dir > /dev/null 2>&1")

package/ReactCommon/react/performance/cdpmetrics/React-performancecdpmetrics.podspec

@@ -8,7 +8,7 @@ require "json"
 package = JSON.parse(File.read(File.join(__dir__, "..", "..", "..", "..", "package.json")))
 version = package['version']
 
-source = { :git => 'https://github.com/react/react-native.git' }
+source = { :git => 'https://github.com/facebook/react-native.git' }
 if version == '1000.0.0'
   # This is an unpublished version, use the latest commit hash of the react-native repo, which we’re presumably in.
   source[:commit] = `git rev-parse HEAD`.strip if system("git rev-parse --git-dir > /dev/null 2>&1")

package/ReactCommon/react/performance/timeline/React-performancetimeline.podspec

@@ -8,7 +8,7 @@ require "json"
 package = JSON.parse(File.read(File.join(__dir__, "..", "..", "..", "..", "package.json")))
 version = package['version']
 
-source = { :git => 'https://github.com/react/react-native.git' }
+source = { :git => 'https://github.com/facebook/react-native.git' }
 if version == '1000.0.0'
   # This is an unpublished version, use the latest commit hash of the react-native repo, which we’re presumably in.
   source[:commit] = `git rev-parse HEAD`.strip if system("git rev-parse --git-dir > /dev/null 2>&1")

package/ReactCommon/react/renderer/animated/NativeAnimatedNodesManager.cpp

@@ -73,7 +73,8 @@ NativeAnimatedNodesManager::NativeAnimatedNodesManager(
     StartOnRenderCallback&& startOnRenderCallback,
     StopOnRenderCallback&& stopOnRenderCallback,
     FrameRateListenerCallback&& frameRateListenerCallback) noexcept
-    : directManipulationCallback_(std::move(directManipulationCallback)),
+    : useSharedAnimatedBackend_(false),
+      directManipulationCallback_(std::move(directManipulationCallback)),
       fabricCommitCallback_(std::move(fabricCommitCallback)),
       resolvePlatformColor_(std::move(resolvePlatformColor)),
       startOnRenderCallback_(std::move(startOnRenderCallback)),
@@ -97,7 +98,7 @@ NativeAnimatedNodesManager::NativeAnimatedNodesManager(
 
 NativeAnimatedNodesManager::NativeAnimatedNodesManager(
     std::shared_ptr<UIManagerAnimationBackend> animationBackend) noexcept
-    : animationBackend_(animationBackend) {}
+    : animationBackend_(animationBackend), useSharedAnimatedBackend_(true) {}
 
 NativeAnimatedNodesManager::~NativeAnimatedNodesManager() noexcept {
   stopRenderCallbackIfNeeded(true);
@@ -228,6 +229,9 @@ void NativeAnimatedNodesManager::connectAnimatedNodeToView(
       connectedAnimatedNodes_.insert({viewTag, propsNodeTag});
     }
     updatedNodeTags_.insert(node->tag());
+    // Seed props_ so getManagedProps() is live at mount, without staging a
+    // commit.
+    node->collectProps();
   } else {
     LOG(WARNING)
         << "Cannot ConnectAnimatedNodeToView, animated node has to be props type";
@@ -256,7 +260,7 @@ void NativeAnimatedNodesManager::disconnectAnimatedNodeFromView(
   auto node = getAnimatedNode<PropsAnimatedNode>(propsNodeTag);
   if (node != nullptr) {
     node->disconnectFromView(viewTag);
-    if (ReactNativeFeatureFlags::useSharedAnimatedBackend()) {
+    if (useSharedAnimatedBackend_) {
       node->disconnectFromShadowNodeFamily();
     }
     {
@@ -521,7 +525,7 @@ void NativeAnimatedNodesManager::handleAnimatedEvent(
     // That's why, in case this is called from the UI thread, we need to
     // proactivelly trigger the animation loop to avoid showing stale
     // frames.
-    if (ReactNativeFeatureFlags::useSharedAnimatedBackend()) {
+    if (useSharedAnimatedBackend_) {
       if (auto animationBackend = animationBackend_.lock()) {
         animationBackend->pushAnimationMutations(
             [this](AnimationTimestamp timestamp) -> AnimationMutations {
@@ -550,61 +554,84 @@ NativeAnimatedNodesManager::ensureEventEmitterListener() noexcept {
 }
 
 void NativeAnimatedNodesManager::startRenderCallbackIfNeeded(bool isAsync) {
-  // This method can be called from either the UI thread or JavaScript thread.
-  // It ensures `startOnRenderCallback_` is called exactly once using atomic
-  // operations. We use std::atomic_bool rather than std::mutex to avoid
-  // potential deadlocks that could occur if we called external code while
-  // holding a mutex.
-  auto isRenderCallbackStarted = isRenderCallbackStarted_.exchange(true);
-  if (isRenderCallbackStarted) {
-    // onRender callback is already started.
-    return;
-  }
-
-  if (ReactNativeFeatureFlags::useSharedAnimatedBackend()) {
-    if (auto animationBackend = animationBackend_.lock()) {
-      auto weak = weak_from_this();
-      animationBackendCallbackId_ = animationBackend->start(
-          [weak](AnimationTimestamp timestamp) -> AnimationMutations {
-            if (auto self = weak.lock()) {
-              return self->pullAnimationMutations(timestamp);
-            }
-            return {};
-          });
+  if (!useSharedAnimatedBackend_) {
+    // This method can be called from either the UI thread or JavaScript thread.
+    // It ensures `startOnRenderCallback_` is called exactly once using atomic
+    // operations. We use std::atomic_bool rather than std::mutex to avoid
+    // potential deadlocks that could occur if we called external code while
+    // holding a mutex.
+    auto isRenderCallbackStarted = isRenderCallbackStarted_.exchange(true);
+    if (isRenderCallbackStarted) {
+      // onRender callback is already started.
+      return;
+    }
+    if (startOnRenderCallback_) {
+      startOnRenderCallback_([this]() { onRender(); }, isAsync);
     }
-
     return;
   }
 
-  if (startOnRenderCallback_) {
-    startOnRenderCallback_([this]() { onRender(); }, isAsync);
+  {
+    auto animationBackend = animationBackend_.lock();
+    if (!animationBackend) {
+      return;
+    }
+    // AnimationBackend::start registers the callback before returning the id.
+    // Keep registration and id publication in one critical section; otherwise a
+    // concurrent stop can observe no id and leave the registered callback
+    // orphaned in the backend.
+    std::lock_guard<std::mutex> lock(animationBackendCallbackMutex_);
+    if (animationBackendCallbackId_.has_value()) {
+      return;
+    }
+    auto weak = weak_from_this();
+    auto callbackId = animationBackend->start(
+        [weak](AnimationTimestamp timestamp) -> AnimationMutations {
+          if (auto self = weak.lock()) {
+            return self->pullAnimationMutations(timestamp);
+          }
+          return {};
+        });
+    animationBackendCallbackId_ = callbackId;
   }
 }
 
 void NativeAnimatedNodesManager::stopRenderCallbackIfNeeded(
     bool isAsync) noexcept {
-  // When multiple threads reach this point, only one thread should call
-  // stopOnRenderCallback_. This synchronization is primarily needed during
-  // destruction of NativeAnimatedNodesManager. In normal operation,
-  // stopRenderCallbackIfNeeded is always called from the UI thread.
-  auto isRenderCallbackStarted = isRenderCallbackStarted_.exchange(false);
-
-  if (ReactNativeFeatureFlags::useSharedAnimatedBackend()) {
+  if (!useSharedAnimatedBackend_) {
+    // When multiple threads reach this point, only one thread should call
+    // stopOnRenderCallback_. This synchronization is primarily needed during
+    // destruction of NativeAnimatedNodesManager. In normal operation,
+    // stopRenderCallbackIfNeeded is always called from the UI thread.
+    auto isRenderCallbackStarted = isRenderCallbackStarted_.exchange(false);
     if (isRenderCallbackStarted) {
-      if (auto animationBackend = animationBackend_.lock()) {
-        animationBackend->stop(animationBackendCallbackId_);
+      if (stopOnRenderCallback_) {
+        stopOnRenderCallback_(isAsync);
+
+        if (frameRateListenerCallback_) {
+          frameRateListenerCallback_(false);
+        }
       }
     }
     return;
   }
 
-  if (isRenderCallbackStarted) {
-    if (stopOnRenderCallback_) {
-      stopOnRenderCallback_(isAsync);
-
-      if (frameRateListenerCallback_) {
-        frameRateListenerCallback_(false);
+  {
+    auto animationBackend = animationBackend_.lock();
+    CallbackId callbackId = 0;
+    {
+      std::lock_guard<std::mutex> lock(animationBackendCallbackMutex_);
+      if (!animationBackendCallbackId_.has_value()) {
+        return;
       }
+      // Clear the published id while holding the same mutex that protects
+      // start registration. This makes a concurrent start either see an active
+      // callback or wait until this stop owns the callback id.
+      callbackId = *animationBackendCallbackId_;
+      animationBackendCallbackId_.reset();
+    }
+    if (animationBackend) {
+      animationBackend->stop(callbackId);
     }
   }
 }
@@ -922,7 +949,7 @@ void NativeAnimatedNodesManager::schedulePropsCommit(
     bool layoutStyleUpdated,
     bool forceFabricCommit,
     ShadowNodeFamily::Weak shadowNodeFamily) noexcept {
-  if (ReactNativeFeatureFlags::useSharedAnimatedBackend()) {
+  if (useSharedAnimatedBackend_) {
     if (forceFabricCommit) {
       shouldRequestAsyncFlush_.insert(viewTag);
     }
@@ -1029,7 +1056,7 @@ AnimationMutations NativeAnimatedNodesManager::onAnimationFrameForBackend(
 
 AnimationMutations NativeAnimatedNodesManager::pullAnimationMutations(
     AnimationTimestamp timestamp) {
-  if (!ReactNativeFeatureFlags::useSharedAnimatedBackend()) {
+  if (!useSharedAnimatedBackend_) {
     return {};
   }
   TraceSection s(
@@ -1039,6 +1066,9 @@ AnimationMutations NativeAnimatedNodesManager::pullAnimationMutations(
 
   isOnRenderThread_ = true;
 
+  // Apply nodes created via the unbatched `createAnimatedNodeAsync` path.
+  flushAnimatedNodesCreatedAsync();
+
   // Run operations scheduled from AnimatedModule
   std::vector<UiTask> operations;
   {
@@ -1097,8 +1127,26 @@ AnimationMutations NativeAnimatedNodesManager::pullAnimationMutations(
   return mutations;
 }
 
+void NativeAnimatedNodesManager::flushAnimatedNodesCreatedAsync() noexcept {
+  // Flush async created animated nodes
+  std::unordered_map<Tag, std::unique_ptr<AnimatedNode>>
+      animatedNodesCreatedAsync;
+  {
+    std::lock_guard<std::mutex> lock(animatedNodesCreatedAsyncMutex_);
+    std::swap(animatedNodesCreatedAsync, animatedNodesCreatedAsync_);
+  }
+
+  if (!animatedNodesCreatedAsync.empty()) {
+    std::lock_guard<std::mutex> lock(connectedAnimatedNodesMutex_);
+    for (auto& [tag, node] : animatedNodesCreatedAsync) {
+      animatedNodes_.insert({tag, std::move(node)});
+      updatedNodeTags_.insert(tag);
+    }
+  }
+}
+
 void NativeAnimatedNodesManager::onRender() {
-  if (ReactNativeFeatureFlags::useSharedAnimatedBackend()) {
+  if (useSharedAnimatedBackend_) {
     return;
   }
   TraceSection s(
@@ -1112,23 +1160,7 @@ void NativeAnimatedNodesManager::onRender() {
 
   isOnRenderThread_ = true;
 
-  {
-    // Flush async created animated nodes
-    std::unordered_map<Tag, std::unique_ptr<AnimatedNode>>
-        animatedNodesCreatedAsync;
-    {
-      std::lock_guard<std::mutex> lock(animatedNodesCreatedAsyncMutex_);
-      std::swap(animatedNodesCreatedAsync, animatedNodesCreatedAsync_);
-    }
-
-    if (!animatedNodesCreatedAsync.empty()) {
-      std::lock_guard<std::mutex> lock(connectedAnimatedNodesMutex_);
-      for (auto& [tag, node] : animatedNodesCreatedAsync) {
-        animatedNodes_.insert({tag, std::move(node)});
-        updatedNodeTags_.insert(tag);
-      }
-    }
-  }
+  flushAnimatedNodesCreatedAsync();
 
   // Run operations scheduled from AnimatedModule
   std::vector<UiTask> operations;

package/ReactCommon/react/renderer/animated/NativeAnimatedNodesManager.h

@@ -78,6 +78,14 @@ class NativeAnimatedNodesManager : public std::enable_shared_from_this<NativeAni
   NativeAnimatedNodesManager(NativeAnimatedNodesManager &&) = delete;
   NativeAnimatedNodesManager &operator=(NativeAnimatedNodesManager &&) = delete;
 
+  // Whether this instance was constructed to use the shared AnimationBackend.
+  // Latched at construction, so it is immune to later flips of the
+  // process-global useSharedAnimatedBackend() flag.
+  bool useSharedAnimatedBackend() const noexcept
+  {
+    return useSharedAnimatedBackend_;
+  }
+
   template <typename T, typename = std::enable_if_t<std::is_base_of_v<AnimatedNode, T>>>
   T *getAnimatedNode(Tag tag) const
     requires(std::is_base_of_v<AnimatedNode, T>)
@@ -207,6 +215,8 @@ class NativeAnimatedNodesManager : public std::enable_shared_from_this<NativeAni
 
   bool onAnimationFrame(double timestamp);
 
+  void flushAnimatedNodesCreatedAsync() noexcept;
+
   bool isAnimationUpdateNeeded() const noexcept;
 
   void stopAnimationsForNode(Tag nodeTag);
@@ -217,6 +227,12 @@ class NativeAnimatedNodesManager : public std::enable_shared_from_this<NativeAni
 
   std::weak_ptr<UIManagerAnimationBackend> animationBackend_;
 
+  // Latched per-instance copy of which backend this manager uses, set from the
+  // constructor that ran (true for the shared-AnimationBackend ctor). Reads stay
+  // stable even when the global useSharedAnimatedBackend() flag is re-overridden
+  // on another RN runtime.
+  const bool useSharedAnimatedBackend_;
+
   std::unique_ptr<AnimatedNode> animatedNode(Tag tag, const folly::dynamic &config) noexcept;
 
   static thread_local bool isOnRenderThread_;
@@ -282,7 +298,10 @@ class NativeAnimatedNodesManager : public std::enable_shared_from_this<NativeAni
   bool warnedAboutGraphTraversal_ = false;
 #endif
 
-  CallbackId animationBackendCallbackId_{0};
+  // Protects the register/publish and exchange/stop lifecycle for the shared
+  // AnimationBackend callback.
+  std::mutex animationBackendCallbackMutex_;
+  std::optional<CallbackId> animationBackendCallbackId_;
 
   friend class ColorAnimatedNode;
   friend class AnimationDriver;

package/ReactCommon/react/renderer/animated/NativeAnimatedNodesManagerProvider.cpp

@@ -8,7 +8,6 @@
 #include "NativeAnimatedNodesManagerProvider.h"
 
 #include <glog/logging.h>
-#include <react/featureflags/ReactNativeFeatureFlags.h>
 #include <react/renderer/animated/MergedValueDispatcher.h>
 #include <react/renderer/animated/internal/AnimatedMountingOverrideDelegate.h>
 #include <react/renderer/animated/internal/primitives.h>
@@ -51,8 +50,9 @@ NativeAnimatedNodesManagerProvider::getOrCreate(
 
   auto* uiManager = &UIManagerBinding::getBinding(runtime)->getUIManager();
 
-  if (!ReactNativeFeatureFlags::useSharedAnimatedBackend()) {
-    // === PATH 1: Legacy Backend (useSharedAnimatedBackend = false) ===
+  auto animationBackend = uiManager->unstable_getAnimationBackend().lock();
+  if (animationBackend == nullptr) {
+    // === PATH 1: Legacy Backend (no shared AnimationBackend attached) ===
     // Uses the architecture with MergedValueDispatcher and
     // AnimatedMountingOverrideDelegate
 
@@ -119,7 +119,7 @@ NativeAnimatedNodesManagerProvider::getOrCreate(
         });
 
     // Register on surfaces started in the future
-    uiManager->setOnSurfaceStartCallback(
+    uiManager->addOnSurfaceStartCallback(
         [animatedMountingOverrideDelegate =
              std::weak_ptr<const AnimatedMountingOverrideDelegate>(
                  animatedMountingOverrideDelegate_)](
@@ -130,13 +130,10 @@ NativeAnimatedNodesManagerProvider::getOrCreate(
 
     uiManager->setNativeAnimatedDelegate(nativeAnimatedDelegate_);
   } else {
-    // === PATH 2: Shared AnimationBackend (useSharedAnimatedBackend = true) ===
+    // === PATH 2: Shared AnimationBackend ===
     // Uses the shared AnimationBackend from UIManager. The backend handles all
-    // animation commits and platform integration internally.
-
-    auto animationBackend = uiManager->unstable_getAnimationBackend().lock();
-    react_native_assert(
-        animationBackend != nullptr && "animationBackend is nullptr");
+    // animation commits and platform integration internally. It is guaranteed
+    // non-null here because it was successfully locked above.
     animationBackend->registerJSInvoker(jsInvoker);
 
     nativeAnimatedNodesManager_ =