From 31db0abb414a6460c02b39d85283f47aead60863 Mon Sep 17 00:00:00 2001 From: David Vacca Date: Wed, 15 Nov 2023 22:43:49 -0800 Subject: [PATCH] Delete com/facebook/react/surface package Summary: com/facebook/react/surface package only contains one file (ReactStage), this annotation is only used internally by the framework and it fit better in uimanager package. In this diff we are: - deleting com/facebook/react/surface package - moving ReactStage to com/facebook/react/uimanager - Properly using ReactStage in ReactRoot and ReactRootView This is a backward compatible change because ReactStage is only used in the internals of React Native bypass-github-export-checks changelog: [internal] internal Reviewed By: rshest Differential Revision: D51262575 fbshipit-source-id: 34c140fbd0868a5a95489ee51b3262263b33ca69 --- .../main/java/com/facebook/react/ReactInstanceManager.java | 2 +- .../src/main/java/com/facebook/react/ReactRootView.java | 4 ++-- .../src/main/java/com/facebook/react/uimanager/ReactRoot.java | 2 +- .../com/facebook/react/{surface => uimanager}/ReactStage.java | 2 +- 4 files changed, 5 insertions(+), 5 deletions(-) rename packages/react-native/ReactAndroid/src/main/java/com/facebook/react/{surface => uimanager}/ReactStage.java (96%) 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 caad54549ac..2ae69e22971 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 @@ -99,9 +99,9 @@ import com.facebook.react.modules.core.DeviceEventManagerModule; import com.facebook.react.modules.core.ReactChoreographer; import com.facebook.react.modules.debug.interfaces.DeveloperSettings; import com.facebook.react.packagerconnection.RequestHandler; -import com.facebook.react.surface.ReactStage; import com.facebook.react.uimanager.DisplayMetricsHolder; import com.facebook.react.uimanager.ReactRoot; +import com.facebook.react.uimanager.ReactStage; import com.facebook.react.uimanager.UIManagerHelper; import com.facebook.react.uimanager.ViewManager; import com.facebook.react.uimanager.common.UIManagerType; diff --git a/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/ReactRootView.java b/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/ReactRootView.java index 1e0519aa8ce..766836fd0b1 100644 --- a/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/ReactRootView.java +++ b/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/ReactRootView.java @@ -51,7 +51,6 @@ import com.facebook.react.common.annotations.VisibleForTesting; import com.facebook.react.config.ReactFeatureFlags; import com.facebook.react.modules.appregistry.AppRegistry; import com.facebook.react.modules.deviceinfo.DeviceInfoModule; -import com.facebook.react.surface.ReactStage; import com.facebook.react.uimanager.DisplayMetricsHolder; import com.facebook.react.uimanager.IllegalViewOperationException; import com.facebook.react.uimanager.JSPointerDispatcher; @@ -60,6 +59,7 @@ import com.facebook.react.uimanager.PixelUtil; import com.facebook.react.uimanager.ReactClippingProhibitedView; import com.facebook.react.uimanager.ReactRoot; import com.facebook.react.uimanager.ReactRootViewTagGenerator; +import com.facebook.react.uimanager.ReactStage; import com.facebook.react.uimanager.RootView; import com.facebook.react.uimanager.RootViewUtil; import com.facebook.react.uimanager.UIManagerHelper; @@ -598,7 +598,7 @@ public class ReactRootView extends FrameLayout implements RootView, ReactRoot { } @Override - public void onStage(int stage) { + public void onStage(@ReactStage int stage) { switch (stage) { case ReactStage.ON_ATTACH_TO_INSTANCE: onAttachedToReactInstance(); diff --git a/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/uimanager/ReactRoot.java b/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/uimanager/ReactRoot.java index e8ddb4b4b18..20a89f746bf 100644 --- a/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/uimanager/ReactRoot.java +++ b/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/uimanager/ReactRoot.java @@ -39,7 +39,7 @@ public interface ReactRoot { void runApplication(); /** Handler for stages {@link com.facebook.react.surface.ReactStage} */ - void onStage(int stage); + void onStage(@ReactStage int stage); /** Return native view for root */ ViewGroup getRootViewGroup(); diff --git a/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/surface/ReactStage.java b/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/uimanager/ReactStage.java similarity index 96% rename from packages/react-native/ReactAndroid/src/main/java/com/facebook/react/surface/ReactStage.java rename to packages/react-native/ReactAndroid/src/main/java/com/facebook/react/uimanager/ReactStage.java index 4ae44ea31ba..f322f2ef197 100644 --- a/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/surface/ReactStage.java +++ b/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/uimanager/ReactStage.java @@ -5,7 +5,7 @@ * LICENSE file in the root directory of this source tree. */ -package com.facebook.react.surface; +package com.facebook.react.uimanager; import static java.lang.annotation.RetentionPolicy.SOURCE;