react-native 0.71.3 → 0.72.0-rc.0

package/ReactAndroid/src/main/jni/CMakeLists.txt

@@ -17,7 +17,10 @@ endif(CCACHE_FOUND)
 
 # Make sure every shared lib includes a .note.gnu.build-id header
 add_link_options(-Wl,--build-id)
-add_compile_options(-Wall -Werror -std=c++1y)
+add_compile_options(-Wall -Werror -std=c++17)
+
+# This exposes the check_for_circular_dependencies macro to all the submodules
+include(CircularDepsValidator.cmake)
 
 function(add_react_android_subdir relative_path)
   add_subdirectory(${REACT_ANDROID_DIR}/${relative_path} ReactAndroid/${relative_path})
@@ -75,6 +78,7 @@ add_react_common_subdir(react/renderer/telemetry)
 add_react_common_subdir(react/renderer/templateprocessor)
 add_react_common_subdir(react/renderer/uimanager)
 add_react_common_subdir(react/renderer/core)
+add_react_common_subdir(react/renderer/element)
 add_react_common_subdir(react/renderer/graphics)
 add_react_common_subdir(react/renderer/debug)
 add_react_common_subdir(react/renderer/imagemanager)
@@ -82,9 +86,9 @@ add_react_common_subdir(react/renderer/components/view)
 add_react_common_subdir(react/renderer/components/switch)
 add_react_common_subdir(react/renderer/components/textinput)
 add_react_common_subdir(react/renderer/components/progressbar)
-add_react_common_subdir(react/renderer/components/slider)
 add_react_common_subdir(react/renderer/components/root)
 add_react_common_subdir(react/renderer/components/image)
+add_react_common_subdir(react/renderer/components/legacyviewmanagerinterop)
 add_react_common_subdir(react/renderer/componentregistry/native)
 add_react_common_subdir(react/renderer/components/text)
 add_react_common_subdir(react/renderer/components/unimplementedview)
@@ -102,7 +106,6 @@ add_react_build_subdir(generated/source/codegen/jni)
 add_react_android_subdir(src/main/jni/first-party/fb)
 add_react_android_subdir(src/main/jni/first-party/fbgloginit)
 add_react_android_subdir(src/main/jni/first-party/yogajni)
-add_react_android_subdir(src/main/jni/react/cxxcomponents)
 add_react_android_subdir(src/main/jni/react/jni)
 add_react_android_subdir(src/main/jni/react/reactperflogger)
 add_react_android_subdir(src/main/jni/react/jscexecutor)
@@ -114,3 +117,109 @@ add_react_android_subdir(src/main/jni/react/fabric)
 add_react_android_subdir(src/main/jni/react/newarchdefaults)
 add_react_android_subdir(src/main/jni/react/hermes/reactexecutor)
 add_react_android_subdir(src/main/jni/react/hermes/instrumentation/)
