react-native 0.71.3 → 0.72.0-rc.0

package/ReactAndroid/src/main/jni/react/fabric/FabricMountingManager.cpp

@@ -6,7 +6,6 @@
  */
 
 #include "FabricMountingManager.h"
-#include "CppViewMutationsWrapper.h"
 #include "EventEmitterWrapper.h"
 #include "StateWrapperImpl.h"
 
@@ -39,13 +38,10 @@ static bool getFeatureFlagValue(const char *name) {
 
 FabricMountingManager::FabricMountingManager(
     std::shared_ptr<const ReactNativeConfig> &config,
-    std::shared_ptr<const CppComponentRegistry> &cppComponentRegistry,
     global_ref<jobject> &javaUIManager)
     : javaUIManager_(javaUIManager),
-      cppComponentRegistry_(cppComponentRegistry),
-      disableRevisionCheckForPreallocation_(config->getBool(
-          "react_fabric:disable_revision_check_for_preallocation")),
-      useOverflowInset_(getFeatureFlagValue("useOverflowInset")) {
+      reduceDeleteCreateMutation_(
+          getFeatureFlagValue("reduceDeleteCreateMutation")) {
   CoreFeatures::enableMapBuffer = getFeatureFlagValue("useMapBufferProps");
 }
 
@@ -79,8 +75,6 @@ static inline int getIntBufferSizeForType(CppMountItem::Type mountItemType) {
       return 7; // tag, parentTag, x, y, w, h, DisplayType
     case CppMountItem::Type::UpdateOverflowInset:
       return 5; // tag, left, top, right, bottom
-    case CppMountItem::Type::RunCPPMutations:
-      return 1;
     case CppMountItem::Undefined:
     case CppMountItem::Multiple:
       return -1;
@@ -269,7 +263,7 @@ local_ref<jobject> FabricMountingManager::getProps(
 }
 
 void FabricMountingManager::executeMount(
-    MountingCoordinator::Shared const &mountingCoordinator) {
+    MountingCoordinator::Shared mountingCoordinator) {
   std::lock_guard<std::recursive_mutex> lock(commitMutex_);
 
   SystraceSection s(
@@ -319,31 +313,35 @@ void FabricMountingManager::executeMount(
       auto &index = mutation.index;
 
       bool isVirtual = mutation.mutatedViewIsVirtual();
-
-      // Detect if the mutation instruction belongs to C++ view managers
-      if (cppComponentRegistry_) {
-        auto componentName = newChildShadowView.componentName
-            ? newChildShadowView.componentName
-            : oldChildShadowView.componentName;
-        auto name = std::string(componentName);
-        if (cppComponentRegistry_->containsComponentManager(name)) {
-          // is this thread safe?
-          cppViewMutations.push_back(mutation);
-
-          // This is a hack that could be avoided by using Portals
-          // Only execute mutations instructions for Root C++ ViewManagers
-          // because Root C++ Components have a Android view counterpart.
-          if (!cppComponentRegistry_->isRootComponent(name)) {
-            continue;
-          }
-        }
-      }
-
       switch (mutationType) {
         case ShadowViewMutation::Create: {
-          bool allocationCheck =
+          bool shouldCreateView =
               !allocatedViewTags.contains(newChildShadowView.tag);
-          bool shouldCreateView = allocationCheck;
+          if (reduceDeleteCreateMutation_) {
+            // Detect DELETE...CREATE situation on the same node and do NOT push
+            // back to the mount items. This is an edge case that may happen
+            // when for example animation runs while commit happened, and we
+            // want to filter them out here to capture all possible sources of
+            // such mutations. The re-ordering logic here assumes no
+            // DELETE...CREATE in the mutations, as we will re-order mutations
+            // and batch all DELETE instructions in the end.
+            auto it = std::remove_if(
+                cppDeleteMountItems.begin(),
+                cppDeleteMountItems.end(),
+                [&](auto &deletedMountItem) -> bool {
+                  return deletedMountItem.oldChildShadowView.tag ==
+                      newChildShadowView.tag;
+                });
+            bool hasDeletedViewsWithSameTag = it != cppDeleteMountItems.end();
+            cppDeleteMountItems.erase(it, cppDeleteMountItems.end());
+
+            if (hasDeletedViewsWithSameTag) {
+              shouldCreateView = false;
+              LOG(ERROR)
+                  << "XIN: Detect DELETE...CREATE on the same tag from mutations in the same batch. The DELETE and CREATE mutations are removed before sending to the native platforms";
+            }
+          }
+
           if (shouldCreateView) {
             cppCommonMountItems.push_back(
                 CppMountItem::CreateMountItem(newChildShadowView));
@@ -405,8 +403,7 @@ void FabricMountingManager::executeMount(
             // children of the current view. The layout of current view may not
             // change, and we separate this part from layout mount items to not
             // pack too much data there.
-            if (useOverflowInset_ &&
-                (oldChildShadowView.layoutMetrics.overflowInset !=
+            if ((oldChildShadowView.layoutMetrics.overflowInset !=
                  newChildShadowView.layoutMetrics.overflowInset)) {
               cppUpdateOverflowInsetMountItems.push_back(
                   CppMountItem::UpdateOverflowInsetMountItem(
@@ -462,9 +459,8 @@ void FabricMountingManager::executeMount(
             // children of the current view. The layout of current view may not
             // change, and we separate this part from layout mount items to not
             // pack too much data there.
-            if (useOverflowInset_ &&
-                newChildShadowView.layoutMetrics.overflowInset !=
-                    EdgeInsets::ZERO) {
+            if (newChildShadowView.layoutMetrics.overflowInset !=
+                EdgeInsets::ZERO) {
               cppUpdateOverflowInsetMountItems.push_back(
                   CppMountItem::UpdateOverflowInsetMountItem(
                       newChildShadowView));
@@ -823,36 +819,6 @@ void FabricMountingManager::executeMount(
     }
   }
 
-  if (cppViewMutations.size() > 0) {
-    writeIntBufferTypePreamble(
-        CppMountItem::Type::RunCPPMutations,
-        1,
-        env,
-        intBufferArray,
-        intBufferPosition);
-
-    // TODO review this logic and memory mamangement
-    // this might not be necessary:
-    // temp[0] = 1234;
-    // env->SetIntArrayRegion(intBufferArray, intBufferPosition, 1, temp);
-    // intBufferPosition += 1;
-
-    // Do not hold a reference to javaCppMutations from the C++ side.
-    auto javaCppMutations = CppViewMutationsWrapper::newObjectJavaArgs();
-    CppViewMutationsWrapper *cppViewMutationsWrapper = cthis(javaCppMutations);
-
-    // TODO move this to init methods
-    cppViewMutationsWrapper->cppComponentRegistry = cppComponentRegistry_;
-    // TODO is moving the cppViewMutations safe / thread safe?
-    // cppViewMutations will be accessed from the UI Thread in a near future
-    // can they dissapear?
-    cppViewMutationsWrapper->cppViewMutations =
-        std::make_shared<std::vector<facebook::react::ShadowViewMutation>>(
-            std::move(cppViewMutations));
-
-    (*objBufferArray)[objBufferPosition++] = javaCppMutations.get();
-  }
-
   // If there are no items, we pass a nullptr instead of passing the object
   // through the JNI
   auto batch = createMountItemsIntBufferBatchContainer(

package/ReactAndroid/src/main/jni/react/fabric/FabricMountingManager.h

@@ -7,7 +7,6 @@
 
 #pragma once
 
-#include "CppComponentRegistry.h"
 #include "FabricMountItem.h"
 
 #include <react/config/ReactNativeConfig.h>
@@ -34,7 +33,6 @@ class FabricMountingManager final {
 
   FabricMountingManager(
       std::shared_ptr<const ReactNativeConfig> &config,
-      std::shared_ptr<const CppComponentRegistry> &cppComponentRegistry,
       jni::global_ref<jobject> &javaUIManager);
 
   void onSurfaceStart(SurfaceId surfaceId);
@@ -43,7 +41,7 @@ class FabricMountingManager final {
 
   void preallocateShadowView(SurfaceId surfaceId, ShadowView const &shadowView);
 
-  void executeMount(MountingCoordinator::Shared const &mountingCoordinator);
+  void executeMount(MountingCoordinator::Shared mountingCoordinator);
 
   void dispatchCommand(
       ShadowView const &shadowView,
@@ -70,10 +68,8 @@ class FabricMountingManager final {
 
   butter::map<SurfaceId, butter::set<Tag>> allocatedViewRegistry_{};
   std::recursive_mutex allocatedViewsMutex_;
-  std::shared_ptr<const CppComponentRegistry> cppComponentRegistry_;
 
-  bool const disableRevisionCheckForPreallocation_{false};
-  bool const useOverflowInset_{false};
+  bool const reduceDeleteCreateMutation_{false};
 
   jni::local_ref<jobject> getProps(
       ShadowView const &oldShadowView,

package/ReactAndroid/src/main/jni/react/fabric/JBackgroundExecutor.h

@@ -13,9 +13,7 @@
 namespace facebook {
 namespace react {
 
-using namespace facebook::jni;
-
-class JBackgroundExecutor : public JavaClass<JBackgroundExecutor> {
+class JBackgroundExecutor : public jni::JavaClass<JBackgroundExecutor> {
  public:
   static auto constexpr kJavaDescriptor =
       "Lcom/facebook/react/bridge/BackgroundExecutor;";

package/ReactAndroid/src/main/jni/react/fabric/JFabricUIManager.h

@@ -8,13 +8,12 @@
 #pragma once
 
 #include <fbjni/fbjni.h>
-#include "Binding.h"
 
-using namespace facebook::jni;
+#include "Binding.h"
 
 namespace facebook::react {
 
-class JFabricUIManager : public JavaClass<JFabricUIManager> {
+class JFabricUIManager : public jni::JavaClass<JFabricUIManager> {
  public:
   static constexpr auto kJavaDescriptor =
       "Lcom/facebook/react/fabric/FabricUIManager;";

package/ReactAndroid/src/main/jni/react/fabric/OnLoad.cpp

@@ -10,7 +10,6 @@
 #include "Binding.h"
 #include "ComponentFactory.h"
 #include "CoreComponentsRegistry.h"
-#include "CppViewMutationsWrapper.h"
 #include "EventBeatManager.h"
 #include "EventEmitterWrapper.h"
 #include "StateWrapperImpl.h"
@@ -21,7 +20,6 @@ JNIEXPORT jint JNICALL JNI_OnLoad(JavaVM *vm, void *) {
     facebook::react::Binding::registerNatives();
     facebook::react::EventBeatManager::registerNatives();
     facebook::react::EventEmitterWrapper::registerNatives();
-    facebook::react::CppViewMutationsWrapper::registerNatives();
     facebook::react::StateWrapperImpl::registerNatives();
     facebook::react::ComponentFactory::registerNatives();
     facebook::react::CoreComponentsRegistry::registerNatives();

package/ReactAndroid/src/main/jni/react/fabric/StateWrapperImpl.cpp

@@ -27,24 +27,20 @@ jni::local_ref<StateWrapperImpl::jhybriddata> StateWrapperImpl::initHybrid(
 jni::local_ref<ReadableNativeMap::jhybridobject>
 StateWrapperImpl::getStateDataImpl() {
   folly::dynamic map = state_->getDynamic();
-  local_ref<ReadableNativeMap::jhybridobject> readableNativeMap =
-      ReadableNativeMap::newObjectCxxArgs(map);
-  return readableNativeMap;
+  return ReadableNativeMap::newObjectCxxArgs(std::move(map));
 }
 
 jni::local_ref<JReadableMapBuffer::jhybridobject>
 StateWrapperImpl::getStateMapBufferDataImpl() {
   MapBuffer map = state_->getMapBuffer();
-  auto readableMapBuffer =
-      JReadableMapBuffer::createWithContents(std::move(map));
-  return readableMapBuffer;
+  return JReadableMapBuffer::createWithContents(std::move(map));
 }
 
 void StateWrapperImpl::updateStateImpl(NativeMap *map) {
   // Get folly::dynamic from map
   auto dynamicMap = map->consume();
   // Set state
-  state_->updateState(dynamicMap);
+  state_->updateState(std::move(dynamicMap));
 }
 
 void StateWrapperImpl::registerNatives() {

package/ReactAndroid/src/main/jni/react/fabric/SurfaceHandlerBinding.cpp

@@ -21,7 +21,7 @@ void SurfaceHandlerBinding::setDisplayMode(jint mode) {
 }
 
 void SurfaceHandlerBinding::start() {
-  std::unique_lock<butter::shared_mutex> lock(lifecycleMutex_);
+  std::unique_lock lock(lifecycleMutex_);
 
   if (surfaceHandler_.getStatus() != SurfaceHandler::Status::Running) {
     surfaceHandler_.start();
@@ -29,7 +29,7 @@ void SurfaceHandlerBinding::start() {
 }
 
 void SurfaceHandlerBinding::stop() {
-  std::unique_lock<butter::shared_mutex> lock(lifecycleMutex_);
+  std::unique_lock lock(lifecycleMutex_);
 
   if (surfaceHandler_.getStatus() == SurfaceHandler::Status::Running) {
     surfaceHandler_.stop();

package/ReactAndroid/src/main/jni/react/fabric/SurfaceHandlerBinding.h

@@ -7,6 +7,8 @@
 
 #pragma once
 
+#include <shared_mutex>
+
 #include <fbjni/fbjni.h>
 #include <react/jni/ReadableNativeMap.h>
 #include <react/renderer/scheduler/SurfaceHandler.h>
@@ -50,7 +52,7 @@ class SurfaceHandlerBinding : public jni::HybridClass<SurfaceHandlerBinding> {
   SurfaceHandler const &getSurfaceHandler();
 
  private:
-  mutable butter::shared_mutex lifecycleMutex_;
+  mutable std::shared_mutex lifecycleMutex_;
   const SurfaceHandler surfaceHandler_;
 
   jni::alias_ref<SurfaceHandlerBinding::jhybriddata> jhybridobject_;

package/ReactAndroid/src/main/jni/react/fabric/viewPropConversions.h

@@ -10,7 +10,7 @@
 #include <react/renderer/components/view/ViewProps.h>
 #include <react/renderer/components/view/ViewPropsMapBuffer.h>
 #include <react/renderer/components/view/conversions.h>
-#include <react/renderer/graphics/conversions.h>
+#include <react/renderer/core/graphicsConversions.h>
 #include <react/renderer/mapbuffer/MapBuffer.h>
 #include <react/renderer/mapbuffer/MapBufferBuilder.h>
 
@@ -113,6 +113,10 @@ constexpr MapBuffer::Key CORNER_TOP_END = 5;
 constexpr MapBuffer::Key CORNER_BOTTOM_END = 6;
 constexpr MapBuffer::Key CORNER_BOTTOM_START = 7;
 constexpr MapBuffer::Key CORNER_ALL = 8;
+constexpr MapBuffer::Key CORNER_END_END = 9;
+constexpr MapBuffer::Key CORNER_END_START = 10;
+constexpr MapBuffer::Key CORNER_START_END = 11;
+constexpr MapBuffer::Key CORNER_START_START = 12;
 
 inline void putOptionalFloat(
     MapBufferBuilder &builder,
@@ -122,7 +126,7 @@ inline void putOptionalFloat(
 }
 
 MapBuffer convertBorderRadii(CascadedBorderRadii const &radii) {
-  MapBufferBuilder builder(9);
+  MapBufferBuilder builder(13);
   putOptionalFloat(builder, CORNER_TOP_LEFT, radii.topLeft);
   putOptionalFloat(builder, CORNER_TOP_RIGHT, radii.topRight);
   putOptionalFloat(builder, CORNER_BOTTOM_RIGHT, radii.bottomRight);
@@ -132,6 +136,10 @@ MapBuffer convertBorderRadii(CascadedBorderRadii const &radii) {
   putOptionalFloat(builder, CORNER_BOTTOM_END, radii.bottomEnd);
   putOptionalFloat(builder, CORNER_BOTTOM_START, radii.bottomStart);
   putOptionalFloat(builder, CORNER_ALL, radii.all);
+  putOptionalFloat(builder, CORNER_END_END, radii.endEnd);
+  putOptionalFloat(builder, CORNER_END_START, radii.endStart);
+  putOptionalFloat(builder, CORNER_START_END, radii.startEnd);
+  putOptionalFloat(builder, CORNER_START_START, radii.startStart);
   return builder.build();
 }
 

package/ReactAndroid/src/main/jni/react/hermes/instrumentation/BUCK

@@ -22,6 +22,6 @@ rn_xplat_cxx_library(
     deps = [
         react_native_target("jni/react/jni:jni"),
         FBJNI_TARGET,
-        react_native_xplat_dep("hermes/API:HermesAPI"),
+        react_native_xplat_dep("hermes/API:HermesAPIFullOrLean"),
     ],
 )

package/ReactAndroid/src/main/jni/react/hermes/reactexecutor/CMakeLists.txt

@@ -16,6 +16,7 @@ target_compile_options(
         hermes_executor
         PRIVATE
         $<$<CONFIG:Debug>:-DHERMES_ENABLE_DEBUGGER=1>
+        -std=c++17
         -fexceptions
 )
 target_include_directories(hermes_executor PRIVATE .)

package/ReactAndroid/src/main/jni/react/hermes/reactexecutor/OnLoad.cpp

@@ -16,7 +16,6 @@
 #include <react/jni/JReactMarker.h>
 #include <react/jni/JSLogging.h>
 #include <react/jni/JavaScriptExecutorHolder.h>
-#include <react/jni/NativeTime.h>
 
 #include <memory>
 
@@ -56,10 +55,7 @@ static void installBindings(jsi::Runtime &runtime) {
       static_cast<void (*)(const std::string &, unsigned int)>(
           &reactAndroidLoggingHook);
   react::bindNativeLogger(runtime, androidLogger);
-
-  react::PerformanceNow androidNativePerformanceNow =
-      static_cast<double (*)()>(&reactAndroidNativePerformanceNowHook);
-  react::bindNativePerformanceNow(runtime, androidNativePerformanceNow);
+  react::bindNativePerformanceNow(runtime);
 }
 
 class HermesExecutorHolder

package/ReactAndroid/src/main/jni/react/jni/.clang-tidy

@@ -2,4 +2,5 @@
 Checks: '>
 clang-diagnostic-*,
 '
+InheritParentConfig: true
 ...

package/ReactAndroid/src/main/jni/react/jni/BUCK

@@ -1,4 +1,4 @@
-load("//tools/build_defs/oss:rn_defs.bzl", "ANDROID", "FBJNI_TARGET", "IS_OSS_BUILD", "react_native_target", "react_native_xplat_dep", "react_native_xplat_target", "rn_xplat_cxx_library")
+load("//tools/build_defs/oss:rn_defs.bzl", "ANDROID", "FBGLOGINIT_TARGET", "FBJNI_TARGET", "IS_OSS_BUILD", "react_native_target", "react_native_xplat_dep", "react_native_xplat_target", "rn_xplat_cxx_library")
 
 EXPORTED_HEADERS = [
     "CxxModuleWrapper.h",
@@ -48,7 +48,7 @@ rn_xplat_cxx_library(
         "-DLOG_TAG=\"ReactNativeJNI\"",
         "-DWITH_FBSYSTRACE=1",
         "-DWITH_INSPECTOR=1",
-    ],
+    ] + ["-DWITH_GLOGINIT=0"] if not IS_OSS_BUILD else [],
     soname = "libreactnativejni.$(ext)",
     visibility = [
         "PUBLIC",
@@ -59,7 +59,6 @@ rn_xplat_cxx_library(
         "//third-party/glog:glog",
         "//xplat/folly:dynamic",
         "//xplat/folly:json",
-        "//fbandroid/xplat/fbgloginit:fbgloginit",
         "//xplat/fbsystrace:fbsystrace",
         react_native_target("jni/react/turbomodule:callinvokerholder"),
         react_native_xplat_target("cxxreact:bridge"),
@@ -71,5 +70,7 @@ rn_xplat_cxx_library(
         react_native_xplat_target("logger:logger"),
         react_native_xplat_dep("jsi:jsi"),
         FBJNI_TARGET,
-    ] if not IS_OSS_BUILD else [],
+    ] + ([
+        FBGLOGINIT_TARGET,
+    ] if IS_OSS_BUILD else []),
 )

package/ReactAndroid/src/main/jni/react/jni/JMessageQueueThread.cpp

@@ -18,6 +18,8 @@
 namespace facebook {
 namespace react {
 
+using namespace jni;
+
 namespace {
 
 struct JavaJSException : jni::JavaClass<JavaJSException, JThrowable> {

package/ReactAndroid/src/main/jni/react/jni/JMessageQueueThread.h

@@ -12,10 +12,7 @@
 #include <cxxreact/MessageQueueThread.h>
 #include <fbjni/fbjni.h>
 
-using namespace facebook::jni;
-
-namespace facebook {
-namespace react {
+namespace facebook::react {
 
 class JavaMessageQueueThread : public jni::JavaClass<JavaMessageQueueThread> {
  public:
@@ -25,7 +22,7 @@ class JavaMessageQueueThread : public jni::JavaClass<JavaMessageQueueThread> {
 
 class JMessageQueueThread : public MessageQueueThread {
  public:
-  JMessageQueueThread(alias_ref<JavaMessageQueueThread::javaobject> jobj);
+  JMessageQueueThread(jni::alias_ref<JavaMessageQueueThread::javaobject> jobj);
 
   /**
    * Enqueues the given function to run on this MessageQueueThread.
@@ -50,8 +47,7 @@ class JMessageQueueThread : public MessageQueueThread {
   }
 
  private:
-  global_ref<JavaMessageQueueThread::javaobject> m_jobj;
+  jni::global_ref<JavaMessageQueueThread::javaobject> m_jobj;
 };
 
-} // namespace react
-} // namespace facebook
+} // namespace facebook::react

package/ReactAndroid/src/main/jni/react/jni/JReactMarker.cpp

@@ -17,9 +17,10 @@ namespace react {
 void JReactMarker::setLogPerfMarkerIfNeeded() {
   static std::once_flag flag{};
   std::call_once(flag, []() {
-    ReactMarker::logTaggedMarker = JReactMarker::logPerfMarker;
-    ReactMarker::logTaggedMarkerBridgeless =
+    ReactMarker::logTaggedMarkerImpl = JReactMarker::logPerfMarker;
+    ReactMarker::logTaggedMarkerBridgelessImpl =
         JReactMarker::logPerfMarkerBridgeless;
+    ReactMarker::getAppStartTimeImpl = JReactMarker::getAppStartTime;
   });
 }
 
@@ -103,5 +104,11 @@ void JReactMarker::logPerfMarkerWithInstanceKey(
   }
 }
 
+double JReactMarker::getAppStartTime() {
+  static auto cls = javaClassStatic();
+  static auto meth = cls->getStaticMethod<double()>("getAppStartTime");
+  return meth(cls);
+}
+
 } // namespace react
 } // namespace facebook

package/ReactAndroid/src/main/jni/react/jni/JReactMarker.h

@@ -38,6 +38,7 @@ class JReactMarker : public facebook::jni::JavaClass<JReactMarker> {
       const ReactMarker::ReactMarkerId markerId,
       const char *tag,
       const int instanceKey);
+  static double getAppStartTime();
 };
 
 } // namespace react

package/ReactAndroid/src/main/jni/react/jni/JavaModuleWrapper.cpp

@@ -62,7 +62,7 @@ std::string JavaNativeModule::getSyncMethodName(unsigned int reactMethodId) {
 
   auto &methodInvoker = syncMethods_[reactMethodId];
 
-  if (!methodInvoker.hasValue()) {
+  if (!methodInvoker.has_value()) {
     throw std::invalid_argument(folly::to<std::string>(
         "methodId ", reactMethodId, " is not a recognized sync method"));
   }
@@ -147,7 +147,7 @@ MethodCallResult JavaNativeModule::callSerializableNativeHook(
   }
 
   auto &method = syncMethods_[reactMethodId];
-  CHECK(method.hasValue() && method->isSyncHook())
+  CHECK(method.has_value() && method->isSyncHook())
       << "Trying to invoke a asynchronous method as synchronous hook";
   return method->invoke(instance_, wrapper_->getModule(), params);
 }

package/ReactAndroid/src/main/jni/react/jni/JavaModuleWrapper.h

@@ -9,7 +9,7 @@
 
 #include <cxxreact/NativeModule.h>
 #include <fbjni/fbjni.h>
-#include <folly/Optional.h>
+#include <optional>
 
 #include "MethodInvoker.h"
 
@@ -82,7 +82,7 @@ class JavaNativeModule : public NativeModule {
   std::weak_ptr<Instance> instance_;
   jni::global_ref<JavaModuleWrapper::javaobject> wrapper_;
   std::shared_ptr<MessageQueueThread> messageQueueThread_;
-  std::vector<folly::Optional<MethodInvoker>> syncMethods_;
+  std::vector<std::optional<MethodInvoker>> syncMethods_;
 };
 
 } // namespace react

package/ReactAndroid/src/main/jni/react/jni/MethodInvoker.cpp

@@ -279,7 +279,7 @@ MethodCallResult MethodInvoker::invoke(
     case 'v':
       env->CallVoidMethodA(module.get(), method_, args);
       throwPendingJniExceptionAsCppException();
-      return folly::none;
+      return std::nullopt;
 
     case 'z':
       PRIMITIVE_CASE_CASTING(Boolean, bool)
@@ -307,7 +307,7 @@ MethodCallResult MethodInvoker::invoke(
 
     default:
       LOG(FATAL) << "Unknown return type: " << returnType;
-      return folly::none;
+      return std::nullopt;
   }
 }
 

package/ReactAndroid/src/main/jni/react/jni/NativeArray.cpp

@@ -7,7 +7,6 @@
 
 #include "NativeArray.h"
 
-#include <fbjni/fbjni.h>
 #include <folly/json.h>
 
 using namespace facebook::jni;
@@ -15,8 +14,7 @@ using namespace facebook::jni;
 namespace facebook {
 namespace react {
 
-NativeArray::NativeArray(folly::dynamic array)
-    : isConsumed(false), array_(std::move(array)) {
+void NativeArray::assertInternalType() {
   if (!array_.isArray()) {
     throwNewJavaException(
         exceptions::gUnexpectedNativeTypeExceptionClass,

package/ReactAndroid/src/main/jni/react/jni/NativeArray.h

@@ -17,7 +17,7 @@ namespace react {
 
 class NativeArray : public jni::HybridClass<NativeArray> {
  public:
-  static constexpr const char *kJavaDescriptor =
+  static auto constexpr *kJavaDescriptor =
       "Lcom/facebook/react/bridge/NativeArray;";
 
   jni::local_ref<jstring> toString();
@@ -27,7 +27,6 @@ class NativeArray : public jni::HybridClass<NativeArray> {
   // Whether this array has been added to another array or map and no longer
   // has a valid array value.
   bool isConsumed;
-  void throwIfConsumed();
 
   static void registerNatives();
 
@@ -35,7 +34,18 @@ class NativeArray : public jni::HybridClass<NativeArray> {
   folly::dynamic array_;
 
   friend HybridBase;
-  explicit NativeArray(folly::dynamic array);
+
+  template <class Dyn>
+  explicit NativeArray(Dyn &&array)
+      : isConsumed(false), array_(std::forward<Dyn>(array)) {
+    assertInternalType();
+  }
+
+  void assertInternalType();
+  void throwIfConsumed();
+
+  NativeArray(const NativeArray &) = delete;
+  NativeArray &operator=(const NativeArray &) = delete;
 };
 
 } // namespace react

package/ReactAndroid/src/main/jni/react/jni/NativeMap.cpp

@@ -14,9 +14,9 @@ using namespace facebook::jni;
 namespace facebook {
 namespace react {
 
-std::string NativeMap::toString() {
+local_ref<jstring> NativeMap::toString() {
   throwIfConsumed();
-  return ("{ NativeMap: " + folly::toJson(map_) + " }").c_str();
+  return make_jstring(folly::toJson(map_).c_str());
 }
 
 void NativeMap::registerNatives() {

package/ReactAndroid/src/main/jni/react/jni/NativeMap.h

@@ -20,14 +20,13 @@ class NativeMap : public jni::HybridClass<NativeMap> {
   static auto constexpr kJavaDescriptor =
       "Lcom/facebook/react/bridge/NativeMap;";
 
-  std::string toString();
+  jni::local_ref<jstring> toString();
 
   RN_EXPORT folly::dynamic consume();
 
   // Whether this map has been added to another array or map and no longer
   // has a valid map value.
   bool isConsumed;
-  void throwIfConsumed();
 
   static void registerNatives();
 
@@ -35,8 +34,15 @@ class NativeMap : public jni::HybridClass<NativeMap> {
   folly::dynamic map_;
 
   friend HybridBase;
-  friend struct ReadableNativeMapKeySetIterator;
-  explicit NativeMap(folly::dynamic s) : isConsumed(false), map_(s) {}
+
+  template <class Dyn>
+  explicit NativeMap(Dyn &&map)
+      : isConsumed(false), map_(std::forward<Dyn>(map)) {}
+
+  void throwIfConsumed();
+
+  NativeMap(const NativeMap &) = delete;
+  NativeMap &operator=(const NativeMap &) = delete;
 };
 
 } // namespace react