react-native 0.68.1 → 0.69.0-rc.1

package/ReactAndroid/src/main/java/com/facebook/react/fabric/jni/FabricMountingManager.cpp

@@ -8,6 +8,7 @@
 #include "FabricMountingManager.h"
 #include "EventEmitterWrapper.h"
 #include "StateWrapperImpl.h"
+#include "viewPropConversions.h"
 
 #include <react/jni/ReadableNativeMap.h>
 #include <react/renderer/components/scrollview/ScrollViewProps.h>
@@ -27,6 +28,31 @@ using namespace facebook::jni;
 namespace facebook {
 namespace react {
 
+static bool doesUseOverflowInset() {
+  static const auto reactFeatureFlagsJavaDescriptor = jni::findClassStatic(
+      FabricMountingManager::ReactFeatureFlagsJavaDescriptor);
+  static const auto doesUseOverflowInset =
+      reactFeatureFlagsJavaDescriptor->getStaticMethod<jboolean()>(
+          "doesUseOverflowInset");
+  return doesUseOverflowInset(reactFeatureFlagsJavaDescriptor);
+}
+
+FabricMountingManager::FabricMountingManager(
+    std::shared_ptr<const ReactNativeConfig> &config,
+    global_ref<jobject> &javaUIManager)
+    : javaUIManager_(javaUIManager),
+      enableEarlyEventEmitterUpdate_(
+          config->getBool("react_fabric:enable_early_event_emitter_update")),
+      disablePreallocateViews_(
+          config->getBool("react_fabric:disabled_view_preallocation_android")),
+      disableRevisionCheckForPreallocation_(config->getBool(
+          "react_fabric:disable_revision_check_for_preallocation")),
+      useOverflowInset_(doesUseOverflowInset()),
+      shouldRememberAllocatedViews_(config->getBool(
+          "react_native_new_architecture:remember_views_on_mount_android")),
+      useMapBufferForViewProps_(config->getBool(
+          "react_native_new_architecture:use_mapbuffer_for_viewprops")) {}
+
 void FabricMountingManager::onSurfaceStart(SurfaceId surfaceId) {
   std::lock_guard lock(allocatedViewsMutex_);
   allocatedViewRegistry_.emplace(surfaceId, butter::set<Tag>{});
@@ -177,11 +203,6 @@ static inline void writeIntBufferTypePreamble(
   }
 }
 
-inline local_ref<ReadableMap::javaobject> castReadableMap(
-    local_ref<ReadableNativeMap::javaobject> const &nativeMap) {
-  return make_local(reinterpret_cast<ReadableMap::javaobject>(nativeMap.get()));
-}
-
 inline local_ref<ReadableArray::javaobject> castReadableArray(
     local_ref<ReadableNativeArray::javaobject> const &nativeArray) {
   return make_local(
@@ -222,6 +243,25 @@ static inline float scale(Float value, Float pointScaleFactor) {
   return result;
 }
 
+local_ref<jobject> FabricMountingManager::getProps(
+    ShadowView const &oldShadowView,
+    ShadowView const &newShadowView) {
+  if (useMapBufferForViewProps_ &&
+      newShadowView.traits.check(ShadowNodeTraits::Trait::View)) {
+    react_native_assert(
+        newShadowView.props->rawProps.empty() &&
+        "Raw props must be empty when views are using mapbuffer");
+    auto oldProps = oldShadowView.props != nullptr
+        ? static_cast<ViewProps const &>(*oldShadowView.props)
+        : ViewProps{};
+    auto newProps = static_cast<ViewProps const &>(*newShadowView.props);
+    return JReadableMapBuffer::createWithContents(
+        viewPropsDiff(oldProps, newProps));
+  } else {
+    return ReadableNativeMap::newObjectCxxArgs(newShadowView.props->rawProps);
+  }
+}
+
 void FabricMountingManager::executeMount(
     MountingCoordinator::Shared const &mountingCoordinator) {
   std::lock_guard<std::recursive_mutex> lock(commitMutex_);
@@ -308,7 +348,8 @@ void FabricMountingManager::executeMount(
           if (!isVirtual) {
             if (oldChildShadowView.props != newChildShadowView.props) {
               cppUpdatePropsMountItems.push_back(
-                  CppMountItem::UpdatePropsMountItem(newChildShadowView));
+                  CppMountItem::UpdatePropsMountItem(
+                      oldChildShadowView, newChildShadowView));
             }
             if (oldChildShadowView.state != newChildShadowView.state) {
               cppUpdateStateMountItems.push_back(
@@ -362,12 +403,13 @@ void FabricMountingManager::executeMount(
             bool revisionCheck =
                 noRevisionCheck || newChildShadowView.props->revision > 1;
             bool allocationCheck =
-                !allocatedViewTags.contains(newChildShadowView.tag);
+                allocatedViewTags.find(newChildShadowView.tag) ==
+                allocatedViewTags.end();
             bool shouldCreateView =
                 shouldRememberAllocatedViews_ ? allocationCheck : revisionCheck;
             if (shouldCreateView) {
               cppUpdatePropsMountItems.push_back(
-                  CppMountItem::UpdatePropsMountItem(newChildShadowView));
+                  CppMountItem::UpdatePropsMountItem({}, newChildShadowView));
             }
 
             // State
@@ -484,7 +526,6 @@ void FabricMountingManager::executeMount(
 
   // Allocate the intBuffer and object array, now that we know exact sizes
   // necessary
-  // TODO: don't allocate at all if size is zero
   jintArray intBufferArray = env->NewIntArray(batchMountItemIntsSize);
   local_ref<JArrayClass<jobject>> objBufferArray =
       JArrayClass<jobject>::newArray(batchMountItemObjectsSize);
@@ -525,10 +566,8 @@ void FabricMountingManager::executeMount(
       int isLayoutable =
           mountItem.newChildShadowView.layoutMetrics != EmptyLayoutMetrics ? 1
                                                                            : 0;
-
-      local_ref<ReadableMap::javaobject> props =
-          castReadableMap(ReadableNativeMap::newObjectCxxArgs(
-              mountItem.newChildShadowView.props->rawProps));
+      local_ref<JObject> props =
+          getProps(mountItem.oldChildShadowView, mountItem.newChildShadowView);
 
       // Do not hold onto Java object from C
       // We DO want to hold onto C object from Java, since we don't know the
@@ -545,11 +584,7 @@ void FabricMountingManager::executeMount(
           mountItem.newChildShadowView.eventEmitter;
       auto javaEventEmitter = EventEmitterWrapper::newObjectJavaArgs();
       EventEmitterWrapper *cEventEmitter = cthis(javaEventEmitter);
-      if (enableEventEmitterRawPointer_) {
-        cEventEmitter->eventEmitterPointer = eventEmitter.get();
-      } else {
-        cEventEmitter->eventEmitter = eventEmitter;
-      }
+      cEventEmitter->eventEmitter = eventEmitter;
       temp[0] = mountItem.newChildShadowView.tag;
       temp[1] = isLayoutable;
       env->SetIntArrayRegion(intBufferArray, intBufferPosition, 2, temp);
@@ -588,11 +623,8 @@ void FabricMountingManager::executeMount(
       temp[0] = mountItem.newChildShadowView.tag;
       env->SetIntArrayRegion(intBufferArray, intBufferPosition, 1, temp);
       intBufferPosition += 1;
-
-      auto newProps = mountItem.newChildShadowView.props->rawProps;
-      local_ref<ReadableMap::javaobject> newPropsReadableMap =
-          castReadableMap(ReadableNativeMap::newObjectCxxArgs(newProps));
-      (*objBufferArray)[objBufferPosition++] = newPropsReadableMap.get();
+      (*objBufferArray)[objBufferPosition++] =
+          getProps(mountItem.oldChildShadowView, mountItem.newChildShadowView);
     }
   }
   if (!cppUpdateStateMountItems.empty()) {
@@ -729,11 +761,7 @@ void FabricMountingManager::executeMount(
       // Do not hold a reference to javaEventEmitter from the C++ side.
       auto javaEventEmitter = EventEmitterWrapper::newObjectJavaArgs();
       EventEmitterWrapper *cEventEmitter = cthis(javaEventEmitter);
-      if (enableEventEmitterRawPointer_) {
-        cEventEmitter->eventEmitterPointer = eventEmitter.get();
-      } else {
-        cEventEmitter->eventEmitter = eventEmitter;
-      }
+      cEventEmitter->eventEmitter = eventEmitter;
 
       (*objBufferArray)[objBufferPosition++] = javaEventEmitter.get();
     }
@@ -795,7 +823,7 @@ void FabricMountingManager::preallocateShadowView(
       return;
     }
     auto &allocatedViews = allocatedViewsIterator->second;
-    if (allocatedViews.contains(shadowView.tag)) {
+    if (allocatedViews.find(shadowView.tag) != allocatedViews.end()) {
       return;
     }
     allocatedViews.insert(shadowView.tag);
@@ -803,15 +831,11 @@ void FabricMountingManager::preallocateShadowView(
 
   bool isLayoutableShadowNode = shadowView.layoutMetrics != EmptyLayoutMetrics;
 
-  static auto preallocateView = jni::findClassStatic(UIManagerJavaDescriptor)
-                                    ->getMethod<void(
-                                        jint,
-                                        jint,
-                                        jstring,
-                                        ReadableMap::javaobject,
-                                        jobject,
-                                        jobject,
-                                        jboolean)>("preallocateView");
+  static auto preallocateView =
+      jni::findClassStatic(UIManagerJavaDescriptor)
+          ->getMethod<void(
+              jint, jint, jstring, jobject, jobject, jobject, jboolean)>(
+              "preallocateView");
 
   // Do not hold onto Java object from C
   // We DO want to hold onto C object from Java, since we don't know the
@@ -830,16 +854,12 @@ void FabricMountingManager::preallocateShadowView(
     if (eventEmitter != nullptr) {
       javaEventEmitter = EventEmitterWrapper::newObjectJavaArgs();
       EventEmitterWrapper *cEventEmitter = cthis(javaEventEmitter);
-      if (enableEventEmitterRawPointer_) {
-        cEventEmitter->eventEmitterPointer = eventEmitter.get();
-      } else {
-        cEventEmitter->eventEmitter = eventEmitter;
-      }
+      cEventEmitter->eventEmitter = eventEmitter;
     }
   }
 
-  local_ref<ReadableMap::javaobject> props = castReadableMap(
-      ReadableNativeMap::newObjectCxxArgs(shadowView.props->rawProps));
+  local_ref<JObject> props = getProps({}, shadowView);
+
   auto component = getPlatformComponentName(shadowView);
 
   preallocateView(
@@ -932,31 +952,5 @@ void FabricMountingManager::onAllAnimationsComplete() {
   allAnimationsCompleteJNI(javaUIManager_);
 }
 
-bool doesUseOverflowInset() {
-  static const auto reactFeatureFlagsJavaDescriptor = jni::findClassStatic(
-      FabricMountingManager::ReactFeatureFlagsJavaDescriptor);
-  static const auto doesUseOverflowInset =
-      reactFeatureFlagsJavaDescriptor->getStaticMethod<jboolean()>(
-          "doesUseOverflowInset");
-  return doesUseOverflowInset(reactFeatureFlagsJavaDescriptor);
-}
-
-FabricMountingManager::FabricMountingManager(
-    std::shared_ptr<const ReactNativeConfig> &config,
-    global_ref<jobject> &javaUIManager)
-    : javaUIManager_(javaUIManager) {
-  enableEarlyEventEmitterUpdate_ =
-      config->getBool("react_fabric:enable_early_event_emitter_update");
-  enableEventEmitterRawPointer_ =
-      config->getBool("react_fabric:enable_event_emitter_wrapper_raw_pointer");
-  disablePreallocateViews_ =
-      config->getBool("react_fabric:disabled_view_preallocation_android");
-  disableRevisionCheckForPreallocation_ =
-      config->getBool("react_fabric:disable_revision_check_for_preallocation");
-  useOverflowInset_ = doesUseOverflowInset();
-  shouldRememberAllocatedViews_ = config->getBool(
-      "react_native_new_architecture:remember_views_on_mount_android");
-}
-
 } // namespace react
 } // namespace facebook

package/ReactAndroid/src/main/java/com/facebook/react/fabric/jni/FabricMountingManager.h

@@ -23,7 +23,7 @@
 namespace facebook {
 namespace react {
 
-class FabricMountingManager {
+class FabricMountingManager final {
  public:
   constexpr static auto UIManagerJavaDescriptor =
       "com/facebook/react/fabric/FabricUIManager";
@@ -61,8 +61,6 @@ class FabricMountingManager {
 
   void onAllAnimationsComplete();
 
-  virtual ~FabricMountingManager() = default;
-
  private:
   jni::global_ref<jobject> javaUIManager_;
 
@@ -71,12 +69,16 @@ class FabricMountingManager {
   butter::map<SurfaceId, butter::set<Tag>> allocatedViewRegistry_{};
   std::recursive_mutex allocatedViewsMutex_;
 
-  bool enableEventEmitterRawPointer_{false};
-  bool enableEarlyEventEmitterUpdate_{false};
-  bool disablePreallocateViews_{false};
-  bool disableRevisionCheckForPreallocation_{false};
-  bool useOverflowInset_{false};
-  bool shouldRememberAllocatedViews_{false};
+  bool const enableEarlyEventEmitterUpdate_{false};
+  bool const disablePreallocateViews_{false};
+  bool const disableRevisionCheckForPreallocation_{false};
+  bool const useOverflowInset_{false};
+  bool const shouldRememberAllocatedViews_{false};
+  bool const useMapBufferForViewProps_{false};
+
+  jni::local_ref<jobject> getProps(
+      ShadowView const &oldShadowView,
+      ShadowView const &newShadowView);
 };
 
 } // namespace react

package/ReactAndroid/src/main/java/com/facebook/react/fabric/jni/JFabricUIManager.cpp

@@ -0,0 +1,18 @@
+/*
+ * Copyright (c) Meta Platforms, Inc. and affiliates.
+ *
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
+ */
+
+#include "JFabricUIManager.h"
+
+namespace facebook::react {
+
+Binding *JFabricUIManager::getBinding() {
+  static const auto bindingField =
+      javaClassStatic()->getField<Binding::javaobject>("mBinding");
+
+  return getFieldValue(bindingField)->cthis();
+}
+} // namespace facebook::react

package/ReactAndroid/src/main/java/com/facebook/react/fabric/jni/JFabricUIManager.h

@@ -0,0 +1,25 @@
+/*
+ * Copyright (c) Meta Platforms, Inc. and 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 <fbjni/fbjni.h>
+#include "Binding.h"
+
+using namespace facebook::jni;
+
+namespace facebook::react {
+
+class JFabricUIManager : public JavaClass<JFabricUIManager> {
+ public:
+  static constexpr auto kJavaDescriptor =
+      "Lcom/facebook/react/fabric/FabricUIManager;";
+
+  Binding *getBinding();
+};
+
+} // namespace facebook::react

package/ReactAndroid/src/main/java/com/facebook/react/fabric/jni/ReactNativeConfigHolder.cpp

@@ -29,7 +29,7 @@ std::string ReactNativeConfigHolder::getString(const std::string &param) const {
 int64_t ReactNativeConfigHolder::getInt64(const std::string &param) const {
   static const auto method = facebook::jni::findClassStatic(
                                  "com/facebook/react/fabric/ReactNativeConfig")
-                                 ->getMethod<jint(jstring)>("getInt64");
+                                 ->getMethod<jlong(jstring)>("getInt64");
   return method(reactNativeConfig_, facebook::jni::make_jstring(param).get());
 }
 

package/ReactAndroid/src/main/java/com/facebook/react/fabric/jni/StateWrapperImpl.cpp

@@ -32,12 +32,12 @@ StateWrapperImpl::getStateDataImpl() {
   return readableNativeMap;
 }
 
-jni::local_ref<ReadableMapBuffer::jhybridobject>
+jni::local_ref<JReadableMapBuffer::jhybridobject>
 StateWrapperImpl::getStateMapBufferDataImpl() {
   MapBuffer map = state_->getMapBuffer();
-  auto ReadableMapBuffer =
-      ReadableMapBuffer::createWithContents(std::move(map));
-  return ReadableMapBuffer;
+  auto readableMapBuffer =
+      JReadableMapBuffer::createWithContents(std::move(map));
+  return readableMapBuffer;
 }
 
 void StateWrapperImpl::updateStateImpl(NativeMap *map) {

package/ReactAndroid/src/main/java/com/facebook/react/fabric/jni/StateWrapperImpl.h

@@ -8,7 +8,7 @@
 #pragma once
 
 #include <fbjni/fbjni.h>
-#include <react/common/mapbuffer/ReadableMapBuffer.h>
+#include <react/common/mapbuffer/JReadableMapBuffer.h>
 #include <react/jni/ReadableNativeMap.h>
 #include <react/renderer/core/State.h>
 
@@ -26,7 +26,7 @@ class StateWrapperImpl : public jni::HybridClass<StateWrapperImpl> {
 
   static void registerNatives();
 
-  jni::local_ref<ReadableMapBuffer::jhybridobject> getStateMapBufferDataImpl();
+  jni::local_ref<JReadableMapBuffer::jhybridobject> getStateMapBufferDataImpl();
   jni::local_ref<ReadableNativeMap::jhybridobject> getStateDataImpl();
   void updateStateImpl(NativeMap *map);