diff --git a/ReactAndroid/src/main/java/com/facebook/react/ReactInstanceManager.java b/ReactAndroid/src/main/java/com/facebook/react/ReactInstanceManager.java index f7f46ee13e8..7dd065c1848 100644 --- a/ReactAndroid/src/main/java/com/facebook/react/ReactInstanceManager.java +++ b/ReactAndroid/src/main/java/com/facebook/react/ReactInstanceManager.java @@ -52,6 +52,7 @@ import com.facebook.react.bridge.CatalystInstance; import com.facebook.react.bridge.CatalystInstanceImpl; import com.facebook.react.bridge.JSBundleLoader; import com.facebook.react.bridge.JSIModulePackage; +import com.facebook.react.bridge.JSIModuleType; import com.facebook.react.bridge.JavaJSExecutor; import com.facebook.react.bridge.JavaScriptExecutor; import com.facebook.react.bridge.JavaScriptExecutorFactory; @@ -71,6 +72,7 @@ import com.facebook.react.bridge.queue.ReactQueueConfigurationSpec; import com.facebook.react.common.LifecycleState; import com.facebook.react.common.ReactConstants; import com.facebook.react.common.annotations.VisibleForTesting; +import com.facebook.react.config.ReactFeatureFlags; import com.facebook.react.devsupport.DevSupportManagerFactory; import com.facebook.react.devsupport.ReactInstanceManagerDevHelper; import com.facebook.react.devsupport.RedBoxHandler; @@ -1006,6 +1008,11 @@ public class ReactInstanceManager { Assertions.assertNotNull(reactContext.getCatalystInstance()); catalystInstance.initialize(); + + if (ReactFeatureFlags.useTurboModules) { + catalystInstance.setTurboModuleManager(catalystInstance.getJSIModule(JSIModuleType.TurboModuleManager)); + } + mDevSupportManager.onNewReactContextCreated(reactContext); mMemoryPressureRouter.addMemoryPressureListener(catalystInstance); moveReactContextToCurrentLifecycleState(); @@ -1158,7 +1165,6 @@ public class ReactInstanceManager { catalystInstance.addJSIModules(mJSIModulePackage .getJSIModules(reactContext, catalystInstance.getJavaScriptContextHolder())); } - if (mBridgeIdleDebugListener != null) { catalystInstance.addBridgeIdleDebugListener(mBridgeIdleDebugListener); } @@ -1172,7 +1178,6 @@ public class ReactInstanceManager { reactContext.initializeWithInstance(catalystInstance); - return reactContext; } diff --git a/ReactAndroid/src/main/java/com/facebook/react/bridge/CatalystInstance.java b/ReactAndroid/src/main/java/com/facebook/react/bridge/CatalystInstance.java index 4ee84ea0675..97048de46d8 100644 --- a/ReactAndroid/src/main/java/com/facebook/react/bridge/CatalystInstance.java +++ b/ReactAndroid/src/main/java/com/facebook/react/bridge/CatalystInstance.java @@ -118,5 +118,5 @@ public interface CatalystInstance * to CatalystInstance so that getNativeModule, hasNativeModule, and * getNativeModules can also return TurboModules. */ - void setTurboModuleRegistry(TurboModuleRegistry getter); + void setTurboModuleManager(JSIModule getter); } diff --git a/ReactAndroid/src/main/java/com/facebook/react/bridge/CatalystInstanceImpl.java b/ReactAndroid/src/main/java/com/facebook/react/bridge/CatalystInstanceImpl.java index 05720aa72c8..fc4d48dd162 100644 --- a/ReactAndroid/src/main/java/com/facebook/react/bridge/CatalystInstanceImpl.java +++ b/ReactAndroid/src/main/java/com/facebook/react/bridge/CatalystInstanceImpl.java @@ -536,8 +536,8 @@ public class CatalystInstanceImpl implements CatalystInstance { } } - public void setTurboModuleRegistry(TurboModuleRegistry getter) { - mTurboModuleRegistry = getter; + public void setTurboModuleManager(JSIModule getter) { + mTurboModuleRegistry = (TurboModuleRegistry)getter; } private void decrementPendingJSCalls() {