react-native 0.69.0-rc.6 → 0.70.0-rc.0

package/ReactCommon/react/renderer/templateprocessor/UITemplateProcessor.h

@@ -56,7 +56,7 @@ class UITemplateProcessor {
   static ShadowNode::Shared runCommand(
       const folly::dynamic &command,
       Tag rootTag,
-      std::vector<SharedShadowNode> &nodes,
+      std::vector<ShadowNode::Shared> &nodes,
       std::vector<folly::dynamic> &registers,
       const ComponentDescriptorRegistry &componentDescriptorRegistry,
       const NativeModuleRegistry &nativeModuleRegistry,

package/ReactCommon/react/renderer/textlayoutmanager/BUCK

@@ -117,7 +117,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/timeline/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",
         react_native_xplat_target("react/utils:utils"),

package/ReactCommon/react/renderer/uimanager/BUCK

@@ -49,7 +49,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/uimanager/LayoutAnimationStatusDelegate.h

@@ -23,6 +23,8 @@ class LayoutAnimationStatusDelegate {
    * Called when the LayoutAnimation engine completes all pending animations.
    */
   virtual void onAllAnimationsComplete() = 0;
+
+  virtual ~LayoutAnimationStatusDelegate() = default;
 };
 
 } // namespace facebook::react

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

@@ -25,25 +25,44 @@ void SurfaceRegistryBinding::startSurface(
   parameters["initialProps"] = initalProps;
   parameters["fabric"] = true;
 
-  if (moduleName != "LogBox" &&
-      runtime.global().hasProperty(runtime, "RN$SurfaceRegistry")) {
-    auto registry =
-        runtime.global().getPropertyAsObject(runtime, "RN$SurfaceRegistry");
-    auto method = registry.getPropertyAsFunction(runtime, "renderSurface");
+  auto global = runtime.global();
+  auto isBridgeless = global.hasProperty(runtime, "RN$Bridgeless") &&
+      global.getProperty(runtime, "RN$Bridgeless").asBool();
+
+  if (isBridgeless) {
+    if (!global.hasProperty(runtime, "RN$SurfaceRegistry")) {
+      throw std::runtime_error(
+          "SurfaceRegistryBinding::startSurface: Failed to start Surface \"" +
+          moduleName + "\". global.RN$SurfaceRegistry was not installed.");
+    }
 
+    auto registry = global.getPropertyAsObject(runtime, "RN$SurfaceRegistry");
+    auto method = registry.getPropertyAsFunction(runtime, "renderSurface");
     method.call(
         runtime,
         {jsi::String::createFromUtf8(runtime, moduleName),
          jsi::valueFromDynamic(runtime, parameters),
          jsi::Value(runtime, displayModeToInt(displayMode))});
   } else {
-    callMethodOfModule(
-        runtime,
-        "AppRegistry",
-        "runApplication",
-        {jsi::String::createFromUtf8(runtime, moduleName),
-         jsi::valueFromDynamic(runtime, parameters),
-         jsi::Value(runtime, displayModeToInt(displayMode))});
+    if (moduleName != "LogBox" &&
+        global.hasProperty(runtime, "RN$SurfaceRegistry")) {
+      auto registry = global.getPropertyAsObject(runtime, "RN$SurfaceRegistry");
+      auto method = registry.getPropertyAsFunction(runtime, "renderSurface");
+
+      method.call(
+          runtime,
+          {jsi::String::createFromUtf8(runtime, moduleName),
+           jsi::valueFromDynamic(runtime, parameters),
+           jsi::Value(runtime, displayModeToInt(displayMode))});
+    } else {
+      callMethodOfModule(
+          runtime,
+          "AppRegistry",
+          "runApplication",
+          {jsi::String::createFromUtf8(runtime, moduleName),
+           jsi::valueFromDynamic(runtime, parameters),
+           jsi::Value(runtime, displayModeToInt(displayMode))});
+    }
   }
 }
 
@@ -59,10 +78,18 @@ void SurfaceRegistryBinding::setSurfaceProps(
   parameters["initialProps"] = initalProps;
   parameters["fabric"] = true;
 
-  if (moduleName != "LogBox" &&
-      runtime.global().hasProperty(runtime, "RN$SurfaceRegistry")) {
-    auto registry =
-        runtime.global().getPropertyAsObject(runtime, "RN$SurfaceRegistry");
+  auto global = runtime.global();
+  auto isBridgeless = global.hasProperty(runtime, "RN$Bridgeless") &&
+      global.getProperty(runtime, "RN$Bridgeless").asBool();
+
+  if (isBridgeless) {
+    if (!global.hasProperty(runtime, "RN$SurfaceRegistry")) {
+      throw std::runtime_error(
+          "SurfaceRegistryBinding::setSurfaceProps: Failed to set Surface props for \"" +
+          moduleName + "\". global.RN$SurfaceRegistry was not installed.");
+    }
+
+    auto registry = global.getPropertyAsObject(runtime, "RN$SurfaceRegistry");
     auto method = registry.getPropertyAsFunction(runtime, "setSurfaceProps");
 
     method.call(
@@ -71,13 +98,25 @@ void SurfaceRegistryBinding::setSurfaceProps(
          jsi::valueFromDynamic(runtime, parameters),
          jsi::Value(runtime, displayModeToInt(displayMode))});
   } else {
-    callMethodOfModule(
-        runtime,
-        "AppRegistry",
-        "setSurfaceProps",
-        {jsi::String::createFromUtf8(runtime, moduleName),
-         jsi::valueFromDynamic(runtime, parameters),
-         jsi::Value(runtime, displayModeToInt(displayMode))});
+    if (moduleName != "LogBox" &&
+        global.hasProperty(runtime, "RN$SurfaceRegistry")) {
+      auto registry = global.getPropertyAsObject(runtime, "RN$SurfaceRegistry");
+      auto method = registry.getPropertyAsFunction(runtime, "setSurfaceProps");
+
+      method.call(
+          runtime,
+          {jsi::String::createFromUtf8(runtime, moduleName),
+           jsi::valueFromDynamic(runtime, parameters),
+           jsi::Value(runtime, displayModeToInt(displayMode))});
+    } else {
+      callMethodOfModule(
+          runtime,
+          "AppRegistry",
+          "setSurfaceProps",
+          {jsi::String::createFromUtf8(runtime, moduleName),
+           jsi::valueFromDynamic(runtime, parameters),
+           jsi::Value(runtime, displayModeToInt(displayMode))});
+    }
   }
 }
 
@@ -85,7 +124,10 @@ void SurfaceRegistryBinding::stopSurface(
     jsi::Runtime &runtime,
     SurfaceId surfaceId) {
   auto global = runtime.global();
-  if (global.hasProperty(runtime, "RN$Bridgeless")) {
+  auto isBridgeless = global.hasProperty(runtime, "RN$Bridgeless") &&
+      global.getProperty(runtime, "RN$Bridgeless").asBool();
+
+  if (isBridgeless) {
     if (!global.hasProperty(runtime, "RN$stopSurface")) {
       // ReactFabric module has not been loaded yet; there's no surface to stop.
       return;

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

@@ -52,7 +52,7 @@ UIManager::~UIManager() {
                << ").";
 }
 
-SharedShadowNode UIManager::createNode(
+ShadowNode::Shared UIManager::createNode(
     Tag tag,
     std::string const &name,
     SurfaceId surfaceId,
@@ -100,9 +100,9 @@ SharedShadowNode UIManager::createNode(
   return shadowNode;
 }
 
-SharedShadowNode UIManager::cloneNode(
+ShadowNode::Shared UIManager::cloneNode(
     ShadowNode const &shadowNode,
-    SharedShadowNodeSharedList const &children,
+    ShadowNode::SharedListOfShared const &children,
     RawProps const *rawProps) const {
   SystraceSection s("UIManager::cloneNode");
 
@@ -138,7 +138,7 @@ void UIManager::appendChild(
 
 void UIManager::completeSurface(
     SurfaceId surfaceId,
-    SharedShadowNodeUnsharedList const &rootChildren,
+    ShadowNode::UnsharedListOfShared const &rootChildren,
     ShadowTree::CommitOptions commitOptions) const {
   SystraceSection s("UIManager::completeSurface");
 

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

@@ -120,7 +120,7 @@ class UIManager final : public ShadowTreeDelegate {
 
   ShadowNode::Shared cloneNode(
       ShadowNode const &shadowNode,
-      SharedShadowNodeSharedList const &children = nullptr,
+      ShadowNode::SharedListOfShared const &children = nullptr,
       RawProps const *rawProps = nullptr) const;
 
   void appendChild(
@@ -129,7 +129,7 @@ class UIManager final : public ShadowTreeDelegate {
 
   void completeSurface(
       SurfaceId surfaceId,
-      SharedShadowNodeUnsharedList const &rootChildren,
+      ShadowNode::UnsharedListOfShared const &rootChildren,
       ShadowTree::CommitOptions commitOptions) const;
 
   void setIsJSResponder(

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

@@ -361,8 +361,8 @@ jsi::Value UIManagerBinding::get(
            jsi::Value const &thisValue,
            jsi::Value const *arguments,
            size_t count) noexcept -> jsi::Value {
-          auto shadowNodeList =
-              std::make_shared<SharedShadowNodeList>(SharedShadowNodeList({}));
+          auto shadowNodeList = std::make_shared<ShadowNode::ListOfShared>(
+              ShadowNode::ListOfShared({}));
           return valueFromShadowNodeList(runtime, shadowNodeList);
         });
   }

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

@@ -27,7 +27,7 @@ struct EventHandlerWrapper : public EventHandler {
 };
 
 struct ShadowNodeWrapper : public jsi::HostObject {
-  ShadowNodeWrapper(SharedShadowNode shadowNode)
+  ShadowNodeWrapper(ShadowNode::Shared shadowNode)
       : shadowNode(std::move(shadowNode)) {}
 
   // The below method needs to be implemented out-of-line in order for the class
@@ -39,7 +39,7 @@ struct ShadowNodeWrapper : public jsi::HostObject {
 };
 
 struct ShadowNodeListWrapper : public jsi::HostObject {
-  ShadowNodeListWrapper(SharedShadowNodeUnsharedList shadowNodeList)
+  ShadowNodeListWrapper(ShadowNode::UnsharedListOfShared shadowNodeList)
       : shadowNodeList(shadowNodeList) {}
 
   // The below method needs to be implemented out-of-line in order for the class
@@ -47,7 +47,7 @@ struct ShadowNodeListWrapper : public jsi::HostObject {
   // https://itanium-cxx-abi.github.io/cxx-abi/abi.html#vague-vtable)
   ~ShadowNodeListWrapper() override;
 
-  SharedShadowNodeUnsharedList shadowNodeList;
+  ShadowNode::UnsharedListOfShared shadowNodeList;
 };
 
 inline static ShadowNode::Shared shadowNodeFromValue(
@@ -64,12 +64,12 @@ inline static ShadowNode::Shared shadowNodeFromValue(
 
 inline static jsi::Value valueFromShadowNode(
     jsi::Runtime &runtime,
-    const ShadowNode::Shared &shadowNode) {
+    ShadowNode::Shared shadowNode) {
   return jsi::Object::createFromHostObject(
-      runtime, std::make_shared<ShadowNodeWrapper>(shadowNode));
+      runtime, std::make_shared<ShadowNodeWrapper>(std::move(shadowNode)));
 }
 
-inline static SharedShadowNodeUnsharedList shadowNodeListFromValue(
+inline static ShadowNode::UnsharedListOfShared shadowNodeListFromValue(
     jsi::Runtime &runtime,
     jsi::Value const &value) {
   return value.getObject(runtime)
@@ -107,7 +107,7 @@ inline static ShadowNode::UnsharedListOfWeak weakShadowNodeListFromValue(
 
 inline static jsi::Value valueFromShadowNodeList(
     jsi::Runtime &runtime,
-    const SharedShadowNodeUnsharedList &shadowNodeList) {
+    const ShadowNode::UnsharedListOfShared &shadowNodeList) {
   return jsi::Object::createFromHostObject(
       runtime, std::make_unique<ShadowNodeListWrapper>(shadowNodeList));
 }

package/ReactCommon/react/test_utils/shadowTreeGeneration.h

@@ -308,7 +308,7 @@ static inline ShadowNode::Shared generateShadowNodeTree(
   return componentDescriptor.createShadowNode(
       ShadowNodeFragment{
           generateDefaultProps(componentDescriptor),
-          std::make_shared<SharedShadowNodeList>(children)},
+          std::make_shared<ShadowNode::ListOfShared>(children)},
       family);
 }
 

package/ReactCommon/react/utils/BUCK

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

package/ReactCommon/reactperflogger/BUCK

@@ -1,4 +1,4 @@
-load("//tools/build_defs/oss:rn_defs.bzl", "ANDROID", "APPLE", "rn_xplat_cxx_library")
+load("//tools/build_defs/oss:rn_defs.bzl", "ANDROID", "APPLE", "CXX", "rn_xplat_cxx_library")
 
 rn_xplat_cxx_library(
     name = "reactperflogger",
@@ -15,7 +15,7 @@ rn_xplat_cxx_library(
         "pfh:ReactNative_CommonInfrastructurePlaceholder",
         "supermodule:xplat/default/public.react_native.infra",
     ],
-    platforms = (ANDROID, APPLE),
+    platforms = (ANDROID, APPLE, CXX),
     preferred_linkage = "static",
     preprocessor_flags = [
         "-DLOG_TAG=\"ReactNative\"",

package/ReactCommon/reactperflogger/React-perflogger.podspec

@@ -17,7 +17,7 @@ else
 end
 
 folly_compiler_flags = '-DFOLLY_NO_CONFIG -DFOLLY_MOBILE=1 -DFOLLY_USE_LIBCPP=1 -Wno-comma -Wno-shorten-64-to-32'
-folly_version = '2021.06.28.00-v2'
+folly_version = '2021.07.22.00'
 boost_compiler_flags = '-Wno-documentation'
 
 Pod::Spec.new do |s|

package/ReactCommon/runtimeexecutor/React-runtimeexecutor.podspec

@@ -17,7 +17,7 @@ else
 end
 
 folly_compiler_flags = '-DFOLLY_NO_CONFIG -DFOLLY_MOBILE=1 -DFOLLY_USE_LIBCPP=1 -Wno-comma -Wno-shorten-64-to-32'
-folly_version = '2021.06.28.00-v2'
+folly_version = '2021.07.22.00'
 boost_compiler_flags = '-Wno-documentation'
 
 Pod::Spec.new do |s|

package/ReactCommon/yoga/Yoga.podspec

@@ -47,25 +47,11 @@ Pod::Spec.new do |spec|
 
   # Set this environment variable when *not* using the `:path` option to install the pod.
   # E.g. when publishing this spec to a spec repo.
-  source_files = 'yoga/**/*.{cpp,h}', 'Yoga-umbrella.h'
-  source_files = source_files.map { |file| File.join('ReactCommon/yoga', file) } if ENV['INSTALL_YOGA_WITHOUT_PATH_OPTION']
+  source_files = 'yoga/**/*.{cpp,h}'
+  source_files = File.join('ReactCommon/yoga', source_files) if ENV['INSTALL_YOGA_WITHOUT_PATH_OPTION']
   spec.source_files = source_files
 
-  spec.module_map = 'Yoga.modulemap'
-
-  # CocoaPods custom `module_map` + `header_dir` doesn't put the umbrella header in right place.
-  # Ideally, modulemap should be placed with the umbrella header, that would work for both use_frameworks! mode and non use_frameworks! mode.
-  # This script copy the umbrella header back to right place.
-  spec.script_phase = {
-    :name => 'Copy umbrella header',
-    :input_files => ["$PODS_ROOT/Headers/Public/Yoga/yoga/Yoga-umbrella.h"],
-    :output_files => ["$PODS_ROOT/Headers/Private/Yoga/Yoga-umbrella.h"],
-    :execution_position => :before_compile,
-    :shell_path => '/bin/bash',
-
-    # In use_frameworks! mode, the umbrella header will by copied to right place.
-    # This copy command will fail because "$PODS_ROOT/Headers/Public/Yoga/yoga/Yoga-umbrella.h" doesn't exist.
-    # The command is just a no-op in use_frameworks! mode.
-    :script => 'cp -f "$PODS_ROOT/Headers/Public/Yoga/yoga/Yoga-umbrella.h" "$PODS_ROOT/Headers/Private/Yoga/Yoga-umbrella.h" || true',
-  }
+  header_files = 'yoga/*.h'
+  header_files = File.join('ReactCommon/yoga', header_files) if ENV['INSTALL_YOGA_WITHOUT_PATH_OPTION']
+  spec.public_header_files = header_files
 end

package/ReactCommon/yoga/yoga/BitUtils.h

@@ -7,6 +7,8 @@
 
 #pragma once
 
+#ifdef __cplusplus
+
 #include <cstdio>
 #include <cstdint>
 #include "YGEnums.h"
@@ -65,3 +67,5 @@ inline void setBooleanData(uint8_t& flags, size_t index, bool value) {
 } // namespace detail
 } // namespace yoga
 } // namespace facebook
+
+#endif

package/ReactCommon/yoga/yoga/CompactValue.h

@@ -7,6 +7,8 @@
 
 #pragma once
 
+#ifdef __cplusplus
+
 #include "YGValue.h"
 #include "YGMacros.h"
 #include <cmath>
@@ -182,3 +184,5 @@ constexpr bool operator!=(CompactValue a, CompactValue b) noexcept {
 } // namespace detail
 } // namespace yoga
 } // namespace facebook
+
+#endif

package/ReactCommon/yoga/yoga/Utils.h

@@ -6,6 +6,9 @@
  */
 
 #pragma once
+
+#ifdef __cplusplus
+
 #include "YGNode.h"
 #include "Yoga-internal.h"
 #include "CompactValue.h"
@@ -145,3 +148,5 @@ inline YGFloatOptional YGResolveValueMargin(
 }
 
 void throwLogicalErrorWithMessage(const char* message);
+
+#endif

package/ReactCommon/yoga/yoga/YGConfig.h

@@ -6,6 +6,9 @@
  */
 
 #pragma once
+
+#ifdef __cplusplus
+
 #include "Yoga-internal.h"
 #include "Yoga.h"
 
@@ -74,3 +77,5 @@ public:
     setCloneNodeCallback(YGCloneNodeFunc{nullptr});
   }
 };
+
+#endif

package/ReactCommon/yoga/yoga/YGFloatOptional.h

@@ -7,6 +7,8 @@
 
 #pragma once
 
+#ifdef __cplusplus
+
 #include <cmath>
 #include <limits>
 #include "Yoga-internal.h"
@@ -68,3 +70,5 @@ inline bool operator>=(YGFloatOptional lhs, YGFloatOptional rhs) {
 inline bool operator<=(YGFloatOptional lhs, YGFloatOptional rhs) {
   return lhs < rhs || lhs == rhs;
 }
+
+#endif

package/ReactCommon/yoga/yoga/YGLayout.h

@@ -6,6 +6,9 @@
  */
 
 #pragma once
+
+#ifdef __cplusplus
+
 #include "BitUtils.h"
 #include "YGFloatOptional.h"
 #include "Yoga-internal.h"
@@ -85,3 +88,5 @@ public:
   bool operator==(YGLayout layout) const;
   bool operator!=(YGLayout layout) const { return !(*this == layout); }
 };
+
+#endif

package/ReactCommon/yoga/yoga/YGNodePrint.h

@@ -6,7 +6,11 @@
  */
 
 #ifdef DEBUG
+
 #pragma once
+
+#ifdef __cplusplus
+
 #include <string>
 
 #include "Yoga.h"
@@ -22,4 +26,7 @@ void YGNodeToString(
 
 } // namespace yoga
 } // namespace facebook
+
+#endif
+
 #endif

package/ReactCommon/yoga/yoga/Yoga-internal.h

@@ -6,6 +6,9 @@
  */
 
 #pragma once
+
+#ifdef __cplusplus
+
 #include <algorithm>
 #include <array>
 #include <cmath>
@@ -148,3 +151,5 @@ static const float kDefaultFlexShrink = 0.0f;
 static const float kWebDefaultFlexShrink = 1.0f;
 
 extern bool YGFloatsEqual(const float a, const float b);
+
+#endif

package/ReactCommon/yoga/yoga/log.h

@@ -7,6 +7,8 @@
 
 #pragma once
 
+#ifdef __cplusplus
+
 #include "YGEnums.h"
 
 struct YGNode;
@@ -36,3 +38,5 @@ struct Log {
 } // namespace detail
 } // namespace yoga
 } // namespace facebook
+
+#endif

package/android/com/facebook/react/hermes-engine/0.70.0-rc.0/hermes-engine-0.70.0-rc.0-debug.aar.md5

@@ -0,0 +1 @@
+fc5ce8b522bd3eba5fad80330f7b3a55

package/android/com/facebook/react/hermes-engine/0.70.0-rc.0/hermes-engine-0.70.0-rc.0-debug.aar.sha1

@@ -0,0 +1 @@
+aad8e9e5436396f31d4739e775044d9ed818d2a2

package/android/com/facebook/react/hermes-engine/0.70.0-rc.0/hermes-engine-0.70.0-rc.0-debug.aar.sha256

@@ -0,0 +1 @@
+a7fbe2a61ab6ec4ce42c7aafce14562f2ecd63d05c873f57bf4ae993b59d662b

package/android/com/facebook/react/hermes-engine/0.70.0-rc.0/hermes-engine-0.70.0-rc.0-debug.aar.sha512

@@ -0,0 +1 @@
+ba93994bbacb93cffb8bd8af88717e5143f5d553e260657c15515a8e7019dd33308240125a1afd415a82ac2e770b1b750f18cdb9ad098102b52c898d5494f943

package/android/com/facebook/react/hermes-engine/0.70.0-rc.0/hermes-engine-0.70.0-rc.0-release.aar.md5

@@ -0,0 +1 @@
+f6667bacfebcbd3edf1980518f4061e0

package/android/com/facebook/react/hermes-engine/0.70.0-rc.0/hermes-engine-0.70.0-rc.0-release.aar.sha1

@@ -0,0 +1 @@
+37c1835b1fc9061db972d8eab8696a8daf508e81

package/android/com/facebook/react/hermes-engine/0.70.0-rc.0/hermes-engine-0.70.0-rc.0-release.aar.sha256

@@ -0,0 +1 @@
+448808db4dd0bf32e908f2dd72b13da4b58a3f8acccb51c13386abcf8e3f4d13

package/android/com/facebook/react/hermes-engine/0.70.0-rc.0/hermes-engine-0.70.0-rc.0-release.aar.sha512

@@ -0,0 +1 @@
+2e6792295793ed38abd8b1c787eb0c9e5be616c48fdfd4dd6f73f7abca40ae49355860e23b97b960aebed107640b842a5b23b04cb017783953dc2de79332aea3