react-native 0.84.0-nightly-20251205-95cc1e767 → 0.84.0-nightly-20251207-e4a5a56df

package/ReactCommon/react/renderer/animationbackend/AnimationBackendCommitHook.cpp

@@ -0,0 +1,69 @@
+/*
+ * 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.
+ */
+
+#include <react/renderer/animationbackend/AnimationBackendCommitHook.h>
+
+namespace facebook::react {
+
+AnimationBackendCommitHook::AnimationBackendCommitHook(
+    UIManager* uiManager,
+    std::shared_ptr<AnimatedPropsRegistry> animatedPropsRegistry)
+    : animatedPropsRegistry_(std::move(animatedPropsRegistry)) {
+  uiManager->registerCommitHook(*this);
+}
+
+RootShadowNode::Unshared AnimationBackendCommitHook::shadowTreeWillCommit(
+    const ShadowTree& shadowTree,
+    const RootShadowNode::Shared& oldRootShadowNode,
+    const RootShadowNode::Unshared& newRootShadowNode,
+    const ShadowTreeCommitOptions& commitOptions) noexcept {
+  if (commitOptions.source != ShadowTreeCommitSource::React) {
+    return newRootShadowNode;
+  }
+
+  const auto& res = animatedPropsRegistry_->getMap(shadowTree.getSurfaceId());
+  auto& surfaceFamilies = res.first;
+  auto& updates = res.second;
+
+  if (surfaceFamilies.empty()) {
+    return newRootShadowNode;
+  }
+  return std::static_pointer_cast<RootShadowNode>(
+      newRootShadowNode->cloneMultiple(
+          surfaceFamilies,
+          [&surfaceFamilies, &updates](
+              const ShadowNode& shadowNode,
+              const ShadowNodeFragment& fragment) {
+            auto newProps = ShadowNodeFragment::propsPlaceholder();
+            std::shared_ptr<BaseViewProps> viewProps = nullptr;
+            if (surfaceFamilies.contains(&shadowNode.getFamily()) &&
+                updates.contains(shadowNode.getTag())) {
+              auto& snapshot = updates.at(shadowNode.getTag());
+              if (!snapshot->propNames.empty()) {
+                PropsParserContext propsParserContext{
+                    shadowNode.getSurfaceId(),
+                    *shadowNode.getContextContainer()};
+
+                newProps = shadowNode.getComponentDescriptor().cloneProps(
+                    propsParserContext, shadowNode.getProps(), {});
+                viewProps = std::const_pointer_cast<BaseViewProps>(
+                    std::static_pointer_cast<const BaseViewProps>(newProps));
+              }
+
+              for (const auto& propName : snapshot->propNames) {
+                updateProp(propName, *viewProps, *snapshot);
+              }
+            }
+            return shadowNode.clone(
+                {.props = newProps,
+                 .children = fragment.children,
+                 .state = shadowNode.getState(),
+                 .runtimeShadowNodeReference = true});
+          }));
+}
+
+} // namespace facebook::react

package/ReactCommon/react/renderer/animationbackend/AnimationBackendCommitHook.h

@@ -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.
+ */
+
+#pragma once
+
+#include <folly/dynamic.h>
+#include <react/renderer/core/ReactPrimitives.h>
+#include <react/renderer/uimanager/UIManager.h>
+#include <react/renderer/uimanager/UIManagerCommitHook.h>
+#include "AnimatedPropsRegistry.h"
+
+namespace facebook::react {
+
+class AnimationBackendCommitHook : public UIManagerCommitHook {
+  std::shared_ptr<AnimatedPropsRegistry> animatedPropsRegistry_;
+
+ public:
+  AnimationBackendCommitHook(UIManager *uiManager, std::shared_ptr<AnimatedPropsRegistry> animatedPropsRegistry);
+  RootShadowNode::Unshared shadowTreeWillCommit(
+      const ShadowTree &shadowTree,
+      const RootShadowNode::Shared &oldRootShadowNode,
+      const RootShadowNode::Unshared &newRootShadowNode,
+      const ShadowTreeCommitOptions &commitOptions) noexcept override;
+  void commitHookWasRegistered(const UIManager &uiManager) noexcept override {}
+  void commitHookWasUnregistered(const UIManager &uiManager) noexcept override {}
+};
+
+} // namespace facebook::react

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

