Make the test pass again

Differential Revision: D81138134

Author: Bartlomiej Bloniarz

packages/react-native/ReactCommon/react/renderer/animated/NativeAnimatedNodesManager.cpp

@@ -851,6 +851,11 @@ void NativeAnimatedNodesManager::schedulePropsCommit(
     const folly::dynamic& props,
     bool layoutStyleUpdated,
     bool forceFabricCommit) noexcept {
+  if (ReactNativeFeatureFlags::useSharedAnimatedBackend()) {
+    mergeObjects(updateViewProps_[viewTag], props);
+    return;
+  }
+
   // When fabricCommitCallback_ & directManipulationCallback_ are both
   // available, we commit layout props via Fabric and the other using direct
   // manipulation. If only fabricCommitCallback_ is available, we commit all
@@ -906,6 +911,7 @@ AnimationMutations NativeAnimatedNodesManager::pullAnimationMutations() {
     auto timestamp = static_cast<double>(microseconds) / 1000.0;
     bool containsChange = false;
     {
+      // copied from onAnimationFrame
       // Run all active animations
       auto hasFinishedAnimations = false;
       std::set<int> finishedAnimationValueNodes;
@@ -948,11 +954,6 @@ AnimationMutations NativeAnimatedNodesManager::pullAnimationMutations() {
             AnimationMutation{tag, props["opacity"].asDouble()});
         containsChange = true;
       }
-      for (auto& [tag, props] : updateViewPropsDirect_) {
-        mutations.emplace_back(
-            AnimationMutation{tag, props["opacity"].asDouble()});
-        containsChange = true;
-      }
     }
 
     if (!containsChange) {
@@ -981,10 +982,6 @@ AnimationMutations NativeAnimatedNodesManager::pullAnimationMutations() {
         mutations.emplace_back(
             AnimationMutation{tag, props["opacity"].asDouble()});
       }
-      for (auto& [tag, props] : updateViewPropsDirect_) {
-        mutations.emplace_back(
-            AnimationMutation{tag, props["opacity"].asDouble()});
-      }
     }
   } else {
     // There is no active animation. Stop the render callback.

packages/react-native/ReactCommon/react/renderer/animated/NativeAnimatedNodesManagerProvider.cpp

@@ -67,9 +67,9 @@ NativeAnimatedNodesManagerProvider::getOrCreate(
 
     if (ReactNativeFeatureFlags::useSharedAnimatedBackend()) {
       animationBackend_ = std::make_shared<AnimationBackend>(
-          startOnRenderCallback_,
-          stopOnRenderCallback_,
-          directManipulationCallback);
+          std::move(startOnRenderCallback_),
+          std::move(stopOnRenderCallback_),
+          std::move(directManipulationCallback));
 
       nativeAnimatedNodesManager_ =
           std::make_shared<NativeAnimatedNodesManager>(animationBackend_);

packages/react-native/ReactCommon/react/renderer/animationbackend/AnimationBackend.cpp

@@ -10,9 +10,9 @@
 namespace facebook::react {
 
 AnimationBackend::AnimationBackend(
-    const StartOnRenderCallback& startOnRenderCallback,
-    const StopOnRenderCallback& stopOnRenderCallback,
-    const DirectManipulationCallback& directManipulationCallback)
+    StartOnRenderCallback&& startOnRenderCallback,
+    StopOnRenderCallback&& stopOnRenderCallback,
+    DirectManipulationCallback&& directManipulationCallback)
     : startOnRenderCallback_(startOnRenderCallback),
       stopOnRenderCallback_(stopOnRenderCallback),
       directManipulationCallback_(directManipulationCallback) {}

packages/react-native/ReactCommon/react/renderer/animationbackend/AnimationBackend.h

@@ -29,14 +29,14 @@ using DirectManipulationCallback =
 class AnimationBackend {
  public:
   std::vector<Callback> callbacks;
-  const StartOnRenderCallback& startOnRenderCallback_;
-  const StopOnRenderCallback& stopOnRenderCallback_;
-  const DirectManipulationCallback& directManipulationCallback_;
+  const StartOnRenderCallback startOnRenderCallback_;
+  const StopOnRenderCallback stopOnRenderCallback_;
+  const DirectManipulationCallback directManipulationCallback_;
 
   AnimationBackend(
-      const StartOnRenderCallback& startOnRenderCallback,
-      const StopOnRenderCallback& stopOnRenderCallback,
-      const DirectManipulationCallback& directManipulationCallback);
+      StartOnRenderCallback&& startOnRenderCallback,
+      StopOnRenderCallback&& stopOnRenderCallback,
+      DirectManipulationCallback&& directManipulationCallback);
   void onAnimationFrame(double timestamp);
   void start(const Callback& callback);
   void stop();