react-native 0.66.0 → 0.67.0-rc.2

package/ReactCommon/react/nativemodule/core/platform/ios/RCTTurboModuleManager.mm

@@ -174,7 +174,6 @@ static Class getFallbackClassFromName(const char *name)
   std::mutex _turboModuleHoldersMutex;
   std::atomic<bool> _invalidating;
 
-  RCTModuleRegistry *_moduleRegistry;
   RCTRetainJSCallback _retainJSCallback;
   std::shared_ptr<LongLivedObjectCollection> _longLivedObjectCollection;
 }
@@ -188,9 +187,6 @@ static Class getFallbackClassFromName(const char *name)
     _delegate = delegate;
     _bridge = bridge;
     _invalidating = false;
-    _moduleRegistry = [RCTModuleRegistry new];
-    [_moduleRegistry setBridge:bridge];
-    [_moduleRegistry setTurboModuleRegistry:self];
 
     [[NSNotificationCenter defaultCenter] addObserver:self
                                              selector:@selector(bridgeWillInvalidateModules:)
@@ -426,9 +422,12 @@ static Class getFallbackClassFromName(const char *name)
      */
 
     if ([_delegate respondsToSelector:@selector(getModuleClassFromName:)]) {
-      std::lock_guard<std::mutex> delegateGuard(_turboModuleManagerDelegateMutex);
-
-      moduleClass = [_delegate getModuleClassFromName:moduleName];
+      if (RCTTurboModuleManagerDelegateLockingDisabled()) {
+        moduleClass = [_delegate getModuleClassFromName:moduleName];
+      } else {
+        std::lock_guard<std::mutex> delegateGuard(_turboModuleManagerDelegateMutex);
+        moduleClass = [_delegate getModuleClassFromName:moduleName];
+      }
     }
 
     if (!moduleClass) {
@@ -510,9 +509,12 @@ static Class getFallbackClassFromName(const char *name)
 
   TurboModulePerfLogger::moduleCreateConstructStart(moduleName, moduleId);
   if ([_delegate respondsToSelector:@selector(getModuleInstanceFromClass:)]) {
-    std::lock_guard<std::mutex> delegateGuard(_turboModuleManagerDelegateMutex);
-
-    module = [_delegate getModuleInstanceFromClass:moduleClass];
+    if (RCTTurboModuleManagerDelegateLockingDisabled()) {
+      module = [_delegate getModuleInstanceFromClass:moduleClass];
+    } else {
+      std::lock_guard<std::mutex> delegateGuard(_turboModuleManagerDelegateMutex);
+      module = [_delegate getModuleInstanceFromClass:moduleClass];
+    }
   } else {
     module = [moduleClass new];
   }
@@ -556,25 +558,6 @@ static Class getFallbackClassFromName(const char *name)
     }
   }
 
-  /**
-   * Attach the RCTModuleRegistry to this TurboModule, which allows this TurboModule
-   * To load other NativeModules & TurboModules.
-   *
-   * Usage: In the NativeModule @implementation, include:
-   *   `@synthesize moduleRegistry = _moduleRegistry`
-   */
-  if ([module respondsToSelector:@selector(moduleRegistry)] && _moduleRegistry) {
-    @try {
-      [(id)module setValue:_moduleRegistry forKey:@"moduleRegistry"];
-    } @catch (NSException *exception) {
-      RCTLogError(
-          @"%@ has no setter or ivar for its module registry, which is not "
-           "permitted. You must either @synthesize the moduleRegistry property, "
-           "or provide your own setter method.",
-          RCTBridgeModuleNameForClass([module class]));
-    }
-  }
-
   /**
    * Some modules need their own queues, but don't provide any, so we need to create it for them.
    * These modules typically have the following:
@@ -612,7 +595,7 @@ static Class getFallbackClassFromName(const char *name)
       } @catch (NSException *exception) {
         RCTLogError(
             @"%@ has no setter or ivar for its methodQueue, which is not "
-             "permitted. You must either @synthesize the bridge property, "
+             "permitted. You must either @synthesize the methodQueue property, "
              "or provide your own setter method.",
             RCTBridgeModuleNameForClass([module class]));
       }
@@ -651,7 +634,7 @@ static Class getFallbackClassFromName(const char *name)
   if (_bridge) {
     RCTModuleData *data = [[RCTModuleData alloc] initWithModuleInstance:(id<RCTBridgeModule>)module
                                                                  bridge:_bridge
-                                                         moduleRegistry:_moduleRegistry
+                                                         moduleRegistry:_bridge.moduleRegistry
                                                 viewRegistry_DEPRECATED:nil
                                                           bundleManager:nil
                                                       callableJSModules:nil];

package/ReactCommon/react/nativemodule/samples/BUCK

@@ -12,12 +12,6 @@ rn_xplat_cxx_library(
         ],
         prefix = "ReactCommon",
     ),
-    compiler_flags = [
-        "-fexceptions",
-        "-frtti",
-        "-std=c++17",
-        "-Wall",
-    ],
     fbandroid_deps = [
         react_native_target("jni/react/jni:jni"),
         FBJNI_TARGET,
@@ -34,7 +28,6 @@ rn_xplat_cxx_library(
         ],
     ),
     fbobjc_compiler_flags = [
-        "-Wall",
         "-fobjc-arc-exceptions",
     ],
     fbobjc_inherited_buck_flags = get_static_library_ios_flags(),

package/ReactCommon/react/renderer/animations/BUCK

@@ -32,10 +32,6 @@ rn_xplat_cxx_library(
         prefix = "react/renderer/animations",
     ),
     compiler_flags = [
-        "-fexceptions",
-        "-frtti",
-        "-std=c++17",
-        "-Wall",
         "-lm",
     ],
     fbobjc_compiler_flags = APPLE_COMPILER_FLAGS,
@@ -62,6 +58,7 @@ rn_xplat_cxx_library(
         react_native_xplat_target("react/debug:debug"),
         react_native_xplat_target("react/renderer/componentregistry:componentregistry"),
         react_native_xplat_target("react/renderer/components/view:view"),
+        react_native_xplat_target("react/renderer/components/image:image"),
         react_native_xplat_target("react/renderer/core:core"),
         react_native_xplat_target("react/renderer/debug:debug"),
         react_native_xplat_target("react/renderer/mounting:mounting"),

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(