react-native 0.69.3 → 0.70.0-rc.2

package/ReactCommon/react/nativemodule/samples/platform/android/ReactCommon/SampleTurboModuleSpec.cpp

@@ -18,8 +18,10 @@ __hostFunction_NativeSampleTurboModuleSpecJSI_voidFunc(
     TurboModule &turboModule,
     const facebook::jsi::Value *args,
     size_t count) {
+  static jmethodID cachedMethodId = nullptr;
   return static_cast<JavaTurboModule &>(turboModule)
-      .invokeJavaMethod(rt, VoidKind, "voidFunc", "()V", args, count);
+      .invokeJavaMethod(
+          rt, VoidKind, "voidFunc", "()V", args, count, cachedMethodId);
 }
 
 static facebook::jsi::Value
@@ -28,8 +30,10 @@ __hostFunction_NativeSampleTurboModuleSpecJSI_getBool(
     TurboModule &turboModule,
     const facebook::jsi::Value *args,
     size_t count) {
+  static jmethodID cachedMethodId = nullptr;
   return static_cast<JavaTurboModule &>(turboModule)
-      .invokeJavaMethod(rt, BooleanKind, "getBool", "(Z)Z", args, count);
+      .invokeJavaMethod(
+          rt, BooleanKind, "getBool", "(Z)Z", args, count, cachedMethodId);
 }
 
 static facebook::jsi::Value
@@ -38,8 +42,10 @@ __hostFunction_NativeSampleTurboModuleSpecJSI_getNumber(
     TurboModule &turboModule,
     const facebook::jsi::Value *args,
     size_t count) {
+  static jmethodID cachedMethodId = nullptr;
   return static_cast<JavaTurboModule &>(turboModule)
-      .invokeJavaMethod(rt, NumberKind, "getNumber", "(D)D", args, count);
+      .invokeJavaMethod(
+          rt, NumberKind, "getNumber", "(D)D", args, count, cachedMethodId);
 }
 
 static facebook::jsi::Value
@@ -48,6 +54,7 @@ __hostFunction_NativeSampleTurboModuleSpecJSI_getString(
     TurboModule &turboModule,
     const facebook::jsi::Value *args,
     size_t count) {
+  static jmethodID cachedMethodId = nullptr;
   return static_cast<JavaTurboModule &>(turboModule)
       .invokeJavaMethod(
           rt,
@@ -55,7 +62,8 @@ __hostFunction_NativeSampleTurboModuleSpecJSI_getString(
           "getString",
           "(Ljava/lang/String;)Ljava/lang/String;",
           args,
-          count);
+          count,
+          cachedMethodId);
 }
 
 static facebook::jsi::Value
@@ -64,6 +72,7 @@ __hostFunction_NativeSampleTurboModuleSpecJSI_getArray(
     TurboModule &turboModule,
     const facebook::jsi::Value *args,
     size_t count) {
+  static jmethodID cachedMethodId = nullptr;
   return static_cast<JavaTurboModule &>(turboModule)
       .invokeJavaMethod(
           rt,
@@ -71,7 +80,8 @@ __hostFunction_NativeSampleTurboModuleSpecJSI_getArray(
           "getArray",
           "(Lcom/facebook/react/bridge/ReadableArray;)Lcom/facebook/react/bridge/WritableArray;",
           args,
-          count);
+          count,
+          cachedMethodId);
 }
 
 static facebook::jsi::Value
@@ -80,6 +90,7 @@ __hostFunction_NativeSampleTurboModuleSpecJSI_getObject(
     TurboModule &turboModule,
     const facebook::jsi::Value *args,
     size_t count) {
+  static jmethodID cachedMethodId = nullptr;
   return static_cast<JavaTurboModule &>(turboModule)
       .invokeJavaMethod(
           rt,
@@ -87,7 +98,8 @@ __hostFunction_NativeSampleTurboModuleSpecJSI_getObject(
           "getObject",
           "(Lcom/facebook/react/bridge/ReadableMap;)Lcom/facebook/react/bridge/WritableMap;",
           args,
-          count);
+          count,
+          cachedMethodId);
 }
 
 static facebook::jsi::Value
@@ -96,8 +108,10 @@ __hostFunction_NativeSampleTurboModuleSpecJSI_getRootTag(
     TurboModule &turboModule,
     const facebook::jsi::Value *args,
     size_t count) {
+  static jmethodID cachedMethodId = nullptr;
   return static_cast<JavaTurboModule &>(turboModule)
-      .invokeJavaMethod(rt, NumberKind, "getRootTag", "(D)D", args, count);
+      .invokeJavaMethod(
+          rt, NumberKind, "getRootTag", "(D)D", args, count, cachedMethodId);
 }
 
 static facebook::jsi::Value
