@depup/react-native 0.86.2-depup.0 → 0.87.1-depup.0

package/ReactCommon/react/renderer/uimanager/UIManager.cpp

@@ -76,20 +76,23 @@ std::shared_ptr<ShadowNode> UIManager::createNode(
       {.tag = tag,
        .surfaceId = surfaceId,
        .instanceHandle = std::move(instanceHandle)});
-  const auto props = componentDescriptor.cloneProps(
+  auto props = componentDescriptor.cloneProps(
       propsParserContext, nullptr, std::move(rawProps));
-  const auto state = componentDescriptor.createInitialState(props, family);
+  auto state = componentDescriptor.createInitialState(props, family);
+
+  // Add a "name" prop if this is the fallback component
+  if (fallbackDescriptor != nullptr &&
+      fallbackDescriptor->getComponentHandle() ==
+          componentDescriptor.getComponentHandle()) {
+    props = componentDescriptor.cloneProps(
+        propsParserContext,
+        props,
+        RawProps(folly::dynamic::object("name", name)));
+  }
 
   auto shadowNode = componentDescriptor.createShadowNode(
       ShadowNodeFragment{
-          .props = fallbackDescriptor != nullptr &&
-                  fallbackDescriptor->getComponentHandle() ==
-                      componentDescriptor.getComponentHandle()
-              ? componentDescriptor.cloneProps(
-                    propsParserContext,
-                    props,
-                    RawProps(folly::dynamic::object("name", name)))
-              : props,
+          .props = props,
           .children = ShadowNodeFragment::childrenPlaceholder(),
           .state = state,
       },
@@ -212,7 +215,8 @@ void UIManager::completeSurface(
     // after we commit a specific one.
     lazyShadowTreeRevisionConsistencyManager_->updateCurrentRevision(surfaceId);
 
-    if (ReactNativeFeatureFlags::useSharedAnimatedBackend()) {
+    if (ReactNativeFeatureFlags::useSharedAnimatedBackend() &&
+        animationBackend_) {
       animationBackend_->clearRegistry(surfaceId);
     }
   }
@@ -277,10 +281,6 @@ ShadowTree::Unique UIManager::stopSurface(SurfaceId surfaceId) const {
   // Stop any ongoing layout animations.
   stopSurfaceForAnimationDelegate(surfaceId);
 
-  if (ReactNativeFeatureFlags::useSharedAnimatedBackend()) {
-    animationBackend_->clearRegistryOnSurfaceStop(surfaceId);
-  }
-
   // Waiting for all concurrent commits to be finished and unregistering the
   // `ShadowTree`.
   auto shadowTree = getShadowTreeRegistry().remove(surfaceId);
@@ -297,6 +297,18 @@ ShadowTree::Unique UIManager::stopSurface(SurfaceId surfaceId) const {
       leakChecker_->stopSurface(surfaceId);
     }
   }
+
+  if (ReactNativeFeatureFlags::useSharedAnimatedBackend()) {
+    runtimeExecutor_(
+        [surfaceId,
+         animationBackendWeak = std::weak_ptr<UIManagerAnimationBackend>(
+             animationBackend_)](jsi::Runtime& /*runtime*/) {
+          if (auto animationBackend = animationBackendWeak.lock()) {
+            animationBackend->clearRegistryOnSurfaceStop(surfaceId);
+          }
+        });
+  }
+
   return shadowTree;
 }
 
@@ -535,30 +547,8 @@ std::shared_ptr<const ShadowNode> UIManager::findShadowNodeByTag_DEPRECATED(
   auto shadowNode = std::shared_ptr<const ShadowNode>{};
 
   shadowTreeRegistry_.enumerate([&](const ShadowTree& shadowTree, bool& stop) {
-    // Obtain a pointer to the root node. The flag-gated path uses
-    // getCurrentRevision() which keeps the root alive via shared_ptr for
-    // the entire traversal, fixing a use-after-free race condition.
-    RootShadowNode::Shared rootShadowNodeHolder;
-    const RootShadowNode* rootShadowNode = nullptr;
-    if (ReactNativeFeatureFlags::fixFindShadowNodeByTagRaceCondition()) {
-      rootShadowNodeHolder = shadowTree.getCurrentRevision().rootShadowNode;
-      rootShadowNode = rootShadowNodeHolder.get();
-    } else {
-      // TODO(T257154369): Remove after flag rollout.
-      // The public interface of `ShadowTree` discourages accessing a stored
-      // pointer to a root node because of the possible data race.
-      // To work around this, we ask for a commit and immediately cancel it
-      // returning `nullptr` instead of a new shadow tree.
-      // We don't want to add a way to access a stored pointer to a root
-      // node because this `findShadowNodeByTag` is deprecated. It is only
-      // added to make migration to the new architecture easier.
-      shadowTree.tryCommit(
-          [&](const RootShadowNode& oldRootShadowNode) {
-            rootShadowNode = &oldRootShadowNode;
-            return nullptr;
-          },
-          {/* default commit options */});
-    }
+    auto rootShadowNodeHolder = shadowTree.getCurrentRevision().rootShadowNode;
+    const auto* rootShadowNode = rootShadowNodeHolder.get();
 
     if (rootShadowNode != nullptr) {
       const auto& children = rootShadowNode->getChildren();
@@ -783,10 +773,10 @@ void UIManager::removeEventListener(
   }
 }
 
-void UIManager::setOnSurfaceStartCallback(
+void UIManager::addOnSurfaceStartCallback(
     UIManagerDelegate::OnSurfaceStartCallback&& callback) {
   if (delegate_ != nullptr) {
-    delegate_->uiManagerShouldSetOnSurfaceStartCallback(std::move(callback));
+    delegate_->uiManagerShouldAddOnSurfaceStartCallback(std::move(callback));
   }
 }
 

package/ReactCommon/react/renderer/uimanager/UIManager.h

@@ -223,8 +223,8 @@ class UIManager final : public ShadowTreeDelegate {
 
   void removeEventListener(const std::shared_ptr<const EventListener> &listener);
 
-#pragma mark - Set on surface start callback
-  void setOnSurfaceStartCallback(UIManagerDelegate::OnSurfaceStartCallback &&callback);
+#pragma mark - Add on surface start callback
+  void addOnSurfaceStartCallback(UIManagerDelegate::OnSurfaceStartCallback &&callback);
 
  private:
   friend class UIManagerBinding;

package/ReactCommon/react/renderer/uimanager/UIManagerDelegate.h

@@ -95,7 +95,7 @@ class UIManagerDelegate {
   virtual void uiManagerDidPromoteReactRevision(const ShadowTree &shadowTree) = 0;
 
   using OnSurfaceStartCallback = std::function<void(const ShadowTree &shadowTree)>;
-  virtual void uiManagerShouldSetOnSurfaceStartCallback(OnSurfaceStartCallback &&callback) = 0;
+  virtual void uiManagerShouldAddOnSurfaceStartCallback(OnSurfaceStartCallback &&callback) = 0;
 
   // View transition bitmap snapshot capture and application.
   virtual void uiManagerDidCaptureViewSnapshot(Tag tag, SurfaceId surfaceId) = 0;

package/ReactCommon/react/renderer/uimanager/tests/FindShadowNodeByTagTest.cpp

@@ -11,8 +11,6 @@
 
 #include <gtest/gtest.h>
 #include <jsi/jsi.h>
-#include <react/featureflags/ReactNativeFeatureFlags.h>
-#include <react/featureflags/ReactNativeFeatureFlagsDefaults.h>
 #include <react/renderer/core/ShadowNodeFragment.h>
 #include <react/renderer/element/Element.h>
 #include <react/renderer/element/testUtils.h>
@@ -20,20 +18,9 @@
 
 namespace facebook::react {
 
-class FindShadowNodeByTagTestFeatureFlags
-    : public ReactNativeFeatureFlagsDefaults {
- public:
-  bool fixFindShadowNodeByTagRaceCondition() override {
-    return true;
-  }
-};
-
 class FindShadowNodeByTagTest : public ::testing::Test {
  public:
   FindShadowNodeByTagTest() {
-    ReactNativeFeatureFlags::override(
-        std::make_unique<FindShadowNodeByTagTestFeatureFlags>());
-
     contextContainer_ = std::make_shared<ContextContainer>();
 
     ComponentDescriptorProviderRegistry componentDescriptorProviderRegistry{};
@@ -66,7 +53,6 @@ class FindShadowNodeByTagTest : public ::testing::Test {
     if (!surfaceStopped_) {
       uiManager_->stopSurface(surfaceId_);
     }
-    ReactNativeFeatureFlags::dangerouslyReset();
   }
 
  protected:
@@ -99,7 +85,7 @@ class FindShadowNodeByTagTest : public ::testing::Test {
               .tag(viewTag_)
               .surfaceId(surfaceId_)
               .props([] {
-                auto sharedProps = std::make_shared<ViewShadowNodeProps>();
+                auto sharedProps = std::make_shared<ViewProps>();
                 auto& yogaStyle = sharedProps->yogaStyle;
                 yogaStyle.setDimension(
                     yoga::Dimension::Width,
@@ -167,43 +153,6 @@ TEST_F(FindShadowNodeByTagTest, FindNonExistentNode) {
   EXPECT_EQ(found, nullptr);
 }
 
-TEST_F(
-    FindShadowNodeByTagTest,
-    RawPointerFromTryCommitDanglesAfterSurfaceStop) {
-  // Observe root lifetime via weak_ptr
-  std::weak_ptr<const RootShadowNode> weakRoot;
-  {
-    auto rev = shadowTreePtr_->getCurrentRevision();
-    weakRoot = rev.rootShadowNode;
-  }
-  ASSERT_FALSE(weakRoot.expired());
-
-  // Simulate the old (buggy) pattern: capture raw pointer via tryCommit.
-  // This is exactly what findShadowNodeByTag_DEPRECATED used to do.
-  const RootShadowNode* rawPtr = nullptr;
-  shadowTreePtr_->tryCommit(
-      [&](const RootShadowNode& oldRoot) {
-        rawPtr = &oldRoot;
-        return nullptr; // cancel commit
-      },
-      {});
-  ASSERT_NE(rawPtr, nullptr);
-  ASSERT_EQ(rawPtr, weakRoot.lock().get());
-
-  // Stop the surface — releases all internal references (ShadowTree's
-  // currentRevision_ and MountingCoordinator's baseRevision_)
-  {
-    auto tree = uiManager_->stopSurface(surfaceId_);
-    surfaceStopped_ = true;
-    // tree goes out of scope here, destroying ShadowTree + MountingCoordinator
-  }
-
-  // Old root is now destroyed. rawPtr is dangling.
-  EXPECT_TRUE(weakRoot.expired())
-      << "Old root should be destroyed after surface stop, "
-         "proving that the raw pointer captured from tryCommit is dangling";
-}
-
 TEST_F(FindShadowNodeByTagTest, SharedPtrFromRevisionSurvivesSurfaceStop) {
   // The fixed pattern: getCurrentRevision() returns a shared_ptr copy
   auto revision = shadowTreePtr_->getCurrentRevision();

package/ReactCommon/react/renderer/uimanager/tests/PointerEventsProcessorTest.cpp

@@ -101,7 +101,7 @@ class PointerEventsProcessorTest : public ::testing::Test {
               .surfaceId(surfaceId_)
               .reference(nodeA_)
               .props([] {
-                auto sharedProps = std::make_shared<ViewShadowNodeProps>();
+                auto sharedProps = std::make_shared<ViewProps>();
                 auto &props = *sharedProps;
                 listenToAllPointerEvents(props);
                 auto &yogaStyle = props.yogaStyle;
@@ -119,7 +119,7 @@ class PointerEventsProcessorTest : public ::testing::Test {
                   .surfaceId(surfaceId_)
                   .reference(nodeAA_)
                   .props([] {
-                    auto sharedProps = std::make_shared<ViewShadowNodeProps>();
+                    auto sharedProps = std::make_shared<ViewProps>();
                     auto &props = *sharedProps;
                     listenToAllPointerEvents(props);
                     auto &yogaStyle = props.yogaStyle;
@@ -133,7 +133,7 @@ class PointerEventsProcessorTest : public ::testing::Test {
               .surfaceId(surfaceId_)
               .reference(nodeB_)
               .props([] {
-                auto sharedProps = std::make_shared<ViewShadowNodeProps>();
+                auto sharedProps = std::make_shared<ViewProps>();
                 auto &props = *sharedProps;
                 listenToAllPointerEvents(props);
                 auto &yogaStyle = props.yogaStyle;
@@ -151,7 +151,7 @@ class PointerEventsProcessorTest : public ::testing::Test {
                   .surfaceId(surfaceId_)
                   .reference(nodeBB_)
                   .props([] {
-                    auto sharedProps = std::make_shared<ViewShadowNodeProps>();
+                    auto sharedProps = std::make_shared<ViewProps>();
                     auto &props = *sharedProps;
                     listenToAllPointerEvents(props);
                     auto &yogaStyle = props.yogaStyle;

package/ReactCommon/react/renderer/viewtransition/ViewTransitionModule.cpp

@@ -7,6 +7,7 @@
 
 #include "ViewTransitionModule.h"
 
+#include <cxxreact/TraceSection.h>
 #include <glog/logging.h>
 #include <react/renderer/components/root/RootShadowNode.h>
 #include <react/renderer/core/LayoutableShadowNode.h>
@@ -17,6 +18,19 @@
 
 namespace facebook::react {
 
+namespace {
+
+RawProps makePseudoElementRawProps(
+    const ViewTransitionModule::AnimationKeyFrameViewLayoutMetrics& metrics) {
+  return RawProps(
+      folly::dynamic::object("position", "absolute")(
+          "left", metrics.originFromRoot.x)("top", metrics.originFromRoot.y)(
+          "width", metrics.size.width)("height", metrics.size.height)(
+          "pointerEvents", "none")("opacity", 0)("collapsable", false));
+}
+
+} // namespace
+
 ViewTransitionModule::~ViewTransitionModule() {
   if (uiManager_ != nullptr) {
     if (uiManager_->getViewTransitionDelegate() == this) {
@@ -45,7 +59,7 @@ void ViewTransitionModule::initialize(
         });
 
     // Register on surfaces started in the future
-    uiManager_->setOnSurfaceStartCallback(
+    uiManager_->addOnSurfaceStartCallback(
         [weakThis](const ShadowTree& shadowTree) {
           shadowTree.getMountingCoordinator()->setMountingOverrideDelegate(
               weakThis);
@@ -59,6 +73,7 @@ void ViewTransitionModule::applyViewTransitionName(
     const ShadowNode& shadowNode,
     const std::string& name,
     const std::string& /*className*/) {
+  TraceSection s("ViewTransitionModule::applyViewTransitionName", "name", name);
   auto tag = shadowNode.getTag();
   auto surfaceId = shadowNode.getSurfaceId();
 
@@ -73,14 +88,22 @@ void ViewTransitionModule::applyViewTransitionName(
       .size = layoutMetrics.frame.size,
       .pointScaleFactor = layoutMetrics.pointScaleFactor};
 
-  nameRegistry_[tag].insert(name);
-
-  // If applyViewTransitionName is called after transition started, this is the
-  // "new" state (end snapshot). Otherwise, this is the "old" state (start
-  // snapshot)
-  if (!transitionStarted_) {
+  // Calls outside mutationCallback are from the before-mutation phase (old
+  // state for an upcoming transition). Assign a provisional next transition ID
+  // so startViewTransitionEnd cleanup preserves these entries.
+  auto currentTransitionId =
+      insideMutationCallback_ ? activeTransitionId_ : activeTransitionId_ + 1;
+  nameRegistry_[tag].names.insert(name);
+  nameRegistry_[tag].transitionId = currentTransitionId;
+
+  // Old state: called outside mutationCallback (before-mutation phase).
+  // New state: called inside mutationCallback (after-mutation phase).
+  if (!insideMutationCallback_) {
     AnimationKeyFrameView oldView{
-        .layoutMetrics = keyframeMetrics, .tag = tag, .surfaceId = surfaceId};
+        .layoutMetrics = keyframeMetrics,
+        .tag = tag,
+        .surfaceId = surfaceId,
+        .transitionId = currentTransitionId};
     oldLayout_[name] = oldView;
 
     // Request the platform to capture a bitmap snapshot of the old view
@@ -88,6 +111,10 @@ void ViewTransitionModule::applyViewTransitionName(
     if (uiManager_ != nullptr) {
       auto* delegate = uiManager_->getDelegate();
       if (delegate != nullptr) {
+        TraceSection snapshotSection(
+            "ViewTransitionModule::applyViewTransitionName - uiManagerDidCaptureViewSnapshot",
+            "name",
+            name);
         delegate->uiManagerDidCaptureViewSnapshot(tag, surfaceId);
       }
     }
@@ -98,6 +125,11 @@ void ViewTransitionModule::applyViewTransitionName(
       auto& pseudoElementsBySourceTag = it->second;
       auto innerIt = pseudoElementsBySourceTag.find(tag);
 
+      TraceSection clonePseudoElementSection(
+          "ViewTransitionModule::applyViewTransitionName - maybeClonePseudoElement",
+          "name",
+          name);
+
       if (innerIt != pseudoElementsBySourceTag.end()) {
         // Only clone the pseudo-element if the layout metrics changed
         // since it was last created/refreshed (e.g. due to scrolling or
@@ -109,13 +141,7 @@ void ViewTransitionModule::applyViewTransitionName(
                 keyframeMetrics.originFromRoot.y ||
             cachedMetrics.size.width != keyframeMetrics.size.width ||
             cachedMetrics.size.height != keyframeMetrics.size.height) {
-          auto updatedRawProps = RawProps(
-              folly::dynamic::object("left", keyframeMetrics.originFromRoot.x)(
-                  "top", keyframeMetrics.originFromRoot.y)(
-                  "width", keyframeMetrics.size.width)(
-                  "height", keyframeMetrics.size.height)(
-                  "pointerEvents", "none")("opacity", 0)("collapsable", false)(
-                  "position", "absolute"));
+          auto updatedRawProps = makePseudoElementRawProps(keyframeMetrics);
 
           auto updatedNode = uiManager_->cloneNode(
               *innerIt->second.node,
@@ -140,7 +166,10 @@ void ViewTransitionModule::applyViewTransitionName(
 
   } else {
     AnimationKeyFrameView newView{
-        .layoutMetrics = keyframeMetrics, .tag = tag, .surfaceId = surfaceId};
+        .layoutMetrics = keyframeMetrics,
+        .tag = tag,
+        .surfaceId = surfaceId,
+        .transitionId = activeTransitionId_};
     newLayout_[name] = newView;
   }
 }
@@ -148,6 +177,8 @@ void ViewTransitionModule::applyViewTransitionName(
 void ViewTransitionModule::createViewTransitionInstance(
     const std::string& name,
     Tag pseudoElementTag) {
+  TraceSection s(
+      "ViewTransitionModule::createViewTransitionInstance", "name", name);
   if (uiManager_ == nullptr) {
     return;
   }
@@ -171,31 +202,17 @@ void ViewTransitionModule::createViewTransitionInstance(
 
   // Build props: absolute position matching old element, non-interactive
   if (pseudoElementTag > 0 && view.tag > 0) {
-    // Create a base node with layout props via createNode
     // TODO: T262559684 created dedicated shadow node type for old pseudo
     // element
-    auto rawProps = RawProps(
-        folly::dynamic::object("position", "absolute")(
-            "left", view.layoutMetrics.originFromRoot.x)(
-            "top", view.layoutMetrics.originFromRoot.y)(
-            "width", view.layoutMetrics.size.width)(
-            "height", view.layoutMetrics.size.height)("pointerEvents", "none")(
-            "opacity", 0)("collapsable", false));
-
-    auto baseNode = uiManager_->createNode(
+    auto rawProps = makePseudoElementRawProps(view.layoutMetrics);
+
+    auto pseudoElementNode = uiManager_->createNode(
         pseudoElementTag,
         "View",
         view.surfaceId,
         std::move(rawProps),
         nullptr /* instanceHandle */);
 
-    if (baseNode == nullptr) {
-      return;
-    }
-
-    // Clone the shadow node — bitmap will be set by platform
-    auto pseudoElementNode = baseNode->clone({});
-
     if (pseudoElementNode != nullptr) {
       if (!forNextTransition) {
         oldPseudoElementNodes_[name] = pseudoElementNode;
@@ -216,6 +233,7 @@ RootShadowNode::Unshared ViewTransitionModule::shadowTreeWillCommit(
   if (oldPseudoElementNodes_.empty()) {
     return newRootShadowNode;
   }
+  TraceSection s("ViewTransitionModule::shadowTreeWillCommit");
 
   auto surfaceId = shadowTree.getSurfaceId();
 
@@ -323,12 +341,14 @@ void ViewTransitionModule::cancelViewTransitionName(
 
 void ViewTransitionModule::restoreViewTransitionName(
     const ShadowNode& shadowNode) {
-  nameRegistry_[shadowNode.getTag()].merge(
+  nameRegistry_[shadowNode.getTag()].names.merge(
       cancelledNameRegistry_[shadowNode.getTag()]);
   cancelledNameRegistry_.erase(shadowNode.getTag());
 }
 
 void ViewTransitionModule::applySnapshotsOnPseudoElementShadowNodes() {
+  TraceSection s(
+      "ViewTransitionModule::applySnapshotsOnPseudoElementShadowNodes");
   if (oldPseudoElementNodes_.empty() || uiManager_ == nullptr) {
     return;
   }
@@ -349,6 +369,7 @@ void ViewTransitionModule::applySnapshotsOnPseudoElementShadowNodes() {
 
 LayoutMetrics ViewTransitionModule::captureLayoutMetricsFromRoot(
     const ShadowNode& shadowNode) {
+  TraceSection s("ViewTransitionModule::captureLayoutMetricsFromRoot");
   if (uiManager_ == nullptr) {
     return EmptyLayoutMetrics;
   }
@@ -394,13 +415,22 @@ void ViewTransitionModule::startViewTransition(
 
   // Mark transition as started
   transitionStarted_ = true;
+  activeTransitionId_ = ++transitionIdCounter_;
+
+  TraceSection s(
+      "ViewTransitionModule::startViewTransition",
+      "transitionId",
+      activeTransitionId_);
+
   pendingAnimationIds_.clear();
   onCompleteCallback_ = onCompleteCallback;
 
   // Call mutation callback (including commitRoot, measureInstance,
   // applyViewTransitionName, createViewTransitionInstance for old & new)
   if (mutationCallback) {
+    insideMutationCallback_ = true;
     mutationCallback();
+    insideMutationCallback_ = false;
   }
 
   applySnapshotsOnPseudoElementShadowNodes();
@@ -449,13 +479,32 @@ void ViewTransitionModule::suspendOnActiveViewTransition() {
 }
 
 void ViewTransitionModule::startViewTransitionEnd() {
-  for (const auto& [tag, names] : nameRegistry_) {
-    for (const auto& name : names) {
-      oldLayout_.erase(name);
-      newLayout_.erase(name);
+  TraceSection s(
+      "ViewTransitionModule::startViewTransitionEnd",
+      "transitionId",
+      activeTransitionId_);
+  auto finishedId = activeTransitionId_;
+
+  // Only clear layout and registry entries belonging to the finished
+  // transition. A suspended transition's before-mutation phase may have
+  // already written entries with a newer transitionId — preserve those.
+  for (auto it = nameRegistry_.begin(); it != nameRegistry_.end();) {
+    if (it->second.transitionId == finishedId) {
+      for (const auto& name : it->second.names) {
+        if (auto oit = oldLayout_.find(name);
+            oit != oldLayout_.end() && oit->second.transitionId == finishedId) {
+          oldLayout_.erase(oit);
+        }
+        if (auto nit = newLayout_.find(name);
+            nit != newLayout_.end() && nit->second.transitionId == finishedId) {
+          newLayout_.erase(nit);
+        }
+      }
+      it = nameRegistry_.erase(it);
+    } else {
+      ++it;
     }
   }
-  nameRegistry_.clear();
   oldPseudoElementNodes_.clear();
 
   // Clear any pending bitmap snapshots that were captured but never consumed.

package/ReactCommon/react/renderer/viewtransition/ViewTransitionModule.h

@@ -98,17 +98,25 @@ class ViewTransitionModule : public UIManagerViewTransitionDelegate,
     AnimationKeyFrameViewLayoutMetrics layoutMetrics;
     Tag tag{0};
     SurfaceId surfaceId{0};
+    uint32_t transitionId{0};
   };
 
  private:
+  uint32_t transitionIdCounter_{0};
+  uint32_t activeTransitionId_{0};
+
   // registry of layout of old/new views
   std::unordered_map<std::string, AnimationKeyFrameView> oldLayout_{};
   std::unordered_map<std::string, AnimationKeyFrameView> newLayout_{};
-  // tag -> names registry, populated during applyViewTransitionName
+  // tag -> (names, transitionId) registry, populated during applyViewTransitionName
   // Note that tag and name are not 1:1 mapping
   // - In some nested composition 2 names are mappped to the same tag
   // - tags of old and new views are mapped to the same name(s)
-  std::unordered_map<Tag, std::unordered_set<std::string>> nameRegistry_{};
+  struct NameRegistryEntry {
+    std::unordered_set<std::string> names;
+    uint32_t transitionId{0};
+  };
+  std::unordered_map<Tag, NameRegistryEntry> nameRegistry_{};
 
   // used for cancel/restore viewTransitionName
   std::unordered_map<Tag, std::unordered_set<std::string>> cancelledNameRegistry_{};
@@ -138,6 +146,8 @@ class ViewTransitionModule : public UIManagerViewTransitionDelegate,
 
   bool transitionStarted_{false};
 
+  bool insideMutationCallback_{false};
+
   bool transitionReadyFinished_{false};
 
   // When suspendNextTransition_ is true and a transition is active, the next

package/ReactCommon/react/runtime/PlatformTimerRegistry.h

@@ -8,9 +8,12 @@
 #pragma once
 
 #include <cstdint>
+#include <memory>
 
 namespace facebook::react {
 
+class TimerManager;
+
 /**
  * This interface is implemented by each platform.
  * Responsibility: Call into some platform API to register/schedule, or delete
@@ -27,6 +30,13 @@ class PlatformTimerRegistry {
   virtual ~PlatformTimerRegistry() noexcept = default;
 
   virtual void quit() {}
+
+  /**
+   * Provides the owning TimerManager so the registry can fire due timers via
+   * TimerManager::callTimer. The default is a no-op for platforms that wire the
+   * TimerManager through other means.
+   */
+  virtual void setTimerManager(std::weak_ptr<TimerManager> /*timerManager*/) {}
 };
 
 using TimerManagerDelegate = PlatformTimerRegistry;

package/ReactCommon/react/runtime/React-RuntimeCore.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/runtime/React-RuntimeHermes.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")