From 51263ccaa093423486d84bb865e34725e35e7a20 Mon Sep 17 00:00:00 2001 From: Arushi Kesarwani Date: Thu, 3 Aug 2023 14:00:43 -0700 Subject: [PATCH] Moving SurfaceHandler to react.interfaces.fabric (#38759) Summary: Pull Request resolved: https://github.com/facebook/react-native/pull/38759 As part of refactoring the `ReactSurface`, moving the `SurfaceHandler` interface to `react.interfaces.fabric`. changelog: [internal] internal Reviewed By: christophpurrer Differential Revision: D48006184 fbshipit-source-id: 09297fccc2b405a5e807d35bfa9eb2a9a4c52a16 --- .../main/java/com/facebook/react/bridgeless/ReactSurface.java | 2 +- .../main/java/com/facebook/react/fabric/FabricUIManager.java | 2 +- .../java/com/facebook/react/fabric/SurfaceHandlerBinding.java | 2 +- .../{fabric/interfaces => interfaces/fabric}/SurfaceHandler.kt | 2 +- .../java/com/facebook/react/bridgeless/ReactSurfaceTest.java | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) rename packages/react-native/ReactAndroid/src/main/java/com/facebook/react/{fabric/interfaces => interfaces/fabric}/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 74caac09e51..22e33c9aa1e 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 @@ -23,9 +23,9 @@ 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.SurfaceHandlerBinding; -import com.facebook.react.fabric.interfaces.SurfaceHandler; import com.facebook.react.interfaces.ReactSurfaceInterface; import com.facebook.react.interfaces.TaskInterface; +import com.facebook.react.interfaces.fabric.SurfaceHandler; import com.facebook.react.modules.i18nmanager.I18nUtil; import com.facebook.react.uimanager.events.EventDispatcher; import java.util.concurrent.atomic.AtomicReference; 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 a7e80e784b5..bb718fea8a1 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 @@ -57,7 +57,6 @@ import com.facebook.react.common.mapbuffer.ReadableMapBuffer; import com.facebook.react.config.ReactFeatureFlags; 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; @@ -67,6 +66,7 @@ import com.facebook.react.fabric.mounting.mountitems.BatchMountItem; import com.facebook.react.fabric.mounting.mountitems.DispatchCommandMountItem; import com.facebook.react.fabric.mounting.mountitems.MountItem; import com.facebook.react.fabric.mounting.mountitems.MountItemFactory; +import com.facebook.react.interfaces.fabric.SurfaceHandler; import com.facebook.react.modules.core.ReactChoreographer; import com.facebook.react.modules.i18nmanager.I18nUtil; import com.facebook.react.uimanager.IllegalViewOperationException; 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 a1f0d4e7eec..1d0a9bfa674 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,7 +14,7 @@ import androidx.annotation.IntDef; 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 com.facebook.react.interfaces.fabric.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/interfaces/SurfaceHandler.kt b/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/interfaces/fabric/SurfaceHandler.kt similarity index 96% rename from packages/react-native/ReactAndroid/src/main/java/com/facebook/react/fabric/interfaces/SurfaceHandler.kt rename to packages/react-native/ReactAndroid/src/main/java/com/facebook/react/interfaces/fabric/SurfaceHandler.kt index d6d2c7c5d9b..2db1c3f6ab7 100644 --- a/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/fabric/interfaces/SurfaceHandler.kt +++ b/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/interfaces/fabric/SurfaceHandler.kt @@ -5,7 +5,7 @@ * LICENSE file in the root directory of this source tree. */ -package com.facebook.react.fabric.interfaces +package com.facebook.react.interfaces.fabric 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 9d66f09abe6..e790558bfda 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.content.Context; import android.view.View; import com.facebook.react.bridge.NativeMap; import com.facebook.react.bridgeless.internal.bolts.Task; -import com.facebook.react.fabric.interfaces.SurfaceHandler; +import com.facebook.react.interfaces.fabric.SurfaceHandler; import com.facebook.react.uimanager.events.EventDispatcher; import java.util.concurrent.Callable; import org.junit.Before;