@@ -205,6 +205,12 @@ void UIManager::completeSurface(
       // after we commit a specific one.
       lazyShadowTreeRevisionConsistencyManager_->updateCurrentRevision(
           surfaceId, shadowTree.getCurrentRevision().rootShadowNode);
+
+      if (ReactNativeFeatureFlags::useSharedAnimatedBackend()) {
+        if (auto animationBackend = animationBackend_.lock()) {
+          animationBackend->clearRegistry(surfaceId);
+        }
+      }
     }
   });
 }

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

@@ -19,6 +19,7 @@ class UIManagerAnimationBackend {
   virtual void onAnimationFrame(double timestamp) = 0;
   // TODO: T240293839 Move over start() function and mutation types
   virtual void stop(bool isAsync) = 0;
+  virtual void clearRegistry(SurfaceId surfaceId) = 0;
 };
 
 } // namespace facebook::react

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "react-native",
-  "version": "0.84.0-nightly-20251205-95cc1e767",
+  "version": "0.84.0-nightly-20251207-e4a5a56df",
   "description": "A framework for building native apps using React",
   "license": "MIT",
   "repository": {
@@ -160,13 +160,13 @@
   },
   "dependencies": {
     "@jest/create-cache-key-function": "^29.7.0",
-    "@react-native/assets-registry": "0.84.0-nightly-20251205-95cc1e767",
-    "@react-native/codegen": "0.84.0-nightly-20251205-95cc1e767",
-    "@react-native/community-cli-plugin": "0.84.0-nightly-20251205-95cc1e767",
-    "@react-native/gradle-plugin": "0.84.0-nightly-20251205-95cc1e767",
-    "@react-native/js-polyfills": "0.84.0-nightly-20251205-95cc1e767",
-    "@react-native/normalize-colors": "0.84.0-nightly-20251205-95cc1e767",
-    "@react-native/virtualized-lists": "0.84.0-nightly-20251205-95cc1e767",
+    "@react-native/assets-registry": "0.84.0-nightly-20251207-e4a5a56df",
+    "@react-native/codegen": "0.84.0-nightly-20251207-e4a5a56df",
+    "@react-native/community-cli-plugin": "0.84.0-nightly-20251207-e4a5a56df",
+    "@react-native/gradle-plugin": "0.84.0-nightly-20251207-e4a5a56df",
+    "@react-native/js-polyfills": "0.84.0-nightly-20251207-e4a5a56df",
+    "@react-native/normalize-colors": "0.84.0-nightly-20251207-e4a5a56df",
+    "@react-native/virtualized-lists": "0.84.0-nightly-20251207-e4a5a56df",
     "abort-controller": "^3.0.0",
     "anser": "^1.4.9",
     "ansi-regex": "^5.0.0",
@@ -175,7 +175,7 @@
     "base64-js": "^1.5.1",
     "commander": "^12.0.0",
     "flow-enums-runtime": "^0.0.6",
-    "hermes-compiler": "0.14.0-commitly-202512030604-3713fb12a",
+    "hermes-compiler": "0.14.0-commitly-202512051838-1e8c447f2",
     "invariant": "^2.2.4",
     "jest-environment-node": "^29.7.0",
     "memoize-one": "^5.0.0",

package/sdks/hermes-engine/version.properties

@@ -1,2 +1,2 @@
-HERMES_VERSION_NAME=0.14.0-commitly-202512030604-3713fb12a
+HERMES_VERSION_NAME=0.14.0-commitly-202512051838-1e8c447f2
 HERMES_V1_VERSION_NAME=250829098.0.4

package/src/private/animated/NativeAnimatedHelper.js

@@ -17,6 +17,8 @@ import type {
   AnimatedNodeConfig,
   EventMapping,
 } from '../../../Libraries/Animated/NativeAnimatedModule';
+import type {Spec as NativeAnimatedTurboModuleSpec} from '../../../Libraries/Animated/NativeAnimatedTurboModule';
+import type {Node} from '../../../Libraries/Renderer/shims/ReactNativeTypes';
 import type {EventSubscription} from '../../../Libraries/vendor/emitter/EventEmitter';
 
 import NativeAnimatedNonTurboModule from '../../../Libraries/Animated/NativeAnimatedModule';
@@ -28,8 +30,17 @@ import * as ReactNativeFeatureFlags from '../featureflags/ReactNativeFeatureFlag
 import invariant from 'invariant';
 import nullthrows from 'nullthrows';
 
+interface NativeAnimatedModuleSpec extends NativeAnimatedTurboModuleSpec {
+  // connectAnimatedNodeToShadowNodeFamily is available only in NativeAnimatedNonTurboModule
+  +connectAnimatedNodeToShadowNodeFamily?: (
+    nodeTag: number,
+    // $FlowExpectedError[unclear-type].
+    shadowNode: Object,
+  ) => void;
+}
+
 // TODO T69437152 @petetheheat - Delete this fork when Fabric ships to 100%.
-const NativeAnimatedModule: typeof NativeAnimatedTurboModule =
+const NativeAnimatedModule: ?NativeAnimatedModuleSpec =
   NativeAnimatedNonTurboModule ?? NativeAnimatedTurboModule;
 
 let __nativeAnimatedNodeTagCount = 1; /* used for animated nodes */
@@ -84,6 +95,13 @@ function createNativeOperations(): $NonMaybeType<typeof NativeAnimatedModule> {
     'addListener', // 20
     'removeListener', // 21
   ];
+  if (
+    ReactNativeFeatureFlags.cxxNativeAnimatedEnabled() &&
+    //eslint-disable-next-line
+    ReactNativeFeatureFlags.useSharedAnimatedBackend()
+  ) {
+    methodNames.push('connectAnimatedNodeToShadowNodeFamily');
+  }
   const nativeOperations: {
     [$Values<typeof methodNames>]: (...$ReadOnlyArray<mixed>) => void,
   } = {};
@@ -312,6 +330,16 @@ const API = {
     NativeOperations.connectAnimatedNodeToView(nodeTag, viewTag);
   },
 
+  connectAnimatedNodeToShadowNodeFamily(
+    nodeTag: number,
+    shadowNode: Node,
+  ): void {
+    NativeOperations.connectAnimatedNodeToShadowNodeFamily?.(
+      nodeTag,
+      shadowNode,
+    );
+  },
+
   disconnectAnimatedNodeFromView(nodeTag: number, viewTag: number): void {
     NativeOperations.disconnectAnimatedNodeFromView(nodeTag, viewTag);
   },

package/src/private/specs_DEPRECATED/modules/NativeAnimatedModule.js

@@ -49,6 +49,10 @@ export interface Spec extends TurboModule {
   +flattenAnimatedNodeOffset: (nodeTag: number) => void;
   +extractAnimatedNodeOffset: (nodeTag: number) => void;
   +connectAnimatedNodeToView: (nodeTag: number, viewTag: number) => void;
+  +connectAnimatedNodeToShadowNodeFamily?: (
+    nodeTag: number,
+    shadowNode: Object,
+  ) => void;
   +disconnectAnimatedNodeFromView: (nodeTag: number, viewTag: number) => void;
   +restoreDefaultValues: (nodeTag: number) => void;
   +dropAnimatedNode: (tag: number) => void;