From 5457811a165585bf374ab207e8aceb906e89fc98 Mon Sep 17 00:00:00 2001 From: Phillip Pan Date: Thu, 30 Mar 2023 15:20:59 -0700 Subject: [PATCH] don't pass around react context in react package if it's not needed (#36711) Summary: Pull Request resolved: https://github.com/facebook/react-native/pull/36711 Changelog: [Internal] minimizing callsites to the react context, which has turned into a bloated toolbox class Reviewed By: javache Differential Revision: D44493500 fbshipit-source-id: 7272b18af96103dee3658d151fd8e9f03846bd09 --- .../main/java/com/facebook/react/DebugCorePackage.java | 8 ++++---- .../java/com/facebook/react/shell/MainReactPackage.java | 8 ++++---- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/DebugCorePackage.java b/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/DebugCorePackage.java index 9a2028db3e1..38d8c24b17f 100644 --- a/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/DebugCorePackage.java +++ b/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/DebugCorePackage.java @@ -99,7 +99,7 @@ public class DebugCorePackage extends TurboReactPackage implements ViewManagerOn } /** @return a map of view managers that should be registered with {@link UIManagerModule} */ - private Map getViewManagersMap(final ReactApplicationContext reactContext) { + private Map getViewManagersMap() { if (mViewManagers == null) { Map viewManagers = new HashMap<>(); appendMap( @@ -119,18 +119,18 @@ public class DebugCorePackage extends TurboReactPackage implements ViewManagerOn @Override public List getViewManagers(ReactApplicationContext reactContext) { - return new ArrayList<>(getViewManagersMap(reactContext).values()); + return new ArrayList<>(getViewManagersMap().values()); } @Override public Collection getViewManagerNames(ReactApplicationContext reactContext) { - return getViewManagersMap(reactContext).keySet(); + return getViewManagersMap().keySet(); } @Override public @Nullable ViewManager createViewManager( ReactApplicationContext reactContext, String viewManagerName) { - ModuleSpec spec = getViewManagersMap(reactContext).get(viewManagerName); + ModuleSpec spec = getViewManagersMap().get(viewManagerName); return spec != null ? (ViewManager) spec.getProvider().get() : null; } } diff --git a/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/shell/MainReactPackage.java b/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/shell/MainReactPackage.java index 5fa72a0ffd0..aa3d187e275 100644 --- a/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/shell/MainReactPackage.java +++ b/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/shell/MainReactPackage.java @@ -187,7 +187,7 @@ public class MainReactPackage extends TurboReactPackage implements ViewManagerOn } /** @return a map of view managers that should be registered with {@link UIManagerModule} */ - public Map getViewManagersMap(final ReactApplicationContext reactContext) { + public Map getViewManagersMap() { if (mViewManagers == null) { Map viewManagers = new HashMap<>(); appendMap( @@ -341,18 +341,18 @@ public class MainReactPackage extends TurboReactPackage implements ViewManagerOn @Override public List getViewManagers(ReactApplicationContext reactContext) { - return new ArrayList<>(getViewManagersMap(reactContext).values()); + return new ArrayList<>(getViewManagersMap().values()); } @Override public Collection getViewManagerNames(ReactApplicationContext reactContext) { - return getViewManagersMap(reactContext).keySet(); + return getViewManagersMap().keySet(); } @Override public @Nullable ViewManager createViewManager( ReactApplicationContext reactContext, String viewManagerName) { - ModuleSpec spec = getViewManagersMap(reactContext).get(viewManagerName); + ModuleSpec spec = getViewManagersMap().get(viewManagerName); return spec != null ? (ViewManager) spec.getProvider().get() : null; }