react-native-tvos 0.73.7-1 → 0.74.0-0

package/ReactAndroid/src/main/jni/react/runtime/hermes/jni/JHermesInstance.h

@@ -8,35 +8,42 @@
 #pragma once
 
 #include <memory>
-#include <string>
 
 #include <cxxreact/MessageQueueThread.h>
 #include <fbjni/fbjni.h>
 #include <jni.h>
 #include <jsi/jsi.h>
-#include <react/runtime/JSEngineInstance.h>
+#include <react/config/ReactNativeConfig.h>
+#include <react/runtime/JSRuntimeFactory.h>
 #include <react/runtime/hermes/HermesInstance.h>
-#include "../../jni/JJSEngineInstance.h"
+#include "../../jni/JJSRuntimeFactory.h"
 
 namespace facebook::react {
 
 class JHermesInstance
-    : public jni::HybridClass<JHermesInstance, JJSEngineInstance> {
+    : public jni::HybridClass<JHermesInstance, JJSRuntimeFactory> {
  public:
   static constexpr auto kJavaDescriptor =
       "Lcom/facebook/react/runtime/hermes/HermesInstance;";
 
-  static jni::local_ref<jhybriddata> initHybrid(jni::alias_ref<jhybridobject>);
+  static jni::local_ref<jhybriddata> initHybrid(
+      jni::alias_ref<jclass> /* unused */,
+      jni::alias_ref<jobject> reactNativeConfig);
 
   static void registerNatives();
 
-  std::unique_ptr<jsi::Runtime> createJSRuntime(
+  JHermesInstance(std::shared_ptr<const ReactNativeConfig> reactNativeConfig)
+      : reactNativeConfig_(reactNativeConfig){};
+
+  std::unique_ptr<JSRuntime> createJSRuntime(
       std::shared_ptr<MessageQueueThread> msgQueueThread) noexcept;
 
   ~JHermesInstance() {}
 
  private:
   friend HybridBase;
+
+  std::shared_ptr<const ReactNativeConfig> reactNativeConfig_;
 };
 
 } // namespace facebook::react

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

@@ -23,6 +23,7 @@ target_include_directories(rninstance PUBLIC .)
 target_link_libraries(
         rninstance
         fabricjni
+        react_featureflagsjni
         turbomodulejsijni
         fb
         jsi

package/ReactAndroid/src/main/jni/react/runtime/jni/{JJSEngineInstance.h → JJSRuntimeFactory.h}

@@ -9,15 +9,15 @@
 
 #include <fbjni/fbjni.h>
 #include <jni.h>
-#include <react/runtime/JSEngineInstance.h>
+#include <react/runtime/JSRuntimeFactory.h>
 
 namespace facebook::react {
 
-class JJSEngineInstance : public jni::HybridClass<JJSEngineInstance>,
-                          public JSEngineInstance {
+class JJSRuntimeFactory : public jni::HybridClass<JJSRuntimeFactory>,
+                          public JSRuntimeFactory {
  public:
   static auto constexpr kJavaDescriptor =
-      "Lcom/facebook/react/runtime/JSEngineInstance;";
+      "Lcom/facebook/react/runtime/JSRuntimeFactory;";
 
  private:
   friend HybridBase;

package/ReactAndroid/src/main/jni/react/runtime/jni/JReactInstance.cpp

@@ -29,7 +29,7 @@
 namespace facebook::react {
 
 JReactInstance::JReactInstance(
-    jni::alias_ref<JJSEngineInstance::javaobject> jsEngineInstance,
+    jni::alias_ref<JJSRuntimeFactory::javaobject> jsRuntimeFactory,
     jni::alias_ref<JavaMessageQueueThread::javaobject> jsMessageQueueThread,
     jni::alias_ref<JavaMessageQueueThread::javaobject> nativeMessageQueueThread,
     jni::alias_ref<JJavaTimerManager::javaobject> javaTimerManager,
@@ -61,7 +61,7 @@ JReactInstance::JReactInstance(
   jBindingsInstaller_ = jni::make_global(jBindingsInstaller);
 
   instance_ = std::make_unique<ReactInstance>(
-      jsEngineInstance->cthis()->createJSRuntime(sharedJSMessageQueueThread),
+      jsRuntimeFactory->cthis()->createJSRuntime(sharedJSMessageQueueThread),
       sharedJSMessageQueueThread,
       timerManager,
       std::move(jsErrorHandlingFunc));
@@ -108,7 +108,7 @@ JReactInstance::JReactInstance(
 
 jni::local_ref<JReactInstance::jhybriddata> JReactInstance::initHybrid(
     jni::alias_ref<jhybridobject> /* unused */,
-    jni::alias_ref<JJSEngineInstance::javaobject> jsEngineInstance,
+    jni::alias_ref<JJSRuntimeFactory::javaobject> jsRuntimeFactory,
     jni::alias_ref<JavaMessageQueueThread::javaobject> jsMessageQueueThread,
     jni::alias_ref<JavaMessageQueueThread::javaobject> nativeMessageQueueThread,
     jni::alias_ref<JJavaTimerManager::javaobject> javaTimerManager,
@@ -117,7 +117,7 @@ jni::local_ref<JReactInstance::jhybriddata> JReactInstance::initHybrid(
     jni::alias_ref<JBindingsInstaller::javaobject> jBindingsInstaller,
     bool isProfiling) {
   return makeCxxInstance(
-      jsEngineInstance,
+      jsRuntimeFactory,
       jsMessageQueueThread,
       nativeMessageQueueThread,
       javaTimerManager,
@@ -201,6 +201,10 @@ void JReactInstance::handleMemoryPressureJs(jint level) {
   instance_->handleMemoryPressureJs(level);
 }
 
+jlong JReactInstance::getJavaScriptContext() {
+  return (jlong)(intptr_t)instance_->getJavaScriptContext();
+}
+
 void JReactInstance::registerNatives() {
   registerHybrid({
       makeNativeMethod("initHybrid", JReactInstance::initHybrid),
@@ -230,6 +234,8 @@ void JReactInstance::registerNatives() {
           "registerSegmentNative", JReactInstance::registerSegment),
       makeNativeMethod(
           "handleMemoryPressureJs", JReactInstance::handleMemoryPressureJs),
+      makeNativeMethod(
+          "getJavaScriptContext", JReactInstance::getJavaScriptContext),
   });
 }
 

package/ReactAndroid/src/main/jni/react/runtime/jni/JReactInstance.h

@@ -18,12 +18,12 @@
 #include <react/jni/JRuntimeScheduler.h>
 #include <react/jni/JSLoader.h>
 #include <react/jni/ReadableNativeMap.h>
-#include <react/runtime/JSEngineInstance.h>
+#include <react/runtime/JSRuntimeFactory.h>
 #include <react/runtime/PlatformTimerRegistry.h>
 #include <react/runtime/ReactInstance.h>
 
 #include "JBindingsInstaller.h"
-#include "JJSEngineInstance.h"
+#include "JJSRuntimeFactory.h"
 #include "JJSTimerExecutor.h"
 #include "JJavaTimerManager.h"
 #include "JReactExceptionManager.h"
@@ -37,7 +37,7 @@ class JReactInstance : public jni::HybridClass<JReactInstance> {
 
   static jni::local_ref<jhybriddata> initHybrid(
       jni::alias_ref<jhybridobject>,
-      jni::alias_ref<JJSEngineInstance::javaobject> jsEngineInstance,
+      jni::alias_ref<JJSRuntimeFactory::javaobject> jsRuntimeFactory,
       jni::alias_ref<JavaMessageQueueThread::javaobject> jsMessageQueueThread,
       jni::alias_ref<JavaMessageQueueThread::javaobject>
           nativeMessageQueueThread,
@@ -82,7 +82,7 @@ class JReactInstance : public jni::HybridClass<JReactInstance> {
   friend HybridBase;
 
   explicit JReactInstance(
-      jni::alias_ref<JJSEngineInstance::javaobject> jsEngineInstance,
+      jni::alias_ref<JJSRuntimeFactory::javaobject> jsRuntimeFactory,
       jni::alias_ref<JavaMessageQueueThread::javaobject> jsMessageQueueThread,
       jni::alias_ref<JavaMessageQueueThread::javaobject>
           nativeMessageQueueThread,
@@ -105,6 +105,8 @@ class JReactInstance : public jni::HybridClass<JReactInstance> {
       nativeMethodCallInvokerHolder_;
   jni::global_ref<JReactExceptionManager::javaobject> jReactExceptionManager_;
   jni::global_ref<JBindingsInstaller::javaobject> jBindingsInstaller_;
+
+  jlong getJavaScriptContext();
 };
 
 } // namespace facebook::react

package/ReactAndroid/src/main/jni/react/runtime/jsc/jni/OnLoad.cpp

@@ -10,12 +10,12 @@
 #include <jsc/JSCRuntime.h>
 #include <jsi/jsi.h>
 #include <react/jni/ReadableNativeMap.h>
-#include <react/runtime/JSEngineInstance.h>
-#include <react/runtime/jni/JJSEngineInstance.h>
+#include <react/runtime/JSRuntimeFactory.h>
+#include <react/runtime/jni/JJSRuntimeFactory.h>
 
 namespace facebook::react {
 
-class JSCInstance : public jni::HybridClass<JSCInstance, JJSEngineInstance> {
+class JSCInstance : public jni::HybridClass<JSCInstance, JJSRuntimeFactory> {
  public:
   static constexpr auto kJavaDescriptor =
       "Lcom/facebook/react/runtime/JSCInstance;";
@@ -30,9 +30,9 @@ class JSCInstance : public jni::HybridClass<JSCInstance, JJSEngineInstance> {
     });
   }
 
-  std::unique_ptr<jsi::Runtime> createJSRuntime(
+  std::unique_ptr<JSRuntime> createJSRuntime(
       std::shared_ptr<MessageQueueThread> msgQueueThread) noexcept {
-    return jsc::makeJSCRuntime();
+    return std::make_unique<JSIRuntimeHolder>(jsc::makeJSCRuntime());
   }
 
  private:

package/ReactAndroid/src/main/jni/react/turbomodule/ReactCommon/OnLoad.cpp

@@ -29,7 +29,7 @@ JNIEXPORT jint JNICALL JNI_OnLoad(JavaVM* vm, void*) {
     facebook::react::CompositeTurboModuleManagerDelegate::registerNatives();
 
     facebook::jni::registerNatives(
-        "com/facebook/react/turbomodule/core/TurboModulePerfLogger",
+        "com/facebook/react/internal/turbomodule/core/TurboModulePerfLogger",
         {makeNativeMethod("jniEnableCppLogging", jniEnableCppLogging)});
   });
 }

package/ReactAndroid/src/main/jni/react/turbomodule/ReactCommon/TurboModuleManager.cpp

@@ -12,6 +12,7 @@
 #include <fbjni/fbjni.h>
 #include <jsi/jsi.h>
 
+#include <ReactCommon/CxxTurboModuleUtils.h>
 #include <ReactCommon/JavaInteropTurboModule.h>
 #include <ReactCommon/TurboCxxModule.h>
 #include <ReactCommon/TurboModuleBinding.h>
@@ -26,7 +27,7 @@ namespace {
 class JMethodDescriptor : public jni::JavaClass<JMethodDescriptor> {
  public:
   static auto constexpr kJavaDescriptor =
-      "Lcom/facebook/react/turbomodule/core/TurboModuleInteropUtils$MethodDescriptor;";
+      "Lcom/facebook/react/internal/turbomodule/core/TurboModuleInteropUtils$MethodDescriptor;";
 
   JavaInteropTurboModule::MethodDescriptor toMethodDescriptor() {
     return JavaInteropTurboModule::MethodDescriptor{
@@ -128,14 +129,15 @@ void TurboModuleManager::registerNatives() {
   });
 }
 
-TurboModuleProviderFunctionType
-TurboModuleManager::createTurboModuleProvider() {
+TurboModuleProviderFunctionType TurboModuleManager::createTurboModuleProvider(
+    bool enableSyncVoidMethods) {
   return [turboModuleCache_ = std::weak_ptr<ModuleCache>(turboModuleCache_),
           jsCallInvoker_ = std::weak_ptr<CallInvoker>(jsCallInvoker_),
           nativeMethodCallInvoker_ =
               std::weak_ptr<NativeMethodCallInvoker>(nativeMethodCallInvoker_),
           delegate_ = jni::make_weak(delegate_),
-          javaPart_ = jni::make_weak(javaPart_)](
+          javaPart_ = jni::make_weak(javaPart_),
+          enableSyncVoidMethods](
              const std::string& name) -> std::shared_ptr<TurboModule> {
     auto turboModuleCache = turboModuleCache_.lock();
     auto jsCallInvoker = jsCallInvoker_.lock();
@@ -167,6 +169,14 @@ TurboModuleManager::createTurboModuleProvider() {
       return cxxModule;
     }
 
+    auto& cxxTurboModuleMapProvider = globalExportedCxxTurboModuleMap();
+    auto it = cxxTurboModuleMapProvider.find(name);
+    if (it != cxxTurboModuleMapProvider.end()) {
+      auto turboModule = it->second(jsCallInvoker);
+      turboModuleCache->insert({name, turboModule});
+      return turboModule;
+    }
+
     static auto getTurboLegacyCxxModule =
         javaPart->getClass()
             ->getMethod<jni::alias_ref<CxxModuleWrapper::javaobject>(
@@ -196,7 +206,8 @@ TurboModuleManager::createTurboModuleProvider() {
           .moduleName = name,
           .instance = moduleInstance,
           .jsInvoker = jsCallInvoker,
-          .nativeMethodCallInvoker = nativeMethodCallInvoker};
+          .nativeMethodCallInvoker = nativeMethodCallInvoker,
+          .shouldVoidMethodsExecuteSync = enableSyncVoidMethods};
 
       auto turboModule = delegate->cthis()->getTurboModule(name, params);
       turboModuleCache->insert({name, turboModule});
@@ -270,7 +281,8 @@ TurboModuleManager::createLegacyModuleProvider() {
           .moduleName = name,
           .instance = moduleInstance,
           .jsInvoker = jsCallInvoker,
-          .nativeMethodCallInvoker = nativeMethodCallInvoker};
+          .nativeMethodCallInvoker = nativeMethodCallInvoker,
+          .shouldVoidMethodsExecuteSync = false};
 
       static auto getMethodDescriptorsFromModule =
           javaPart->getClass()
@@ -300,21 +312,27 @@ TurboModuleManager::createLegacyModuleProvider() {
   };
 }
 
-void TurboModuleManager::installJSIBindings(bool shouldCreateLegacyModules) {
+void TurboModuleManager::installJSIBindings(
+    bool shouldCreateLegacyModules,
+    bool enableSyncVoidMethods) {
   if (!jsCallInvoker_) {
     return; // Runtime doesn't exist when attached to Chrome debugger.
   }
 
   bool isInteropLayerDisabled = !shouldCreateLegacyModules;
 
-  runtimeExecutor_([this, isInteropLayerDisabled](jsi::Runtime& runtime) {
+  runtimeExecutor_([this, isInteropLayerDisabled, enableSyncVoidMethods](
+                       jsi::Runtime& runtime) {
     if (isInteropLayerDisabled) {
-      TurboModuleBinding::install(runtime, createTurboModuleProvider());
+      TurboModuleBinding::install(
+          runtime, createTurboModuleProvider(enableSyncVoidMethods));
       return;
     }
 
     TurboModuleBinding::install(
-        runtime, createTurboModuleProvider(), createLegacyModuleProvider());
+        runtime,
+        createTurboModuleProvider(enableSyncVoidMethods),
+        createLegacyModuleProvider());
   });
 }
 

package/ReactAndroid/src/main/jni/react/turbomodule/ReactCommon/TurboModuleManager.h

@@ -26,7 +26,7 @@ namespace facebook::react {
 class TurboModuleManager : public jni::HybridClass<TurboModuleManager> {
  public:
   static auto constexpr kJavaDescriptor =
-      "Lcom/facebook/react/turbomodule/core/TurboModuleManager;";
+      "Lcom/facebook/react/internal/turbomodule/core/TurboModuleManager;";
   static jni::local_ref<jhybriddata> initHybrid(
       jni::alias_ref<jhybridobject> jThis,
       jni::alias_ref<JRuntimeExecutor::javaobject> runtimeExecutor,
@@ -56,7 +56,9 @@ class TurboModuleManager : public jni::HybridClass<TurboModuleManager> {
   std::shared_ptr<ModuleCache> turboModuleCache_;
   std::shared_ptr<ModuleCache> legacyModuleCache_;
 
-  void installJSIBindings(bool shouldCreateLegacyModules);
+  void installJSIBindings(
+      bool shouldCreateLegacyModules,
+      bool enableSyncVoidMethods);
   explicit TurboModuleManager(
       jni::alias_ref<TurboModuleManager::jhybridobject> jThis,
       RuntimeExecutor runtimeExecutor,
@@ -64,7 +66,8 @@ class TurboModuleManager : public jni::HybridClass<TurboModuleManager> {
       std::shared_ptr<NativeMethodCallInvoker> nativeMethodCallInvoker,
       jni::alias_ref<TurboModuleManagerDelegate::javaobject> delegate);
 
-  TurboModuleProviderFunctionType createTurboModuleProvider();
+  TurboModuleProviderFunctionType createTurboModuleProvider(
+      bool enableSyncVoidMethods);
   TurboModuleProviderFunctionType createLegacyModuleProvider();
 };
 

package/ReactAndroid/src/main/jni/react/turbomodule/ReactCommon/TurboModuleManagerDelegate.h

@@ -19,7 +19,7 @@ class TurboModuleManagerDelegate
     : public jni::HybridClass<TurboModuleManagerDelegate> {
  public:
   static auto constexpr kJavaDescriptor =
-      "Lcom/facebook/react/turbomodule/core/TurboModuleManagerDelegate;";
+      "Lcom/facebook/react/internal/turbomodule/core/TurboModuleManagerDelegate;";
 
   virtual std::shared_ptr<TurboModule> getTurboModule(
       const std::string& name,

package/ReactAndroid/src/main/jni/react/uimanager/UIConstantsProviderManager.cpp

@@ -22,18 +22,34 @@ using namespace facebook::jni;
 UIConstantsProviderManager::UIConstantsProviderManager(
     jni::alias_ref<UIConstantsProviderManager::javaobject> jThis,
     RuntimeExecutor runtimeExecutor,
-    jni::alias_ref<jobject> uiConstantsProvider)
+    jni::alias_ref<DefaultEventTypesProvider::javaobject>
+        defaultExportableEventTypesProvider,
+    jni::alias_ref<ConstantsForViewManagerProvider::javaobject>
+        constantsForViewManagerProvider,
+    jni::alias_ref<ConstantsProvider::javaobject> constantsProvider)
     : javaPart_(jni::make_global(jThis)),
       runtimeExecutor_(runtimeExecutor),
-      uiConstantsProvider_(jni::make_global(uiConstantsProvider)) {}
+      defaultExportableEventTypesProvider_(
+          jni::make_global(defaultExportableEventTypesProvider)),
+      constantsForViewManagerProvider_(
+          jni::make_global(constantsForViewManagerProvider)),
+      constantsProvider_(jni::make_global(constantsProvider)) {}
 
 jni::local_ref<UIConstantsProviderManager::jhybriddata>
 UIConstantsProviderManager::initHybrid(
     jni::alias_ref<jhybridobject> jThis,
     jni::alias_ref<JRuntimeExecutor::javaobject> runtimeExecutor,
-    jni::alias_ref<jobject> uiConstantsProvider) {
+    jni::alias_ref<DefaultEventTypesProvider::javaobject>
+        defaultExportableEventTypesProvider,
+    jni::alias_ref<ConstantsForViewManagerProvider::javaobject>
+        constantsForViewManagerProvider,
+    jni::alias_ref<ConstantsProvider::javaobject> constantsProvider) {
   return makeCxxInstance(
-      jThis, runtimeExecutor->cthis()->get(), uiConstantsProvider);
+      jThis,
+      runtimeExecutor->cthis()->get(),
+      defaultExportableEventTypesProvider,
+      constantsForViewManagerProvider,
+      constantsProvider);
 }
 
 void UIConstantsProviderManager::registerNatives() {
@@ -46,18 +62,33 @@ void UIConstantsProviderManager::registerNatives() {
 
 void UIConstantsProviderManager::installJSIBindings() {
   runtimeExecutor_([thizz = this](jsi::Runtime& runtime) {
-    auto uiConstantsProvider = [thizz, &runtime]() -> jsi::Value {
-      static auto getConstants =
-          jni::findClassStatic(
-              UIConstantsProviderManager::UIConstantsProviderJavaDescriptor)
-              ->getMethod<jni::alias_ref<NativeMap::jhybridobject>()>(
-                  "getConstants");
-      auto constants = getConstants(thizz->uiConstantsProvider_.get());
-      return jsi::valueFromDynamic(runtime, constants->cthis()->consume());
+    auto jsiDefaultEventTypesProvider = [thizz, &runtime]() -> jsi::Value {
+      return thizz->defaultExportableEventTypesProvider_->getDefaultEventTypes(
+          runtime);
     };
 
+    auto jsiConstantsForViewManagerProvider =
+        [thizz, &runtime](std::string viewManagerName) -> jsi::Value {
+      return thizz->constantsForViewManagerProvider_
+          ->getConstantsForViewManager(runtime, viewManagerName);
+    };
+
+    auto jsiConstantsProvider = [thizz, &runtime]() -> jsi::Value {
+      return thizz->constantsProvider_->getConstants(runtime);
+    };
+
+    LegacyUIManagerConstantsProviderBinding::install(
+        runtime,
+        "getDefaultEventTypes",
+        std::move(jsiDefaultEventTypesProvider));
+
+    LegacyUIManagerConstantsProviderBinding::install(
+        runtime,
+        "getConstantsForViewManager",
+        std::move(jsiConstantsForViewManagerProvider));
+
     LegacyUIManagerConstantsProviderBinding::install(
-        runtime, std::move(uiConstantsProvider));
+        runtime, "getConstants", std::move(jsiConstantsProvider));
   });
 }
 

package/ReactAndroid/src/main/jni/react/uimanager/UIConstantsProviderManager.h

@@ -9,23 +9,80 @@
 
 #include <ReactCommon/RuntimeExecutor.h>
 #include <fbjni/fbjni.h>
+#include <jsi/JSIDynamic.h>
+#include <jsi/jsi.h>
 #include <react/jni/JRuntimeExecutor.h>
+#include <react/jni/NativeMap.h>
 
 namespace facebook::react {
 
+class DefaultEventTypesProvider
+    : public jni::JavaClass<DefaultEventTypesProvider> {
+ public:
+  static constexpr const char* kJavaDescriptor =
+      "Lcom/facebook/react/uimanager/UIConstantsProviderManager$DefaultEventTypesProvider;";
+
+  jsi::Value getDefaultEventTypes(jsi::Runtime& runtime) {
+    static auto method =
+        javaClassStatic()
+            ->getMethod<jni::alias_ref<NativeMap::jhybridobject>()>(
+                "getDefaultEventTypes");
+    auto result = method(self());
+    return jsi::valueFromDynamic(runtime, result->cthis()->consume());
+  }
+};
+
+class ConstantsForViewManagerProvider
+    : public jni::JavaClass<ConstantsForViewManagerProvider> {
+ public:
+  static constexpr const char* kJavaDescriptor =
+      "Lcom/facebook/react/uimanager/UIConstantsProviderManager$ConstantsForViewManagerProvider;";
+
+  jsi::Value getConstantsForViewManager(
+      jsi::Runtime& runtime,
+      std::string viewManagerName) {
+    static auto method =
+        javaClassStatic()
+            ->getMethod<jni::alias_ref<NativeMap::jhybridobject>(std::string)>(
+                "getConstantsForViewManager");
+    auto result = method(self(), viewManagerName);
+    if (result == nullptr) {
+      return jsi::Value::null();
+    }
+    return jsi::valueFromDynamic(runtime, result->cthis()->consume());
+  }
+};
+
+class ConstantsProvider : public jni::JavaClass<ConstantsProvider> {
+ public:
+  static constexpr const char* kJavaDescriptor =
+      "Lcom/facebook/react/uimanager/UIConstantsProviderManager$ConstantsProvider;";
+
+  jsi::Value getConstants(jsi::Runtime& runtime) {
+    static auto method =
+        javaClassStatic()
+            ->getMethod<jni::alias_ref<NativeMap::jhybridobject>()>(
+                "getConstants");
+    auto result = method(self());
+    return jsi::valueFromDynamic(runtime, result->cthis()->consume());
+  }
+};
+
 class UIConstantsProviderManager
     : public facebook::jni::HybridClass<UIConstantsProviderManager> {
  public:
   static auto constexpr kJavaDescriptor =
       "Lcom/facebook/react/uimanager/UIConstantsProviderManager;";
 
-  constexpr static auto UIConstantsProviderJavaDescriptor =
-      "com/facebook/react/uimanager/UIConstantsProvider";
-
   static facebook::jni::local_ref<jhybriddata> initHybrid(
       facebook::jni::alias_ref<jhybridobject> jThis,
       facebook::jni::alias_ref<JRuntimeExecutor::javaobject> runtimeExecutor,
-      facebook::jni::alias_ref<jobject> uiConstantsProviderManager);
+      facebook::jni::alias_ref<DefaultEventTypesProvider::javaobject>
+          defaultExportableEventTypesProvider,
+      facebook::jni::alias_ref<ConstantsForViewManagerProvider::javaobject>
+          constantsForViewManagerProvider,
+      facebook::jni::alias_ref<ConstantsProvider::javaobject>
+          constantsProvider);
 
   static void registerNatives();
 
@@ -34,14 +91,23 @@ class UIConstantsProviderManager
   facebook::jni::global_ref<UIConstantsProviderManager::javaobject> javaPart_;
   RuntimeExecutor runtimeExecutor_;
 
-  facebook::jni::global_ref<jobject> uiConstantsProvider_;
+  facebook::jni::global_ref<DefaultEventTypesProvider::javaobject>
+      defaultExportableEventTypesProvider_;
+  facebook::jni::global_ref<ConstantsForViewManagerProvider::javaobject>
+      constantsForViewManagerProvider_;
+  facebook::jni::global_ref<ConstantsProvider::javaobject> constantsProvider_;
 
   void installJSIBindings();
 
   explicit UIConstantsProviderManager(
       facebook::jni::alias_ref<UIConstantsProviderManager::jhybridobject> jThis,
       RuntimeExecutor runtimeExecutor,
-      facebook::jni::alias_ref<jobject> uiConstantsProviderManager);
+      facebook::jni::alias_ref<DefaultEventTypesProvider::javaobject>
+          defaultExportableEventTypesProvider,
+      facebook::jni::alias_ref<ConstantsForViewManagerProvider::javaobject>
+          constantsForViewManagerProvider,
+      facebook::jni::alias_ref<ConstantsProvider::javaobject>
+          constantsProvider);
 };
 
 } // namespace facebook::react

package/ReactAndroid/src/main/jni/third-party/fmt/CMakeLists.txt

@@ -6,7 +6,7 @@
 cmake_minimum_required(VERSION 3.13)
 set(CMAKE_VERBOSE_MAKEFILE on)
 
-add_compile_options(-std=c++11 -fexceptions)
+add_compile_options(-std=c++20 -fexceptions)
 
 add_library(fmt STATIC src/format.cc)
 

package/ReactAndroid/src/main/jni/third-party/folly/CMakeLists.txt

@@ -24,31 +24,35 @@ SET(folly_FLAGS
 ##################
 
 SET(folly_runtime_SRC
-        folly/SharedMutex.cpp
-        folly/concurrency/CacheLocality.cpp
-        folly/detail/Futex.cpp
-        folly/lang/SafeAssert.cpp
-        folly/lang/ToAscii.cpp
-        folly/synchronization/ParkingLot.cpp
-        folly/system/ThreadId.cpp
-        folly/system/ThreadName.cpp
-        folly/json.cpp
-        folly/Unicode.cpp
         folly/Conv.cpp
         folly/Demangle.cpp
-        folly/memory/detail/MallocImpl.cpp
-        folly/String.cpp
         folly/dynamic.cpp
         folly/FileUtil.cpp
         folly/Format.cpp
-        folly/net/NetOps.cpp
         folly/json_pointer.cpp
-        folly/lang/CString.cpp
+        folly/json.cpp
+        folly/ScopeGuard.cpp
+        folly/SharedMutex.cpp
+        folly/String.cpp
+        folly/Unicode.cpp
+        folly/concurrency/CacheLocality.cpp
+        folly/container/detail/F14Table.cpp
+        folly/detail/FileUtilDetail.cpp
+        folly/detail/Futex.cpp
+        folly/detail/SplitStringSimd.cpp
         folly/detail/UniqueInstance.cpp
         folly/hash/SpookyHashV2.cpp
-        folly/container/detail/F14Table.cpp
-        folly/ScopeGuard.cpp
-        folly/portability/SysUio.cpp)
+        folly/lang/CString.cpp
+        folly/lang/SafeAssert.cpp
+        folly/lang/ToAscii.cpp
+        folly/memory/detail/MallocImpl.cpp
+        folly/net/NetOps.cpp
+        folly/portability/SysUio.cpp
+        folly/synchronization/SanitizeThread.cpp
+        folly/synchronization/ParkingLot.cpp
+        folly/system/AtFork.cpp
+        folly/system/ThreadId.cpp
+        folly/system/ThreadName.cpp)
 
 add_library(folly_runtime SHARED ${folly_runtime_SRC})
 
@@ -64,58 +68,3 @@ target_compile_options(folly_runtime PUBLIC ${folly_FLAGS})
 
 target_include_directories(folly_runtime PUBLIC .)
 target_link_libraries(folly_runtime glog double-conversion boost fmt)
-
-#####################
-### folly_futures ###
-#####################
-
-add_library(folly_futures STATIC
-        folly/ExceptionWrapper.cpp
-        folly/ExceptionString.cpp
-        folly/Executor.cpp
-        folly/Singleton.cpp
-        folly/Try.cpp
-        folly/concurrency/CacheLocality.cpp
-        folly/detail/AsyncTrace.cpp
-        folly/detail/MemoryIdler.cpp
-        folly/detail/ThreadLocalDetail.cpp
-        folly/fibers/Baton.cpp
-        folly/fibers/FiberManager.cpp
-        folly/fibers/Fiber.cpp
-        folly/fibers/GuardPageAllocator.cpp
-        folly/futures/detail/Core.cpp
-        folly/futures/Future.cpp
-        folly/futures/ThreadWheelTimekeeper.cpp
-        folly/executors/ExecutorWithPriority.cpp
-        folly/executors/InlineExecutor.cpp
-        folly/executors/TimedDrivableExecutor.cpp
-        folly/executors/QueuedImmediateExecutor.cpp
-        folly/io/async/AsyncTimeout.cpp
-        folly/io/async/EventBase.cpp
-        folly/io/async/EventBaseBackendBase.cpp
-        folly/io/async/EventBaseLocal.cpp
-        folly/io/async/EventHandler.cpp
-        folly/io/async/HHWheelTimer.cpp
-        folly/io/async/Request.cpp
-        folly/io/async/TimeoutManager.cpp
-        folly/io/async/VirtualEventBase.cpp
-        folly/lang/Exception.cpp
-        folly/memory/MallctlHelper.cpp
-        folly/portability/SysMembarrier.cpp
-        folly/synchronization/AsymmetricThreadFence.cpp
-        folly/synchronization/Hazptr.cpp
-        folly/synchronization/WaitOptions.cpp
-        folly/synchronization/detail/Sleeper.cpp
-        folly/system/AtFork.cpp
-        folly/system/Pid.cpp)
-
-target_compile_options(folly_futures
-        PRIVATE
-        -fexceptions
-        -fno-omit-frame-pointer
-        -frtti
-        -Wno-sign-compare
-        -Wno-unused-variable)
-
-target_include_directories(folly_futures PUBLIC .)
-target_link_libraries(folly_futures glog double-conversion folly_runtime boost event fmt)