react-native 0.70.4 → 0.71.0-rc.0

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

@@ -0,0 +1,100 @@
+/*
+ * 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 "CppViewMutationsWrapper.h"
+
+#include <react/renderer/core/ReactPrimitives.h>
+
+#include <fbjni/fbjni.h>
+#include <glog/logging.h>
+
+using namespace facebook::jni;
+
+namespace facebook {
+namespace react {
+
+jni::local_ref<CppViewMutationsWrapper::jhybriddata>
+CppViewMutationsWrapper::initHybrid(jni::alias_ref<jclass>) {
+  return makeCxxInstance();
+}
+
+void CppViewMutationsWrapper::registerNatives() {
+  registerHybrid({
+      makeNativeMethod("initHybrid", CppViewMutationsWrapper::initHybrid),
+      makeNativeMethod(
+          "runCppViewMutations", CppViewMutationsWrapper::runCppViewMutations),
+  });
+}
+
+void CppViewMutationsWrapper::runCppViewMutations() {
+  // TODO implement rendering logic:
+  // - caching of componengtManagers of views into maps
+  // - caching of allocated views
+  // - logic for each mutation instruction
+  // - Define API in ComponentManager
+  // - Define API in Component
+  // - see RCTMountingManager.mm for logic
+  for (const auto &mutation : *cppViewMutations) {
+    const auto &newChildShadowView = mutation.newChildShadowView;
+    auto &mutationType = mutation.type;
+    auto componentName = newChildShadowView.componentName;
+    auto tag = mutation.newChildShadowView.tag;
+
+    switch (mutationType) {
+      case ShadowViewMutation::Create: {
+        auto component = cppComponentRegistry->createComponentInstance(
+            componentName, tag, newChildShadowView.props);
+        break;
+      }
+      case ShadowViewMutation::Remove: {
+        auto parentTag = mutation.parentShadowView.tag;
+        auto parentComponent =
+            cppComponentRegistry->getComponentInstance(parentTag);
+        auto childComponent = cppComponentRegistry->getComponentInstance(
+            mutation.newChildShadowView.tag);
+        parentComponent->unmountChildComponent(childComponent, mutation.index);
+        break;
+      }
+      case ShadowViewMutation::Delete: {
+        cppComponentRegistry->deleteComponentInstance(tag);
+        break;
+      }
+      case ShadowViewMutation::Update: {
+        auto component = cppComponentRegistry->getComponentInstance(tag);
+        if (mutation.oldChildShadowView.props !=
+            mutation.newChildShadowView.props) {
+          component->updateProps(
+              mutation.oldChildShadowView.props,
+              mutation.newChildShadowView.props);
+        }
+        break;
+      }
+      case ShadowViewMutation::Insert: {
+        auto parentTag = mutation.parentShadowView.tag;
+        auto parentComponent =
+            cppComponentRegistry->getComponentInstance(parentTag);
+        auto childTag = mutation.newChildShadowView.tag;
+        auto childComponent =
+            cppComponentRegistry->getComponentInstance(childTag);
+        auto oldProps = mutation.oldChildShadowView.props;
+        auto newProps = mutation.newChildShadowView.props;
+        childComponent->updateProps(oldProps, newProps);
+
+        if (childComponent && parentComponent) {
+          parentComponent->mountChildComponent(childComponent, mutation.index);
+        }
+        break;
+      }
+      default: {
+        break;
+      }
+    }
+  }
+}
+
+} // namespace react
+} // namespace facebook

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

@@ -0,0 +1,39 @@
+/*
+ * 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 <react/fabric/CppComponentRegistry.h>
+
+#include <fbjni/fbjni.h>
+#include <react/jni/ReadableNativeMap.h>
+#include <react/renderer/mounting/ShadowViewMutation.h>
+
+namespace facebook {
+namespace react {
+
+class CppViewMutationsWrapper
+    : public jni::HybridClass<CppViewMutationsWrapper> {
+ public:
+  constexpr static const char *const kJavaDescriptor =
+      "Lcom/facebook/react/fabric/CppViewMutationsWrapper;";
+
+  static void registerNatives();
+
+  // TODO move this to a constructor or init methods
+  std::shared_ptr<ShadowViewMutationList> cppViewMutations;
+
+  std::shared_ptr<const CppComponentRegistry> cppComponentRegistry;
+
+  void runCppViewMutations();
+
+ private:
+  static jni::local_ref<jhybriddata> initHybrid(jni::alias_ref<jclass>);
+};
+
+} // namespace react
+} // namespace facebook

package/ReactAndroid/src/main/{java/com/facebook/react/fabric/jni → jni/react/fabric}/FabricMountItem.cpp

@@ -44,8 +44,10 @@ CppMountItem CppMountItem::UpdatePropsMountItem(
 CppMountItem CppMountItem::UpdateStateMountItem(ShadowView const &shadowView) {
   return {CppMountItem::Type::UpdateState, {}, {}, shadowView, -1};
 }
-CppMountItem CppMountItem::UpdateLayoutMountItem(ShadowView const &shadowView) {
-  return {CppMountItem::Type::UpdateLayout, {}, {}, shadowView, -1};
+CppMountItem CppMountItem::UpdateLayoutMountItem(
+    ShadowView const &shadowView,
+    ShadowView const &parentView) {
+  return {CppMountItem::Type::UpdateLayout, parentView, {}, shadowView, -1};
 }
 CppMountItem CppMountItem::UpdateEventEmitterMountItem(
     ShadowView const &shadowView) {

package/ReactAndroid/src/main/{java/com/facebook/react/fabric/jni → jni/react/fabric}/FabricMountItem.h

@@ -46,7 +46,9 @@ struct CppMountItem final {
 
   static CppMountItem UpdateStateMountItem(ShadowView const &shadowView);
 
-  static CppMountItem UpdateLayoutMountItem(ShadowView const &shadowView);
+  static CppMountItem UpdateLayoutMountItem(
+      ShadowView const &shadowView,
+      ShadowView const &parentView);
 
   static CppMountItem UpdateEventEmitterMountItem(ShadowView const &shadowView);
 
@@ -71,6 +73,7 @@ struct CppMountItem final {
     UpdatePadding = 512,
     UpdateOverflowInset = 1024,
     RemoveDeleteTree = 2048,
+    RunCPPMutations = 4096
   };
 
 #pragma mark - Fields

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

@@ -6,12 +6,13 @@
  */
 
 #include "FabricMountingManager.h"
