introduce unstable_enableSyncVoidMethods config

Differential Revision: D50028200 fbshipit-source-id: 343379309c335f82679b17473af976a25e751c45
philIip · Oct 9, 2023 · 5267f85 · 5267f85
1 parent a2d0eb6
commit 5267f85
Show file tree

Hide file tree

Showing 4 changed files with 32 additions and 13 deletions.
diff --git a/...ve/ReactAndroid/src/main/java/com/facebook/react/turbomodule/core/TurboModuleManager.java b/...ve/ReactAndroid/src/main/java/com/facebook/react/turbomodule/core/TurboModuleManager.java
@@ -71,7 +71,7 @@ public TurboModuleManager(
             (CallInvokerHolderImpl) jsCallInvokerHolder,
             (NativeMethodCallInvokerHolderImpl) nativeMethodCallInvokerHolder,
             delegate);
-    installJSIBindings(shouldEnableLegacyModuleInterop());
+    installJSIBindings(shouldEnableLegacyModuleInterop(), enableSyncVoidMethods());
 
     mEagerInitModuleNames =
         delegate == null ? new ArrayList<>() : delegate.getEagerInitModuleNames();
@@ -116,6 +116,10 @@ private boolean shouldRouteTurboModulesThroughLegacyModuleInterop() {
         && mDelegate.unstable_shouldRouteTurboModulesThroughLegacyModuleInterop();
   }
 
+  private boolean enableSyncVoidMethods() {
+    return mDelegate != null && mDelegate.unstable_enableSyncVoidMethods();
+  }
+
   @Override
   @NonNull
   public List<String> getEagerInitModuleNames() {
@@ -417,7 +421,8 @@ private native HybridData initHybrid(
       NativeMethodCallInvokerHolderImpl nativeMethodCallInvoker,
       TurboModuleManagerDelegate tmmDelegate);
 
-  private native void installJSIBindings(boolean shouldCreateLegacyModules);
+  private native void installJSIBindings(
+      boolean shouldCreateLegacyModules, boolean enableSyncVoidMethods);
 
   @Override
   public void initialize() {}

diff --git a/...Android/src/main/java/com/facebook/react/turbomodule/core/TurboModuleManagerDelegate.java b/...Android/src/main/java/com/facebook/react/turbomodule/core/TurboModuleManagerDelegate.java
@@ -70,5 +70,9 @@ public boolean unstable_shouldRouteTurboModulesThroughLegacyModuleInterop() {
     return false;
   }
 
+  public boolean unstable_enableSyncVoidMethods() {
+    return false;
+  }
+
   protected synchronized void maybeLoadOtherSoLibraries() {}
 }
diff --git a/...act-native/ReactAndroid/src/main/jni/react/turbomodule/ReactCommon/TurboModuleManager.cpp b/...act-native/ReactAndroid/src/main/jni/react/turbomodule/ReactCommon/TurboModuleManager.cpp
@@ -128,8 +128,8 @@ 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_ =
@@ -209,8 +209,8 @@ TurboModuleManager::createTurboModuleProvider() {
   };
 }
 
-TurboModuleProviderFunctionType
-TurboModuleManager::createLegacyModuleProvider() {
+TurboModuleProviderFunctionType TurboModuleManager::createLegacyModuleProvider(
+    bool enableSyncVoidMethods) {
   return [legacyModuleCache_ = std::weak_ptr<ModuleCache>(legacyModuleCache_),
           jsCallInvoker_ = std::weak_ptr<CallInvoker>(jsCallInvoker_),
           nativeMethodCallInvoker_ =
@@ -302,21 +302,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(enableSyncVoidMethods));
   });
 }
 

diff --git a/...react-native/ReactAndroid/src/main/jni/react/turbomodule/ReactCommon/TurboModuleManager.h b/...react-native/ReactAndroid/src/main/jni/react/turbomodule/ReactCommon/TurboModuleManager.h
@@ -56,16 +56,20 @@ 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,
       std::shared_ptr<CallInvoker> jsCallInvoker,
       std::shared_ptr<NativeMethodCallInvoker> nativeMethodCallInvoker,
       jni::alias_ref<TurboModuleManagerDelegate::javaobject> delegate);
 
-  TurboModuleProviderFunctionType createTurboModuleProvider();
-  TurboModuleProviderFunctionType createLegacyModuleProvider();
+  TurboModuleProviderFunctionType createTurboModuleProvider(
+      bool enableSyncVoidMethods);
+  TurboModuleProviderFunctionType createLegacyModuleProvider(
+      bool enableSyncVoidMethods);
 };
 
 } // namespace facebook::react