react-native 0.66.2 → 0.67.0-rc.3

package/ReactCommon/react/renderer/animations/LayoutAnimationCallbackWrapper.h

@@ -0,0 +1,34 @@
+/*
+ * Copyright (c) Facebook, Inc. and its 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 <jsi/jsi.h>
+#include <memory>
+
+namespace facebook {
+namespace react {
+
+class LayoutAnimationCallbackWrapper {
+ public:
+  LayoutAnimationCallbackWrapper(jsi::Function &&callback)
+      : callback_(std::make_shared<jsi::Function>(std::move(callback))) {}
+  LayoutAnimationCallbackWrapper() : callback_(nullptr) {}
+
+  void call(jsi::Runtime &runtime) const {
+    if (callback_) {
+      callback_->call(runtime);
+      callback_.reset();
+    }
+  }
+
+ private:
+  mutable std::shared_ptr<jsi::Function> callback_;
+};
+
+} // namespace react
+} // namespace facebook

package/ReactCommon/react/renderer/animations/LayoutAnimationDriver.cpp

@@ -7,24 +7,10 @@
 
 #include "LayoutAnimationDriver.h"
 
-#include <algorithm>
-#include <chrono>
-
-#include <react/renderer/componentregistry/ComponentDescriptorFactory.h>
-#include <react/renderer/components/view/ViewProps.h>
-#include <react/renderer/core/ComponentDescriptor.h>
-#include <react/renderer/core/LayoutMetrics.h>
-#include <react/renderer/core/LayoutableShadowNode.h>
-#include <react/renderer/core/Props.h>
-#include <react/renderer/mounting/MountingCoordinator.h>
-
-#include <react/renderer/mounting/Differentiator.h>
-#include <react/renderer/mounting/ShadowTreeRevision.h>
-#include <react/renderer/mounting/ShadowView.h>
-#include <react/renderer/mounting/ShadowViewMutation.h>
-
 #include <glog/logging.h>
 #include <react/debug/react_native_assert.h>
+#include <react/renderer/animations/utils.h>
+#include <algorithm>
 
 namespace facebook {
 namespace react {
@@ -70,19 +56,12 @@ void LayoutAnimationDriver::animationMutationsForFrame(
           animationInterpolationFactor, baselineShadowView, finalShadowView);
 
       // Create the mutation instruction
-      auto updateMutation = ShadowViewMutation::UpdateMutation(
-          keyframe.viewPrev, mutatedShadowView);
-
-      // All generated Update mutations must have an "old" and "new"
-      // ShadowView. Checking for nonzero tag doesn't guarantee that the views
-      // are valid/correct, just that something is there.
-      react_native_assert(updateMutation.oldChildShadowView.tag > 0);
-      react_native_assert(updateMutation.newChildShadowView.tag > 0);
+      mutationsList.emplace_back(ShadowViewMutation::UpdateMutation(
+          keyframe.viewPrev, mutatedShadowView));
 
-      mutationsList.push_back(updateMutation);
       PrintMutationInstruction("Animation Progress:", updateMutation);
 
-      keyframe.viewPrev = mutatedShadowView;
+      keyframe.viewPrev = std::move(mutatedShadowView);
 
       if (animationTimeProgressLinear < 1) {
         incompleteAnimations++;

package/ReactCommon/react/renderer/animations/LayoutAnimationDriver.h

@@ -7,17 +7,9 @@
 
 #pragma once
 
-#include <react/renderer/core/EventTarget.h>
-#include <react/renderer/debug/flags.h>
-#include <react/renderer/mounting/Differentiator.h>
-#include <react/renderer/mounting/MountingCoordinator.h>
-#include <react/renderer/mounting/MountingOverrideDelegate.h>
-#include <react/renderer/mounting/MountingTransaction.h>
-#include <react/renderer/uimanager/UIManagerAnimationDelegate.h>
-
-#include <folly/dynamic.h>
-
-#include "LayoutAnimationKeyFrameManager.h"
+#include <react/renderer/animations/LayoutAnimationKeyFrameManager.h>
+#include <react/renderer/core/ReactPrimitives.h>
+#include <react/renderer/mounting/ShadowViewMutation.h>
 
 namespace facebook {
 namespace react {
@@ -26,10 +18,12 @@ class LayoutAnimationDriver : public LayoutAnimationKeyFrameManager {
  public:
   LayoutAnimationDriver(
       RuntimeExecutor runtimeExecutor,
+      ContextContainer::Shared &contextContainer,
       LayoutAnimationStatusDelegate *delegate)
-      : LayoutAnimationKeyFrameManager(runtimeExecutor, delegate) {}
-
-  virtual ~LayoutAnimationDriver() {}
+      : LayoutAnimationKeyFrameManager(
+            runtimeExecutor,
+            contextContainer,
+            delegate) {}
 
  protected:
   virtual void animationMutationsForFrame(