+
+# GTest setup
+set(GOOGLETEST_ROOT ${ANDROID_NDK}/sources/third_party/googletest)
+add_library(gtest STATIC ${GOOGLETEST_ROOT}/src/gtest_main.cc ${GOOGLETEST_ROOT}/src/gtest-all.cc)
+target_include_directories(gtest PRIVATE ${GOOGLETEST_ROOT})
+target_include_directories(gtest PUBLIC ${GOOGLETEST_ROOT}/include)
+
+# GTest dependencies
+add_executable(reactnative_unittest
+  ${REACT_COMMON_DIR}/cxxreact/tests/jsarg_helpers.cpp
+  ${REACT_COMMON_DIR}/cxxreact/tests/jsbigstring.cpp
+  ${REACT_COMMON_DIR}/cxxreact/tests/methodcall.cpp
+  ${REACT_COMMON_DIR}/cxxreact/tests/RecoverableErrorTest.cpp
+  ${REACT_COMMON_DIR}/hermes/inspector/chrome/tests/MessageTests.cpp
+  ${REACT_COMMON_DIR}/hermes/inspector/chrome/tests/RemoteObjectsTableTest.cpp
+  ${REACT_COMMON_DIR}/react/bridging/tests/BridgingTest.cpp
+  ${REACT_COMMON_DIR}/react/renderer/attributedstring/tests/AttributedStringBoxTest.cpp
+  ${REACT_COMMON_DIR}/react/renderer/attributedstring/tests/AttributedStringTest.cpp
+  ${REACT_COMMON_DIR}/react/renderer/attributedstring/tests/ParagraphAttributesTest.cpp
+  ${REACT_COMMON_DIR}/react/renderer/attributedstring/tests/TextAttributesTest.cpp
+  ${REACT_COMMON_DIR}/react/renderer/components/image/tests/ImageTest.cpp
+  ${REACT_COMMON_DIR}/react/renderer/components/root/tests/RootShadowNodeTest.cpp
+  ${REACT_COMMON_DIR}/react/renderer/components/scrollview/tests/ScrollViewTest.cpp
+  ${REACT_COMMON_DIR}/react/renderer/components/text/tests/ParagraphLocalDataTest.cpp
+  ${REACT_COMMON_DIR}/react/renderer/components/text/tests/TextTest.cpp
+  ${REACT_COMMON_DIR}/react/renderer/components/view/tests/LayoutTest.cpp
+  ${REACT_COMMON_DIR}/react/renderer/components/view/tests/ViewTest.cpp
+  ${REACT_COMMON_DIR}/react/renderer/core/tests/DynamicPropsUtilitiesTest.cpp
+  ${REACT_COMMON_DIR}/react/renderer/core/tests/EventQueueProcessorTest.cpp
+  ${REACT_COMMON_DIR}/react/renderer/core/tests/FindNodeAtPointTest.cpp
+  ${REACT_COMMON_DIR}/react/renderer/core/tests/LayoutableShadowNodeTest.cpp
+  ${REACT_COMMON_DIR}/react/renderer/core/tests/PrimitivesTest.cpp
+  ${REACT_COMMON_DIR}/react/renderer/core/tests/RawPropsTest.cpp
+  ${REACT_COMMON_DIR}/react/renderer/core/tests/ShadowNodeFamilyTest.cpp
+  ${REACT_COMMON_DIR}/react/renderer/core/tests/traitCastTest.cpp
+  ${REACT_COMMON_DIR}/react/renderer/debug/tests/DebugStringConvertibleTest.cpp
+  ${REACT_COMMON_DIR}/react/renderer/element/tests/ElementTest.cpp
+  ${REACT_COMMON_DIR}/react/renderer/graphics/tests/GraphicsTest.cpp
+  ${REACT_COMMON_DIR}/react/renderer/graphics/tests/TransformTest.cpp
+  ${REACT_COMMON_DIR}/react/renderer/imagemanager/tests/ImageManagerTest.cpp
+  ${REACT_COMMON_DIR}/react/renderer/mapbuffer/tests/MapBufferTest.cpp
+  ${REACT_COMMON_DIR}/react/renderer/mounting/tests/StackingContextTest.cpp
+  ${REACT_COMMON_DIR}/react/renderer/mounting/tests/StateReconciliationTest.cpp
+  ${REACT_COMMON_DIR}/react/renderer/runtimescheduler/tests/RuntimeSchedulerTest.cpp
+  ${REACT_COMMON_DIR}/react/renderer/runtimescheduler/tests/SchedulerPriorityTest.cpp
+  ${REACT_COMMON_DIR}/react/renderer/telemetry/tests/TransactionTelemetryTest.cpp
+  ${REACT_COMMON_DIR}/react/renderer/templateprocessor/tests/UITemplateProcessorTest.cpp
+  ${REACT_COMMON_DIR}/react/renderer/textlayoutmanager/tests/TextLayoutManagerTest.cpp
+  ${REACT_COMMON_DIR}/react/renderer/uimanager/tests/FabricUIManagerTest.cpp
+  
+  ########## (COMPILE BUT FAIL ON ASSERTS) ###########
+  # ${REACT_COMMON_DIR}/react/renderer/animations/tests/LayoutAnimationTest.cpp
+  # ${REACT_COMMON_DIR}/react/renderer/mounting/tests/MountingTest.cpp
+  # ${REACT_COMMON_DIR}/react/renderer/mounting/tests/ShadowTreeLifeCycleTest.cpp
+  
+  ########## (COMPILE BUT FAIL WITH RUNTIME EXCEPTIONS) ###########
+  # ${REACT_COMMON_DIR}/hermes/inspector/chrome/tests/ConnectionDemuxTests.cpp
+  # ${REACT_COMMON_DIR}/hermes/inspector/detail/tests/SerialExecutorTests.cpp
+  # ${REACT_COMMON_DIR}/hermes/inspector/tests/InspectorTests.cpp
+  
+  ########## (DO NOT COMPILE) ###########
+  # ${REACT_COMMON_DIR}/react/renderer/core/tests/ShadowNodeTest.cpp
+  # ${REACT_COMMON_DIR}/react/renderer/core/tests/ConcreteShadowNodeTest.cpp
+  # ${REACT_COMMON_DIR}/react/renderer/core/tests/ComponentDescriptorTest.cpp
+  # ${REACT_COMMON_DIR}/hermes/inspector/chrome/tests/ConnectionTests.cpp
+  )
+  target_compile_options(reactnative_unittest
+    PRIVATE
+    -Wall
+    -Werror
+    -fexceptions
+    -frtti
+    -std=c++17
+    -DANDROID
+    -DHERMES_ENABLE_DEBUGGER)
+
+  target_link_libraries(reactnative_unittest
+  folly_runtime
+  folly_futures
+  glog  
+  glog_init
+  gtest
+  hermes-engine::libhermes
+  hermes_inspector
+  jsi
+  react_codegen_rncore
+  react_debug
+  react_render_animations
+  react_render_attributedstring
+  react_render_core
+  react_render_debug
+  react_render_element
+  react_render_graphics
+  react_render_mapbuffer
+  react_render_mounting
+  react_render_templateprocessor
+  react_render_textlayoutmanager
+  react_render_uimanager
+  react_utils
+  reactnative
+  rrc_modal
+  rrc_scrollview
+  rrc_text
+  rrc_view
+  yoga
+)

