From 8832ddab2054b79e53c613688aa9bf9acee8ecea Mon Sep 17 00:00:00 2001 From: Arushi Kesarwani Date: Mon, 11 Dec 2023 03:40:09 -0800 Subject: [PATCH] Removing Fabric check from UIManagerProvider (#41880) Summary: Pull Request resolved: https://github.com/facebook/react-native/pull/41880 Pull Request resolved: https://github.com/facebook/react-native/pull/41664 Moving the check for Fabric i.e. `ReactFeatureFlags.enableFabricRenderer` to old JSI Module path logic instead of new UIManagerProvider path for Fabric initialization Reviewed By: philIip Differential Revision: D51610399 fbshipit-source-id: 1d868111dd2b65ac8d69198f7ab115ac8a2b43ec --- .../com/facebook/react/ReactInstanceManager.java | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) 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..25e57481092 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); - uiManager.initialize(); - catalystInstance.setFabricUIManager(uiManager); - } else { - catalystInstance.getJSIModule(JSIModuleType.UIManager); - } + // The setFabricUIManager API is valid even if enableFabricRenderer is false because + // apps that override getUIManagerProvider() are indicating they want to use Fabric. + if (mUIManagerProvider != null) { + UIManager uiManager = mUIManagerProvider.createUIManager(reactContext); + uiManager.initialize(); + catalystInstance.setFabricUIManager(uiManager); + } else if (ReactFeatureFlags.enableFabricRenderer) { + catalystInstance.getJSIModule(JSIModuleType.UIManager); } if (mBridgeIdleDebugListener != null) { catalystInstance.addBridgeIdleDebugListener(mBridgeIdleDebugListener);