From 1045b225f1a1ab1150b3e8732820c8cecd3e04c2 Mon Sep 17 00:00:00 2001 From: Arushi Kesarwani Date: Tue, 19 Dec 2023 00:03:17 -0800 Subject: [PATCH] Removing Fabric check from UIManagerProvider (#41982) Summary: Pull Request resolved: https://github.com/facebook/react-native/pull/41982 Moving the check for Fabric i.e. `ReactFeatureFlags.enableFabricRenderer` to old JSI Module path logic instead of new UIManagerProvider path for Fabric initialization and changing the default of UIManagerProvider from `null` -> `reactApplicationContext -> null;` since we are adding null check on the returned `UIManager` Slight change of design of API for JSI Module in order to address the issues faced due to `ReactFeatureFlags.enableFabricRenderer`, 1. Getting rid of this check for the new Fabric initialization and keeping the old JSI Module path intact. 2. Allowing the UIManager to be nullable so as to allow Twilight surface not have UIManager set even though they it succeeds in initializing the TwilightJSIModule. 3. As made the UIManager nullable, added the null check for the same. 4. This eradicates the dependency on this flag for Anna as well. Reviewed By: christophpurrer Differential Revision: D52273097 fbshipit-source-id: bdf8b1de3771250c987c8f8bd4e48192f67a1afa --- .../java/com/facebook/react/ReactInstanceManager.java | 10 +++++----- .../main/java/com/facebook/react/ReactNativeHost.java | 2 +- .../com/facebook/react/bridge/UIManagerProvider.kt | 2 +- 3 files changed, 7 insertions(+), 7 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..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? }