react-native-tvos 0.75.2-0rc0 → 0.76.0-0rc0

package/ReactAndroid/src/main/jni/first-party/jni-lib-merge/jni_lib_merge.c

@@ -0,0 +1,157 @@
+/*
+ * 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.
+ */
+
+// To be linked into merged libraries.
+
+#define _GNU_SOURCE
+
+#include <assert.h>
+#include <ctype.h>
+#include <stdlib.h>
+#include <string.h>
+
+#include <jni.h>
+
+#include "jni_lib_merge.h"
+// We define JNI_OnLoad_Weak directly, so this macro doesn't hurt anything,
+// but undef it anyway just to avoid possible future confusion.
+#undef JNI_OnLoad
+#define PRINT(...) JNI_MERGE_PRINT(__VA_ARGS__)
+
+// Class with mapping that will be generated by buck or manually edited by
+// users.
+static const char* invoke_class_name = "com/facebook/soloader/MergedSoMapping";
+
+// Stub pre-merged library to ensure that our custom section gets created
+// when we merge a group of native libraries with no JNI_OnLoad. We don't
+// want this to be instrumented by ASAN to avoid a redzone around it (which
+// would add bogus bytes to the pre_merge_jni_libraries section). We also want
+// the linker to retain it (since the section will be traversed at runtime).
+static struct pre_merge_jni_library pmjl_stub
+#if __has_attribute(__retain__)
+    __attribute__((__retain__))
+#endif
+    __attribute__((__section__("pre_merge_jni_libraries")))
+    __attribute__((no_sanitize("address"))) = {
+        .name = "jni_lib_merge-stub",
+        .onload_func = NULL,
+};
+
+// References to custom section bounds, filled in by linker.
+// Marking these hidden here takes precedence over the global visibility
+// of the generated symbols.  This ensures that they are hidden in
+// the shared object, so they can't be accidentally referenced by
+// another merged library.
+__attribute__((__visibility__("hidden"))) extern struct pre_merge_jni_library
+    __start_pre_merge_jni_libraries;
+__attribute__((__visibility__("hidden"))) extern struct pre_merge_jni_library
+    __stop_pre_merge_jni_libraries;
+
+// Returns a malloc'ed string.
+static char* method_name_for_invoke(const char* soname) {
+  char* name = strdup(soname);
+  if (!name) {
+    // Can't log here, since we don't know if we're depending on Android
+    // logging.
+    assert(!"Failed to strdup soname.");
+    abort();
+  }
+  for (char* c = name; *c != '\0'; ++c) {
+    if (!isalnum(*c) && *c != '_') {
+      *c = '_';
+    }
+  }
+  return name;
+}
+
+// Replacement for weak JNI_OnLoad.
+jint JNI_OnLoad_Weak(JavaVM* vm, void* reserved) {
+#ifdef INVOKE_ALL_JNI_ONLOAD
+  (void)invoke_class_name;
+  (void)method_name_for_invoke;
+  PRINT("Entering merged library JNI_OnLoad. Invoking all.\n");
+  JNIEnv* env;
+  if ((*vm)->GetEnv(vm, (void**)&env, JNI_VERSION_1_2) != JNI_OK) {
+    return JNI_ERR;
+  }
+
+  struct pre_merge_jni_library* start = &__start_pre_merge_jni_libraries;
+  struct pre_merge_jni_library* stop = &__stop_pre_merge_jni_libraries;
+  for (struct pre_merge_jni_library* pmjl = start; pmjl != stop; pmjl++) {
+    if (pmjl == &pmjl_stub) {
+      continue;
+    }
+    if (pmjl->onload_func(env, NULL /* unused */) < 0) {
+      return JNI_ERR;
+    }
+  }
+  return JNI_VERSION_1_6;
+#else
+  (void)reserved;
+
+  PRINT("Entering merged library JNI_OnLoad.\n");
+
+  // Get the JNI Env so we can register the original JNI_OnLoad methods.
+  JNIEnv* env;
+  if ((*vm)->GetEnv(vm, (void**)&env, JNI_VERSION_1_2) != JNI_OK) {
+    return JNI_ERR;
+  }
+
+  // Find the class we need to register with.
+  jclass invoke_class = (*env)->FindClass(env, invoke_class_name);
+  if (invoke_class == NULL) {
+    return JNI_ERR;
+  }
+
+  // Construct the argument to RegisterNatives with proper sanitized names
+  // and function pointers.
+  struct pre_merge_jni_library* start = &__start_pre_merge_jni_libraries;
+  struct pre_merge_jni_library* stop = &__stop_pre_merge_jni_libraries;
+  size_t num_merged_libraries = stop - start;
+  PRINT(
+      "Preparing %zu pre-merged libs (including stub)\n", num_merged_libraries);
+  JNINativeMethod* natives = calloc(num_merged_libraries, sizeof(*natives));
+  assert(natives != NULL);
+  if (natives == NULL) {
+    abort();
+  }
+  JNINativeMethod* cur_native = natives;
+  struct pre_merge_jni_library* pmjl = start;
+  for (size_t i = 0; i < num_merged_libraries; i++, pmjl++) {
+    if (pmjl == &pmjl_stub) {
+      continue;
+    }
+    char* name = method_name_for_invoke(pmjl->name);
+    PRINT(
+        "Preparing to register %s.  onload_func: %p\n",
+        name,
+        pmjl->onload_func);
+
+    cur_native->name = name;
+    cur_native->signature = "()I";
+    cur_native->fnPtr = pmjl->onload_func;
+    cur_native++;
+  }
+
+  size_t num_actual_methods = cur_native - natives;
+  PRINT("About to register %zu actual methods.\n", num_actual_methods);
+  jint ret =
+      (*env)->RegisterNatives(env, invoke_class, natives, num_actual_methods);
+
+  for (size_t i = 0; i < num_actual_methods; i++) {
+    free((void*)natives[i].name);
+  }
+  free(natives);
+
+  if (ret < 0) {
+    // Exception already thrown.
+    return JNI_ERR;
+  }
+
+  return JNI_VERSION_1_6;
+#endif // INVOKE_ALL_JNI_ONLOAD
+}

