react-native 0.66.2 → 0.67.0-rc.3

package/ReactCommon/react/renderer/core/RawPropsKey.cpp

@@ -51,10 +51,18 @@ RawPropsKey::operator std::string() const noexcept {
   return std::string{buffer, length};
 }
 
+static bool areFieldsEqual(char const *lhs, char const *rhs) {
+  if (lhs == nullptr || rhs == nullptr) {
+    return lhs == rhs;
+  }
+  return std::string(lhs) == std::string(rhs);
+}
+
 bool operator==(RawPropsKey const &lhs, RawPropsKey const &rhs) noexcept {
   // Note: We check the name first.
-  return lhs.name == rhs.name && lhs.prefix == rhs.prefix &&
-      lhs.suffix == rhs.suffix;
+  return areFieldsEqual(lhs.name, rhs.name) &&
+      areFieldsEqual(lhs.prefix, rhs.prefix) &&
+      areFieldsEqual(lhs.suffix, rhs.suffix);
 }
 
 bool operator!=(RawPropsKey const &lhs, RawPropsKey const &rhs) noexcept {

package/ReactCommon/react/renderer/core/ReactPrimitives.h

@@ -8,8 +8,6 @@
 #pragma once
 
 #include <folly/dynamic.h>
-#include <react/renderer/core/RawProps.h>
-#include <react/renderer/core/RawValue.h>
 #include <memory>
 #include <string>
 

package/ReactCommon/react/renderer/core/ShadowNode.cpp

@@ -6,7 +6,6 @@
  */
 
 #include "ShadowNode.h"
-#include "Constants.h"
 #include "DynamicPropsUtilities.h"
 #include "ShadowNodeFragment.h"
 
@@ -39,15 +38,13 @@ SharedProps ShadowNode::propsForClonedShadowNode(
     ShadowNode const &sourceShadowNode,
     Props::Shared const &props) {
 #ifdef ANDROID
-  if (Constants::getPropsForwardingEnabled()) {
-    bool hasBeenMounted = sourceShadowNode.hasBeenMounted_;
-    bool sourceNodeHasRawProps = !sourceShadowNode.getProps()->rawProps.empty();
-    if (!hasBeenMounted && sourceNodeHasRawProps && props) {
-      auto &castedProps = const_cast<Props &>(*props);
-      castedProps.rawProps = mergeDynamicProps(
-          sourceShadowNode.getProps()->rawProps, props->rawProps);
-      return props;
-    }
+  bool hasBeenMounted = sourceShadowNode.hasBeenMounted_;
+  bool sourceNodeHasRawProps = !sourceShadowNode.getProps()->rawProps.empty();
+  if (!hasBeenMounted && sourceNodeHasRawProps && props) {
+    auto &castedProps = const_cast<Props &>(*props);
+    castedProps.rawProps = mergeDynamicProps(
+        sourceShadowNode.getProps()->rawProps, props->rawProps);
+    return props;
   }
 #endif
   return props ? props : sourceShadowNode.getProps();

package/ReactCommon/react/renderer/core/ShadowNodeFamily.h

@@ -10,6 +10,7 @@
 #include <memory>
 
 #include <better/mutex.h>
+#include <better/small_vector.h>
 
 #include <react/renderer/core/EventEmitter.h>
 #include <react/renderer/core/ReactPrimitives.h>

package/ReactCommon/react/renderer/debug/BUCK

@@ -31,12 +31,6 @@ rn_xplat_cxx_library(
         ],
         prefix = "react/renderer/debug",
     ),
-    compiler_flags = [
-        "-fexceptions",
-        "-frtti",
-        "-std=c++17",
-        "-Wall",
-    ],
     fbobjc_compiler_flags = APPLE_COMPILER_FLAGS,
     fbobjc_preprocessor_flags = get_preprocessor_flags_for_build_mode() + get_apple_inspector_flags(),
     force_static = True,

package/ReactCommon/react/renderer/element/BUCK

@@ -31,12 +31,6 @@ rn_xplat_cxx_library(
         ],
         prefix = "react/renderer/element",
     ),
-    compiler_flags = [
-        "-fexceptions",
-        "-frtti",
-        "-std=c++17",
-        "-Wall",
-    ],
     fbobjc_compiler_flags = APPLE_COMPILER_FLAGS,
     fbobjc_preprocessor_flags = get_preprocessor_flags_for_build_mode() + get_apple_inspector_flags(),
     force_static = True,

package/ReactCommon/react/renderer/graphics/Android.mk

@@ -15,7 +15,7 @@ LOCAL_SHARED_LIBRARIES := libfolly_json libreact_debug libfb libfbjni libfolly_j
 
 LOCAL_STATIC_LIBRARIES :=
 
-LOCAL_C_INCLUDES := $(LOCAL_PATH)/../../../ $(LOCAL_PATH)/platform/cxx/
+LOCAL_C_INCLUDES := $(LOCAL_PATH)/ $(LOCAL_PATH)/../../../ $(LOCAL_PATH)/platform/cxx/
 
 LOCAL_EXPORT_C_INCLUDES := $(LOCAL_PATH)/../../../ $(LOCAL_PATH)/platform/cxx/
 

package/ReactCommon/react/renderer/graphics/BUCK

@@ -36,12 +36,6 @@ rn_xplat_cxx_library(
         ],
         prefix = "react/renderer/graphics",
     ),