+#include "CppViewMutationsWrapper.h"
 #include "EventEmitterWrapper.h"
 #include "StateWrapperImpl.h"
-#include "viewPropConversions.h"
 
 #include <react/jni/ReadableNativeMap.h>
 #include <react/renderer/components/scrollview/ScrollViewProps.h>
+#include <react/renderer/core/CoreFeatures.h>
 #include <react/renderer/core/conversions.h>
 #include <react/renderer/debug/SystraceSection.h>
 #include <react/renderer/mounting/ShadowViewMutation.h>
@@ -38,19 +39,15 @@ 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),
-      enableEarlyEventEmitterUpdate_(
-          config->getBool("react_fabric:enable_early_event_emitter_update")),
-      disablePreallocateViews_(
-          config->getBool("react_fabric:disabled_view_preallocation_android")),
+      cppComponentRegistry_(cppComponentRegistry),
       disableRevisionCheckForPreallocation_(config->getBool(
           "react_fabric:disable_revision_check_for_preallocation")),
-      useOverflowInset_(getFeatureFlagValue("useOverflowInset")),
-      shouldRememberAllocatedViews_(
-          getFeatureFlagValue("shouldRememberAllocatedViews")),
-      useMapBufferForViewProps_(config->getBool(
-          "react_native_new_architecture:use_mapbuffer_for_viewprops")) {}
+      useOverflowInset_(getFeatureFlagValue("useOverflowInset")) {
+  CoreFeatures::enableMapBuffer = getFeatureFlagValue("useMapBufferProps");
+}
 
 void FabricMountingManager::onSurfaceStart(SurfaceId surfaceId) {
   std::lock_guard lock(allocatedViewsMutex_);
@@ -79,9 +76,11 @@ static inline int getIntBufferSizeForType(CppMountItem::Type mountItemType) {
     case CppMountItem::Type::UpdatePadding:
       return 5; // tag, top, left, bottom, right
     case CppMountItem::Type::UpdateLayout:
-      return 6; // tag, x, y, w, h, DisplayType
+      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;
@@ -124,7 +123,8 @@ static inline void computeBufferSizes(
     std::vector<CppMountItem> &cppUpdatePaddingMountItems,
     std::vector<CppMountItem> &cppUpdateLayoutMountItems,
     std::vector<CppMountItem> &cppUpdateOverflowInsetMountItems,
-    std::vector<CppMountItem> &cppUpdateEventEmitterMountItems) {
+    std::vector<CppMountItem> &cppUpdateEventEmitterMountItems,
+    ShadowViewMutationList &cppViewMutations) {
   CppMountItem::Type lastType = CppMountItem::Type::Undefined;
   int numSameType = 0;
   for (auto const &mountItem : cppCommonMountItems) {
@@ -183,6 +183,11 @@ static inline void computeBufferSizes(
       cppDeleteMountItems.size(),
       batchMountItemIntsSize,
       batchMountItemObjectsSize);
+
+  if (cppViewMutations.size() > 0) {
+    batchMountItemIntsSize++;
+    batchMountItemObjectsSize++;
+  }
 }
 
 static inline void writeIntBufferTypePreamble(
@@ -247,17 +252,17 @@ static inline float scale(Float value, Float pointScaleFactor) {
 local_ref<jobject> FabricMountingManager::getProps(
     ShadowView const &oldShadowView,
     ShadowView const &newShadowView) {
-  if (useMapBufferForViewProps_ &&
-      newShadowView.traits.check(ShadowNodeTraits::Trait::View)) {
+  if (CoreFeatures::enableMapBuffer &&
+      newShadowView.traits.check(
+          ShadowNodeTraits::Trait::AndroidMapBufferPropsSupported)) {
     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));
+
+    // MapBufferBuilder must be constructed and live in this scope,
+    MapBufferBuilder builder;
+    newShadowView.props->propsDiffMapBuffer(&*oldShadowView.props, builder);
+    return JReadableMapBuffer::createWithContents(builder.build());
   } else {
     return ReadableNativeMap::newObjectCxxArgs(newShadowView.props->rawProps);
   }
@@ -293,7 +298,7 @@ void FabricMountingManager::executeMount(
   std::vector<CppMountItem> cppUpdateLayoutMountItems;
   std::vector<CppMountItem> cppUpdateOverflowInsetMountItems;
   std::vector<CppMountItem> cppUpdateEventEmitterMountItems;
-
+  auto cppViewMutations = ShadowViewMutationList();
   {
     std::lock_guard allocatedViewsLock(allocatedViewsMutex_);
 
@@ -306,9 +311,6 @@ void FabricMountingManager::executeMount(
       LOG(ERROR) << "Executing commit after surface was stopped!";
     }
 
-    bool noRevisionCheck =
-        disablePreallocateViews_ || disableRevisionCheckForPreallocation_;
-
     for (const auto &mutation : mutations) {
       const auto &parentShadowView = mutation.parentShadowView;
       const auto &oldChildShadowView = mutation.oldChildShadowView;
@@ -318,15 +320,30 @@ void FabricMountingManager::executeMount(
 
       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 revisionCheck =
-              noRevisionCheck || newChildShadowView.props->revision > 1;
           bool allocationCheck =
               !allocatedViewTags.contains(newChildShadowView.tag);
-          bool shouldCreateView =
-              shouldRememberAllocatedViews_ ? allocationCheck : revisionCheck;
-
+          bool shouldCreateView = allocationCheck;
           if (shouldCreateView) {
             cppCommonMountItems.push_back(
                 CppMountItem::CreateMountItem(newChildShadowView));
@@ -381,7 +398,7 @@ void FabricMountingManager::executeMount(
                 newChildShadowView.layoutMetrics) {
               cppUpdateLayoutMountItems.push_back(
                   CppMountItem::UpdateLayoutMountItem(
-                      mutation.newChildShadowView));
+                      mutation.newChildShadowView, parentShadowView));
             }
 
             // OverflowInset: This is the values indicating boundaries including
@@ -411,13 +428,10 @@ void FabricMountingManager::executeMount(
             cppCommonMountItems.push_back(CppMountItem::InsertMountItem(
                 parentShadowView, newChildShadowView, index));
 
-            bool revisionCheck =
-                noRevisionCheck || newChildShadowView.props->revision > 1;
             bool allocationCheck =
                 allocatedViewTags.find(newChildShadowView.tag) ==
                 allocatedViewTags.end();
-            bool shouldCreateView =
-                shouldRememberAllocatedViews_ ? allocationCheck : revisionCheck;
+            bool shouldCreateView = allocationCheck;
             if (shouldCreateView) {
               cppUpdatePropsMountItems.push_back(
                   CppMountItem::UpdatePropsMountItem({}, newChildShadowView));
@@ -441,7 +455,8 @@ void FabricMountingManager::executeMount(
 
             // Layout
             cppUpdateLayoutMountItems.push_back(
-                CppMountItem::UpdateLayoutMountItem(newChildShadowView));
+                CppMountItem::UpdateLayoutMountItem(
+                    newChildShadowView, parentShadowView));
 
             // OverflowInset: This is the values indicating boundaries including
             // children of the current view. The layout of current view may not
@@ -469,8 +484,7 @@ void FabricMountingManager::executeMount(
       }
     }
 
-    if (shouldRememberAllocatedViews_ &&
-        allocatedViewsIterator != allocatedViewRegistry_.end()) {
+    if (allocatedViewsIterator != allocatedViewRegistry_.end()) {
       auto &views = allocatedViewsIterator->second;
       for (auto const &mutation : mutations) {
         switch (mutation.type) {
@@ -501,7 +515,8 @@ void FabricMountingManager::executeMount(
       cppUpdatePaddingMountItems,
       cppUpdateLayoutMountItems,
       cppUpdateOverflowInsetMountItems,
-      cppUpdateEventEmitterMountItems);
+      cppUpdateEventEmitterMountItems,
+      cppViewMutations);
 
   static auto createMountItemsIntBufferBatchContainer =
       jni::findClassStatic(UIManagerJavaDescriptor)
@@ -548,7 +563,7 @@ void FabricMountingManager::executeMount(
   int intBufferPosition = 0;
   int objBufferPosition = 0;
   int prevMountItemType = -1;
-  jint temp[6];
+  jint temp[7];
   for (int i = 0; i < cppCommonMountItems.size(); i++) {
     const auto &mountItem = cppCommonMountItems[i];
     const auto &mountItemType = mountItem.type;
@@ -723,13 +738,14 @@ void FabricMountingManager::executeMount(
           toInt(mountItem.newChildShadowView.layoutMetrics.displayType);
 
       temp[0] = mountItem.newChildShadowView.tag;
-      temp[1] = x;
-      temp[2] = y;
-      temp[3] = w;
-      temp[4] = h;
-      temp[5] = displayType;
-      env->SetIntArrayRegion(intBufferArray, intBufferPosition, 6, temp);
-      intBufferPosition += 6;
+      temp[1] = mountItem.parentShadowView.tag;
+      temp[2] = x;
+      temp[3] = y;
+      temp[4] = w;
+      temp[5] = h;
+      temp[6] = displayType;
+      env->SetIntArrayRegion(intBufferArray, intBufferPosition, 7, temp);
+      intBufferPosition += 7;
     }
   }
   if (!cppUpdateOverflowInsetMountItems.empty()) {
@@ -807,6 +823,36 @@ 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(
@@ -836,7 +882,7 @@ void FabricMountingManager::executeMount(
 void FabricMountingManager::preallocateShadowView(
     SurfaceId surfaceId,
     ShadowView const &shadowView) {
-  if (shouldRememberAllocatedViews_) {
+  {
     std::lock_guard lock(allocatedViewsMutex_);
     auto allocatedViewsIterator = allocatedViewRegistry_.find(surfaceId);
     if (allocatedViewsIterator == allocatedViewRegistry_.end()) {
@@ -869,14 +915,6 @@ void FabricMountingManager::preallocateShadowView(
 
   // Do not hold a reference to javaEventEmitter from the C++ side.
   local_ref<EventEmitterWrapper::JavaPart> javaEventEmitter = nullptr;
-  if (enableEarlyEventEmitterUpdate_) {
-    SharedEventEmitter eventEmitter = shadowView.eventEmitter;
-    if (eventEmitter != nullptr) {
-      javaEventEmitter = EventEmitterWrapper::newObjectJavaArgs();
-      EventEmitterWrapper *cEventEmitter = cthis(javaEventEmitter);
-      cEventEmitter->eventEmitter = eventEmitter;
-    }
-  }
 
   local_ref<JObject> props = getProps({}, shadowView);
 

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

@@ -7,6 +7,7 @@
 
 #pragma once
 
+#include "CppComponentRegistry.h"
 #include "FabricMountItem.h"
 
 #include <react/config/ReactNativeConfig.h>
@@ -33,6 +34,7 @@ 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);
@@ -68,13 +70,10 @@ class FabricMountingManager final {
 
   butter::map<SurfaceId, butter::set<Tag>> allocatedViewRegistry_{};
   std::recursive_mutex allocatedViewsMutex_;
+  std::shared_ptr<const CppComponentRegistry> cppComponentRegistry_;
 
-  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,

package/ReactAndroid/src/main/{java/com/facebook/react/fabric/jni → jni/react/fabric}/OnLoad.cpp

@@ -10,6 +10,7 @@
 #include "Binding.h"
 #include "ComponentFactory.h"
 #include "CoreComponentsRegistry.h"
+#include "CppViewMutationsWrapper.h"
 #include "EventBeatManager.h"
 #include "EventEmitterWrapper.h"
 #include "StateWrapperImpl.h"
@@ -20,6 +21,7 @@ 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();