@@ -106,6 +120,7 @@ __hostFunction_NativeSampleTurboModuleSpecJSI_getValue(
     TurboModule &turboModule,
     const facebook::jsi::Value *args,
     size_t count) {
+  static jmethodID cachedMethodId = nullptr;
   return static_cast<JavaTurboModule &>(turboModule)
       .invokeJavaMethod(
           rt,
@@ -113,7 +128,8 @@ __hostFunction_NativeSampleTurboModuleSpecJSI_getValue(
           "getValue",
           "(DLjava/lang/String;Lcom/facebook/react/bridge/ReadableMap;)Lcom/facebook/react/bridge/WritableMap;",
           args,
-          count);
+          count,
+          cachedMethodId);
 }
 
 static facebook::jsi::Value
@@ -122,6 +138,7 @@ __hostFunction_NativeSampleTurboModuleSpecJSI_getValueWithCallback(
     TurboModule &turboModule,
     const facebook::jsi::Value *args,
     size_t count) {
+  static jmethodID cachedMethodId = nullptr;
   return static_cast<JavaTurboModule &>(turboModule)
       .invokeJavaMethod(
           rt,
@@ -129,7 +146,8 @@ __hostFunction_NativeSampleTurboModuleSpecJSI_getValueWithCallback(
           "getValueWithCallback",
           "(Lcom/facebook/react/bridge/Callback;)V",
           args,
-          count);
+          count,
+          cachedMethodId);
 }
 
 static facebook::jsi::Value
@@ -138,6 +156,7 @@ __hostFunction_NativeSampleTurboModuleSpecJSI_getValueWithPromise(
     TurboModule &turboModule,
     const facebook::jsi::Value *args,
     size_t count) {
+  static jmethodID cachedMethodId = nullptr;
   return static_cast<JavaTurboModule &>(turboModule)
       .invokeJavaMethod(
           rt,
@@ -145,7 +164,8 @@ __hostFunction_NativeSampleTurboModuleSpecJSI_getValueWithPromise(
           "getValueWithPromise",
           "(ZLcom/facebook/react/bridge/Promise;)V",
           args,
-          count);
+          count,
+          cachedMethodId);
 }
 
 static facebook::jsi::Value