package/ReactAndroid/src/main/jni/first-party/jni-lib-merge/jni_lib_merge.h

@@ -0,0 +1,108 @@
+/*
+ * 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 <jni.h>
+#include <stddef.h>
+
+#ifdef JNI_MERGE_PRINT_ONLOAD
+#ifdef __ANDROID__
+#include <android/log.h>
+#define JNI_MERGE_PRINT(...) \
+  __android_log_print(ANDROID_LOG_DEBUG, "jni_lib_merge", __VA_ARGS__)
+#else
+#include <stdio.h>
+#define JNI_MERGE_PRINT(...) fprintf(stderr, __VA_ARGS__);
+#endif
+#else
+#define JNI_MERGE_PRINT(...) \
+  do {                       \
+  } while (0)
+#endif
+
+#ifdef __cplusplus
+#define JNI_MERGE_GET_JAVA_VM(env, vm) (env->GetJavaVM(&vm))
+#else
+#define JNI_MERGE_GET_JAVA_VM(env, vm) ((*env)->GetJavaVM(env, &vm))
+#endif
+
+#if __has_attribute(__retain__)
+#define ATTRIBUTE_RETAIN __attribute__((__retain__))
+#else
+#define ATTRIBUTE_RETAIN
+#endif
+
+struct pre_merge_jni_library {
+  const char* name;
+  int (*onload_func)(JNIEnv*, jclass);
+};
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+JNIEXPORT jint JNICALL JNI_OnLoad_Weak(JavaVM* vm, void* reserved);
+#ifdef __cplusplus
+}
+#endif
+
+#define JNI_OnLoad                                                             \
+  /* Need to make JNI_OnLoad weak, which requires splitting it into */         \
+  /* a declaration and definition, which is a little risky. */                 \
+  /* Hopefully they didn't use 'extern "C"'. */                                \
+  JNI_OnLoad_Weak(JavaVM* vm, void* reserved) __attribute__((weak));           \
+                                                                               \
+  /* We rename the declared JNI_OnLoad to this so we can call it */            \
+  /* from either our weak JNI_OnLoad or our merge-friendly init function. */   \
+  static jint pre_merge_original_JNI_OnLoad(                                   \
+      JavaVM* vm, void* _Nullable reserved);                                   \
+                                                                               \
+  /* Merge-friendly wrapper for the original JNI_OnLoad, called by JNI. */     \
+  /* Return non-zero to indicate failure. */                                   \
+  static inline jint pre_merge_jni_library_wrapper_for_JNI_OnLoad(             \
+      JNIEnv* env, jclass clazz) {                                             \
+    (void)clazz;                                                               \
+    JNI_MERGE_PRINT("In JNI_OnLoad wrapper for %s", ORIGINAL_SONAME);          \
+    /* Note: relying on SoLoader's synchronization for thread-safety. */       \
+    static char already_loaded = 0;                                            \
+    if (already_loaded) {                                                      \
+      return 0;                                                                \
+    }                                                                          \
+    already_loaded = 1;                                                        \
+    JavaVM* vm;                                                                \
+    jint ret = JNI_MERGE_GET_JAVA_VM(env, vm);                                 \
+    if (ret < 0) {                                                             \
+      /* Exception already thrown. */                                          \
+      return -1;                                                               \
+    }                                                                          \
+    JNI_MERGE_PRINT("Calling original JNI_OnLoad for %s", ORIGINAL_SONAME);    \
+    ret = pre_merge_original_JNI_OnLoad(vm, NULL);                             \
+    if (!(ret == JNI_VERSION_1_2 || ret == JNI_VERSION_1_4 ||                  \
+          ret == JNI_VERSION_1_6)) {                                           \
+      return -1;                                                               \
+    }                                                                          \
+    return 0;                                                                  \
+  }                                                                            \
+                                                                               \
+  jint JNI_OnLoad_Weak(JavaVM* vm, void* reserved) {                           \
+    /* This path will be taken if we're not merged. */                         \
+    /* Just call the original JNI_OnLoad. */                                   \
+    JNI_MERGE_PRINT(                                                           \
+        "Calling original (unmerged) JNI_OnLoad for %s", ORIGINAL_SONAME);     \
+    return pre_merge_original_JNI_OnLoad(vm, reserved);                        \
+  }                                                                            \
+                                                                               \
+  /* Register our name and wrapper in the proper section. */                   \
+  static struct pre_merge_jni_library pre_merge_jni_library_register_object    \
+      ATTRIBUTE_RETAIN __attribute__((__section__("pre_merge_jni_libraries"))) \
+      __attribute__((no_sanitize("address"))) __attribute__((__used__)) = {    \
+          .name = ORIGINAL_SONAME,                                             \
+          .onload_func = pre_merge_jni_library_wrapper_for_JNI_OnLoad,         \
+  };                                                                           \
+                                                                               \
+  /* Re-start the JNI_OnLoad prototype to capture the body. */                 \
+  static jint pre_merge_original_JNI_OnLoad

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