package/ReactAndroid/src/main/jni/CircularDepsValidator.cmake

@@ -0,0 +1,32 @@
+# 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.
+
+cmake_minimum_required(VERSION 3.13)
+set(CMAKE_VERBOSE_MAKEFILE on)
+
+# Util function that help us verify that you're not including a header file
+# which has an invalid import path. Most of the time this is causing a C++ circular dependency.
+function(check_for_circular_dependencies allowed_imports_paths)
+  file(GLOB headers CONFIGURE_DEPENDS *.h)
+  foreach(file ${headers})
+    file(STRINGS ${file} header_file)
+    while(header_file)
+      list(POP_FRONT header_file line)
+      if (line MATCHES "^#include <react")
+        set(matched_import false)
+        foreach(allowed_import ${allowed_imports_paths})
+          if (line MATCHES "^#include <${allowed_import}")
+            set(matched_import true)
+            continue()
+          endif()
+        endforeach()
+        if (NOT matched_import)
+          message(FATAL_ERROR "!!!!!\nDiscovered an invalid include on file\n${file}\nfor include\n${line}\n")
+          break()
+        endif()
+      endif()
+    endwhile()
+  endforeach()
+endfunction()

package/ReactAndroid/src/main/jni/first-party/.clang-tidy

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

package/ReactAndroid/src/main/jni/first-party/fb/CMakeLists.txt

@@ -21,6 +21,9 @@ add_compile_options(
         -Wno-error=unused-but-set-variable
         -DHAVE_POSIX_CLOCKS
 )
+if(${CMAKE_BUILD_TYPE} MATCHES Release)
+        add_compile_options(-DNDEBUG)
+endif()
 
 # Yogacore needs to link towards android and log from the NDK libs
 target_link_libraries(fb dl android log)

