From 6d1de636a6c1f2d5e29d46291c84abbb3b4850d4 Mon Sep 17 00:00:00 2001 From: Arushi Kesarwani Date: Wed, 19 Jul 2023 15:38:23 -0700 Subject: [PATCH] Move SurfaceHandler to fabric/interfaces (#38508) Summary: Pull Request resolved: https://github.com/facebook/react-native/pull/38508 Moving SurfaceHandler to `fabric/interfaces` since it was already a interface. changelog: [internal] internal Reviewed By: luluwu2032 Differential Revision: D47280778 fbshipit-source-id: e759cb6e1b570b782ff208f7cf26b9b9f62762b4 --- .../main/java/com/facebook/react/bridgeless/ReactSurface.java | 2 +- .../main/java/com/facebook/react/fabric/FabricUIManager.java | 1 + .../java/com/facebook/react/fabric/SurfaceHandlerBinding.java | 1 + .../facebook/react/fabric/{ => interfaces}/SurfaceHandler.kt | 2 +- .../java/com/facebook/react/bridgeless/ReactSurfaceTest.java | 2 +- 5 files changed, 5 insertions(+), 3 deletions(-) rename packages/react-native/ReactAndroid/src/main/java/com/facebook/react/fabric/{ => interfaces}/SurfaceHandler.kt (96%) diff --git a/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/bridgeless/ReactSurface.java b/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/bridgeless/ReactSurface.java index 589ba6ede6274f..d8144923fc49a3 100644 --- a/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/bridgeless/ReactSurface.java +++ b/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/bridgeless/ReactSurface.java @@ -22,8 +22,8 @@ import com.facebook.react.bridge.WritableNativeMap; import com.facebook.react.bridgeless.internal.bolts.Task; import com.facebook.react.common.annotations.VisibleForTesting; -import com.facebook.react.fabric.SurfaceHandler; import com.facebook.react.fabric.SurfaceHandlerBinding; +import com.facebook.react.fabric.interfaces.SurfaceHandler; import com.facebook.react.interfaces.ReactSurfaceInterface; import com.facebook.react.interfaces.TaskInterface; import com.facebook.react.modules.i18nmanager.I18nUtil; diff --git a/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/fabric/FabricUIManager.java b/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/fabric/FabricUIManager.java index 7813cb005a7190..f03d2bafbe6701 100644 --- a/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/fabric/FabricUIManager.java +++ b/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/fabric/FabricUIManager.java @@ -58,6 +58,7 @@ import com.facebook.react.fabric.events.EventBeatManager; import com.facebook.react.fabric.events.EventEmitterWrapper; import com.facebook.react.fabric.events.FabricEventEmitter; +import com.facebook.react.fabric.interfaces.SurfaceHandler; import com.facebook.react.fabric.interop.InteropEventEmitter; import com.facebook.react.fabric.mounting.MountItemDispatcher; import com.facebook.react.fabric.mounting.MountingManager; diff --git a/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/fabric/SurfaceHandlerBinding.java b/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/fabric/SurfaceHandlerBinding.java index 0cefe448a2d43c..a1f0d4e7eec5c7 100644 --- a/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/fabric/SurfaceHandlerBinding.java +++ b/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/fabric/SurfaceHandlerBinding.java @@ -14,6 +14,7 @@ import com.facebook.jni.HybridData; import com.facebook.proguard.annotations.DoNotStrip; import com.facebook.react.bridge.NativeMap; +import com.facebook.react.fabric.interfaces.SurfaceHandler; import java.lang.annotation.Retention; import java.lang.annotation.RetentionPolicy; diff --git a/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/fabric/SurfaceHandler.kt b/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/fabric/interfaces/SurfaceHandler.kt similarity index 96% rename from packages/react-native/ReactAndroid/src/main/java/com/facebook/react/fabric/SurfaceHandler.kt rename to packages/react-native/ReactAndroid/src/main/java/com/facebook/react/fabric/interfaces/SurfaceHandler.kt index 34325c05ea677e..d6d2c7c5d9b692 100644 --- a/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/fabric/SurfaceHandler.kt +++ b/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/fabric/interfaces/SurfaceHandler.kt @@ -5,7 +5,7 @@ * LICENSE file in the root directory of this source tree. */ -package com.facebook.react.fabric +package com.facebook.react.fabric.interfaces import com.facebook.react.bridge.NativeMap import javax.annotation.concurrent.ThreadSafe diff --git a/packages/react-native/ReactAndroid/src/test/java/com/facebook/react/bridgeless/ReactSurfaceTest.java b/packages/react-native/ReactAndroid/src/test/java/com/facebook/react/bridgeless/ReactSurfaceTest.java index dbf0554e1a37fe..9d66f09abe62fa 100644 --- a/packages/react-native/ReactAndroid/src/test/java/com/facebook/react/bridgeless/ReactSurfaceTest.java +++ b/packages/react-native/ReactAndroid/src/test/java/com/facebook/react/bridgeless/ReactSurfaceTest.java @@ -20,7 +20,7 @@ import android.view.View; import com.facebook.react.bridge.NativeMap; import com.facebook.react.bridgeless.internal.bolts.Task; -import com.facebook.react.fabric.SurfaceHandler; +import com.facebook.react.fabric.interfaces.SurfaceHandler; import com.facebook.react.uimanager.events.EventDispatcher; import java.util.concurrent.Callable; import org.junit.Before;