diff --git a/ReactAndroid/src/main/java/com/facebook/react/ReactInstanceManager.java b/ReactAndroid/src/main/java/com/facebook/react/ReactInstanceManager.java index c45b3b42329..0a317af7e85 100644 --- a/ReactAndroid/src/main/java/com/facebook/react/ReactInstanceManager.java +++ b/ReactAndroid/src/main/java/com/facebook/react/ReactInstanceManager.java @@ -1289,34 +1289,34 @@ public class ReactInstanceManager { reactContext.initializeWithInstance(catalystInstance); + if (ReactFeatureFlags.useTurboModules && mTMMDelegateBuilder != null) { + TurboModuleManagerDelegate tmmDelegate = + mTMMDelegateBuilder + .setPackages(mPackages) + .setReactApplicationContext(reactContext) + .build(); + + TurboModuleManager turboModuleManager = + new TurboModuleManager( + catalystInstance.getRuntimeExecutor(), + tmmDelegate, + catalystInstance.getJSCallInvokerHolder(), + catalystInstance.getNativeCallInvokerHolder()); + + catalystInstance.setTurboModuleManager(turboModuleManager); + + TurboModuleRegistry registry = (TurboModuleRegistry) turboModuleManager; + + // Eagerly initialize TurboModules + for (String moduleName : registry.getEagerInitModuleNames()) { + registry.getModule(moduleName); + } + } + if (mJSIModulePackage != null) { catalystInstance.addJSIModules( mJSIModulePackage.getJSIModules( reactContext, catalystInstance.getJavaScriptContextHolder())); - - if (ReactFeatureFlags.useTurboModules && mTMMDelegateBuilder != null) { - TurboModuleManagerDelegate tmmDelegate = - mTMMDelegateBuilder - .setPackages(mPackages) - .setReactApplicationContext(reactContext) - .build(); - - TurboModuleManager turboModuleManager = - new TurboModuleManager( - catalystInstance.getRuntimeExecutor(), - tmmDelegate, - catalystInstance.getJSCallInvokerHolder(), - catalystInstance.getNativeCallInvokerHolder()); - - catalystInstance.setTurboModuleManager(turboModuleManager); - - TurboModuleRegistry registry = (TurboModuleRegistry) turboModuleManager; - - // Eagerly initialize TurboModules - for (String moduleName : registry.getEagerInitModuleNames()) { - registry.getModule(moduleName); - } - } } if (ReactFeatureFlags.eagerInitializeFabric) { catalystInstance.getJSIModule(JSIModuleType.UIManager);