package/ReactAndroid/src/main/jni/first-party/yogajni/BUCK

@@ -16,7 +16,7 @@ oss_cxx_library(
     soname = "libyoga.$(ext)",
     visibility = ["PUBLIC"],
     deps = [
-        "//ReactCommon/yoga:yoga",
+        "//packages/react-native/ReactCommon/yoga:yoga",
         FBJNI_TARGET,
     ],
 )

package/ReactAndroid/src/main/jni/first-party/yogajni/jni/YGJNI.h

@@ -17,7 +17,6 @@ const short int LAYOUT_BORDER_START_INDEX = 14;
 
 namespace {
 
-const int DOES_LEGACY_STRETCH_BEHAVIOUR = 8;
 const int HAS_NEW_LAYOUT = 16;
 
 union YGNodeContext {

package/ReactAndroid/src/main/jni/first-party/yogajni/jni/YGJNIVanilla.cpp

@@ -57,15 +57,6 @@ static void jni_YGConfigSetExperimentalFeatureEnabledJNI(
       config, static_cast<YGExperimentalFeature>(feature), enabled);
 }
 
-static void jni_YGConfigSetShouldDiffLayoutWithoutLegacyStretchBehaviourJNI(
-    JNIEnv* env,
-    jobject obj,
-    jlong nativePointer,
-    jboolean enabled) {
-  const YGConfigRef config = _jlong2YGConfigRef(nativePointer);
-  YGConfigSetShouldDiffLayoutWithoutLegacyStretchBehaviour(config, enabled);
-}
-
 static void jni_YGConfigSetUseWebDefaultsJNI(
     JNIEnv* env,
     jobject obj,
@@ -294,9 +285,6 @@ static void YGTransferLayoutOutputsRecursive(
 
   int fieldFlags = edgesSet.get();
   fieldFlags |= HAS_NEW_LAYOUT;
-  if (YGNodeLayoutGetDidLegacyStretchFlagAffectLayout(root)) {
-    fieldFlags |= DOES_LEGACY_STRETCH_BEHAVIOUR;
-  }
 
   const int arrSize = 6 + (marginFieldSet ? 4 : 0) + (paddingFieldSet ? 4 : 0) +
       (borderFieldSet ? 4 : 0);
@@ -776,9 +764,6 @@ static JNINativeMethod methods[] = {
     {"jni_YGConfigSetUseLegacyStretchBehaviourJNI",
      "(JZ)V",
      (void*) jni_YGConfigSetUseLegacyStretchBehaviourJNI},
-    {"jni_YGConfigSetShouldDiffLayoutWithoutLegacyStretchBehaviourJNI",
-     "(JZ)V",
-     (void*) jni_YGConfigSetShouldDiffLayoutWithoutLegacyStretchBehaviourJNI},
     {"jni_YGConfigSetLoggerJNI",
      "(JLcom/facebook/yoga/YogaLogger;)V",
      (void*) jni_YGConfigSetLoggerJNI},

package/ReactAndroid/src/main/jni/first-party/yogajni/jni/YGJTypesVanilla.h

@@ -11,9 +11,6 @@
 #include <map>
 #include "common.h"
 
-using namespace facebook::yoga::vanillajni;
-using namespace std;
-
 class PtrJNodeMapVanilla {
   std::map<YGNodeRef, size_t> ptrsToIdxs_;
   jobjectArray javaNodes_;
@@ -22,6 +19,7 @@ public:
   PtrJNodeMapVanilla() : ptrsToIdxs_{}, javaNodes_{} {}
   PtrJNodeMapVanilla(jlongArray javaNativePointers, jobjectArray javaNodes)
       : javaNodes_{javaNodes} {
+    using namespace facebook::yoga::vanillajni;
 
     JNIEnv* env = getCurrentEnv();
     size_t nativePointersSize = env->GetArrayLength(javaNativePointers);
@@ -34,7 +32,9 @@ public:
     }
   }
 
-  ScopedLocalRef<jobject> ref(YGNodeRef node) {
+  facebook::yoga::vanillajni::ScopedLocalRef<jobject> ref(YGNodeRef node) {
+    using namespace facebook::yoga::vanillajni;
+
     JNIEnv* env = getCurrentEnv();
     auto idx = ptrsToIdxs_.find(node);
     if (idx == ptrsToIdxs_.end()) {

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

@@ -34,7 +34,6 @@ rn_xplat_cxx_library(
         react_native_xplat_target("react/renderer/componentregistry:componentregistry"),
         react_native_xplat_target("react/renderer/components/scrollview:scrollview"),
         react_native_xplat_target("runtimeexecutor:runtimeexecutor"),
-        "//xplat/js/react-native-github/ReactAndroid/src/main/jni/react/cxxcomponents:components",
         react_native_target("jni/react/jni:jni"),
         "//xplat/fbsystrace:fbsystrace",
         "//xplat/jsi:JSIDynamic",
@@ -46,7 +45,6 @@ rn_xplat_cxx_library(
         "//xplat/js/react-native-github:generated_components-rncore",
         react_native_xplat_target("react/renderer/components/image:image"),
         react_native_xplat_target("react/renderer/components/modal:modal"),
-        react_native_xplat_target("react/renderer/components/slider:slider"),
         react_native_xplat_target("react/renderer/components/switch:androidswitch"),
         react_native_xplat_target("react/renderer/components/progressbar:androidprogressbar"),
         react_native_xplat_target("react/renderer/components/text:text"),

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

@@ -8,7 +8,6 @@
 #include "Binding.h"
 
 #include "AsyncEventBeat.h"
-#include "CppComponentRegistry.h"
 #include "EventEmitterWrapper.h"
 #include "JBackgroundExecutor.h"
 #include "ReactNativeConfigHolder.h"
@@ -52,7 +51,7 @@ jni::local_ref<Binding::jhybriddata> Binding::initHybrid(
 
 // Thread-safe getter
 std::shared_ptr<Scheduler> Binding::getScheduler() {
-  std::shared_lock<butter::shared_mutex> lock(installMutex_);
+  std::shared_lock lock(installMutex_);
   return scheduler_;
 }
 
@@ -133,7 +132,7 @@ void Binding::startSurface(
 
   {
     SystraceSection s2("FabricUIManagerBinding::startSurface::surfaceId::lock");
-    std::unique_lock<butter::shared_mutex> lock(surfaceHandlerRegistryMutex_);
+    std::unique_lock lock(surfaceHandlerRegistryMutex_);
     SystraceSection s3("FabricUIManagerBinding::startSurface::surfaceId");
     surfaceHandlerRegistry_.emplace(surfaceId, std::move(surfaceHandler));
   }
@@ -203,7 +202,7 @@ void Binding::startSurfaceWithConstraints(
   {
     SystraceSection s2(
         "FabricUIManagerBinding::startSurfaceWithConstraints::surfaceId::lock");
-    std::unique_lock<butter::shared_mutex> lock(surfaceHandlerRegistryMutex_);
+    std::unique_lock lock(surfaceHandlerRegistryMutex_);
     SystraceSection s3(
         "FabricUIManagerBinding::startSurfaceWithConstraints::surfaceId");
     surfaceHandlerRegistry_.emplace(surfaceId, std::move(surfaceHandler));
@@ -247,7 +246,7 @@ void Binding::stopSurface(jint surfaceId) {
   }
 
   {
-    std::unique_lock<butter::shared_mutex> lock(surfaceHandlerRegistryMutex_);
+    std::unique_lock lock(surfaceHandlerRegistryMutex_);
 
     auto iterator = surfaceHandlerRegistry_.find(surfaceId);
 
@@ -339,7 +338,7 @@ void Binding::setConstraints(
       isRTL ? LayoutDirection::RightToLeft : LayoutDirection::LeftToRight;
 
   {
-    std::shared_lock<butter::shared_mutex> lock(surfaceHandlerRegistryMutex_);
+    std::shared_lock lock(surfaceHandlerRegistryMutex_);
 
     auto iterator = surfaceHandlerRegistry_.find(surfaceId);
 
@@ -362,8 +361,7 @@ void Binding::installFabricUIManager(
     jni::alias_ref<jobject> javaUIManager,
     EventBeatManager *eventBeatManager,
     ComponentFactory *componentsRegistry,
-    jni::alias_ref<jobject> reactNativeConfig,
-    CppComponentRegistry *cppComponentRegistry) {
+    jni::alias_ref<jobject> reactNativeConfig) {
   SystraceSection s("FabricUIManagerBinding::installFabricUIManager");
 
   std::shared_ptr<const ReactNativeConfig> config =
@@ -377,19 +375,13 @@ void Binding::installFabricUIManager(
                  << this << ").";
   }
 
-  // TODO[T135327389]: Investigate why code relying on CppComponentRegistry
-  // crashing during hot reload restart.
-  // sharedCppComponentRegistry_ =
-  //     std::shared_ptr<const facebook::react::CppComponentRegistry>(
-  //         cppComponentRegistry ? cppComponentRegistry : nullptr);
-
   // Use std::lock and std::adopt_lock to prevent deadlocks by locking mutexes
   // at the same time
-  std::unique_lock<butter::shared_mutex> lock(installMutex_);
+  std::unique_lock lock(installMutex_);
 
   auto globalJavaUiManager = make_global(javaUIManager);
-  mountingManager_ = std::make_shared<FabricMountingManager>(
-      config, sharedCppComponentRegistry_, globalJavaUiManager);
+  mountingManager_ =
+      std::make_shared<FabricMountingManager>(config, globalJavaUiManager);
 
   ContextContainer::Shared contextContainer =
       std::make_shared<ContextContainer>();
@@ -437,13 +429,13 @@ void Binding::installFabricUIManager(
       "CalculateTransformedFramesEnabled",
       getFeatureFlagValue("calculateTransformedFramesEnabled"));
 
-  disablePreallocateViews_ = reactNativeConfig_->getBool(
-      "react_fabric:disabled_view_preallocation_android");
-
   // Props setter pattern feature
   CoreFeatures::enablePropIteratorSetter =
       getFeatureFlagValue("enableCppPropsIteratorSetter");
 
+  // NativeState experiment
+  CoreFeatures::useNativeState = getFeatureFlagValue("useNativeState");
+
   // RemoveDelete mega-op
   ShadowViewMutation::PlatformSupportsRemoveDeleteTreeInstruction =
       getFeatureFlagValue("enableRemoveDeleteTreeInstruction");
@@ -478,17 +470,16 @@ void Binding::uninstallFabricUIManager() {
                  << this << ").";
   }
 
-  std::unique_lock<butter::shared_mutex> lock(installMutex_);
+  std::unique_lock lock(installMutex_);
   animationDriver_ = nullptr;
   scheduler_ = nullptr;
   mountingManager_ = nullptr;
   reactNativeConfig_ = nullptr;
-  sharedCppComponentRegistry_ = nullptr;
 }
 
 std::shared_ptr<FabricMountingManager> Binding::verifyMountingManager(
     std::string const &hint) {
-  std::shared_lock<butter::shared_mutex> lock(installMutex_);
+  std::shared_lock lock(installMutex_);
   if (!mountingManager_) {
     LOG(ERROR) << hint << " mounting manager disappeared.";
   }
@@ -496,23 +487,19 @@ std::shared_ptr<FabricMountingManager> Binding::verifyMountingManager(
 }
 
 void Binding::schedulerDidFinishTransaction(
-    MountingCoordinator::Shared const &mountingCoordinator) {
+    MountingCoordinator::Shared mountingCoordinator) {
   auto mountingManager =
       verifyMountingManager("Binding::schedulerDidFinishTransaction");
   if (!mountingManager) {
     return;
   }
 
-  mountingManager->executeMount(mountingCoordinator);
+  mountingManager->executeMount(std::move(mountingCoordinator));
 }
 
 void Binding::schedulerDidRequestPreliminaryViewAllocation(
     const SurfaceId surfaceId,
     const ShadowNode &shadowNode) {
-  if (disablePreallocateViews_) {
-    return;
-  }
-
   if (!shadowNode.getTraits().check(ShadowNodeTraits::Trait::FormsView)) {
     return;
   }
@@ -524,29 +511,13 @@ void Binding::preallocateView(
     SurfaceId surfaceId,
     ShadowNode const &shadowNode) {
   auto name = std::string(shadowNode.getComponentName());
-
-  // Disable preallocation in java for C++ view managers
-  // RootComponents that are implmented as C++ view managers are still
-  // preallocated (this could be avoided by using Portals)
-  if (sharedCppComponentRegistry_ && sharedCppComponentRegistry_.get() &&
-      sharedCppComponentRegistry_->containsComponentManager(name) &&
-      !sharedCppComponentRegistry_->isRootComponent(name)) {
+  auto shadowView = ShadowView(shadowNode);
+  auto mountingManager = verifyMountingManager("Binding::preallocateView");
+  if (!mountingManager) {
     return;
   }
 
-  auto shadowView = ShadowView(shadowNode);
-  auto preallocationFunction = [this,
-                                surfaceId,
-                                shadowView = std::move(shadowView)] {
-    auto mountingManager = verifyMountingManager("Binding::preallocateView");
-    if (!mountingManager) {
-      return;
-    }
-
-    mountingManager->preallocateShadowView(surfaceId, shadowView);
-  };
-
-  preallocationFunction();
+  mountingManager->preallocateShadowView(surfaceId, shadowView);
 }
 
 void Binding::schedulerDidDispatchCommand(

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

@@ -7,11 +7,10 @@
 
 #pragma once
 
-#include "CppComponentRegistry.h"
 #include "FabricMountingManager.h"
 
 #include <memory>
-#include <mutex>
+#include <shared_mutex>
 
 #include <fbjni/fbjni.h>
 #include <react/jni/JRuntimeExecutor.h>
@@ -66,8 +65,7 @@ class Binding : public jni::HybridClass<Binding>,
       jni::alias_ref<jobject> javaUIManager,
       EventBeatManager *eventBeatManager,
       ComponentFactory *componentsRegistry,
-      jni::alias_ref<jobject> reactNativeConfig,
-      CppComponentRegistry *cppComponentRegistry);
+      jni::alias_ref<jobject> reactNativeConfig);
 
   void startSurface(
       jint surfaceId,
@@ -96,7 +94,7 @@ class Binding : public jni::HybridClass<Binding>,
   void unregisterSurface(SurfaceHandlerBinding *surfaceHandler);
 
   void schedulerDidFinishTransaction(
-      MountingCoordinator::Shared const &mountingCoordinator) override;
+      MountingCoordinator::Shared mountingCoordinator) override;
 
   void schedulerDidRequestPreliminaryViewAllocation(
       const SurfaceId surfaceId,
@@ -125,7 +123,7 @@ class Binding : public jni::HybridClass<Binding>,
   void uninstallFabricUIManager();
 
   // Private member variables
-  butter::shared_mutex installMutex_;
+  std::shared_mutex installMutex_;
   std::shared_ptr<FabricMountingManager> mountingManager_;
   std::shared_ptr<Scheduler> scheduler_;
 
@@ -141,15 +139,12 @@ class Binding : public jni::HybridClass<Binding>,
   BackgroundExecutor backgroundExecutor_;
 
   butter::map<SurfaceId, SurfaceHandler> surfaceHandlerRegistry_{};
-  butter::shared_mutex
+  std::shared_mutex
       surfaceHandlerRegistryMutex_; // Protects `surfaceHandlerRegistry_`.
 
   float pointScaleFactor_ = 1;
 
   std::shared_ptr<const ReactNativeConfig> reactNativeConfig_{nullptr};
-  std::shared_ptr<const facebook::react::CppComponentRegistry>
-      sharedCppComponentRegistry_{nullptr};
-  bool disablePreallocateViews_{false};
   bool enableFabricLogs_{false};
 };
 

package/ReactAndroid/src/main/jni/react/fabric/CMakeLists.txt

@@ -18,7 +18,6 @@ target_include_directories(fabricjni PUBLIC ${CMAKE_CURRENT_SOURCE_DIR})
 target_link_libraries(
         fabricjni
         butter
-        cxxcomponents
         fb
         fbjni
         folly_runtime
@@ -51,7 +50,6 @@ target_link_libraries(
         rrc_progressbar
         rrc_root
         rrc_scrollview
-        rrc_slider
         rrc_switch
         rrc_text
         rrc_textinput

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

@@ -8,14 +8,8 @@
 #pragma once
 
 #include <fbjni/fbjni.h>
-#include <jsi/jsi.h>
+#include <react/renderer/componentregistry/ComponentDescriptorFactory.h>
 #include <react/renderer/componentregistry/ComponentDescriptorRegistry.h>
-#include <react/renderer/scheduler/Scheduler.h>
-#include <react/utils/ContextContainer.h>
-#include <mutex>
-#include <unordered_set>
-
-using namespace facebook::jsi;
 
 namespace facebook {
 namespace react {

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

@@ -19,7 +19,6 @@
 #include <react/renderer/components/progressbar/AndroidProgressBarComponentDescriptor.h>
 #include <react/renderer/components/rncore/ComponentDescriptors.h>
 #include <react/renderer/components/scrollview/ScrollViewComponentDescriptor.h>
-#include <react/renderer/components/slider/SliderComponentDescriptor.h>
 #include <react/renderer/components/text/ParagraphComponentDescriptor.h>
 #include <react/renderer/components/text/RawTextComponentDescriptor.h>
 #include <react/renderer/components/text/TextComponentDescriptor.h>
@@ -58,8 +57,6 @@ CoreComponentsRegistry::sharedProviderRegistry() {
         concreteComponentDescriptorProvider<TextComponentDescriptor>());
     providerRegistry->add(
         concreteComponentDescriptorProvider<RawTextComponentDescriptor>());
-    providerRegistry->add(
-        concreteComponentDescriptorProvider<SliderComponentDescriptor>());
     providerRegistry->add(
         concreteComponentDescriptorProvider<ScrollViewComponentDescriptor>());
     providerRegistry->add(
@@ -69,6 +66,8 @@ CoreComponentsRegistry::sharedProviderRegistry() {
         concreteComponentDescriptorProvider<ParagraphComponentDescriptor>());
     providerRegistry->add(concreteComponentDescriptorProvider<
                           AndroidDrawerLayoutComponentDescriptor>());
+    providerRegistry->add(concreteComponentDescriptorProvider<
+                          TraceUpdateOverlayComponentDescriptor>());
 
     return providerRegistry;
   }();

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

@@ -28,7 +28,7 @@ void EventEmitterWrapper::invokeEvent(
   if (eventEmitter != nullptr) {
     eventEmitter->dispatchEvent(
         eventName,
-        payload->consume(),
+        payload ? payload->consume() : folly::dynamic::object(),
         EventPriority::AsynchronousBatched,
         static_cast<RawEvent::Category>(category));
   }
@@ -43,7 +43,8 @@ void EventEmitterWrapper::invokeUniqueEvent(
   // EventEmitter. In those cases, make sure we noop/blackhole events instead of
   // crashing.
   if (eventEmitter != nullptr) {
-    eventEmitter->dispatchUniqueEvent(eventName, payload->consume());
+    eventEmitter->dispatchUniqueEvent(
+        eventName, payload ? payload->consume() : folly::dynamic::object());
   }
 }
 

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

@@ -72,8 +72,7 @@ struct CppMountItem final {
     UpdateEventEmitter = 256,
     UpdatePadding = 512,
     UpdateOverflowInset = 1024,
-    RemoveDeleteTree = 2048,
-    RunCPPMutations = 4096
+    RemoveDeleteTree = 2048
   };
 
 #pragma mark - Fields