@@ -154,9 +174,16 @@ __hostFunction_NativeSampleTurboModuleSpecJSI_getConstants(
     TurboModule &turboModule,
     const facebook::jsi::Value *args,
     size_t count) {
+  static jmethodID cachedMethodId = nullptr;
   return static_cast<JavaTurboModule &>(turboModule)
       .invokeJavaMethod(
-          rt, ObjectKind, "getConstants", "()Ljava/util/Map;", args, count);
+          rt,
+          ObjectKind,
+          "getConstants",
+          "()Ljava/util/Map;",
+          args,
+          count,
+          cachedMethodId);
 }
 
 NativeSampleTurboModuleSpecJSI::NativeSampleTurboModuleSpecJSI(
@@ -197,7 +224,7 @@ NativeSampleTurboModuleSpecJSI::NativeSampleTurboModuleSpecJSI(
 }
 
 std::shared_ptr<TurboModule> SampleTurboModuleSpec_ModuleProvider(
-    const std::string moduleName,
+    const std::string &moduleName,
     const JavaTurboModule::InitParams &params) {
   if (moduleName == "SampleTurboModule") {
     return std::make_shared<NativeSampleTurboModuleSpecJSI>(params);

package/ReactCommon/react/nativemodule/samples/platform/android/ReactCommon/SampleTurboModuleSpec.h

@@ -25,7 +25,7 @@ class JSI_EXPORT NativeSampleTurboModuleSpecJSI : public JavaTurboModule {
 };
 
 std::shared_ptr<TurboModule> SampleTurboModuleSpec_ModuleProvider(
-    const std::string moduleName,
+    const std::string &moduleName,
     const JavaTurboModule::InitParams &params);
 
 } // namespace react

package/ReactCommon/react/renderer/animations/BUCK

@@ -52,7 +52,7 @@ rn_xplat_cxx_library(
     deps = [
         "//third-party/glog:glog",
         "//xplat/fbsystrace:fbsystrace",
-        "//xplat/folly:headers_only",
+        "//xplat/folly:headers_only_do_not_use",
         "//xplat/folly:memory",
         "//xplat/folly:molly",
         "//xplat/jsi:JSIDynamic",

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

@@ -8,6 +8,7 @@
 #include "LayoutAnimationKeyFrameManager.h"
 
 #include <algorithm>
+#include <sstream>
 #include <utility>
 
 #include <react/debug/flags.h>
@@ -304,6 +305,10 @@ LayoutAnimationKeyFrameManager::pullTransaction(
       std::vector<AnimationKeyFrame> keyFramesToAnimate;
       auto const layoutAnimationConfig = animation.layoutAnimationConfig;
       for (auto const &mutation : mutations) {
+        if (mutation.type == ShadowViewMutation::Type::RemoveDeleteTree) {
+          continue;
+        }
+
         ShadowView baselineShadowView =
             (mutation.type == ShadowViewMutation::Type::Delete ||
                      mutation.type == ShadowViewMutation::Type::Remove ||
@@ -1224,6 +1229,16 @@ void LayoutAnimationKeyFrameManager::queueFinalMutationsForCompletedKeyFrame(
           mutationsList.push_back(ShadowViewMutation::RemoveMutation(
               finalMutation.parentShadowView, prev, finalMutation.index));
           break;
+        case ShadowViewMutation::Type::RemoveDeleteTree:
+          // Note: Currently, there is a guarantee that if RemoveDeleteTree
+          // operations are generated, we /also/ generate corresponding
+          // Remove/Delete operations that are marked as "redundant".
+          // LayoutAnimations will process the redundant operations here, and
+          // ignore this mega-op. In the future for perf reasons it would be
+          // nice to remove the redundant operations entirely but we would need
+          // to find a way to make the RemoveDeleteTree operation work with
+          // LayoutAnimations (that might not be possible).
+          break;
         case ShadowViewMutation::Type::Update:
           mutationsList.push_back(ShadowViewMutation::UpdateMutation(
               prev, finalMutation.newChildShadowView));
@@ -1513,6 +1528,10 @@ void LayoutAnimationKeyFrameManager::getAndEraseConflictingAnimations(
     std::vector<AnimationKeyFrame> &conflictingAnimations) const {
   ShadowViewMutationList localConflictingMutations{};
   for (auto const &mutation : mutations) {
+    if (mutation.type == ShadowViewMutation::Type::RemoveDeleteTree) {
+      continue;
+    }
+
     bool mutationIsCreateOrDelete =
         mutation.type == ShadowViewMutation::Type::Create ||
         mutation.type == ShadowViewMutation::Type::Delete;

package/ReactCommon/react/renderer/animations/tests/LayoutAnimationTest.cpp

@@ -11,6 +11,7 @@
 #include <gtest/gtest.h>
 
 #include <ReactCommon/RuntimeExecutor.h>
+#include <react/renderer/animations/LayoutAnimationDriver.h>
 #include <react/renderer/componentregistry/ComponentDescriptorProvider.h>
 #include <react/renderer/componentregistry/ComponentDescriptorProviderRegistry.h>
 #include <react/renderer/componentregistry/ComponentDescriptorRegistry.h>
@@ -29,8 +30,6 @@
 // #include <algorithm>
 // #include <random>
 
-#include "LayoutAnimationDriver.h"
-
 MockClock::time_point MockClock::time_ = {};
 
 namespace facebook {
@@ -121,8 +120,8 @@ static void testShadowNodeTreeLifeCycleLayoutAnimations(
     auto currentRootNode = std::static_pointer_cast<RootShadowNode const>(
         emptyRootNode->ShadowNode::clone(ShadowNodeFragment{
             ShadowNodeFragment::propsPlaceholder(),
-            std::make_shared<SharedShadowNodeList>(
-                SharedShadowNodeList{singleRootChildNode})}));
+            std::make_shared<ShadowNode::ListOfShared>(
+                ShadowNode::ListOfShared{singleRootChildNode})}));
 
     // Building an initial view hierarchy.
     auto viewTree = buildStubViewTreeWithoutUsingDifferentiator(*emptyRootNode);

package/ReactCommon/react/renderer/attributedstring/BUCK

@@ -52,7 +52,7 @@ rn_xplat_cxx_library(
     deps = [
         "//third-party/glog:glog",
         "//xplat/fbsystrace:fbsystrace",
-        "//xplat/folly:headers_only",
+        "//xplat/folly:headers_only_do_not_use",
         "//xplat/folly:memory",
         "//xplat/folly:molly",
         react_native_xplat_target("react/debug:debug"),

package/ReactCommon/react/renderer/componentregistry/BUCK

@@ -47,7 +47,7 @@ rn_xplat_cxx_library(
     deps = [
         "//third-party/glog:glog",
         "//xplat/fbsystrace:fbsystrace",
-        "//xplat/folly:headers_only",
+        "//xplat/folly:headers_only_do_not_use",
         "//xplat/folly:memory",
         "//xplat/folly:molly",
         "//xplat/jsi:JSIDynamic",

package/ReactCommon/react/renderer/componentregistry/ComponentDescriptorRegistry.cpp

@@ -126,7 +126,7 @@ bool ComponentDescriptorRegistry::hasComponentDescriptorAt(
   return true;
 }
 
-SharedShadowNode ComponentDescriptorRegistry::createNode(
+ShadowNode::Shared ComponentDescriptorRegistry::createNode(
     Tag tag,
     std::string const &viewName,
     SurfaceId surfaceId,

package/ReactCommon/react/renderer/componentregistry/native/BUCK

@@ -46,7 +46,7 @@ rn_xplat_cxx_library(
     deps = [
         "//third-party/glog:glog",
         "//xplat/fbsystrace:fbsystrace",
-        "//xplat/folly:headers_only",
+        "//xplat/folly:headers_only_do_not_use",
         "//xplat/folly:memory",
         "//xplat/folly:molly",
         "//xplat/jsi:JSIDynamic",

package/ReactCommon/react/renderer/components/image/BUCK

@@ -47,7 +47,7 @@ rn_xplat_cxx_library(
     tests = [":tests"],
     visibility = ["PUBLIC"],
     deps = [
-        "//xplat/folly:headers_only",
+        "//xplat/folly:headers_only_do_not_use",
         "//xplat/folly:molly",
         YOGA_CXX_TARGET,
         react_native_xplat_target("react/debug:debug"),

package/ReactCommon/react/renderer/components/legacyviewmanagerinterop/BUCK

@@ -41,7 +41,7 @@ rn_xplat_cxx_library(
     ],
     visibility = ["PUBLIC"],
     deps = [
-        "//xplat/folly:headers_only",
+        "//xplat/folly:headers_only_do_not_use",
         "//xplat/folly:memory",
         react_native_xplat_target("react/renderer/core:core"),
         react_native_xplat_target("react/renderer/components/view:view"),

package/ReactCommon/react/renderer/components/legacyviewmanagerinterop/LegacyViewManagerInteropComponentDescriptor.mm

@@ -30,9 +30,6 @@ static std::string moduleNameFromComponentName(const std::string &componentName)
     return "FBReactFDSTooltipViewManager";
   }
 
-  if (componentName == "FBRotatablePhotoPlayer") {
-    return "FBRotatablePhotoPlayerViewManager";
-  }
   std::string fbPrefix("FB");
   if (std::mismatch(fbPrefix.begin(), fbPrefix.end(), componentName.begin()).first == fbPrefix.end()) {
     // If `moduleName` has "FB" prefix.

package/ReactCommon/react/renderer/components/modal/BUCK

@@ -71,7 +71,7 @@ rn_xplat_cxx_library(
     deps = [
         "//third-party/glog:glog",
         "//xplat/fbsystrace:fbsystrace",
-        "//xplat/folly:headers_only",
+        "//xplat/folly:headers_only_do_not_use",
         "//xplat/folly:memory",
         "//xplat/folly:molly",
         YOGA_CXX_TARGET,

package/ReactCommon/react/renderer/components/progressbar/BUCK

@@ -78,7 +78,7 @@ rn_xplat_cxx_library(
     deps = [
         "//third-party/glog:glog",
         "//xplat/fbsystrace:fbsystrace",
-        "//xplat/folly:headers_only",
+        "//xplat/folly:headers_only_do_not_use",
         "//xplat/folly:memory",
         "//xplat/folly:molly",
         YOGA_CXX_TARGET,

package/ReactCommon/react/renderer/components/progressbar/CMakeLists.txt

@@ -28,7 +28,7 @@ target_link_libraries(rrc_progressbar
         react_render_debug
         react_render_graphics
         react_render_uimanager
-        reactnativeutilsjni
+        reactnativejni
         rrc_view
         yoga
 )

package/ReactCommon/react/renderer/components/root/BUCK

@@ -46,7 +46,7 @@ rn_xplat_cxx_library(
     deps = [
         "//third-party/glog:glog",
         "//xplat/fbsystrace:fbsystrace",
-        "//xplat/folly:headers_only",
+        "//xplat/folly:headers_only_do_not_use",
         "//xplat/folly:memory",
         "//xplat/folly:molly",
         YOGA_CXX_TARGET,

package/ReactCommon/react/renderer/components/scrollview/BUCK

@@ -53,7 +53,7 @@ rn_xplat_cxx_library(
     deps = [
         "//third-party/glog:glog",
         "//xplat/fbsystrace:fbsystrace",
-        "//xplat/folly:headers_only",
+        "//xplat/folly:headers_only_do_not_use",
         "//xplat/folly:memory",
         "//xplat/folly:molly",
         YOGA_CXX_TARGET,