-    compiler_flags = [
-        "-fexceptions",
-        "-frtti",
-        "-std=c++17",
-        "-Wall",
-    ],
     cxx_exported_headers = subdir_glob(
         [
             ("platform/cxx/react/renderer/graphics", "**/*.h"),

package/ReactCommon/react/renderer/graphics/React-graphics.podspec

@@ -29,7 +29,6 @@ Pod::Spec.new do |s|
   s.author                 = "Facebook, Inc. and its affiliates"
   s.platforms              = { :ios => "11.0", :tvos => "11.0" }
   s.source                 = source
-  s.library                = "stdc++"
   s.compiler_flags         = folly_compiler_flags + ' ' + boost_compiler_flags
   s.source_files           = "**/*.{m,mm,cpp,h}"
   s.exclude_files          = "tests",

package/ReactCommon/react/renderer/graphics/Transform.cpp

@@ -183,7 +183,7 @@ TransformOperation Transform::DefaultTransformOperation(
 }
 
 Transform Transform::Interpolate(
-    float animationProgress,
+    Float animationProgress,
     Transform const &lhs,
     Transform const &rhs) {
   // Iterate through operations and reconstruct an interpolated resulting

package/ReactCommon/react/renderer/graphics/Transform.h

@@ -117,7 +117,7 @@ struct Transform {
    * @return
    */
   static Transform Interpolate(
-      float animationProgress,
+      Float animationProgress,
       Transform const &lhs,
       Transform const &rhs);
 

package/ReactCommon/react/renderer/imagemanager/BUCK

@@ -31,12 +31,6 @@ rn_xplat_cxx_library(
         ],
         prefix = "react/renderer/imagemanager",
     ),
-    compiler_flags = [
-        "-fexceptions",
-        "-frtti",
-        "-std=c++17",
-        "-Wall",
-    ],
     contacts = ["oncall+react_native@xmail.facebook.com"],
     fbandroid_exported_headers = subdir_glob(
         [

package/ReactCommon/react/renderer/leakchecker/BUCK

@@ -30,12 +30,6 @@ rn_xplat_cxx_library(
         ],
         prefix = "react/renderer/leakchecker",
     ),
-    compiler_flags = [
-        "-fexceptions",
-        "-frtti",
-        "-std=c++17",
-        "-Wall",
-    ],
     fbobjc_compiler_flags = APPLE_COMPILER_FLAGS,
     fbobjc_preprocessor_flags = get_preprocessor_flags_for_build_mode() + get_apple_inspector_flags(),
     force_static = True,

package/ReactCommon/react/renderer/mapbuffer/BUCK

@@ -29,12 +29,6 @@ rn_xplat_cxx_library(
         ],
         prefix = "react/renderer/mapbuffer",
     ),
-    compiler_flags = [
-        "-fexceptions",
-        "-frtti",
-        "-std=c++17",
-        "-Wall",
-    ],
     fbobjc_compiler_flags = APPLE_COMPILER_FLAGS,
     fbobjc_preprocessor_flags = get_preprocessor_flags_for_build_mode() + get_apple_inspector_flags(),
     force_static = True,

package/ReactCommon/react/renderer/mounting/Android.mk

@@ -21,7 +21,7 @@ LOCAL_CFLAGS += -fexceptions -frtti -std=c++17 -Wall
 
 LOCAL_STATIC_LIBRARIES :=
 
-LOCAL_SHARED_LIBRARIES := libjsi libbetter libyoga libfolly_futures glog libfolly_json libglog_init libreact_render_core libreact_render_debug librrc_view librrc_root libreact_utils libreact_debug libreact_render_telemetry
+LOCAL_SHARED_LIBRARIES := libjsi libbetter libyoga libfolly_futures glog libfolly_json libglog_init libreact_render_core libreact_render_debug librrc_view librrc_root libreact_utils libreact_debug libreact_render_graphics libreact_render_telemetry
 
 include $(BUILD_SHARED_LIBRARY)
 
@@ -36,4 +36,5 @@ $(call import-module,react/renderer/debug)
 $(call import-module,react/utils)
 $(call import-module,react/debug)
 $(call import-module,yogajni)
+$(call import-module,react/renderer/graphics)
 $(call import-module,react/renderer/telemetry)

package/ReactCommon/react/renderer/mounting/BUCK

@@ -32,12 +32,6 @@ rn_xplat_cxx_library(
         ],
         prefix = "react/renderer/mounting",
     ),
-    compiler_flags = [
-        "-fexceptions",
-        "-frtti",
-        "-std=c++17",
-        "-Wall",
-    ],
     fbobjc_compiler_flags = APPLE_COMPILER_FLAGS,
     fbobjc_preprocessor_flags = get_preprocessor_flags_for_build_mode() + get_apple_inspector_flags(),
     force_static = True,

package/ReactCommon/react/renderer/mounting/MountingOverrideDelegate.h

@@ -22,7 +22,7 @@ class MountingCoordinator;
 class MountingOverrideDelegate {
  public:
   virtual bool shouldOverridePullTransaction() const = 0;
-  virtual ~MountingOverrideDelegate(){};
+  virtual ~MountingOverrideDelegate() = default;
 
   /**
    * Delegates that override this method are responsible for:

package/ReactCommon/react/renderer/mounting/ShadowViewMutation.cpp

@@ -84,6 +84,18 @@ bool ShadowViewMutation::mutatedViewIsVirtual() const {
   return viewIsVirtual;
 }
 
+ShadowViewMutation::ShadowViewMutation(
+    Type type,
+    ShadowView parentShadowView,
+    ShadowView oldChildShadowView,
+    ShadowView newChildShadowView,
+    int index)
+    : type(type),
+      parentShadowView(parentShadowView),
+      oldChildShadowView(oldChildShadowView),
+      newChildShadowView(newChildShadowView),
+      index(index) {}
+
 #if RN_DEBUG_STRING_CONVERTIBLE
 
 std::string getDebugName(ShadowViewMutation const &mutation) {

package/ReactCommon/react/renderer/mounting/ShadowViewMutation.h

@@ -23,6 +23,8 @@ namespace react {
 struct ShadowViewMutation final {
   using List = std::vector<ShadowViewMutation>;
 
+  ShadowViewMutation() = delete;
+
 #pragma mark - Designated Initializers
 
   /*
@@ -70,13 +72,20 @@ struct ShadowViewMutation final {
   ShadowView newChildShadowView = {};
   int index = -1;
 
- public:
   // Some platforms can have the notion of virtual views - views that are in the
   // ShadowTree hierarchy but never are on the platform. Generally this is used
   // so notify the platform that a view exists so that we can keep EventEmitters
   // around, to notify JS of something. This mechanism is DEPRECATED and it is
   // highly recommended that you NOT make use of this in your platform!
   bool mutatedViewIsVirtual() const;
+
+ private:
+  ShadowViewMutation(
+      Type type,
+      ShadowView parentShadowView,
+      ShadowView oldChildShadowView,
+      ShadowView newChildShadowView,
+      int index);
 };
 
 using ShadowViewMutationList = std::vector<ShadowViewMutation>;

package/ReactCommon/react/renderer/runtimescheduler/Android.mk

@@ -15,7 +15,7 @@ LOCAL_SRC_FILES := $(wildcard $(LOCAL_PATH)/*.cpp)
 
 LOCAL_EXPORT_C_INCLUDES := $(LOCAL_PATH)/../../../
 
-LOCAL_SHARED_LIBRARIES := libruntimeexecutor libreact_render_core libreact_debug libjsi
+LOCAL_SHARED_LIBRARIES := libruntimeexecutor libreact_render_core libreact_debug libjsi callinvoker
 
 LOCAL_CFLAGS := \
   -DLOG_TAG=\"Fabric\"
@@ -25,3 +25,4 @@ LOCAL_CFLAGS += -fexceptions -frtti -std=c++17 -Wall
 include $(BUILD_SHARED_LIBRARY)
 
 $(call import-module,runtimeexecutor)
+$(call import-module,callinvoker)

package/ReactCommon/react/renderer/runtimescheduler/BUCK

@@ -31,12 +31,6 @@ rn_xplat_cxx_library(
         ],
         prefix = "react/renderer/runtimescheduler",
     ),
-    compiler_flags = [
-        "-fexceptions",
-        "-frtti",
-        "-std=c++17",
-        "-Wall",
-    ],
     fbobjc_compiler_flags = APPLE_COMPILER_FLAGS,
     fbobjc_preprocessor_flags = get_preprocessor_flags_for_build_mode() + get_apple_inspector_flags(),
     force_static = True,
@@ -50,10 +44,10 @@ rn_xplat_cxx_library(
     tests = [":tests"],
     visibility = ["PUBLIC"],
     deps = [
-        react_native_xplat_target("react/renderer/core:core"),
         react_native_xplat_target("runtimeexecutor:runtimeexecutor"),
         react_native_xplat_target("react/renderer/debug:debug"),
         react_native_xplat_target("better:better"),
+        react_native_xplat_target("callinvoker:callinvoker"),
     ],
 )
 

package/ReactCommon/react/renderer/runtimescheduler/ErrorUtils.h

@@ -0,0 +1,36 @@
+/*
+ * 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.
+ */
+
+#include <jsi/jsi.h>
+
+namespace facebook {
+namespace react {
+
+inline static void handleFatalError(
+    jsi::Runtime &runtime,
+    const jsi::JSError &error) {
+  auto reportFatalError = "reportFatalError";
+  auto errorUtils = runtime.global().getProperty(runtime, "ErrorUtils");
+  if (errorUtils.isUndefined() || !errorUtils.isObject() ||
+      !errorUtils.getObject(runtime).hasProperty(runtime, reportFatalError)) {
+    // ErrorUtils was not set up. This probably means the bundle didn't
+    // load properly.
+    throw jsi::JSError(
+        runtime,
+        "ErrorUtils is not set up properly. Something probably went wrong trying to load the JS bundle. Trying to report error " +
+            error.getMessage(),
+        error.getStack());
+  }
+
+  auto func = errorUtils.asObject(runtime).getPropertyAsFunction(
+      runtime, reportFatalError);
+
+  func.call(runtime, error.value());
+}
+
+} // namespace react
+} // namespace facebook

package/ReactCommon/react/renderer/runtimescheduler/RuntimeScheduler.cpp

@@ -6,8 +6,10 @@
  */
 
 #include "RuntimeScheduler.h"
+#include "ErrorUtils.h"
 
-namespace facebook::react {
+namespace facebook {
+namespace react {
 
 #pragma mark - Public
 
@@ -88,29 +90,35 @@ void RuntimeScheduler::executeNowOnTheSameThread(
 void RuntimeScheduler::startWorkLoop(jsi::Runtime &runtime) const {
   auto previousPriority = currentPriority_;
   isPerformingWork_ = true;
-  while (!taskQueue_.empty()) {
-    auto topPriorityTask = taskQueue_.top();
-    auto now = now_();
-    auto didUserCallbackTimeout = topPriorityTask->expirationTime <= now;
-
-    if (!didUserCallbackTimeout && shouldYield_) {
-      // This task hasn't expired and we need to yield.
-      break;
-    }
-    currentPriority_ = topPriorityTask->priority;
-    auto result = topPriorityTask->execute(runtime);
-
-    if (result.isObject() && result.getObject(runtime).isFunction(runtime)) {
-      topPriorityTask->callback =
-          result.getObject(runtime).getFunction(runtime);
-    } else {
-      if (taskQueue_.top() == topPriorityTask) {
-        taskQueue_.pop();
+  try {
+    while (!taskQueue_.empty()) {
+      auto topPriorityTask = taskQueue_.top();
+      auto now = now_();
+      auto didUserCallbackTimeout = topPriorityTask->expirationTime <= now;
+
+      if (!didUserCallbackTimeout && shouldYield_) {
+        // This task hasn't expired and we need to yield.
+        break;
+      }
+      currentPriority_ = topPriorityTask->priority;
+      auto result = topPriorityTask->execute(runtime);
+
+      if (result.isObject() && result.getObject(runtime).isFunction(runtime)) {
+        topPriorityTask->callback =
+            result.getObject(runtime).getFunction(runtime);
+      } else {
+        if (taskQueue_.top() == topPriorityTask) {
+          taskQueue_.pop();
+        }
       }
     }
+  } catch (jsi::JSError &error) {
+    handleFatalError(runtime, error);
   }
+
   currentPriority_ = previousPriority;
   isPerformingWork_ = false;
 }
 
-} // namespace facebook::react
+} // namespace react
+} // namespace facebook

package/ReactCommon/react/renderer/runtimescheduler/RuntimeScheduler.h

@@ -14,7 +14,8 @@
 #include <memory>
 #include <queue>
 
-namespace facebook::react {
+namespace facebook {
+namespace react {
 
 class RuntimeScheduler final {
  public:
@@ -100,4 +101,5 @@ class RuntimeScheduler final {
   mutable bool isPerformingWork_{false};
 };
 
-} // namespace facebook::react
+} // namespace react
+} // namespace facebook

package/ReactCommon/react/renderer/runtimescheduler/RuntimeSchedulerBinding.cpp

@@ -10,11 +10,11 @@
 #include "primitives.h"
 
 #include <react/debug/react_native_assert.h>
-#include <react/renderer/core/PropsParserContext.h>
 #include <chrono>
 #include <memory>
 
-namespace facebook::react {
+namespace facebook {
+namespace react {
 
 std::shared_ptr<RuntimeSchedulerBinding>
 RuntimeSchedulerBinding::createAndInstallIfNeeded(
@@ -167,4 +167,5 @@ jsi::Value RuntimeSchedulerBinding::get(
   return jsi::Value::undefined();
 }
 
-} // namespace facebook::react
+} // namespace react
+} // namespace facebook

package/ReactCommon/react/renderer/runtimescheduler/RuntimeSchedulerBinding.h

@@ -10,7 +10,8 @@
 #include <jsi/jsi.h>
 #include <react/renderer/runtimescheduler/RuntimeScheduler.h>
 
-namespace facebook::react {
+namespace facebook {
+namespace react {
 
 /*
  * Exposes RuntimeScheduler to JavaScript realm.
@@ -39,4 +40,5 @@ class RuntimeSchedulerBinding : public jsi::HostObject {
   std::shared_ptr<RuntimeScheduler> runtimeScheduler_;
 };
 
-} // namespace facebook::react
+} // namespace react
+} // namespace facebook

package/ReactCommon/react/renderer/runtimescheduler/RuntimeSchedulerCallInvoker.cpp

@@ -0,0 +1,32 @@
+/*
+ * 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.
+ */
+
+#include "RuntimeSchedulerCallInvoker.h"
+
+namespace facebook {
+namespace react {
+
+RuntimeSchedulerCallInvoker::RuntimeSchedulerCallInvoker(
+    std::weak_ptr<RuntimeScheduler> runtimeScheduler)
+    : runtimeScheduler_(runtimeScheduler) {}
+
+void RuntimeSchedulerCallInvoker::invokeAsync(std::function<void()> &&func) {
+  if (auto runtimeScheduler = runtimeScheduler_.lock()) {
+    runtimeScheduler->scheduleWork(
+        [func = std::move(func)](jsi::Runtime &) { func(); });
+  }
+}
+
+void RuntimeSchedulerCallInvoker::invokeSync(std::function<void()> &&func) {
+  if (auto runtimeScheduler = runtimeScheduler_.lock()) {
+    runtimeScheduler->executeNowOnTheSameThread(
+        [func = std::move(func)](jsi::Runtime &) { func(); });
+  }
+}
+
+} // namespace react
+} // namespace facebook

package/ReactCommon/react/renderer/runtimescheduler/RuntimeSchedulerCallInvoker.h

@@ -0,0 +1,36 @@
+/*
+ * 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 <ReactCommon/CallInvoker.h>
+#include <react/renderer/runtimescheduler/RuntimeScheduler.h>
+
+namespace facebook {
+namespace react {
+
+/*
+ * Exposes RuntimeScheduler to native modules. All calls invonked on JavaScript
+ * queue from native modules will be funneled through RuntimeScheduler.
+ */
+class RuntimeSchedulerCallInvoker : public CallInvoker {
+ public:
+  RuntimeSchedulerCallInvoker(std::weak_ptr<RuntimeScheduler> runtimeScheduler);
+
+  void invokeAsync(std::function<void()> &&func) override;
+  void invokeSync(std::function<void()> &&func) override;
+
+ private:
+  /*
+   * RuntimeScheduler is retained by the runtime. It must not be
+   * retained by anything beyond the runtime.
+   */
+  std::weak_ptr<RuntimeScheduler> runtimeScheduler_;
+};
+
+} // namespace react
+} // namespace facebook

package/ReactCommon/react/renderer/runtimescheduler/RuntimeSchedulerClock.h

@@ -9,7 +9,8 @@
 
 #include <chrono>
 
-namespace facebook::react {
+namespace facebook {
+namespace react {
 
 /*
  * Represents a monotonic clock suitable for measuring intervals.
@@ -19,4 +20,5 @@ using RuntimeSchedulerClock = std::chrono::steady_clock;
 using RuntimeSchedulerTimePoint = RuntimeSchedulerClock::time_point;
 using RuntimeSchedulerDuration = RuntimeSchedulerClock::duration;
 
-} // namespace facebook::react
+} // namespace react
+} // namespace facebook

package/ReactCommon/react/renderer/runtimescheduler/SchedulerPriority.h

@@ -8,10 +8,10 @@
 #pragma once
 
 #include <react/debug/react_native_assert.h>
-#include <react/renderer/core/PropsParserContext.h>
 #include <chrono>
 
-namespace facebook::react {
+namespace facebook {
+namespace react {
 
 enum class SchedulerPriority : int {
   ImmediatePriority = 1,
@@ -61,4 +61,5 @@ static inline std::chrono::milliseconds timeoutForSchedulerPriority(
   }
 }
 
-} // namespace facebook::react
+} // namespace react
+} // namespace facebook

package/ReactCommon/react/renderer/runtimescheduler/Task.cpp

@@ -7,7 +7,8 @@
 
 #include "RuntimeScheduler.h"
 
-namespace facebook::react {
+namespace facebook {
+namespace react {
 
 Task::Task(
     SchedulerPriority priority,
@@ -32,4 +33,5 @@ jsi::Value Task::execute(jsi::Runtime &runtime) {
   return result;
 }
 
-} // namespace facebook::react
+} // namespace react
+} // namespace facebook

package/ReactCommon/react/renderer/runtimescheduler/Task.h

@@ -12,7 +12,8 @@
 #include <react/renderer/runtimescheduler/RuntimeSchedulerClock.h>
 #include <react/renderer/runtimescheduler/SchedulerPriority.h>
 
-namespace facebook::react {
+namespace facebook {
+namespace react {
 
 class RuntimeScheduler;
 class TaskPriorityComparer;
@@ -43,4 +44,5 @@ class TaskPriorityComparer {
   }
 };
 
-} // namespace facebook::react
+} // namespace react
+} // namespace facebook

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

@@ -11,7 +11,8 @@
 #include <jsi/jsi.h>
 #include <react/renderer/runtimescheduler/Task.h>
 
-namespace facebook::react {
+namespace facebook {
+namespace react {
 
 struct TaskWrapper : public jsi::HostObject {
   TaskWrapper(std::shared_ptr<Task> const &task) : task(task) {}
@@ -36,4 +37,5 @@ inline static std::shared_ptr<Task> taskFromValue(
   return value.getObject(runtime).getHostObject<TaskWrapper>(runtime)->task;
 }
 
-} // namespace facebook::react
+} // namespace react
+} // namespace facebook