Provide easy regristration of C++ TurboModules in rn-tester Android (f…

…acebook#35225) Summary: Pull Request resolved: facebook#35225 Changelog: [Android] [Changed] - Provide easy regristration of C++ TurboModules in rn-tester Android Differential Revision: D41069277 fbshipit-source-id: 88f28234c4cfc29fbc9a2fd2ae0127f7ead7e4ff
christophpurrer · Nov 7, 2022 · 052dfbc · 052dfbc
1 parent d62b0b4
commit 052dfbc
Show file tree

Hide file tree

Showing 4 changed files with 44 additions and 13 deletions.
diff --git a/ReactAndroid/cmake-utils/default-app-setup/OnLoad.cpp b/ReactAndroid/cmake-utils/default-app-setup/OnLoad.cpp
@@ -48,7 +48,14 @@ void registerComponents(
   rncli_registerProviders(registry);
 }
 
-std::shared_ptr<TurboModule> provideModules(
+std::shared_ptr<TurboModule> cxxModuleProvider(
+    const std::string &name,
+    const std::shared_ptr<CallInvoker> &jsInvoker) {
+  // Not implemented yet: provide pure-C++ NativeModules here.
+  return nullptr;
+}
+
+std::shared_ptr<TurboModule> moduleProvider(
     const std::string &name,
     const JavaTurboModule::InitParams &params) {
   // Here you can provide your own module provider for TurboModules coming from
@@ -70,8 +77,10 @@ std::shared_ptr<TurboModule> provideModules(
 
 JNIEXPORT jint JNICALL JNI_OnLoad(JavaVM *vm, void *) {
   return facebook::jni::initialize(vm, [] {
-    facebook::react::DefaultTurboModuleManagerDelegate::
-        moduleProvidersFromEntryPoint = &facebook::react::provideModules;
+    facebook::react::DefaultTurboModuleManagerDelegate::cxxModuleProvider =
+        &facebook::react::cxxModuleProvider;
+    facebook::react::DefaultTurboModuleManagerDelegate::moduleProvider =
+        &facebook::react::moduleProvider;
     facebook::react::DefaultComponentsRegistry::
         registerComponentDescriptorsFromEntryPoint =
             &facebook::react::registerComponents;

diff --git a/ReactAndroid/src/main/jni/react/newarchdefaults/DefaultTurboModuleManagerDelegate.cpp b/ReactAndroid/src/main/jni/react/newarchdefaults/DefaultTurboModuleManagerDelegate.cpp
@@ -12,10 +12,15 @@
 namespace facebook {
 namespace react {
 
+std::function<std::shared_ptr<TurboModule>(
+    const std::string &,
+    const std::shared_ptr<CallInvoker> &)>
+    DefaultTurboModuleManagerDelegate::cxxModuleProvider{nullptr};
+
 std::function<std::shared_ptr<TurboModule>(
     const std::string &,
     const JavaTurboModule::InitParams &)>
-    DefaultTurboModuleManagerDelegate::moduleProvidersFromEntryPoint{nullptr};
+    DefaultTurboModuleManagerDelegate::moduleProvider{nullptr};
 
 jni::local_ref<DefaultTurboModuleManagerDelegate::jhybriddata>
 DefaultTurboModuleManagerDelegate::initHybrid(jni::alias_ref<jhybridobject>) {
@@ -32,17 +37,21 @@ void DefaultTurboModuleManagerDelegate::registerNatives() {
 std::shared_ptr<TurboModule> DefaultTurboModuleManagerDelegate::getTurboModule(
     const std::string &name,
     const std::shared_ptr<CallInvoker> &jsInvoker) {
-  // Not implemented yet: provide pure-C++ NativeModules here.
+  auto moduleProvider = DefaultTurboModuleManagerDelegate::cxxModuleProvider;
+  if (moduleProvider) {
+    return moduleProvider(name, jsInvoker);
+  }
   return nullptr;
 }
 
 std::shared_ptr<TurboModule> DefaultTurboModuleManagerDelegate::getTurboModule(
     const std::string &name,
     const JavaTurboModule::InitParams &params) {
-  auto resolvedModule = (DefaultTurboModuleManagerDelegate::
-                             moduleProvidersFromEntryPoint)(name, params);
-  if (resolvedModule != nullptr) {
-    return resolvedModule;
+  auto moduleProvider = DefaultTurboModuleManagerDelegate::moduleProvider;
+  if (moduleProvider) {
+    if (auto resolvedModule = moduleProvider(name, params)) {
+      return resolvedModule;
+    }
   }
   return rncore_ModuleProvider(name, params);
 }

diff --git a/ReactAndroid/src/main/jni/react/newarchdefaults/DefaultTurboModuleManagerDelegate.h b/ReactAndroid/src/main/jni/react/newarchdefaults/DefaultTurboModuleManagerDelegate.h
@@ -27,10 +27,15 @@ class DefaultTurboModuleManagerDelegate : public jni::HybridClass<
 
   static void registerNatives();
 
+  static std::function<std::shared_ptr<TurboModule>(
+      const std::string &,
+      const std::shared_ptr<CallInvoker> &)>
+      cxxModuleProvider;
+
   static std::function<std::shared_ptr<TurboModule>(
       const std::string &,
       const JavaTurboModule::InitParams &)>
-      moduleProvidersFromEntryPoint;
+      moduleProvider;
 
   std::shared_ptr<TurboModule> getTurboModule(
       const std::string &name,

diff --git a/packages/rn-tester/android/app/src/main/jni/OnLoad.cpp b/packages/rn-tester/android/app/src/main/jni/OnLoad.cpp
@@ -23,7 +23,13 @@ void registerComponents(
                 RNTMyNativeViewComponentDescriptor>());
 }
 
-std::shared_ptr<TurboModule> provideModules(
+std::shared_ptr<TurboModule> cxxModuleProvider(
+    const std::string &name,
+    const std::shared_ptr<CallInvoker> &jsInvoker) {
+  return nullptr;
+}
+
+std::shared_ptr<TurboModule> moduleProvider(
     const std::string &name,
     const JavaTurboModule::InitParams &params) {
   auto module = AppSpecs_ModuleProvider(name, params);
@@ -42,8 +48,10 @@ std::shared_ptr<TurboModule> provideModules(
 
 JNIEXPORT jint JNICALL JNI_OnLoad(JavaVM *vm, void *) {
   return facebook::jni::initialize(vm, [] {
-    facebook::react::DefaultTurboModuleManagerDelegate::
-        moduleProvidersFromEntryPoint = &facebook::react::provideModules;
+    facebook::react::DefaultTurboModuleManagerDelegate::cxxModuleProvider =
+        &facebook::react::cxxModuleProvider;
+    facebook::react::DefaultTurboModuleManagerDelegate::moduleProvider =
+        &facebook::react::moduleProvider;
     facebook::react::DefaultComponentsRegistry::
         registerComponentDescriptorsFromEntryPoint =
             &facebook::react::registerComponents;