diff --git a/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/ReactInstanceManager.java b/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/ReactInstanceManager.java index 4bf3fbbfca9..e16cb596ee0 100644 --- a/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/ReactInstanceManager.java +++ b/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/ReactInstanceManager.java @@ -1406,14 +1406,14 @@ public class ReactInstanceManager { mJSIModulePackage.getJSIModules( reactContext, catalystInstance.getJavaScriptContextHolder())); } - if (ReactFeatureFlags.enableFabricRenderer) { - if (mUIManagerProvider != null) { - UIManager uiManager = mUIManagerProvider.createUIManager(reactContext); + if (mUIManagerProvider != null) { + UIManager uiManager = mUIManagerProvider.createUIManager(reactContext); + if (uiManager != null) { uiManager.initialize(); catalystInstance.setFabricUIManager(uiManager); - } else { - catalystInstance.getJSIModule(JSIModuleType.UIManager); } + } else if (ReactFeatureFlags.enableFabricRenderer) { + catalystInstance.getJSIModule(JSIModuleType.UIManager); } if (mBridgeIdleDebugListener != null) { catalystInstance.addBridgeIdleDebugListener(mBridgeIdleDebugListener); diff --git a/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/ReactNativeHost.java b/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/ReactNativeHost.java index 5352d11ea9b..3f1fb6f9462 100644 --- a/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/ReactNativeHost.java +++ b/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/ReactNativeHost.java @@ -132,7 +132,7 @@ public abstract class ReactNativeHost { } protected @Nullable UIManagerProvider getUIManagerProvider() { - return null; + return reactApplicationContext -> null; } /** Returns whether or not to treat it as normal if Activity is null. */ diff --git a/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/bridge/UIManagerProvider.kt b/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/bridge/UIManagerProvider.kt index 0153cd2d35d..0112d7ee264 100644 --- a/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/bridge/UIManagerProvider.kt +++ b/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/bridge/UIManagerProvider.kt @@ -18,5 +18,5 @@ import com.facebook.react.common.annotations.DeprecatedInNewArchitecture fun interface UIManagerProvider { /* Provides a {@link com.facebook.react.bridge.UIManager} for the context received as a parameter. */ - fun createUIManager(context: ReactApplicationContext): UIManager + fun createUIManager(context: ReactApplicationContext): UIManager? }