diff --git a/ReactAndroid/src/main/java/com/facebook/react/fabric/BUCK b/ReactAndroid/src/main/java/com/facebook/react/fabric/BUCK index 80e09b6a0e7..a1b3e467e75 100644 --- a/ReactAndroid/src/main/java/com/facebook/react/fabric/BUCK +++ b/ReactAndroid/src/main/java/com/facebook/react/fabric/BUCK @@ -4,6 +4,7 @@ rn_android_library( name = "fabric", srcs = glob([ "*.java", + "events/**/*.java", "jsi/*.java", "mounting/**/*.java", ]), @@ -28,7 +29,7 @@ rn_android_library( react_native_target("java/com/facebook/debug/tags:tags"), react_native_target("java/com/facebook/debug/holder:holder"), react_native_target("java/com/facebook/react/bridge:bridge"), - react_native_target("java/com/facebook/react/fabric/jsi/jni:jni"), + react_native_target("java/com/facebook/react/fabric/jni:jni"), react_native_target("java/com/facebook/react:react"), react_native_target("java/com/facebook/react/module/annotations:annotations"), react_native_target("java/com/facebook/react/modules/core:core"), diff --git a/ReactAndroid/src/main/java/com/facebook/react/fabric/jsi/Binding.java b/ReactAndroid/src/main/java/com/facebook/react/fabric/Binding.java similarity index 93% rename from ReactAndroid/src/main/java/com/facebook/react/fabric/jsi/Binding.java rename to ReactAndroid/src/main/java/com/facebook/react/fabric/Binding.java index 441e9809110..cd2557a4357 100644 --- a/ReactAndroid/src/main/java/com/facebook/react/fabric/jsi/Binding.java +++ b/ReactAndroid/src/main/java/com/facebook/react/fabric/Binding.java @@ -4,7 +4,7 @@ *

This source code is licensed under the MIT license found in the LICENSE file in the root * directory of this source tree. */ -package com.facebook.react.fabric.jsi; +package com.facebook.react.fabric; import android.annotation.SuppressLint; import com.facebook.jni.HybridData; @@ -12,8 +12,7 @@ import com.facebook.proguard.annotations.DoNotStrip; import com.facebook.react.bridge.JavaScriptContextHolder; import com.facebook.react.bridge.NativeMap; import com.facebook.react.bridge.queue.MessageQueueThread; -import com.facebook.react.fabric.ReactNativeConfig; -import com.facebook.react.fabric.FabricUIManager; +import com.facebook.react.fabric.events.EventBeatManager; import com.facebook.react.uimanager.PixelUtil; @DoNotStrip diff --git a/ReactAndroid/src/main/java/com/facebook/react/fabric/jsi/ComponentFactoryDelegate.java b/ReactAndroid/src/main/java/com/facebook/react/fabric/ComponentFactoryDelegate.java similarity index 84% rename from ReactAndroid/src/main/java/com/facebook/react/fabric/jsi/ComponentFactoryDelegate.java rename to ReactAndroid/src/main/java/com/facebook/react/fabric/ComponentFactoryDelegate.java index b16d2038e5f..412cec466fb 100644 --- a/ReactAndroid/src/main/java/com/facebook/react/fabric/jsi/ComponentFactoryDelegate.java +++ b/ReactAndroid/src/main/java/com/facebook/react/fabric/ComponentFactoryDelegate.java @@ -1,11 +1,10 @@ // Copyright 2004-present Facebook. All Rights Reserved. -package com.facebook.react.fabric.jsi; +package com.facebook.react.fabric; import com.facebook.jni.HybridData; import com.facebook.proguard.annotations.DoNotStrip; import com.facebook.soloader.SoLoader; -import com.facebook.react.fabric.jsi.FabricSoLoader; @DoNotStrip public class ComponentFactoryDelegate { diff --git a/ReactAndroid/src/main/java/com/facebook/react/fabric/jsi/ComponentRegistry.java b/ReactAndroid/src/main/java/com/facebook/react/fabric/ComponentRegistry.java similarity index 92% rename from ReactAndroid/src/main/java/com/facebook/react/fabric/jsi/ComponentRegistry.java rename to ReactAndroid/src/main/java/com/facebook/react/fabric/ComponentRegistry.java index b942af8dc10..1f656aefeb9 100644 --- a/ReactAndroid/src/main/java/com/facebook/react/fabric/jsi/ComponentRegistry.java +++ b/ReactAndroid/src/main/java/com/facebook/react/fabric/ComponentRegistry.java @@ -1,6 +1,6 @@ // Copyright 2004-present Facebook. All Rights Reserved. -package com.facebook.react.fabric.jsi; +package com.facebook.react.fabric; import com.facebook.jni.HybridData; import com.facebook.proguard.annotations.DoNotStrip; diff --git a/ReactAndroid/src/main/java/com/facebook/react/fabric/FabricJSIModuleProvider.java b/ReactAndroid/src/main/java/com/facebook/react/fabric/FabricJSIModuleProvider.java index f83bbd4abd6..1116f387430 100644 --- a/ReactAndroid/src/main/java/com/facebook/react/fabric/FabricJSIModuleProvider.java +++ b/ReactAndroid/src/main/java/com/facebook/react/fabric/FabricJSIModuleProvider.java @@ -6,13 +6,9 @@ import com.facebook.react.bridge.JavaScriptContextHolder; import com.facebook.react.bridge.ReactApplicationContext; import com.facebook.react.bridge.UIManager; import com.facebook.react.bridge.queue.MessageQueueThread; -import com.facebook.react.fabric.jsi.Binding; -import com.facebook.react.fabric.jsi.ComponentFactoryDelegate; -import com.facebook.react.fabric.jsi.ComponentRegistry; -import com.facebook.react.fabric.jsi.EventBeatManager; -import com.facebook.react.fabric.jsi.EventEmitterWrapper; -import com.facebook.react.fabric.jsi.FabricSoLoader; -import com.facebook.react.fabric.jsi.StateWrapperImpl; +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.mounting.ContextBasedViewPool; import com.facebook.react.fabric.mounting.LayoutMetricsConversions; import com.facebook.react.fabric.mounting.MountingManager; diff --git a/ReactAndroid/src/main/java/com/facebook/react/fabric/jsi/FabricSoLoader.java b/ReactAndroid/src/main/java/com/facebook/react/fabric/FabricSoLoader.java similarity index 96% rename from ReactAndroid/src/main/java/com/facebook/react/fabric/jsi/FabricSoLoader.java rename to ReactAndroid/src/main/java/com/facebook/react/fabric/FabricSoLoader.java index f84a2ac8375..f49eb476d3d 100644 --- a/ReactAndroid/src/main/java/com/facebook/react/fabric/jsi/FabricSoLoader.java +++ b/ReactAndroid/src/main/java/com/facebook/react/fabric/FabricSoLoader.java @@ -4,7 +4,7 @@ *

This source code is licensed under the MIT license found in the LICENSE file in the root * directory of this source tree. */ -package com.facebook.react.fabric.jsi; +package com.facebook.react.fabric; import static com.facebook.systrace.Systrace.TRACE_TAG_REACT_JAVA_BRIDGE; diff --git a/ReactAndroid/src/main/java/com/facebook/react/fabric/FabricUIManager.java b/ReactAndroid/src/main/java/com/facebook/react/fabric/FabricUIManager.java index 9b9c6f78107..880f9a827c9 100644 --- a/ReactAndroid/src/main/java/com/facebook/react/fabric/FabricUIManager.java +++ b/ReactAndroid/src/main/java/com/facebook/react/fabric/FabricUIManager.java @@ -35,10 +35,9 @@ import com.facebook.react.bridge.UIManager; import com.facebook.react.bridge.UiThreadUtil; import com.facebook.react.bridge.WritableMap; import com.facebook.react.common.ReactConstants; -import com.facebook.react.fabric.jsi.Binding; -import com.facebook.react.fabric.jsi.EventBeatManager; -import com.facebook.react.fabric.jsi.EventEmitterWrapper; -import com.facebook.react.fabric.jsi.FabricSoLoader; +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.mounting.MountingManager; import com.facebook.react.fabric.mounting.mountitems.BatchMountItem; import com.facebook.react.fabric.mounting.mountitems.CreateMountItem; diff --git a/ReactAndroid/src/main/java/com/facebook/react/fabric/jsi/StateWrapperImpl.java b/ReactAndroid/src/main/java/com/facebook/react/fabric/StateWrapperImpl.java similarity index 96% rename from ReactAndroid/src/main/java/com/facebook/react/fabric/jsi/StateWrapperImpl.java rename to ReactAndroid/src/main/java/com/facebook/react/fabric/StateWrapperImpl.java index b5f459f797d..a938af35e97 100644 --- a/ReactAndroid/src/main/java/com/facebook/react/fabric/jsi/StateWrapperImpl.java +++ b/ReactAndroid/src/main/java/com/facebook/react/fabric/StateWrapperImpl.java @@ -4,7 +4,7 @@ *

This source code is licensed under the MIT license found in the LICENSE file in the root * directory of this source tree. */ -package com.facebook.react.fabric.jsi; +package com.facebook.react.fabric; import android.annotation.SuppressLint; import com.facebook.jni.HybridData; diff --git a/ReactAndroid/src/main/java/com/facebook/react/fabric/jsi/EventBeatManager.java b/ReactAndroid/src/main/java/com/facebook/react/fabric/events/EventBeatManager.java similarity index 91% rename from ReactAndroid/src/main/java/com/facebook/react/fabric/jsi/EventBeatManager.java rename to ReactAndroid/src/main/java/com/facebook/react/fabric/events/EventBeatManager.java index 285a24f8946..f3e6cd4f8e8 100644 --- a/ReactAndroid/src/main/java/com/facebook/react/fabric/jsi/EventBeatManager.java +++ b/ReactAndroid/src/main/java/com/facebook/react/fabric/events/EventBeatManager.java @@ -4,15 +4,14 @@ *

This source code is licensed under the MIT license found in the LICENSE file in the root * directory of this source tree. */ -package com.facebook.react.fabric.jsi; +package com.facebook.react.fabric.events; import android.annotation.SuppressLint; import com.facebook.jni.HybridData; import com.facebook.proguard.annotations.DoNotStrip; -import com.facebook.react.bridge.JavaScriptContextHolder; import com.facebook.react.bridge.ReactApplicationContext; +import com.facebook.react.fabric.FabricSoLoader; import com.facebook.react.uimanager.events.BatchEventDispatchedListener; -import com.facebook.react.fabric.jsi.FabricSoLoader; /** * Class that acts as a proxy between the list of EventBeats registered in C++ and the Android side. diff --git a/ReactAndroid/src/main/java/com/facebook/react/fabric/jsi/EventEmitterWrapper.java b/ReactAndroid/src/main/java/com/facebook/react/fabric/events/EventEmitterWrapper.java similarity index 94% rename from ReactAndroid/src/main/java/com/facebook/react/fabric/jsi/EventEmitterWrapper.java rename to ReactAndroid/src/main/java/com/facebook/react/fabric/events/EventEmitterWrapper.java index 4d5e621ffc1..00d6a1f1205 100644 --- a/ReactAndroid/src/main/java/com/facebook/react/fabric/jsi/EventEmitterWrapper.java +++ b/ReactAndroid/src/main/java/com/facebook/react/fabric/events/EventEmitterWrapper.java @@ -4,7 +4,7 @@ *

This source code is licensed under the MIT license found in the LICENSE file in the root * directory of this source tree. */ -package com.facebook.react.fabric.jsi; +package com.facebook.react.fabric.events; import android.annotation.SuppressLint; import androidx.annotation.Nullable; @@ -13,7 +13,7 @@ import com.facebook.proguard.annotations.DoNotStrip; import com.facebook.react.bridge.NativeMap; import com.facebook.react.bridge.WritableMap; import com.facebook.react.bridge.WritableNativeMap; -import com.facebook.react.fabric.jsi.FabricSoLoader; +import com.facebook.react.fabric.FabricSoLoader; /** * This class holds reference to the C++ EventEmitter object. Instances of this class are created on diff --git a/ReactAndroid/src/main/java/com/facebook/react/fabric/FabricEventEmitter.java b/ReactAndroid/src/main/java/com/facebook/react/fabric/events/FabricEventEmitter.java similarity index 98% rename from ReactAndroid/src/main/java/com/facebook/react/fabric/FabricEventEmitter.java rename to ReactAndroid/src/main/java/com/facebook/react/fabric/events/FabricEventEmitter.java index c399ac12cda..f9fa3de0fa8 100644 --- a/ReactAndroid/src/main/java/com/facebook/react/fabric/FabricEventEmitter.java +++ b/ReactAndroid/src/main/java/com/facebook/react/fabric/events/FabricEventEmitter.java @@ -4,7 +4,7 @@ *

This source code is licensed under the MIT license found in the LICENSE file in the root * directory of this source tree. */ -package com.facebook.react.fabric; +package com.facebook.react.fabric.events; import static com.facebook.react.uimanager.events.TouchesHelper.CHANGED_TOUCHES_KEY; import static com.facebook.react.uimanager.events.TouchesHelper.TARGET_KEY; @@ -19,6 +19,7 @@ import com.facebook.react.bridge.WritableArray; import com.facebook.react.bridge.WritableMap; import com.facebook.react.bridge.WritableNativeArray; import com.facebook.react.bridge.WritableNativeMap; +import com.facebook.react.fabric.FabricUIManager; import com.facebook.react.uimanager.events.RCTEventEmitter; import com.facebook.systrace.Systrace; import java.util.HashSet; diff --git a/ReactAndroid/src/main/java/com/facebook/react/fabric/jsi/jni/AsyncEventBeat.h b/ReactAndroid/src/main/java/com/facebook/react/fabric/jni/AsyncEventBeat.h similarity index 100% rename from ReactAndroid/src/main/java/com/facebook/react/fabric/jsi/jni/AsyncEventBeat.h rename to ReactAndroid/src/main/java/com/facebook/react/fabric/jni/AsyncEventBeat.h diff --git a/ReactAndroid/src/main/java/com/facebook/react/fabric/jsi/jni/BUCK b/ReactAndroid/src/main/java/com/facebook/react/fabric/jni/BUCK similarity index 100% rename from ReactAndroid/src/main/java/com/facebook/react/fabric/jsi/jni/BUCK rename to ReactAndroid/src/main/java/com/facebook/react/fabric/jni/BUCK diff --git a/ReactAndroid/src/main/java/com/facebook/react/fabric/jsi/jni/Binding.cpp b/ReactAndroid/src/main/java/com/facebook/react/fabric/jni/Binding.cpp similarity index 100% rename from ReactAndroid/src/main/java/com/facebook/react/fabric/jsi/jni/Binding.cpp rename to ReactAndroid/src/main/java/com/facebook/react/fabric/jni/Binding.cpp diff --git a/ReactAndroid/src/main/java/com/facebook/react/fabric/jsi/jni/Binding.h b/ReactAndroid/src/main/java/com/facebook/react/fabric/jni/Binding.h similarity index 94% rename from ReactAndroid/src/main/java/com/facebook/react/fabric/jsi/jni/Binding.h rename to ReactAndroid/src/main/java/com/facebook/react/fabric/jni/Binding.h index 6486763e7ee..588e94740f8 100644 --- a/ReactAndroid/src/main/java/com/facebook/react/fabric/jsi/jni/Binding.h +++ b/ReactAndroid/src/main/java/com/facebook/react/fabric/jni/Binding.h @@ -21,8 +21,8 @@ class Instance; class Binding : public jni::HybridClass, public SchedulerDelegate { public: - constexpr static const char *const kJavaDescriptor = - "Lcom/facebook/react/fabric/jsi/Binding;"; + constexpr static const char* const kJavaDescriptor = + "Lcom/facebook/react/fabric/Binding;"; static void registerNatives(); diff --git a/ReactAndroid/src/main/java/com/facebook/react/fabric/jsi/jni/ComponentFactoryDelegate.cpp b/ReactAndroid/src/main/java/com/facebook/react/fabric/jni/ComponentFactoryDelegate.cpp similarity index 100% rename from ReactAndroid/src/main/java/com/facebook/react/fabric/jsi/jni/ComponentFactoryDelegate.cpp rename to ReactAndroid/src/main/java/com/facebook/react/fabric/jni/ComponentFactoryDelegate.cpp diff --git a/ReactAndroid/src/main/java/com/facebook/react/fabric/jsi/jni/ComponentFactoryDelegate.h b/ReactAndroid/src/main/java/com/facebook/react/fabric/jni/ComponentFactoryDelegate.h similarity index 93% rename from ReactAndroid/src/main/java/com/facebook/react/fabric/jsi/jni/ComponentFactoryDelegate.h rename to ReactAndroid/src/main/java/com/facebook/react/fabric/jni/ComponentFactoryDelegate.h index a215eac89dd..c3abdc210ac 100644 --- a/ReactAndroid/src/main/java/com/facebook/react/fabric/jsi/jni/ComponentFactoryDelegate.h +++ b/ReactAndroid/src/main/java/com/facebook/react/fabric/jni/ComponentFactoryDelegate.h @@ -23,7 +23,7 @@ class ComponentFactoryDelegate : public jni::HybridClass { public: constexpr static const char* const kJavaDescriptor = - "Lcom/facebook/react/fabric/jsi/ComponentFactoryDelegate;"; + "Lcom/facebook/react/fabric/ComponentFactoryDelegate;"; static void registerNatives(); diff --git a/ReactAndroid/src/main/java/com/facebook/react/fabric/jsi/jni/EventBeatManager.cpp b/ReactAndroid/src/main/java/com/facebook/react/fabric/jni/EventBeatManager.cpp similarity index 100% rename from ReactAndroid/src/main/java/com/facebook/react/fabric/jsi/jni/EventBeatManager.cpp rename to ReactAndroid/src/main/java/com/facebook/react/fabric/jni/EventBeatManager.cpp diff --git a/ReactAndroid/src/main/java/com/facebook/react/fabric/jsi/jni/EventBeatManager.h b/ReactAndroid/src/main/java/com/facebook/react/fabric/jni/EventBeatManager.h similarity index 95% rename from ReactAndroid/src/main/java/com/facebook/react/fabric/jsi/jni/EventBeatManager.h rename to ReactAndroid/src/main/java/com/facebook/react/fabric/jni/EventBeatManager.h index 4425bc386f6..4fa39139a4d 100644 --- a/ReactAndroid/src/main/java/com/facebook/react/fabric/jsi/jni/EventBeatManager.h +++ b/ReactAndroid/src/main/java/com/facebook/react/fabric/jni/EventBeatManager.h @@ -21,7 +21,7 @@ class Instance; class EventBeatManager : public jni::HybridClass { public: constexpr static const char* const kJavaDescriptor = - "Lcom/facebook/react/fabric/jsi/EventBeatManager;"; + "Lcom/facebook/react/fabric/events/EventBeatManager;"; static void registerNatives(); diff --git a/ReactAndroid/src/main/java/com/facebook/react/fabric/jsi/jni/EventEmitterWrapper.cpp b/ReactAndroid/src/main/java/com/facebook/react/fabric/jni/EventEmitterWrapper.cpp similarity index 100% rename from ReactAndroid/src/main/java/com/facebook/react/fabric/jsi/jni/EventEmitterWrapper.cpp rename to ReactAndroid/src/main/java/com/facebook/react/fabric/jni/EventEmitterWrapper.cpp diff --git a/ReactAndroid/src/main/java/com/facebook/react/fabric/jsi/jni/EventEmitterWrapper.h b/ReactAndroid/src/main/java/com/facebook/react/fabric/jni/EventEmitterWrapper.h similarity index 92% rename from ReactAndroid/src/main/java/com/facebook/react/fabric/jsi/jni/EventEmitterWrapper.h rename to ReactAndroid/src/main/java/com/facebook/react/fabric/jni/EventEmitterWrapper.h index ce43653eac9..cd612ac4d46 100644 --- a/ReactAndroid/src/main/java/com/facebook/react/fabric/jsi/jni/EventEmitterWrapper.h +++ b/ReactAndroid/src/main/java/com/facebook/react/fabric/jni/EventEmitterWrapper.h @@ -16,7 +16,7 @@ class Instance; class EventEmitterWrapper : public jni::HybridClass { public: constexpr static const char* const kJavaDescriptor = - "Lcom/facebook/react/fabric/jsi/EventEmitterWrapper;"; + "Lcom/facebook/react/fabric/events/EventEmitterWrapper;"; static void registerNatives(); diff --git a/ReactAndroid/src/main/java/com/facebook/react/fabric/jsi/jni/NodeStateWrapper.cpp b/ReactAndroid/src/main/java/com/facebook/react/fabric/jni/NodeStateWrapper.cpp similarity index 100% rename from ReactAndroid/src/main/java/com/facebook/react/fabric/jsi/jni/NodeStateWrapper.cpp rename to ReactAndroid/src/main/java/com/facebook/react/fabric/jni/NodeStateWrapper.cpp diff --git a/ReactAndroid/src/main/java/com/facebook/react/fabric/jsi/jni/NodeStateWrapper.h b/ReactAndroid/src/main/java/com/facebook/react/fabric/jni/NodeStateWrapper.h similarity index 100% rename from ReactAndroid/src/main/java/com/facebook/react/fabric/jsi/jni/NodeStateWrapper.h rename to ReactAndroid/src/main/java/com/facebook/react/fabric/jni/NodeStateWrapper.h diff --git a/ReactAndroid/src/main/java/com/facebook/react/fabric/jsi/jni/OnLoad.cpp b/ReactAndroid/src/main/java/com/facebook/react/fabric/jni/OnLoad.cpp similarity index 100% rename from ReactAndroid/src/main/java/com/facebook/react/fabric/jsi/jni/OnLoad.cpp rename to ReactAndroid/src/main/java/com/facebook/react/fabric/jni/OnLoad.cpp diff --git a/ReactAndroid/src/main/java/com/facebook/react/fabric/jsi/jni/ReactNativeConfigHolder.cpp b/ReactAndroid/src/main/java/com/facebook/react/fabric/jni/ReactNativeConfigHolder.cpp similarity index 100% rename from ReactAndroid/src/main/java/com/facebook/react/fabric/jsi/jni/ReactNativeConfigHolder.cpp rename to ReactAndroid/src/main/java/com/facebook/react/fabric/jni/ReactNativeConfigHolder.cpp diff --git a/ReactAndroid/src/main/java/com/facebook/react/fabric/jsi/jni/ReactNativeConfigHolder.h b/ReactAndroid/src/main/java/com/facebook/react/fabric/jni/ReactNativeConfigHolder.h similarity index 100% rename from ReactAndroid/src/main/java/com/facebook/react/fabric/jsi/jni/ReactNativeConfigHolder.h rename to ReactAndroid/src/main/java/com/facebook/react/fabric/jni/ReactNativeConfigHolder.h diff --git a/ReactAndroid/src/main/java/com/facebook/react/fabric/jsi/jni/StateWrapperImpl.cpp b/ReactAndroid/src/main/java/com/facebook/react/fabric/jni/StateWrapperImpl.cpp similarity index 100% rename from ReactAndroid/src/main/java/com/facebook/react/fabric/jsi/jni/StateWrapperImpl.cpp rename to ReactAndroid/src/main/java/com/facebook/react/fabric/jni/StateWrapperImpl.cpp diff --git a/ReactAndroid/src/main/java/com/facebook/react/fabric/jsi/jni/StateWrapperImpl.h b/ReactAndroid/src/main/java/com/facebook/react/fabric/jni/StateWrapperImpl.h similarity index 93% rename from ReactAndroid/src/main/java/com/facebook/react/fabric/jsi/jni/StateWrapperImpl.h rename to ReactAndroid/src/main/java/com/facebook/react/fabric/jni/StateWrapperImpl.h index 82239ef0635..17fe04e25ef 100644 --- a/ReactAndroid/src/main/java/com/facebook/react/fabric/jsi/jni/StateWrapperImpl.h +++ b/ReactAndroid/src/main/java/com/facebook/react/fabric/jni/StateWrapperImpl.h @@ -16,7 +16,7 @@ class Instance; class StateWrapperImpl : public jni::HybridClass { public: constexpr static const char* const kJavaDescriptor = - "Lcom/facebook/react/fabric/jsi/StateWrapperImpl;"; + "Lcom/facebook/react/fabric/StateWrapperImpl;"; static void registerNatives(); diff --git a/ReactAndroid/src/main/java/com/facebook/react/fabric/mounting/MountingManager.java b/ReactAndroid/src/main/java/com/facebook/react/fabric/mounting/MountingManager.java index 730db120539..5a2bb4924e0 100644 --- a/ReactAndroid/src/main/java/com/facebook/react/fabric/mounting/MountingManager.java +++ b/ReactAndroid/src/main/java/com/facebook/react/fabric/mounting/MountingManager.java @@ -20,7 +20,7 @@ import com.facebook.react.bridge.ReadableNativeMap; import com.facebook.react.bridge.SoftAssertions; import com.facebook.react.bridge.UiThreadUtil; import com.facebook.react.fabric.FabricUIManager; -import com.facebook.react.fabric.jsi.EventEmitterWrapper; +import com.facebook.react.fabric.events.EventEmitterWrapper; import com.facebook.react.fabric.mounting.mountitems.MountItem; import com.facebook.react.uimanager.IllegalViewOperationException; import com.facebook.react.uimanager.ReactStylesDiffMap; diff --git a/ReactAndroid/src/main/java/com/facebook/react/fabric/mounting/mountitems/UpdateEventEmitterMountItem.java b/ReactAndroid/src/main/java/com/facebook/react/fabric/mounting/mountitems/UpdateEventEmitterMountItem.java index 24dd1b64fe6..9d5f0dc6b85 100644 --- a/ReactAndroid/src/main/java/com/facebook/react/fabric/mounting/mountitems/UpdateEventEmitterMountItem.java +++ b/ReactAndroid/src/main/java/com/facebook/react/fabric/mounting/mountitems/UpdateEventEmitterMountItem.java @@ -6,7 +6,7 @@ */ package com.facebook.react.fabric.mounting.mountitems; -import com.facebook.react.fabric.jsi.EventEmitterWrapper; +import com.facebook.react.fabric.events.EventEmitterWrapper; import com.facebook.react.fabric.mounting.MountingManager; public class UpdateEventEmitterMountItem implements MountItem {