diff --git a/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/internal/interop/InteropEventEmitter.kt b/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/internal/interop/InteropEventEmitter.kt index eca7be1f683..c76b670251c 100644 --- a/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/internal/interop/InteropEventEmitter.kt +++ b/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/internal/interop/InteropEventEmitter.kt @@ -31,12 +31,12 @@ public class InteropEventEmitter(private val reactContext: ReactContext) : RCTEv private var eventDispatcherOverride: EventDispatcher? = null @Deprecated("Deprecated in Java") - override fun receiveEvent(targetReactTag: Int, eventName: String, eventData: WritableMap?) { + override fun receiveEvent(targetTag: Int, eventName: String, params: WritableMap?) { val dispatcher: EventDispatcher? = eventDispatcherOverride - ?: UIManagerHelper.getEventDispatcherForReactTag(reactContext, targetReactTag) + ?: UIManagerHelper.getEventDispatcherForReactTag(reactContext, targetTag) val surfaceId = UIManagerHelper.getSurfaceId(reactContext) - dispatcher?.dispatchEvent(InteropEvent(eventName, eventData, surfaceId, targetReactTag)) + dispatcher?.dispatchEvent(InteropEvent(eventName, params, surfaceId, targetTag)) } @Deprecated("Deprecated in Java") diff --git a/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/uimanager/events/RCTEventEmitter.java b/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/uimanager/events/RCTEventEmitter.java deleted file mode 100644 index c51ed518ba5..00000000000 --- a/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/uimanager/events/RCTEventEmitter.java +++ /dev/null @@ -1,43 +0,0 @@ -/* - * Copyright (c) Meta Platforms, Inc. and affiliates. - * - * 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.uimanager.events; - -import androidx.annotation.Nullable; -import com.facebook.proguard.annotations.DoNotStrip; -import com.facebook.react.bridge.JavaScriptModule; -import com.facebook.react.bridge.WritableArray; -import com.facebook.react.bridge.WritableMap; - -/** - * Paper JS interface to emit events from native to JS. - * - *

Deprecated in favor of RCTModernEventEmitter, which works with both the old and new renderer. - */ -@DoNotStrip -@Deprecated -public interface RCTEventEmitter extends JavaScriptModule { - /** - * @param targetReactTag react tag of the view that receives the event - * @param eventName name of event - * @param event event params - * @deprecated Use RCTModernEventEmitter.receiveEvent instead - */ - @Deprecated - void receiveEvent(int targetReactTag, String eventName, @Nullable WritableMap event); - - /** - * Receive and process touches - * - * @param eventName JS event name - * @param touches active pointers data - * @param changedIndices indices of changed pointers - * @deprecated Dispatch the TouchEvent using {@link EventDispatcher} instead - */ - @Deprecated - void receiveTouches(String eventName, WritableArray touches, WritableArray changedIndices); -} diff --git a/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/uimanager/events/RCTEventEmitter.kt b/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/uimanager/events/RCTEventEmitter.kt new file mode 100644 index 00000000000..521c00fad6d --- /dev/null +++ b/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/uimanager/events/RCTEventEmitter.kt @@ -0,0 +1,44 @@ +/* + * Copyright (c) Meta Platforms, Inc. and affiliates. + * + * 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.uimanager.events + +import com.facebook.proguard.annotations.DoNotStripAny +import com.facebook.react.bridge.JavaScriptModule +import com.facebook.react.bridge.WritableArray +import com.facebook.react.bridge.WritableMap + +/** + * Paper JS interface to emit events from native to JS. + * + * Deprecated in favor of [RCTModernEventEmitter], which works with both the old and new renderer. + */ +@DoNotStripAny +@Deprecated("Use [RCTModernEventEmitter] instead") +public interface RCTEventEmitter : JavaScriptModule { + /** + * @param targetTag react tag of the view that receives the event + * @param eventName name of event + * @param params event params + */ + @Deprecated("Use [RCTModernEventEmitter.receiveEvent] instead") + public fun receiveEvent(targetTag: Int, eventName: String, params: WritableMap?) + + /** + * Receive and process touches + * + * @param eventName JS event name + * @param touches active pointers data + * @param changedIndices indices of changed pointers + */ + @Deprecated("Dispatch the TouchEvent using [EventDispatcher] instead") + public fun receiveTouches( + eventName: String, + touches: WritableArray, + changedIndices: WritableArray + ) +} diff --git a/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/uimanager/events/ReactEventEmitter.kt b/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/uimanager/events/ReactEventEmitter.kt index 07afeaf366e..752de30ee7e 100644 --- a/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/uimanager/events/ReactEventEmitter.kt +++ b/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/uimanager/events/ReactEventEmitter.kt @@ -45,8 +45,8 @@ internal class ReactEventEmitter(private val reactContext: ReactApplicationConte } @Deprecated("Please use RCTModernEventEmitter") - override fun receiveEvent(targetReactTag: Int, eventName: String, params: WritableMap?) { - receiveEvent(-1, targetReactTag, eventName, params) + override fun receiveEvent(targetTag: Int, eventName: String, params: WritableMap?) { + receiveEvent(-1, targetTag, eventName, params) } override fun receiveEvent( diff --git a/packages/react-native/ReactAndroid/src/test/java/com/facebook/react/bridge/interop/FakeRCTEventEmitter.kt b/packages/react-native/ReactAndroid/src/test/java/com/facebook/react/bridge/interop/FakeRCTEventEmitter.kt index f325893d022..a2f1709c8e5 100644 --- a/packages/react-native/ReactAndroid/src/test/java/com/facebook/react/bridge/interop/FakeRCTEventEmitter.kt +++ b/packages/react-native/ReactAndroid/src/test/java/com/facebook/react/bridge/interop/FakeRCTEventEmitter.kt @@ -18,7 +18,7 @@ import com.facebook.react.uimanager.events.RCTEventEmitter class FakeRCTEventEmitter : RCTEventEmitter { @Deprecated("Deprecated in Java") - override fun receiveEvent(targetReactTag: Int, eventName: String, event: WritableMap?) = Unit + override fun receiveEvent(targetTag: Int, eventName: String, params: WritableMap?) = Unit @Deprecated("Deprecated in Java") override fun receiveTouches(