From 8c67eb1d185c888b0a58194525f1357d24e134be Mon Sep 17 00:00:00 2001 From: Arushi Kesarwani Date: Mon, 10 Jul 2023 19:10:53 -0700 Subject: [PATCH] Changing fabric to renderer as part of stable APIs refactor Summary: Changelog: [Internal] Differential Revision: D47280468 fbshipit-source-id: e610a5b3f8395788cdfe0ad8e558baf3f808aac5 --- .../facebook/react/bridgeless/ReactHost.java | 4 +- .../react/bridgeless/ReactHostDelegate.kt | 2 +- .../react/bridgeless/ReactInstance.java | 12 ++-- .../react/bridgeless/ReactSurface.java | 4 +- .../defaults/DefaultComponentsRegistry.kt | 2 +- .../react/defaults/DefaultJSIModulePackage.kt | 6 +- .../defaults/DefaultReactHostDelegate.kt | 2 +- .../react/{fabric => renderer}/.clang-tidy | 0 .../react/{fabric => renderer}/Binding.java | 6 +- .../{fabric => renderer}/BindingImpl.java | 6 +- .../ComponentFactory.java | 2 +- .../CoreComponentsRegistry.java | 2 +- .../CppComponentRegistry.java | 2 +- .../DevToolsReactPerfLogger.java | 2 +- .../EmptyReactNativeConfig.java | 2 +- .../FabricComponents.java | 2 +- .../FabricJSIModuleProvider.java | 4 +- .../{fabric => renderer}/FabricSoLoader.java | 2 +- .../{fabric => renderer}/FabricUIManager.java | 57 +++++++++---------- .../GuardedFrameCallback.java | 2 +- .../ReactNativeConfig.java | 2 +- .../StateWrapperImpl.java | 2 +- .../{fabric => renderer}/SurfaceHandler.java | 2 +- .../SurfaceHandlerBinding.java | 6 +- .../events/EventBeatManager.java | 4 +- .../events/EventEmitterWrapper.java | 4 +- .../events/FabricEventEmitter.java | 4 +- .../interop/InteropEvent.java | 2 +- .../interop/InteropEventEmitter.java | 2 +- .../mounting/LayoutMetricsConversions.java | 2 +- .../mounting/MountItemDispatcher.java | 10 ++-- .../mounting/MountingManager.java | 10 ++-- .../mounting/SurfaceMountingManager.java | 10 ++-- .../mounting/mountitems/BatchMountItem.java | 2 +- .../mountitems/DispatchCommandMountItem.java | 2 +- .../DispatchIntCommandMountItem.java | 4 +- .../DispatchStringCommandMountItem.java | 4 +- .../FabricNameComponentMapping.java | 2 +- .../mountitems/IntBufferBatchMountItem.java | 14 ++--- .../mounting/mountitems/MountItem.java | 4 +- .../mounting/mountitems/MountItemFactory.java | 4 +- .../mountitems/PreAllocateViewMountItem.java | 14 ++--- .../mountitems/SendAccessibilityEvent.java | 4 +- .../SendAccessibilityEventMountItem.java | 4 +- .../react/bridgeless/ReactHostTest.java | 4 +- .../react/bridgeless/ReactSurfaceTest.java | 2 +- .../events/TouchEventDispatchTest.kt | 6 +- .../interop/FakeEventDispatcher.kt | 2 +- .../interop/InteropEventEmitterTest.kt | 2 +- .../react/uiapp/RNTesterApplication.java | 2 +- .../uiapp/RNTesterReactHostDelegate.java | 2 +- 51 files changed, 128 insertions(+), 131 deletions(-) rename packages/react-native/ReactAndroid/src/main/java/com/facebook/react/{fabric => renderer}/.clang-tidy (100%) rename packages/react-native/ReactAndroid/src/main/java/com/facebook/react/{fabric => renderer}/Binding.java (92%) rename packages/react-native/ReactAndroid/src/main/java/com/facebook/react/{fabric => renderer}/BindingImpl.java (95%) rename packages/react-native/ReactAndroid/src/main/java/com/facebook/react/{fabric => renderer}/ComponentFactory.java (94%) rename packages/react-native/ReactAndroid/src/main/java/com/facebook/react/{fabric => renderer}/CoreComponentsRegistry.java (95%) rename packages/react-native/ReactAndroid/src/main/java/com/facebook/react/{fabric => renderer}/CppComponentRegistry.java (94%) rename packages/react-native/ReactAndroid/src/main/java/com/facebook/react/{fabric => renderer}/DevToolsReactPerfLogger.java (99%) rename packages/react-native/ReactAndroid/src/main/java/com/facebook/react/{fabric => renderer}/EmptyReactNativeConfig.java (94%) rename packages/react-native/ReactAndroid/src/main/java/com/facebook/react/{fabric => renderer}/FabricComponents.java (98%) rename packages/react-native/ReactAndroid/src/main/java/com/facebook/react/{fabric => renderer}/FabricJSIModuleProvider.java (96%) rename packages/react-native/ReactAndroid/src/main/java/com/facebook/react/{fabric => renderer}/FabricSoLoader.java (96%) rename packages/react-native/ReactAndroid/src/main/java/com/facebook/react/{fabric => renderer}/FabricUIManager.java (96%) rename packages/react-native/ReactAndroid/src/main/java/com/facebook/react/{fabric => renderer}/GuardedFrameCallback.java (97%) rename packages/react-native/ReactAndroid/src/main/java/com/facebook/react/{fabric => renderer}/ReactNativeConfig.java (97%) rename packages/react-native/ReactAndroid/src/main/java/com/facebook/react/{fabric => renderer}/StateWrapperImpl.java (98%) rename packages/react-native/ReactAndroid/src/main/java/com/facebook/react/{fabric => renderer}/SurfaceHandler.java (97%) rename packages/react-native/ReactAndroid/src/main/java/com/facebook/react/{fabric => renderer}/SurfaceHandlerBinding.java (93%) rename packages/react-native/ReactAndroid/src/main/java/com/facebook/react/{fabric => renderer}/events/EventBeatManager.java (92%) rename packages/react-native/ReactAndroid/src/main/java/com/facebook/react/{fabric => renderer}/events/EventEmitterWrapper.java (96%) rename packages/react-native/ReactAndroid/src/main/java/com/facebook/react/{fabric => renderer}/events/FabricEventEmitter.java (96%) rename packages/react-native/ReactAndroid/src/main/java/com/facebook/react/{fabric => renderer}/interop/InteropEvent.java (96%) rename packages/react-native/ReactAndroid/src/main/java/com/facebook/react/{fabric => renderer}/interop/InteropEventEmitter.java (98%) rename packages/react-native/ReactAndroid/src/main/java/com/facebook/react/{fabric => renderer}/mounting/LayoutMetricsConversions.java (97%) rename packages/react-native/ReactAndroid/src/main/java/com/facebook/react/{fabric => renderer}/mounting/MountItemDispatcher.java (97%) rename packages/react-native/ReactAndroid/src/main/java/com/facebook/react/{fabric => renderer}/mounting/MountingManager.java (98%) rename packages/react-native/ReactAndroid/src/main/java/com/facebook/react/{fabric => renderer}/mounting/SurfaceMountingManager.java (99%) rename packages/react-native/ReactAndroid/src/main/java/com/facebook/react/{fabric => renderer}/mounting/mountitems/BatchMountItem.java (85%) rename packages/react-native/ReactAndroid/src/main/java/com/facebook/react/{fabric => renderer}/mounting/mountitems/DispatchCommandMountItem.java (92%) rename packages/react-native/ReactAndroid/src/main/java/com/facebook/react/{fabric => renderer}/mounting/mountitems/DispatchIntCommandMountItem.java (90%) rename packages/react-native/ReactAndroid/src/main/java/com/facebook/react/{fabric => renderer}/mounting/mountitems/DispatchStringCommandMountItem.java (90%) rename packages/react-native/ReactAndroid/src/main/java/com/facebook/react/{fabric => renderer}/mounting/mountitems/FabricNameComponentMapping.java (97%) rename packages/react-native/ReactAndroid/src/main/java/com/facebook/react/{fabric => renderer}/mounting/mountitems/IntBufferBatchMountItem.java (95%) rename packages/react-native/ReactAndroid/src/main/java/com/facebook/react/{fabric => renderer}/mounting/mountitems/MountItem.java (83%) rename packages/react-native/ReactAndroid/src/main/java/com/facebook/react/{fabric => renderer}/mounting/mountitems/MountItemFactory.java (95%) rename packages/react-native/ReactAndroid/src/main/java/com/facebook/react/{fabric => renderer}/mounting/mountitems/PreAllocateViewMountItem.java (83%) rename packages/react-native/ReactAndroid/src/main/java/com/facebook/react/{fabric => renderer}/mounting/mountitems/SendAccessibilityEvent.java (93%) rename packages/react-native/ReactAndroid/src/main/java/com/facebook/react/{fabric => renderer}/mounting/mountitems/SendAccessibilityEventMountItem.java (93%) rename packages/react-native/ReactAndroid/src/test/java/com/facebook/react/{fabric => renderer}/events/TouchEventDispatchTest.kt (99%) rename packages/react-native/ReactAndroid/src/test/java/com/facebook/react/{fabric => renderer}/interop/FakeEventDispatcher.kt (97%) rename packages/react-native/ReactAndroid/src/test/java/com/facebook/react/{fabric => renderer}/interop/InteropEventEmitterTest.kt (97%) diff --git a/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/bridgeless/ReactHost.java b/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/bridgeless/ReactHost.java index 10ef6bc52344bc..a2fc852f19d878 100644 --- a/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/bridgeless/ReactHost.java +++ b/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/bridgeless/ReactHost.java @@ -48,13 +48,13 @@ import com.facebook.react.devsupport.DevSupportManagerBase; import com.facebook.react.devsupport.DisabledDevSupportManager; import com.facebook.react.devsupport.interfaces.DevSupportManager; -import com.facebook.react.fabric.ComponentFactory; -import com.facebook.react.fabric.FabricUIManager; import com.facebook.react.interfaces.ReactHostInterface; import com.facebook.react.interfaces.ReactSurfaceInterface; import com.facebook.react.interfaces.exceptionmanager.ReactJsExceptionHandler; import com.facebook.react.modules.core.DefaultHardwareBackBtnHandler; import com.facebook.react.modules.core.DeviceEventManagerModule; +import com.facebook.react.renderer.ComponentFactory; +import com.facebook.react.renderer.FabricUIManager; import com.facebook.react.uimanager.UIManagerModule; import com.facebook.react.uimanager.events.BlackHoleEventDispatcher; import com.facebook.react.uimanager.events.EventDispatcher; diff --git a/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/bridgeless/ReactHostDelegate.kt b/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/bridgeless/ReactHostDelegate.kt index 1a409a98aab0dc..7fccd0bbcb1e30 100644 --- a/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/bridgeless/ReactHostDelegate.kt +++ b/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/bridgeless/ReactHostDelegate.kt @@ -12,7 +12,7 @@ import com.facebook.react.ReactPackage import com.facebook.react.ReactPackageTurboModuleManagerDelegate import com.facebook.react.bridge.JSBundleLoader import com.facebook.react.common.annotations.UnstableReactNativeAPI -import com.facebook.react.fabric.ReactNativeConfig +import com.facebook.react.renderer.ReactNativeConfig import com.facebook.react.turbomodule.core.TurboModuleManager /** diff --git a/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/bridgeless/ReactInstance.java b/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/bridgeless/ReactInstance.java index e756dd6740258f..f88571d45c9452 100644 --- a/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/bridgeless/ReactInstance.java +++ b/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/bridgeless/ReactInstance.java @@ -34,16 +34,16 @@ import com.facebook.react.bridge.queue.ReactQueueConfigurationImpl; import com.facebook.react.bridge.queue.ReactQueueConfigurationSpec; import com.facebook.react.devsupport.interfaces.DevSupportManager; -import com.facebook.react.fabric.Binding; -import com.facebook.react.fabric.BindingImpl; -import com.facebook.react.fabric.ComponentFactory; -import com.facebook.react.fabric.FabricUIManager; -import com.facebook.react.fabric.ReactNativeConfig; -import com.facebook.react.fabric.events.EventBeatManager; import com.facebook.react.interfaces.exceptionmanager.ReactJsExceptionHandler; import com.facebook.react.module.annotations.ReactModule; import com.facebook.react.modules.core.JavaTimerManager; import com.facebook.react.modules.core.ReactChoreographer; +import com.facebook.react.renderer.Binding; +import com.facebook.react.renderer.BindingImpl; +import com.facebook.react.renderer.ComponentFactory; +import com.facebook.react.renderer.FabricUIManager; +import com.facebook.react.renderer.ReactNativeConfig; +import com.facebook.react.renderer.events.EventBeatManager; import com.facebook.react.turbomodule.core.CallInvokerHolderImpl; import com.facebook.react.turbomodule.core.NativeMethodCallInvokerHolderImpl; import com.facebook.react.turbomodule.core.TurboModuleManager; 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..04e511ce3267d5 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,11 +22,11 @@ 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.interfaces.ReactSurfaceInterface; import com.facebook.react.interfaces.TaskInterface; import com.facebook.react.modules.i18nmanager.I18nUtil; +import com.facebook.react.renderer.SurfaceHandler; +import com.facebook.react.renderer.SurfaceHandlerBinding; import com.facebook.react.uimanager.events.EventDispatcher; import java.util.concurrent.atomic.AtomicReference; import javax.annotation.Nullable; diff --git a/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/defaults/DefaultComponentsRegistry.kt b/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/defaults/DefaultComponentsRegistry.kt index 131804140ee901..c64f2b6a91b767 100644 --- a/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/defaults/DefaultComponentsRegistry.kt +++ b/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/defaults/DefaultComponentsRegistry.kt @@ -9,7 +9,7 @@ package com.facebook.react.defaults import com.facebook.jni.HybridData import com.facebook.proguard.annotations.DoNotStrip -import com.facebook.react.fabric.ComponentFactory +import com.facebook.react.renderer.ComponentFactory /** * A utility class that provides users a ComponentRegistry they can customize with a C++ diff --git a/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/defaults/DefaultJSIModulePackage.kt b/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/defaults/DefaultJSIModulePackage.kt index f1328997c849ea..283a4cfcc2467d 100644 --- a/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/defaults/DefaultJSIModulePackage.kt +++ b/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/defaults/DefaultJSIModulePackage.kt @@ -15,9 +15,9 @@ import com.facebook.react.bridge.JSIModuleType import com.facebook.react.bridge.JavaScriptContextHolder import com.facebook.react.bridge.ReactApplicationContext import com.facebook.react.bridge.UIManager -import com.facebook.react.fabric.ComponentFactory -import com.facebook.react.fabric.FabricJSIModuleProvider -import com.facebook.react.fabric.ReactNativeConfig +import com.facebook.react.renderer.ComponentFactory +import com.facebook.react.renderer.FabricJSIModuleProvider +import com.facebook.react.renderer.ReactNativeConfig import com.facebook.react.uimanager.ViewManagerRegistry /** diff --git a/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/defaults/DefaultReactHostDelegate.kt b/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/defaults/DefaultReactHostDelegate.kt index f789bdd03acdaa..5f717790eafa94 100644 --- a/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/defaults/DefaultReactHostDelegate.kt +++ b/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/defaults/DefaultReactHostDelegate.kt @@ -16,7 +16,7 @@ import com.facebook.react.bridgeless.JSEngineInstance import com.facebook.react.bridgeless.ReactHostDelegate import com.facebook.react.bridgeless.hermes.HermesInstance import com.facebook.react.common.annotations.UnstableReactNativeAPI -import com.facebook.react.fabric.ReactNativeConfig +import com.facebook.react.renderer.ReactNativeConfig import com.facebook.react.turbomodule.core.TurboModuleManager /** diff --git a/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/fabric/.clang-tidy b/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/renderer/.clang-tidy similarity index 100% rename from packages/react-native/ReactAndroid/src/main/java/com/facebook/react/fabric/.clang-tidy rename to packages/react-native/ReactAndroid/src/main/java/com/facebook/react/renderer/.clang-tidy diff --git a/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/fabric/Binding.java b/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/renderer/Binding.java similarity index 92% rename from packages/react-native/ReactAndroid/src/main/java/com/facebook/react/fabric/Binding.java rename to packages/react-native/ReactAndroid/src/main/java/com/facebook/react/renderer/Binding.java index e99632b25bed77..bb17c653e2ee6e 100644 --- a/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/fabric/Binding.java +++ b/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/renderer/Binding.java @@ -5,15 +5,15 @@ * LICENSE file in the root directory of this source tree. */ -package com.facebook.react.fabric; +package com.facebook.react.renderer; import androidx.annotation.NonNull; import com.facebook.react.bridge.NativeMap; import com.facebook.react.bridge.ReadableNativeMap; import com.facebook.react.bridge.RuntimeExecutor; import com.facebook.react.bridge.RuntimeScheduler; -import com.facebook.react.fabric.events.EventBeatManager; -import com.facebook.react.fabric.events.EventEmitterWrapper; +import com.facebook.react.renderer.events.EventBeatManager; +import com.facebook.react.renderer.events.EventEmitterWrapper; public interface Binding { diff --git a/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/fabric/BindingImpl.java b/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/renderer/BindingImpl.java similarity index 95% rename from packages/react-native/ReactAndroid/src/main/java/com/facebook/react/fabric/BindingImpl.java rename to packages/react-native/ReactAndroid/src/main/java/com/facebook/react/renderer/BindingImpl.java index a05dc0ef207bed..3dd7bb36d51cfe 100644 --- a/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/fabric/BindingImpl.java +++ b/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/renderer/BindingImpl.java @@ -5,7 +5,7 @@ * LICENSE file in the root directory of this source tree. */ -package com.facebook.react.fabric; +package com.facebook.react.renderer; import android.annotation.SuppressLint; import androidx.annotation.NonNull; @@ -16,8 +16,8 @@ import com.facebook.react.bridge.RuntimeExecutor; import com.facebook.react.bridge.RuntimeScheduler; import com.facebook.react.common.mapbuffer.MapBufferSoLoader; -import com.facebook.react.fabric.events.EventBeatManager; -import com.facebook.react.fabric.events.EventEmitterWrapper; +import com.facebook.react.renderer.events.EventBeatManager; +import com.facebook.react.renderer.events.EventEmitterWrapper; import com.facebook.react.uimanager.PixelUtil; @DoNotStrip diff --git a/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/fabric/ComponentFactory.java b/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/renderer/ComponentFactory.java similarity index 94% rename from packages/react-native/ReactAndroid/src/main/java/com/facebook/react/fabric/ComponentFactory.java rename to packages/react-native/ReactAndroid/src/main/java/com/facebook/react/renderer/ComponentFactory.java index 1c9974ef76592a..06cb995b1a1c5b 100644 --- a/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/fabric/ComponentFactory.java +++ b/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/renderer/ComponentFactory.java @@ -5,7 +5,7 @@ * LICENSE file in the root directory of this source tree. */ -package com.facebook.react.fabric; +package com.facebook.react.renderer; import androidx.annotation.NonNull; import com.facebook.jni.HybridData; diff --git a/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/fabric/CoreComponentsRegistry.java b/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/renderer/CoreComponentsRegistry.java similarity index 95% rename from packages/react-native/ReactAndroid/src/main/java/com/facebook/react/fabric/CoreComponentsRegistry.java rename to packages/react-native/ReactAndroid/src/main/java/com/facebook/react/renderer/CoreComponentsRegistry.java index 797106872d6cda..39d452caeec70e 100644 --- a/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/fabric/CoreComponentsRegistry.java +++ b/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/renderer/CoreComponentsRegistry.java @@ -5,7 +5,7 @@ * LICENSE file in the root directory of this source tree. */ -package com.facebook.react.fabric; +package com.facebook.react.renderer; import com.facebook.jni.HybridData; import com.facebook.proguard.annotations.DoNotStrip; diff --git a/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/fabric/CppComponentRegistry.java b/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/renderer/CppComponentRegistry.java similarity index 94% rename from packages/react-native/ReactAndroid/src/main/java/com/facebook/react/fabric/CppComponentRegistry.java rename to packages/react-native/ReactAndroid/src/main/java/com/facebook/react/renderer/CppComponentRegistry.java index 0a14322c64975d..7895c1fe9d4154 100644 --- a/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/fabric/CppComponentRegistry.java +++ b/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/renderer/CppComponentRegistry.java @@ -5,7 +5,7 @@ * LICENSE file in the root directory of this source tree. */ -package com.facebook.react.fabric; +package com.facebook.react.renderer; import androidx.annotation.NonNull; import com.facebook.jni.HybridData; diff --git a/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/fabric/DevToolsReactPerfLogger.java b/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/renderer/DevToolsReactPerfLogger.java similarity index 99% rename from packages/react-native/ReactAndroid/src/main/java/com/facebook/react/fabric/DevToolsReactPerfLogger.java rename to packages/react-native/ReactAndroid/src/main/java/com/facebook/react/renderer/DevToolsReactPerfLogger.java index 9a233ec5b052fc..0b36c803e67146 100644 --- a/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/fabric/DevToolsReactPerfLogger.java +++ b/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/renderer/DevToolsReactPerfLogger.java @@ -5,7 +5,7 @@ * LICENSE file in the root directory of this source tree. */ -package com.facebook.react.fabric; +package com.facebook.react.renderer; import static com.facebook.react.bridge.ReactMarkerConstants.*; diff --git a/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/fabric/EmptyReactNativeConfig.java b/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/renderer/EmptyReactNativeConfig.java similarity index 94% rename from packages/react-native/ReactAndroid/src/main/java/com/facebook/react/fabric/EmptyReactNativeConfig.java rename to packages/react-native/ReactAndroid/src/main/java/com/facebook/react/renderer/EmptyReactNativeConfig.java index e068e3f4d1dd6b..035d824f5ba970 100644 --- a/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/fabric/EmptyReactNativeConfig.java +++ b/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/renderer/EmptyReactNativeConfig.java @@ -5,7 +5,7 @@ * LICENSE file in the root directory of this source tree. */ -package com.facebook.react.fabric; +package com.facebook.react.renderer; /** * An empty {@link ReactNativeConfig} that is returning empty responses and false for all the diff --git a/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/fabric/FabricComponents.java b/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/renderer/FabricComponents.java similarity index 98% rename from packages/react-native/ReactAndroid/src/main/java/com/facebook/react/fabric/FabricComponents.java rename to packages/react-native/ReactAndroid/src/main/java/com/facebook/react/renderer/FabricComponents.java index bf6c6a2aaa36d8..c5011930987697 100644 --- a/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/fabric/FabricComponents.java +++ b/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/renderer/FabricComponents.java @@ -5,7 +5,7 @@ * LICENSE file in the root directory of this source tree. */ -package com.facebook.react.fabric; +package com.facebook.react.renderer; import androidx.annotation.NonNull; import java.util.HashMap; diff --git a/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/fabric/FabricJSIModuleProvider.java b/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/renderer/FabricJSIModuleProvider.java similarity index 96% rename from packages/react-native/ReactAndroid/src/main/java/com/facebook/react/fabric/FabricJSIModuleProvider.java rename to packages/react-native/ReactAndroid/src/main/java/com/facebook/react/renderer/FabricJSIModuleProvider.java index 533b1368b92d8a..4a00cf050d005b 100644 --- a/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/fabric/FabricJSIModuleProvider.java +++ b/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/renderer/FabricJSIModuleProvider.java @@ -5,13 +5,13 @@ * LICENSE file in the root directory of this source tree. */ -package com.facebook.react.fabric; +package com.facebook.react.renderer; import androidx.annotation.NonNull; import com.facebook.react.bridge.JSIModuleProvider; import com.facebook.react.bridge.ReactApplicationContext; import com.facebook.react.bridge.UIManager; -import com.facebook.react.fabric.events.EventBeatManager; +import com.facebook.react.renderer.events.EventBeatManager; import com.facebook.react.uimanager.ViewManagerRegistry; import com.facebook.systrace.Systrace; diff --git a/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/fabric/FabricSoLoader.java b/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/renderer/FabricSoLoader.java similarity index 96% rename from packages/react-native/ReactAndroid/src/main/java/com/facebook/react/fabric/FabricSoLoader.java rename to packages/react-native/ReactAndroid/src/main/java/com/facebook/react/renderer/FabricSoLoader.java index 26526701c51ef4..2cd64818832e8b 100644 --- a/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/fabric/FabricSoLoader.java +++ b/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/renderer/FabricSoLoader.java @@ -5,7 +5,7 @@ * LICENSE file in the root directory of this source tree. */ -package com.facebook.react.fabric; +package com.facebook.react.renderer; import static com.facebook.systrace.Systrace.TRACE_TAG_REACT_JAVA_BRIDGE; 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/renderer/FabricUIManager.java similarity index 96% rename from packages/react-native/ReactAndroid/src/main/java/com/facebook/react/fabric/FabricUIManager.java rename to packages/react-native/ReactAndroid/src/main/java/com/facebook/react/renderer/FabricUIManager.java index 7813cb005a7190..0aaf47ad192e3a 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/renderer/FabricUIManager.java @@ -5,14 +5,14 @@ * LICENSE file in the root directory of this source tree. */ -package com.facebook.react.fabric; +package com.facebook.react.renderer; import static com.facebook.infer.annotation.ThreadConfined.ANY; import static com.facebook.infer.annotation.ThreadConfined.UI; -import static com.facebook.react.fabric.mounting.LayoutMetricsConversions.getMaxSize; -import static com.facebook.react.fabric.mounting.LayoutMetricsConversions.getMinSize; -import static com.facebook.react.fabric.mounting.LayoutMetricsConversions.getYogaMeasureMode; -import static com.facebook.react.fabric.mounting.LayoutMetricsConversions.getYogaSize; +import static com.facebook.react.renderer.mounting.LayoutMetricsConversions.getMaxSize; +import static com.facebook.react.renderer.mounting.LayoutMetricsConversions.getMinSize; +import static com.facebook.react.renderer.mounting.LayoutMetricsConversions.getYogaMeasureMode; +import static com.facebook.react.renderer.mounting.LayoutMetricsConversions.getYogaSize; import static com.facebook.react.uimanager.UIManagerHelper.PADDING_BOTTOM_INDEX; import static com.facebook.react.uimanager.UIManagerHelper.PADDING_END_INDEX; import static com.facebook.react.uimanager.UIManagerHelper.PADDING_START_INDEX; @@ -55,19 +55,19 @@ import com.facebook.react.common.build.ReactBuildConfig; import com.facebook.react.common.mapbuffer.ReadableMapBuffer; import com.facebook.react.config.ReactFeatureFlags; -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.interop.InteropEventEmitter; -import com.facebook.react.fabric.mounting.MountItemDispatcher; -import com.facebook.react.fabric.mounting.MountingManager; -import com.facebook.react.fabric.mounting.SurfaceMountingManager; -import com.facebook.react.fabric.mounting.SurfaceMountingManager.ViewEvent; -import com.facebook.react.fabric.mounting.mountitems.BatchMountItem; -import com.facebook.react.fabric.mounting.mountitems.MountItem; -import com.facebook.react.fabric.mounting.mountitems.MountItemFactory; import com.facebook.react.modules.core.ReactChoreographer; import com.facebook.react.modules.i18nmanager.I18nUtil; +import com.facebook.react.renderer.events.EventBeatManager; +import com.facebook.react.renderer.events.EventEmitterWrapper; +import com.facebook.react.renderer.events.FabricEventEmitter; +import com.facebook.react.renderer.interop.InteropEventEmitter; +import com.facebook.react.renderer.mounting.MountItemDispatcher; +import com.facebook.react.renderer.mounting.MountingManager; +import com.facebook.react.renderer.mounting.SurfaceMountingManager; +import com.facebook.react.renderer.mounting.SurfaceMountingManager.ViewEvent; +import com.facebook.react.renderer.mounting.mountitems.BatchMountItem; +import com.facebook.react.renderer.mounting.mountitems.MountItem; +import com.facebook.react.renderer.mounting.mountitems.MountItemFactory; import com.facebook.react.uimanager.IllegalViewOperationException; import com.facebook.react.uimanager.PixelUtil; import com.facebook.react.uimanager.ReactRoot; @@ -505,11 +505,6 @@ private long measure( public int getColor(int surfaceId, String[] resourcePaths) { ThemedReactContext context = mMountingManager.getSurfaceManagerEnforced(surfaceId, "getColor").getContext(); - // Surface may have been stopped - if (context == null) { - return 0; - } - for (String resourcePath : resourcePaths) { Integer color = ColorPropConverter.resolveResourcePath(context, resourcePath); if (color != null) { @@ -603,14 +598,16 @@ private long measureMapBuffer( * @return if theme data is available in the output parameters. */ public boolean getThemeData(int surfaceId, float[] defaultTextInputPadding) { - Context context = - mMountingManager.getSurfaceManagerEnforced(surfaceId, "getThemeData").getContext(); - if (context == null) { + SurfaceMountingManager surfaceMountingManager = + mMountingManager.getSurfaceManagerEnforced(surfaceId, "getThemeData"); + ThemedReactContext themedReactContext = surfaceMountingManager.getContext(); + + if (themedReactContext == null) { FLog.w(TAG, "\"themedReactContext\" is null when call \"getThemeData\""); return false; } - - float[] defaultTextInputPaddingForTheme = UIManagerHelper.getDefaultTextInputPadding(context); + float[] defaultTextInputPaddingForTheme = + UIManagerHelper.getDefaultTextInputPadding(themedReactContext); defaultTextInputPadding[0] = defaultTextInputPaddingForTheme[PADDING_START_INDEX]; defaultTextInputPadding[1] = defaultTextInputPaddingForTheme[PADDING_END_INDEX]; defaultTextInputPadding[2] = defaultTextInputPaddingForTheme[PADDING_TOP_INDEX]; @@ -872,12 +869,12 @@ public void updateRootLayoutSpecs( return; } - Context context = surfaceMountingManager.getContext(); + ThemedReactContext reactContext = surfaceMountingManager.getContext(); boolean isRTL = false; boolean doLeftAndRightSwapInRTL = false; - if (context != null) { - isRTL = I18nUtil.getInstance().isRTL(context); - doLeftAndRightSwapInRTL = I18nUtil.getInstance().doLeftAndRightSwapInRTL(context); + if (reactContext != null) { + isRTL = I18nUtil.getInstance().isRTL(reactContext); + doLeftAndRightSwapInRTL = I18nUtil.getInstance().doLeftAndRightSwapInRTL(reactContext); } mBinding.setConstraints( diff --git a/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/fabric/GuardedFrameCallback.java b/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/renderer/GuardedFrameCallback.java similarity index 97% rename from packages/react-native/ReactAndroid/src/main/java/com/facebook/react/fabric/GuardedFrameCallback.java rename to packages/react-native/ReactAndroid/src/main/java/com/facebook/react/renderer/GuardedFrameCallback.java index dcee5e2ebe8f91..f190f5ce9b424a 100644 --- a/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/fabric/GuardedFrameCallback.java +++ b/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/renderer/GuardedFrameCallback.java @@ -5,7 +5,7 @@ * LICENSE file in the root directory of this source tree. */ -package com.facebook.react.fabric; +package com.facebook.react.renderer; import androidx.annotation.NonNull; import com.facebook.react.bridge.JSExceptionHandler; diff --git a/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/fabric/ReactNativeConfig.java b/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/renderer/ReactNativeConfig.java similarity index 97% rename from packages/react-native/ReactAndroid/src/main/java/com/facebook/react/fabric/ReactNativeConfig.java rename to packages/react-native/ReactAndroid/src/main/java/com/facebook/react/renderer/ReactNativeConfig.java index 1c6704b3d88db7..7e0c2641bbc1c5 100644 --- a/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/fabric/ReactNativeConfig.java +++ b/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/renderer/ReactNativeConfig.java @@ -5,7 +5,7 @@ * LICENSE file in the root directory of this source tree. */ -package com.facebook.react.fabric; +package com.facebook.react.renderer; import androidx.annotation.NonNull; import com.facebook.proguard.annotations.DoNotStrip; diff --git a/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/fabric/StateWrapperImpl.java b/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/renderer/StateWrapperImpl.java similarity index 98% rename from packages/react-native/ReactAndroid/src/main/java/com/facebook/react/fabric/StateWrapperImpl.java rename to packages/react-native/ReactAndroid/src/main/java/com/facebook/react/renderer/StateWrapperImpl.java index bccf0593407fcb..3b21e5dfddbe0c 100644 --- a/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/fabric/StateWrapperImpl.java +++ b/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/renderer/StateWrapperImpl.java @@ -5,7 +5,7 @@ * LICENSE file in the root directory of this source tree. */ -package com.facebook.react.fabric; +package com.facebook.react.renderer; import android.annotation.SuppressLint; import androidx.annotation.NonNull; diff --git a/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/fabric/SurfaceHandler.java b/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/renderer/SurfaceHandler.java similarity index 97% rename from packages/react-native/ReactAndroid/src/main/java/com/facebook/react/fabric/SurfaceHandler.java rename to packages/react-native/ReactAndroid/src/main/java/com/facebook/react/renderer/SurfaceHandler.java index 19b3ff7739fe01..84b594af17b8b3 100644 --- a/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/fabric/SurfaceHandler.java +++ b/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/renderer/SurfaceHandler.java @@ -5,7 +5,7 @@ * LICENSE file in the root directory of this source tree. */ -package com.facebook.react.fabric; +package com.facebook.react.renderer; import com.facebook.react.bridge.NativeMap; import javax.annotation.concurrent.ThreadSafe; 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/renderer/SurfaceHandlerBinding.java similarity index 93% rename from packages/react-native/ReactAndroid/src/main/java/com/facebook/react/fabric/SurfaceHandlerBinding.java rename to packages/react-native/ReactAndroid/src/main/java/com/facebook/react/renderer/SurfaceHandlerBinding.java index 0cefe448a2d43c..9f4f16e735d791 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/renderer/SurfaceHandlerBinding.java @@ -5,10 +5,10 @@ * LICENSE file in the root directory of this source tree. */ -package com.facebook.react.fabric; +package com.facebook.react.renderer; -import static com.facebook.react.fabric.mounting.LayoutMetricsConversions.getMaxSize; -import static com.facebook.react.fabric.mounting.LayoutMetricsConversions.getMinSize; +import static com.facebook.react.renderer.mounting.LayoutMetricsConversions.getMaxSize; +import static com.facebook.react.renderer.mounting.LayoutMetricsConversions.getMinSize; import androidx.annotation.IntDef; import com.facebook.jni.HybridData; diff --git a/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/fabric/events/EventBeatManager.java b/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/renderer/events/EventBeatManager.java similarity index 92% rename from packages/react-native/ReactAndroid/src/main/java/com/facebook/react/fabric/events/EventBeatManager.java rename to packages/react-native/ReactAndroid/src/main/java/com/facebook/react/renderer/events/EventBeatManager.java index 4c4703d0ae7910..2abd68d3b5bc9d 100644 --- a/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/fabric/events/EventBeatManager.java +++ b/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/renderer/events/EventBeatManager.java @@ -5,14 +5,14 @@ * LICENSE file in the root directory of this source tree. */ -package com.facebook.react.fabric.events; +package com.facebook.react.renderer.events; import android.annotation.SuppressLint; import androidx.annotation.NonNull; import com.facebook.jni.HybridData; import com.facebook.proguard.annotations.DoNotStrip; import com.facebook.react.bridge.ReactApplicationContext; -import com.facebook.react.fabric.FabricSoLoader; +import com.facebook.react.renderer.FabricSoLoader; import com.facebook.react.uimanager.events.BatchEventDispatchedListener; /** diff --git a/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/fabric/events/EventEmitterWrapper.java b/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/renderer/events/EventEmitterWrapper.java similarity index 96% rename from packages/react-native/ReactAndroid/src/main/java/com/facebook/react/fabric/events/EventEmitterWrapper.java rename to packages/react-native/ReactAndroid/src/main/java/com/facebook/react/renderer/events/EventEmitterWrapper.java index 27cb19b3534342..5b2e845bb1c16b 100644 --- a/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/fabric/events/EventEmitterWrapper.java +++ b/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/renderer/events/EventEmitterWrapper.java @@ -5,7 +5,7 @@ * LICENSE file in the root directory of this source tree. */ -package com.facebook.react.fabric.events; +package com.facebook.react.renderer.events; import android.annotation.SuppressLint; import androidx.annotation.NonNull; @@ -14,7 +14,7 @@ import com.facebook.proguard.annotations.DoNotStrip; import com.facebook.react.bridge.NativeMap; import com.facebook.react.bridge.WritableMap; -import com.facebook.react.fabric.FabricSoLoader; +import com.facebook.react.renderer.FabricSoLoader; import com.facebook.react.uimanager.events.EventCategoryDef; /** diff --git a/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/fabric/events/FabricEventEmitter.java b/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/renderer/events/FabricEventEmitter.java similarity index 96% rename from packages/react-native/ReactAndroid/src/main/java/com/facebook/react/fabric/events/FabricEventEmitter.java rename to packages/react-native/ReactAndroid/src/main/java/com/facebook/react/renderer/events/FabricEventEmitter.java index 6674681fc40c63..3287903b799a9c 100644 --- a/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/fabric/events/FabricEventEmitter.java +++ b/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/renderer/events/FabricEventEmitter.java @@ -5,13 +5,13 @@ * LICENSE file in the root directory of this source tree. */ -package com.facebook.react.fabric.events; +package com.facebook.react.renderer.events; import androidx.annotation.NonNull; import androidx.annotation.Nullable; import com.facebook.react.bridge.WritableArray; import com.facebook.react.bridge.WritableMap; -import com.facebook.react.fabric.FabricUIManager; +import com.facebook.react.renderer.FabricUIManager; import com.facebook.react.uimanager.common.ViewUtil; import com.facebook.react.uimanager.events.EventCategoryDef; import com.facebook.react.uimanager.events.RCTModernEventEmitter; diff --git a/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/fabric/interop/InteropEvent.java b/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/renderer/interop/InteropEvent.java similarity index 96% rename from packages/react-native/ReactAndroid/src/main/java/com/facebook/react/fabric/interop/InteropEvent.java rename to packages/react-native/ReactAndroid/src/main/java/com/facebook/react/renderer/interop/InteropEvent.java index 881edbdf6fa4e1..a6d19d4a0305ad 100644 --- a/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/fabric/interop/InteropEvent.java +++ b/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/renderer/interop/InteropEvent.java @@ -5,7 +5,7 @@ * LICENSE file in the root directory of this source tree. */ -package com.facebook.react.fabric.interop; +package com.facebook.react.renderer.interop; import androidx.annotation.Nullable; import com.facebook.react.bridge.WritableMap; diff --git a/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/fabric/interop/InteropEventEmitter.java b/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/renderer/interop/InteropEventEmitter.java similarity index 98% rename from packages/react-native/ReactAndroid/src/main/java/com/facebook/react/fabric/interop/InteropEventEmitter.java rename to packages/react-native/ReactAndroid/src/main/java/com/facebook/react/renderer/interop/InteropEventEmitter.java index aef10bffdfbdcf..b81e959dc14fbd 100644 --- a/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/fabric/interop/InteropEventEmitter.java +++ b/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/renderer/interop/InteropEventEmitter.java @@ -5,7 +5,7 @@ * LICENSE file in the root directory of this source tree. */ -package com.facebook.react.fabric.interop; +package com.facebook.react.renderer.interop; import androidx.annotation.Nullable; import com.facebook.react.bridge.ReactContext; diff --git a/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/fabric/mounting/LayoutMetricsConversions.java b/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/renderer/mounting/LayoutMetricsConversions.java similarity index 97% rename from packages/react-native/ReactAndroid/src/main/java/com/facebook/react/fabric/mounting/LayoutMetricsConversions.java rename to packages/react-native/ReactAndroid/src/main/java/com/facebook/react/renderer/mounting/LayoutMetricsConversions.java index 249e3b84f7c251..ed6e1aba6aaad7 100644 --- a/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/fabric/mounting/LayoutMetricsConversions.java +++ b/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/renderer/mounting/LayoutMetricsConversions.java @@ -5,7 +5,7 @@ * LICENSE file in the root directory of this source tree. */ -package com.facebook.react.fabric.mounting; +package com.facebook.react.renderer.mounting; import static android.view.View.MeasureSpec.EXACTLY; diff --git a/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/fabric/mounting/MountItemDispatcher.java b/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/renderer/mounting/MountItemDispatcher.java similarity index 97% rename from packages/react-native/ReactAndroid/src/main/java/com/facebook/react/fabric/mounting/MountItemDispatcher.java rename to packages/react-native/ReactAndroid/src/main/java/com/facebook/react/renderer/mounting/MountItemDispatcher.java index 8b8ae700fa4677..ad0658fbc4c143 100644 --- a/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/fabric/mounting/MountItemDispatcher.java +++ b/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/renderer/mounting/MountItemDispatcher.java @@ -5,12 +5,12 @@ * LICENSE file in the root directory of this source tree. */ -package com.facebook.react.fabric.mounting; +package com.facebook.react.renderer.mounting; import static com.facebook.infer.annotation.ThreadConfined.ANY; import static com.facebook.infer.annotation.ThreadConfined.UI; -import static com.facebook.react.fabric.FabricUIManager.ENABLE_FABRIC_LOGS; -import static com.facebook.react.fabric.FabricUIManager.IS_DEVELOPMENT_ENVIRONMENT; +import static com.facebook.react.renderer.FabricUIManager.ENABLE_FABRIC_LOGS; +import static com.facebook.react.renderer.FabricUIManager.IS_DEVELOPMENT_ENVIRONMENT; import android.os.SystemClock; import android.view.View; @@ -24,8 +24,8 @@ import com.facebook.react.bridge.ReactNoCrashSoftException; import com.facebook.react.bridge.ReactSoftExceptionLogger; import com.facebook.react.bridge.RetryableMountingLayerException; -import com.facebook.react.fabric.mounting.mountitems.DispatchCommandMountItem; -import com.facebook.react.fabric.mounting.mountitems.MountItem; +import com.facebook.react.renderer.mounting.mountitems.DispatchCommandMountItem; +import com.facebook.react.renderer.mounting.mountitems.MountItem; import com.facebook.systrace.Systrace; import java.util.ArrayList; import java.util.Collection; diff --git a/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/fabric/mounting/MountingManager.java b/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/renderer/mounting/MountingManager.java similarity index 98% rename from packages/react-native/ReactAndroid/src/main/java/com/facebook/react/fabric/mounting/MountingManager.java rename to packages/react-native/ReactAndroid/src/main/java/com/facebook/react/renderer/mounting/MountingManager.java index 0efb84e8b96468..8d8d44ea5abd40 100644 --- a/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/fabric/mounting/MountingManager.java +++ b/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/renderer/mounting/MountingManager.java @@ -5,7 +5,7 @@ * LICENSE file in the root directory of this source tree. */ -package com.facebook.react.fabric.mounting; +package com.facebook.react.renderer.mounting; import static com.facebook.infer.annotation.ThreadConfined.ANY; import static com.facebook.infer.annotation.ThreadConfined.UI; @@ -24,10 +24,10 @@ import com.facebook.react.bridge.RetryableMountingLayerException; import com.facebook.react.bridge.UiThreadUtil; import com.facebook.react.common.mapbuffer.MapBuffer; -import com.facebook.react.fabric.FabricUIManager; -import com.facebook.react.fabric.events.EventEmitterWrapper; -import com.facebook.react.fabric.mounting.SurfaceMountingManager.ViewEvent; -import com.facebook.react.fabric.mounting.mountitems.MountItem; +import com.facebook.react.renderer.FabricUIManager; +import com.facebook.react.renderer.events.EventEmitterWrapper; +import com.facebook.react.renderer.mounting.SurfaceMountingManager.ViewEvent; +import com.facebook.react.renderer.mounting.mountitems.MountItem; import com.facebook.react.touch.JSResponderHandler; import com.facebook.react.uimanager.RootViewManager; import com.facebook.react.uimanager.ThemedReactContext; diff --git a/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/fabric/mounting/SurfaceMountingManager.java b/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/renderer/mounting/SurfaceMountingManager.java similarity index 99% rename from packages/react-native/ReactAndroid/src/main/java/com/facebook/react/fabric/mounting/SurfaceMountingManager.java rename to packages/react-native/ReactAndroid/src/main/java/com/facebook/react/renderer/mounting/SurfaceMountingManager.java index be7bf13bbf6723..236a6119e2ca50 100644 --- a/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/fabric/mounting/SurfaceMountingManager.java +++ b/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/renderer/mounting/SurfaceMountingManager.java @@ -5,7 +5,7 @@ * LICENSE file in the root directory of this source tree. */ -package com.facebook.react.fabric.mounting; +package com.facebook.react.renderer.mounting; import static com.facebook.infer.annotation.ThreadConfined.ANY; import static com.facebook.infer.annotation.ThreadConfined.UI; @@ -31,11 +31,11 @@ import com.facebook.react.common.build.ReactBuildConfig; import com.facebook.react.common.mapbuffer.ReadableMapBuffer; import com.facebook.react.config.ReactFeatureFlags; -import com.facebook.react.fabric.GuardedFrameCallback; -import com.facebook.react.fabric.events.EventEmitterWrapper; -import com.facebook.react.fabric.mounting.MountingManager.MountItemExecutor; -import com.facebook.react.fabric.mounting.mountitems.MountItem; import com.facebook.react.modules.core.ReactChoreographer; +import com.facebook.react.renderer.GuardedFrameCallback; +import com.facebook.react.renderer.events.EventEmitterWrapper; +import com.facebook.react.renderer.mounting.MountingManager.MountItemExecutor; +import com.facebook.react.renderer.mounting.mountitems.MountItem; import com.facebook.react.touch.JSResponderHandler; import com.facebook.react.uimanager.IViewGroupManager; import com.facebook.react.uimanager.IllegalViewOperationException; diff --git a/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/fabric/mounting/mountitems/BatchMountItem.java b/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/renderer/mounting/mountitems/BatchMountItem.java similarity index 85% rename from packages/react-native/ReactAndroid/src/main/java/com/facebook/react/fabric/mounting/mountitems/BatchMountItem.java rename to packages/react-native/ReactAndroid/src/main/java/com/facebook/react/renderer/mounting/mountitems/BatchMountItem.java index 97c0f4f37b90ea..b65e354fbbb110 100644 --- a/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/fabric/mounting/mountitems/BatchMountItem.java +++ b/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/renderer/mounting/mountitems/BatchMountItem.java @@ -5,7 +5,7 @@ * LICENSE file in the root directory of this source tree. */ -package com.facebook.react.fabric.mounting.mountitems; +package com.facebook.react.renderer.mounting.mountitems; public interface BatchMountItem extends MountItem { diff --git a/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/fabric/mounting/mountitems/DispatchCommandMountItem.java b/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/renderer/mounting/mountitems/DispatchCommandMountItem.java similarity index 92% rename from packages/react-native/ReactAndroid/src/main/java/com/facebook/react/fabric/mounting/mountitems/DispatchCommandMountItem.java rename to packages/react-native/ReactAndroid/src/main/java/com/facebook/react/renderer/mounting/mountitems/DispatchCommandMountItem.java index 43b6d7120b995d..e3aec016d5b05b 100644 --- a/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/fabric/mounting/mountitems/DispatchCommandMountItem.java +++ b/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/renderer/mounting/mountitems/DispatchCommandMountItem.java @@ -5,7 +5,7 @@ * LICENSE file in the root directory of this source tree. */ -package com.facebook.react.fabric.mounting.mountitems; +package com.facebook.react.renderer.mounting.mountitems; import androidx.annotation.UiThread; diff --git a/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/fabric/mounting/mountitems/DispatchIntCommandMountItem.java b/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/renderer/mounting/mountitems/DispatchIntCommandMountItem.java similarity index 90% rename from packages/react-native/ReactAndroid/src/main/java/com/facebook/react/fabric/mounting/mountitems/DispatchIntCommandMountItem.java rename to packages/react-native/ReactAndroid/src/main/java/com/facebook/react/renderer/mounting/mountitems/DispatchIntCommandMountItem.java index 89f69e1288853f..441e488d6e8abc 100644 --- a/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/fabric/mounting/mountitems/DispatchIntCommandMountItem.java +++ b/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/renderer/mounting/mountitems/DispatchIntCommandMountItem.java @@ -5,12 +5,12 @@ * LICENSE file in the root directory of this source tree. */ -package com.facebook.react.fabric.mounting.mountitems; +package com.facebook.react.renderer.mounting.mountitems; import androidx.annotation.NonNull; import androidx.annotation.Nullable; import com.facebook.react.bridge.ReadableArray; -import com.facebook.react.fabric.mounting.MountingManager; +import com.facebook.react.renderer.mounting.MountingManager; final class DispatchIntCommandMountItem extends DispatchCommandMountItem { diff --git a/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/fabric/mounting/mountitems/DispatchStringCommandMountItem.java b/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/renderer/mounting/mountitems/DispatchStringCommandMountItem.java similarity index 90% rename from packages/react-native/ReactAndroid/src/main/java/com/facebook/react/fabric/mounting/mountitems/DispatchStringCommandMountItem.java rename to packages/react-native/ReactAndroid/src/main/java/com/facebook/react/renderer/mounting/mountitems/DispatchStringCommandMountItem.java index c86abde48e9fb3..31c94553e45bba 100644 --- a/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/fabric/mounting/mountitems/DispatchStringCommandMountItem.java +++ b/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/renderer/mounting/mountitems/DispatchStringCommandMountItem.java @@ -5,12 +5,12 @@ * LICENSE file in the root directory of this source tree. */ -package com.facebook.react.fabric.mounting.mountitems; +package com.facebook.react.renderer.mounting.mountitems; import androidx.annotation.NonNull; import androidx.annotation.Nullable; import com.facebook.react.bridge.ReadableArray; -import com.facebook.react.fabric.mounting.MountingManager; +import com.facebook.react.renderer.mounting.MountingManager; final class DispatchStringCommandMountItem extends DispatchCommandMountItem { diff --git a/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/fabric/mounting/mountitems/FabricNameComponentMapping.java b/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/renderer/mounting/mountitems/FabricNameComponentMapping.java similarity index 97% rename from packages/react-native/ReactAndroid/src/main/java/com/facebook/react/fabric/mounting/mountitems/FabricNameComponentMapping.java rename to packages/react-native/ReactAndroid/src/main/java/com/facebook/react/renderer/mounting/mountitems/FabricNameComponentMapping.java index bd5e1488227c97..fab41eb3d6306a 100644 --- a/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/fabric/mounting/mountitems/FabricNameComponentMapping.java +++ b/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/renderer/mounting/mountitems/FabricNameComponentMapping.java @@ -5,7 +5,7 @@ * LICENSE file in the root directory of this source tree. */ -package com.facebook.react.fabric.mounting.mountitems; +package com.facebook.react.renderer.mounting.mountitems; import androidx.annotation.NonNull; import java.util.HashMap; diff --git a/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/fabric/mounting/mountitems/IntBufferBatchMountItem.java b/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/renderer/mounting/mountitems/IntBufferBatchMountItem.java similarity index 95% rename from packages/react-native/ReactAndroid/src/main/java/com/facebook/react/fabric/mounting/mountitems/IntBufferBatchMountItem.java rename to packages/react-native/ReactAndroid/src/main/java/com/facebook/react/renderer/mounting/mountitems/IntBufferBatchMountItem.java index 05b5a5a2f488bb..191f3503660bb7 100644 --- a/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/fabric/mounting/mountitems/IntBufferBatchMountItem.java +++ b/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/renderer/mounting/mountitems/IntBufferBatchMountItem.java @@ -5,20 +5,20 @@ * LICENSE file in the root directory of this source tree. */ -package com.facebook.react.fabric.mounting.mountitems; +package com.facebook.react.renderer.mounting.mountitems; -import static com.facebook.react.fabric.FabricUIManager.ENABLE_FABRIC_LOGS; -import static com.facebook.react.fabric.FabricUIManager.IS_DEVELOPMENT_ENVIRONMENT; -import static com.facebook.react.fabric.mounting.mountitems.FabricNameComponentMapping.getFabricComponentName; +import static com.facebook.react.renderer.FabricUIManager.ENABLE_FABRIC_LOGS; +import static com.facebook.react.renderer.FabricUIManager.IS_DEVELOPMENT_ENVIRONMENT; +import static com.facebook.react.renderer.mounting.mountitems.FabricNameComponentMapping.getFabricComponentName; import androidx.annotation.NonNull; import com.facebook.common.logging.FLog; import com.facebook.proguard.annotations.DoNotStrip; import com.facebook.react.bridge.ReactMarker; import com.facebook.react.bridge.ReactMarkerConstants; -import com.facebook.react.fabric.events.EventEmitterWrapper; -import com.facebook.react.fabric.mounting.MountingManager; -import com.facebook.react.fabric.mounting.SurfaceMountingManager; +import com.facebook.react.renderer.events.EventEmitterWrapper; +import com.facebook.react.renderer.mounting.MountingManager; +import com.facebook.react.renderer.mounting.SurfaceMountingManager; import com.facebook.react.uimanager.StateWrapper; import com.facebook.systrace.Systrace; diff --git a/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/fabric/mounting/mountitems/MountItem.java b/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/renderer/mounting/mountitems/MountItem.java similarity index 83% rename from packages/react-native/ReactAndroid/src/main/java/com/facebook/react/fabric/mounting/mountitems/MountItem.java rename to packages/react-native/ReactAndroid/src/main/java/com/facebook/react/renderer/mounting/mountitems/MountItem.java index d966f5445e5cd3..6c7bdcaac2a46f 100644 --- a/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/fabric/mounting/mountitems/MountItem.java +++ b/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/renderer/mounting/mountitems/MountItem.java @@ -5,13 +5,13 @@ * LICENSE file in the root directory of this source tree. */ -package com.facebook.react.fabric.mounting.mountitems; +package com.facebook.react.renderer.mounting.mountitems; import androidx.annotation.AnyThread; import androidx.annotation.NonNull; import androidx.annotation.UiThread; import com.facebook.proguard.annotations.DoNotStrip; -import com.facebook.react.fabric.mounting.MountingManager; +import com.facebook.react.renderer.mounting.MountingManager; @DoNotStrip public interface MountItem { diff --git a/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/fabric/mounting/mountitems/MountItemFactory.java b/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/renderer/mounting/mountitems/MountItemFactory.java similarity index 95% rename from packages/react-native/ReactAndroid/src/main/java/com/facebook/react/fabric/mounting/mountitems/MountItemFactory.java rename to packages/react-native/ReactAndroid/src/main/java/com/facebook/react/renderer/mounting/mountitems/MountItemFactory.java index b68adff51119f5..79b74b3b612249 100644 --- a/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/fabric/mounting/mountitems/MountItemFactory.java +++ b/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/renderer/mounting/mountitems/MountItemFactory.java @@ -5,12 +5,12 @@ * LICENSE file in the root directory of this source tree. */ -package com.facebook.react.fabric.mounting.mountitems; +package com.facebook.react.renderer.mounting.mountitems; import androidx.annotation.NonNull; import androidx.annotation.Nullable; import com.facebook.react.bridge.ReadableArray; -import com.facebook.react.fabric.events.EventEmitterWrapper; +import com.facebook.react.renderer.events.EventEmitterWrapper; import com.facebook.react.uimanager.StateWrapper; /** Factory class that expose creation of {@link MountItem} */ diff --git a/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/fabric/mounting/mountitems/PreAllocateViewMountItem.java b/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/renderer/mounting/mountitems/PreAllocateViewMountItem.java similarity index 83% rename from packages/react-native/ReactAndroid/src/main/java/com/facebook/react/fabric/mounting/mountitems/PreAllocateViewMountItem.java rename to packages/react-native/ReactAndroid/src/main/java/com/facebook/react/renderer/mounting/mountitems/PreAllocateViewMountItem.java index 8f4f6feab3c83e..74844a021b55e7 100644 --- a/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/fabric/mounting/mountitems/PreAllocateViewMountItem.java +++ b/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/renderer/mounting/mountitems/PreAllocateViewMountItem.java @@ -5,18 +5,18 @@ * LICENSE file in the root directory of this source tree. */ -package com.facebook.react.fabric.mounting.mountitems; +package com.facebook.react.renderer.mounting.mountitems; -import static com.facebook.react.fabric.FabricUIManager.IS_DEVELOPMENT_ENVIRONMENT; -import static com.facebook.react.fabric.FabricUIManager.TAG; -import static com.facebook.react.fabric.mounting.mountitems.FabricNameComponentMapping.getFabricComponentName; +import static com.facebook.react.renderer.FabricUIManager.IS_DEVELOPMENT_ENVIRONMENT; +import static com.facebook.react.renderer.FabricUIManager.TAG; +import static com.facebook.react.renderer.mounting.mountitems.FabricNameComponentMapping.getFabricComponentName; import androidx.annotation.NonNull; import androidx.annotation.Nullable; import com.facebook.common.logging.FLog; -import com.facebook.react.fabric.events.EventEmitterWrapper; -import com.facebook.react.fabric.mounting.MountingManager; -import com.facebook.react.fabric.mounting.SurfaceMountingManager; +import com.facebook.react.renderer.events.EventEmitterWrapper; +import com.facebook.react.renderer.mounting.MountingManager; +import com.facebook.react.renderer.mounting.SurfaceMountingManager; import com.facebook.react.uimanager.StateWrapper; /** {@link MountItem} that is used to pre-allocate views for JS components. */ diff --git a/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/fabric/mounting/mountitems/SendAccessibilityEvent.java b/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/renderer/mounting/mountitems/SendAccessibilityEvent.java similarity index 93% rename from packages/react-native/ReactAndroid/src/main/java/com/facebook/react/fabric/mounting/mountitems/SendAccessibilityEvent.java rename to packages/react-native/ReactAndroid/src/main/java/com/facebook/react/renderer/mounting/mountitems/SendAccessibilityEvent.java index 6560895fa06743..a2346f24cbf21a 100644 --- a/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/fabric/mounting/mountitems/SendAccessibilityEvent.java +++ b/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/renderer/mounting/mountitems/SendAccessibilityEvent.java @@ -5,12 +5,12 @@ * LICENSE file in the root directory of this source tree. */ -package com.facebook.react.fabric.mounting.mountitems; +package com.facebook.react.renderer.mounting.mountitems; import androidx.annotation.NonNull; import com.facebook.react.bridge.ReactSoftExceptionLogger; import com.facebook.react.bridge.RetryableMountingLayerException; -import com.facebook.react.fabric.mounting.MountingManager; +import com.facebook.react.renderer.mounting.MountingManager; public class SendAccessibilityEvent implements MountItem { diff --git a/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/fabric/mounting/mountitems/SendAccessibilityEventMountItem.java b/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/renderer/mounting/mountitems/SendAccessibilityEventMountItem.java similarity index 93% rename from packages/react-native/ReactAndroid/src/main/java/com/facebook/react/fabric/mounting/mountitems/SendAccessibilityEventMountItem.java rename to packages/react-native/ReactAndroid/src/main/java/com/facebook/react/renderer/mounting/mountitems/SendAccessibilityEventMountItem.java index 13e90ada6dd2cb..e28d442785775a 100644 --- a/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/fabric/mounting/mountitems/SendAccessibilityEventMountItem.java +++ b/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/renderer/mounting/mountitems/SendAccessibilityEventMountItem.java @@ -5,12 +5,12 @@ * LICENSE file in the root directory of this source tree. */ -package com.facebook.react.fabric.mounting.mountitems; +package com.facebook.react.renderer.mounting.mountitems; import androidx.annotation.NonNull; import com.facebook.react.bridge.ReactSoftExceptionLogger; import com.facebook.react.bridge.RetryableMountingLayerException; -import com.facebook.react.fabric.mounting.MountingManager; +import com.facebook.react.renderer.mounting.MountingManager; final class SendAccessibilityEventMountItem implements MountItem { diff --git a/packages/react-native/ReactAndroid/src/test/java/com/facebook/react/bridgeless/ReactHostTest.java b/packages/react-native/ReactAndroid/src/test/java/com/facebook/react/bridgeless/ReactHostTest.java index e56bae01bd1735..9ffecf5224aace 100644 --- a/packages/react-native/ReactAndroid/src/test/java/com/facebook/react/bridgeless/ReactHostTest.java +++ b/packages/react-native/ReactAndroid/src/test/java/com/facebook/react/bridgeless/ReactHostTest.java @@ -28,7 +28,7 @@ import com.facebook.react.bridgeless.internal.bolts.TaskCompletionSource; import com.facebook.react.common.LifecycleState; import com.facebook.react.devsupport.interfaces.PackagerStatusCallback; -import com.facebook.react.fabric.ComponentFactory; +import com.facebook.react.renderer.ComponentFactory; import com.facebook.react.uimanager.events.BlackHoleEventDispatcher; import com.facebook.react.uimanager.events.EventDispatcher; import com.facebook.testutils.shadows.ShadowSoLoader; @@ -50,7 +50,7 @@ /** Tests {@linkcom.facebook.react.bridgeless.ReactHost} */ @Ignore("Ignore for now as these tests fail in OSS only") -@SuppressStaticInitializationFor("com.facebook.react.fabric.ComponentFactory") +@SuppressStaticInitializationFor("com.facebook.react.renderer.ComponentFactory") @RunWith(RobolectricTestRunner.class) @PowerMockIgnore({ "org.mockito.*", 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..04765119fc7aed 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.renderer.SurfaceHandler; import com.facebook.react.uimanager.events.EventDispatcher; import java.util.concurrent.Callable; import org.junit.Before; diff --git a/packages/react-native/ReactAndroid/src/test/java/com/facebook/react/fabric/events/TouchEventDispatchTest.kt b/packages/react-native/ReactAndroid/src/test/java/com/facebook/react/renderer/events/TouchEventDispatchTest.kt similarity index 99% rename from packages/react-native/ReactAndroid/src/test/java/com/facebook/react/fabric/events/TouchEventDispatchTest.kt rename to packages/react-native/ReactAndroid/src/test/java/com/facebook/react/renderer/events/TouchEventDispatchTest.kt index 87ad9d665062f1..a94d9d5cf6cd63 100644 --- a/packages/react-native/ReactAndroid/src/test/java/com/facebook/react/fabric/events/TouchEventDispatchTest.kt +++ b/packages/react-native/ReactAndroid/src/test/java/com/facebook/react/renderer/events/TouchEventDispatchTest.kt @@ -5,14 +5,14 @@ * LICENSE file in the root directory of this source tree. */ -package com.facebook.react.fabric.events +package com.facebook.react.renderer.events import android.util.DisplayMetrics import android.view.MotionEvent import android.view.MotionEvent.PointerCoords import android.view.MotionEvent.PointerProperties import com.facebook.react.bridge.* -import com.facebook.react.fabric.FabricUIManager +import com.facebook.react.renderer.FabricUIManager import com.facebook.react.uimanager.DisplayMetricsHolder import com.facebook.react.uimanager.events.TouchEvent import com.facebook.react.uimanager.events.TouchEventCoalescingKeyHelper @@ -36,7 +36,7 @@ import org.powermock.modules.junit4.rule.PowerMockRule import org.robolectric.RobolectricTestRunner @PrepareForTest(Arguments::class, FabricUIManager::class) -@SuppressStaticInitializationFor("com.facebook.react.fabric.FabricUIManager") +@SuppressStaticInitializationFor("com.facebook.react.renderer.FabricUIManager") @RunWith(RobolectricTestRunner::class) @PowerMockIgnore("org.mockito.*", "org.robolectric.*", "androidx.*", "android.*") class TouchEventDispatchTest { diff --git a/packages/react-native/ReactAndroid/src/test/java/com/facebook/react/fabric/interop/FakeEventDispatcher.kt b/packages/react-native/ReactAndroid/src/test/java/com/facebook/react/renderer/interop/FakeEventDispatcher.kt similarity index 97% rename from packages/react-native/ReactAndroid/src/test/java/com/facebook/react/fabric/interop/FakeEventDispatcher.kt rename to packages/react-native/ReactAndroid/src/test/java/com/facebook/react/renderer/interop/FakeEventDispatcher.kt index 3c444a5d124756..ffbce957aa7f12 100644 --- a/packages/react-native/ReactAndroid/src/test/java/com/facebook/react/fabric/interop/FakeEventDispatcher.kt +++ b/packages/react-native/ReactAndroid/src/test/java/com/facebook/react/renderer/interop/FakeEventDispatcher.kt @@ -6,7 +6,7 @@ */ @file:Suppress("DEPRECATION") // Suppressing as RCTEventEmitter is part of the API -package com.facebook.react.fabric.interop +package com.facebook.react.renderer.interop import com.facebook.react.uimanager.events.BatchEventDispatchedListener import com.facebook.react.uimanager.events.Event diff --git a/packages/react-native/ReactAndroid/src/test/java/com/facebook/react/fabric/interop/InteropEventEmitterTest.kt b/packages/react-native/ReactAndroid/src/test/java/com/facebook/react/renderer/interop/InteropEventEmitterTest.kt similarity index 97% rename from packages/react-native/ReactAndroid/src/test/java/com/facebook/react/fabric/interop/InteropEventEmitterTest.kt rename to packages/react-native/ReactAndroid/src/test/java/com/facebook/react/renderer/interop/InteropEventEmitterTest.kt index 7922e5301d6c84..e34326380b70fd 100644 --- a/packages/react-native/ReactAndroid/src/test/java/com/facebook/react/fabric/interop/InteropEventEmitterTest.kt +++ b/packages/react-native/ReactAndroid/src/test/java/com/facebook/react/renderer/interop/InteropEventEmitterTest.kt @@ -5,7 +5,7 @@ * LICENSE file in the root directory of this source tree. */ -package com.facebook.react.fabric.interop +package com.facebook.react.renderer.interop import com.facebook.react.bridge.JavaOnlyMap import com.facebook.react.bridge.ReactApplicationContext diff --git a/packages/rn-tester/android/app/src/main/java/com/facebook/react/uiapp/RNTesterApplication.java b/packages/rn-tester/android/app/src/main/java/com/facebook/react/uiapp/RNTesterApplication.java index 19b4823da57d38..36aa4f51c23f8d 100644 --- a/packages/rn-tester/android/app/src/main/java/com/facebook/react/uiapp/RNTesterApplication.java +++ b/packages/rn-tester/android/app/src/main/java/com/facebook/react/uiapp/RNTesterApplication.java @@ -24,12 +24,12 @@ import com.facebook.react.defaults.DefaultComponentsRegistry; import com.facebook.react.defaults.DefaultNewArchitectureEntryPoint; import com.facebook.react.defaults.DefaultReactNativeHost; -import com.facebook.react.fabric.ComponentFactory; import com.facebook.react.flipper.ReactNativeFlipper; import com.facebook.react.interfaces.ReactHostInterface; import com.facebook.react.interfaces.exceptionmanager.ReactJsExceptionHandler; import com.facebook.react.module.model.ReactModuleInfo; import com.facebook.react.module.model.ReactModuleInfoProvider; +import com.facebook.react.renderer.ComponentFactory; import com.facebook.react.shell.MainReactPackage; import com.facebook.react.uiapp.component.MyLegacyViewManager; import com.facebook.react.uiapp.component.MyNativeViewManager; diff --git a/packages/rn-tester/android/app/src/main/java/com/facebook/react/uiapp/RNTesterReactHostDelegate.java b/packages/rn-tester/android/app/src/main/java/com/facebook/react/uiapp/RNTesterReactHostDelegate.java index ef3eb92712d8f0..b880e45c51f13a 100644 --- a/packages/rn-tester/android/app/src/main/java/com/facebook/react/uiapp/RNTesterReactHostDelegate.java +++ b/packages/rn-tester/android/app/src/main/java/com/facebook/react/uiapp/RNTesterReactHostDelegate.java @@ -27,9 +27,9 @@ import com.facebook.react.common.annotations.UnstableReactNativeAPI; import com.facebook.react.config.ReactFeatureFlags; import com.facebook.react.defaults.DefaultTurboModuleManagerDelegate; -import com.facebook.react.fabric.ReactNativeConfig; import com.facebook.react.module.model.ReactModuleInfo; import com.facebook.react.module.model.ReactModuleInfoProvider; +import com.facebook.react.renderer.ReactNativeConfig; import com.facebook.react.shell.MainReactPackage; import com.facebook.react.turbomodule.core.TurboModuleManager; import com.facebook.react.uiapp.component.MyLegacyViewManager;