@@ -6,15 +6,19 @@
 cmake_minimum_required(VERSION 3.13)
 set(CMAKE_VERBOSE_MAKEFILE on)
 
+include(${REACT_ANDROID_DIR}/src/main/jni/first-party/jni-lib-merge/SoMerging-utils.cmake)
+
 add_compile_options(
         -fvisibility=hidden
         -fexceptions
         -frtti
+        -std=c++20
         -O3)
 
 file(GLOB yoga_SRC CONFIGURE_DEPENDS jni/*.cpp)
-add_library(yoga SHARED ${yoga_SRC})
+add_library(yoga OBJECT ${yoga_SRC})
 
 target_include_directories(yoga PUBLIC jni)
+target_merge_so(yoga)
 
 target_link_libraries(yoga yogacore fb fbjni log android)

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

@@ -460,6 +460,14 @@ static void jni_YGNodeCopyStyleJNI(
         static_cast<float>(value));                                       \
   }
 
+#define YG_NODE_JNI_STYLE_EDGE_UNIT_PROP_AUTO(name)                       \
+  YG_NODE_JNI_STYLE_EDGE_UNIT_PROP(name)                                  \
+  static void jni_YGNodeStyleSet##name##AutoJNI(                          \
+      JNIEnv* /*env*/, jobject /*obj*/, jlong nativePointer, jint edge) { \
+    YGNodeStyleSet##name##Auto(                                           \
+        _jlong2YGNodeRef(nativePointer), static_cast<YGEdge>(edge));      \
+  }
+
 YG_NODE_JNI_STYLE_PROP(jint, YGDirection, Direction);
 YG_NODE_JNI_STYLE_PROP(jint, YGFlexDirection, FlexDirection);
 YG_NODE_JNI_STYLE_PROP(jint, YGJustify, JustifyContent);
@@ -482,7 +490,7 @@ YG_NODE_JNI_STYLE_UNIT_PROP_AUTO(Height);
 YG_NODE_JNI_STYLE_UNIT_PROP(MinHeight);
 YG_NODE_JNI_STYLE_UNIT_PROP(MaxHeight);
 
-YG_NODE_JNI_STYLE_EDGE_UNIT_PROP(Position);
+YG_NODE_JNI_STYLE_EDGE_UNIT_PROP_AUTO(Position);
 
 static jlong jni_YGNodeStyleGetMarginJNI(
     JNIEnv* /*env*/,
@@ -891,6 +899,9 @@ static JNINativeMethod methods[] = {
     {"jni_YGNodeStyleSetPositionPercentJNI",
      "(JIF)V",
      (void*)jni_YGNodeStyleSetPositionPercentJNI},
+    {"jni_YGNodeStyleSetPositionAutoJNI",
+     "(JI)V",
+     (void*)jni_YGNodeStyleSetPositionAutoJNI},
     {"jni_YGNodeStyleGetWidthJNI", "(J)J", (void*)jni_YGNodeStyleGetWidthJNI},
     {"jni_YGNodeStyleSetWidthJNI", "(JF)V", (void*)jni_YGNodeStyleSetWidthJNI},
     {"jni_YGNodeStyleSetWidthPercentJNI",

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

@@ -8,9 +8,13 @@ set(CMAKE_VERBOSE_MAKEFILE on)
 
 add_compile_options(-fexceptions -frtti -std=c++20 -Wall -DLOG_TAG=\"ReactNative\")
 
+include(${REACT_ANDROID_DIR}/src/main/jni/first-party/jni-lib-merge/SoMerging-utils.cmake)
+
 file(GLOB react_devsupportjni_SRC CONFIGURE_DEPENDS *.cpp)
 
-add_library(react_devsupportjni SHARED ${react_devsupportjni_SRC})
+add_library(react_devsupportjni OBJECT ${react_devsupportjni_SRC})
+
+target_merge_so(react_devsupportjni)
 
 target_include_directories(react_devsupportjni PUBLIC .)
 

package/ReactAndroid/src/main/jni/react/devsupport/JCxxInspectorPackagerConnectionWebSocketDelegate.cpp

@@ -7,6 +7,8 @@
 
 #include "JCxxInspectorPackagerConnectionWebSocketDelegate.h"
 
+#include <optional>
+
 using namespace facebook::jni;
 
 namespace facebook::react::jsinspector_modern {
@@ -17,10 +19,17 @@ JCxxInspectorPackagerConnectionWebSocketDelegate::
     : cxxDelegate_(cxxDelegate) {}
 
 void JCxxInspectorPackagerConnectionWebSocketDelegate::didFailWithError(
-    alias_ref<JOptionalInt::javaobject> posixCode,
+    alias_ref<jni::JInteger> posixCode,
     const std::string& error) {
+  std::optional<int> posixCodeVal;
+
+  // Handle @Nullable JInteger param
+  if (posixCode.get() != nullptr) {
+    posixCodeVal = posixCode->intValue();
+  }
+
   if (auto delegate = cxxDelegate_.lock()) {
-    delegate->didFailWithError(*posixCode, error);
+    delegate->didFailWithError(posixCodeVal, error);
   }
 }
 

package/ReactAndroid/src/main/jni/react/devsupport/JCxxInspectorPackagerConnectionWebSocketDelegate.h

@@ -7,8 +7,6 @@
 
 #pragma once
 
-#include "JOptional.h"
-
 #include <fbjni/fbjni.h>
 #include <jsinspector-modern/InspectorPackagerConnection.h>
 
@@ -29,7 +27,7 @@ class JCxxInspectorPackagerConnectionWebSocketDelegate
       "Lcom/facebook/react/devsupport/CxxInspectorPackagerConnection$WebSocketDelegate;";
 
   void didFailWithError(
-      jni::alias_ref<JOptionalInt::javaobject> posixCode,
+      jni::alias_ref<jni::JInteger> posixCode,
       const std::string& error);
 
   void didReceiveMessage(const std::string& message);

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

@@ -12,7 +12,6 @@
 #include "EventBeatManager.h"
 #include "EventEmitterWrapper.h"
 #include "FabricMountingManager.h"
-#include "JBackgroundExecutor.h"
 #include "ReactNativeConfigHolder.h"
 #include "SurfaceHandlerBinding.h"
 
@@ -94,7 +93,30 @@ void Binding::driveCxxAnimations() {
   getScheduler()->animationTick();
 }
 
+void Binding::drainPreallocateViewsQueue() {
+  auto mountingManager = getMountingManager("drainPreallocateViewsQueue");
+  if (!mountingManager) {
+    return;
+  }
+  mountingManager->drainPreallocateViewsQueue();
+}
+
 void Binding::reportMount(SurfaceId surfaceId) {
+  if (ReactNativeFeatureFlags::
+          fixMountingCoordinatorReportedPendingTransactionsOnAndroid()) {
+    // This is a fix for `MountingCoordinator::hasPendingTransactions` on
+    // Android, which otherwise would report no pending transactions
+    // incorrectly. This is due to the push model used on Android and can be
+    // removed when we migrate to a pull model.
+    std::shared_lock lock(surfaceHandlerRegistryMutex_);
+
+    auto iterator = surfaceHandlerRegistry_.find(surfaceId);
+    if (iterator != surfaceHandlerRegistry_.end()) {
+      auto& surfaceHandler = iterator->second;
+      surfaceHandler.getMountingCoordinator()->didPerformAsyncTransactions();
+    }
+  }
+
   auto scheduler = getScheduler();
   if (!scheduler) {
     LOG(ERROR) << "Binding::reportMount: scheduler disappeared";
@@ -349,8 +371,7 @@ void Binding::installFabricUIManager(
   std::shared_ptr<const ReactNativeConfig> config =
       std::make_shared<const ReactNativeConfigHolder>(reactNativeConfig);
 
-  enableFabricLogs_ =
-      config->getBool("react_fabric:enabled_android_fabric_logs");
+  enableFabricLogs_ = ReactNativeFeatureFlags::enableFabricLogs();
 
   if (enableFabricLogs_) {
     LOG(WARNING) << "Binding::installFabricUIManager() was called (address: "
@@ -399,11 +420,7 @@ void Binding::installFabricUIManager(
   CoreFeatures::enablePropIteratorSetter =
       getFeatureFlagValue("enableCppPropsIteratorSetter");
   CoreFeatures::excludeYogaFromRawProps =
-      getFeatureFlagValue("excludeYogaFromRawProps");
-
-  // RemoveDelete mega-op
-  ShadowViewMutation::PlatformSupportsRemoveDeleteTreeInstruction =
-      getFeatureFlagValue("enableRemoveDeleteTreeInstruction");
+      ReactNativeFeatureFlags::excludeYogaFromRawProps();
 
   auto toolbox = SchedulerToolbox{};
   toolbox.contextContainer = contextContainer;
@@ -416,11 +433,6 @@ void Binding::installFabricUIManager(
 
   toolbox.asynchronousEventBeatFactory = asynchronousBeatFactory;
 
-  if (ReactNativeFeatureFlags::enableBackgroundExecutor()) {
-    backgroundExecutor_ = JBackgroundExecutor::create("fabric_bg");
-    toolbox.backgroundExecutor = backgroundExecutor_;
-  }
-
   animationDriver_ = std::make_shared<LayoutAnimationDriver>(
       runtimeExecutor, contextContainer, this);
   scheduler_ =
@@ -454,7 +466,13 @@ std::shared_ptr<FabricMountingManager> Binding::getMountingManager(
 
 void Binding::schedulerDidFinishTransaction(
     const MountingCoordinator::Shared& mountingCoordinator) {
-  auto mountingTransaction = mountingCoordinator->pullTransaction();
+  // We shouldn't be pulling the transaction here (which triggers diffing of
+  // the trees to determine the mutations to run on the host platform),
+  // but we have to due to current limitations in the Android implementation.
+  auto mountingTransaction = mountingCoordinator->pullTransaction(
+      // Indicate that the transaction will be performed asynchronously
+      ReactNativeFeatureFlags::
+          fixMountingCoordinatorReportedPendingTransactionsOnAndroid());
   if (!mountingTransaction.has_value()) {
     return;
   }
@@ -509,15 +527,11 @@ void Binding::schedulerShouldRenderTransactions(
 
 void Binding::schedulerDidRequestPreliminaryViewAllocation(
     const ShadowNode& shadowNode) {
-  if (!shadowNode.getTraits().check(ShadowNodeTraits::Trait::FormsView)) {
-    return;
-  }
-
   auto mountingManager = getMountingManager("preallocateView");
   if (!mountingManager) {
     return;
   }
-  mountingManager->preallocateShadowView(shadowNode);
+  mountingManager->maybePreallocateShadowNode(shadowNode);
 }
 
 void Binding::schedulerDidDispatchCommand(
@@ -584,6 +598,8 @@ void Binding::registerNatives() {
       makeNativeMethod("setConstraints", Binding::setConstraints),
       makeNativeMethod("setPixelDensity", Binding::setPixelDensity),
       makeNativeMethod("driveCxxAnimations", Binding::driveCxxAnimations),
+      makeNativeMethod(
+          "drainPreallocateViewsQueue", Binding::drainPreallocateViewsQueue),
       makeNativeMethod("reportMount", Binding::reportMount),
       makeNativeMethod(
           "uninstallFabricUIManager", Binding::uninstallFabricUIManager),

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

@@ -125,6 +125,9 @@ class Binding : public jni::HybridClass<Binding, JBinding>,
   void setPixelDensity(float pointScaleFactor);
 
   void driveCxxAnimations();
+
+  void drainPreallocateViewsQueue();
+
   void reportMount(SurfaceId surfaceId);
 
   void uninstallFabricUIManager();

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

@@ -5,16 +5,20 @@
 
 cmake_minimum_required(VERSION 3.13)
 
+include(${REACT_ANDROID_DIR}/src/main/jni/first-party/jni-lib-merge/SoMerging-utils.cmake)
+
 file(GLOB fabricjni_SRCS CONFIGURE_DEPENDS *.cpp)
 
 add_library(
         fabricjni
-        SHARED
+        OBJECT
         ${fabricjni_SRCS}
 )
 
 target_include_directories(fabricjni PUBLIC ${CMAKE_CURRENT_SOURCE_DIR})
 
+target_merge_so(fabricjni)
+
 target_link_libraries(
         fabricjni
         fb
@@ -32,6 +36,7 @@ target_link_libraries(
         react_render_componentregistry
         react_render_core
         react_render_debug
+        react_render_dom
         react_render_graphics
         react_render_imagemanager
         react_render_mapbuffer
@@ -41,6 +46,8 @@ target_link_libraries(
         react_render_telemetry
         react_render_textlayoutmanager
         react_render_uimanager
+        react_render_uimanager_consistency
+        rrc_legacyviewmanagerinterop
         react_utils
         react_config
         reactnativejni
@@ -48,6 +55,7 @@ target_link_libraries(
         rrc_modal
         rrc_progressbar
         rrc_root
+        rrc_safeareaview
         rrc_scrollview
         rrc_switch
         rrc_text

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

@@ -9,8 +9,6 @@
 
 #include <android/log.h>
 
-#include <fbjni/fbjni.h>
-
 #include <react/renderer/componentregistry/ComponentDescriptorRegistry.h>
 #include <react/renderer/components/androidswitch/AndroidSwitchComponentDescriptor.h>
 #include <react/renderer/components/androidtextinput/AndroidTextInputComponentDescriptor.h>
@@ -18,19 +16,17 @@
 #include <react/renderer/components/modal/ModalHostViewComponentDescriptor.h>
 #include <react/renderer/components/progressbar/AndroidProgressBarComponentDescriptor.h>
 #include <react/renderer/components/rncore/ComponentDescriptors.h>
+#include <react/renderer/components/safeareaview/SafeAreaViewComponentDescriptor.h>
 #include <react/renderer/components/scrollview/ScrollViewComponentDescriptor.h>
 #include <react/renderer/components/text/ParagraphComponentDescriptor.h>
 #include <react/renderer/components/text/RawTextComponentDescriptor.h>
 #include <react/renderer/components/text/TextComponentDescriptor.h>
 #include <react/renderer/components/view/ViewComponentDescriptor.h>
 
-namespace facebook::react {
-
-CoreComponentsRegistry::CoreComponentsRegistry(ComponentFactory* delegate)
-    : delegate_(delegate) {}
+namespace facebook::react::CoreComponentsRegistry {
 
 std::shared_ptr<const ComponentDescriptorProviderRegistry>
-CoreComponentsRegistry::sharedProviderRegistry() {
+sharedProviderRegistry() {
   static auto providerRegistry =
       []() -> std::shared_ptr<ComponentDescriptorProviderRegistry> {
     auto providerRegistry =
@@ -52,6 +48,8 @@ CoreComponentsRegistry::sharedProviderRegistry() {
                           ModalHostViewComponentDescriptor>());
     providerRegistry->add(concreteComponentDescriptorProvider<
                           AndroidSwitchComponentDescriptor>());
+    providerRegistry->add(
+        concreteComponentDescriptorProvider<SafeAreaViewComponentDescriptor>());
     providerRegistry->add(
         concreteComponentDescriptorProvider<TextComponentDescriptor>());
     providerRegistry->add(
@@ -74,39 +72,4 @@ CoreComponentsRegistry::sharedProviderRegistry() {
   return providerRegistry;
 }
 
-jni::local_ref<CoreComponentsRegistry::jhybriddata>
-CoreComponentsRegistry::initHybrid(
-    jni::alias_ref<jclass>,
-    ComponentFactory* delegate) {
-  auto instance = makeCxxInstance(delegate);
-
-  // TODO T69453179: Codegen this file
-  auto buildRegistryFunction =
-      [](const EventDispatcher::Weak& eventDispatcher,
-         const ContextContainer::Shared& contextContainer)
-      -> ComponentDescriptorRegistry::Shared {
-    ComponentDescriptorParameters params{
-        .eventDispatcher = eventDispatcher,
-        .contextContainer = contextContainer,
-        .flavor = nullptr};
-
-    auto registry = CoreComponentsRegistry::sharedProviderRegistry()
-                        ->createComponentDescriptorRegistry(params);
-    auto& mutableRegistry = const_cast<ComponentDescriptorRegistry&>(*registry);
-    mutableRegistry.setFallbackComponentDescriptor(
-        std::make_shared<UnimplementedNativeViewComponentDescriptor>(params));
-
-    return registry;
-  };
-
-  delegate->buildRegistryFunction = buildRegistryFunction;
-  return instance;
-}
-
-void CoreComponentsRegistry::registerNatives() {
-  registerHybrid({
-      makeNativeMethod("initHybrid", CoreComponentsRegistry::initHybrid),
-  });
-}
-
-} // namespace facebook::react
+} // namespace facebook::react::CoreComponentsRegistry

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

@@ -7,34 +7,11 @@
 
 #pragma once
 
-#include <fbjni/fbjni.h>
 #include <react/renderer/componentregistry/ComponentDescriptorProviderRegistry.h>
-#include <react/renderer/componentregistry/ComponentDescriptorRegistry.h>
-#include "ComponentFactory.h"
 
-namespace facebook::react {
+namespace facebook::react::CoreComponentsRegistry {
 
-class CoreComponentsRegistry
-    : public facebook::jni::HybridClass<CoreComponentsRegistry> {
- public:
-  constexpr static auto kJavaDescriptor =
-      "Lcom/facebook/react/fabric/CoreComponentsRegistry;";
+std::shared_ptr<const ComponentDescriptorProviderRegistry>
+sharedProviderRegistry();
 
-  static void registerNatives();
-
-  explicit CoreComponentsRegistry(ComponentFactory* delegate);
-
-  static std::shared_ptr<const ComponentDescriptorProviderRegistry>
-  sharedProviderRegistry();
-
- private:
-  friend HybridBase;
-
-  const ComponentFactory* delegate_;
-
-  static jni::local_ref<jhybriddata> initHybrid(
-      jni::alias_ref<jclass>,
-      ComponentFactory* delegate);
-};
-
-} // namespace facebook::react
+} // namespace facebook::react::CoreComponentsRegistry