Skip to content

Commit 906474a

Browse files
mdvaccafacebook-github-bot
authored andcommitted
Annotate Interop Event APIs (react#50927)
Summary: Pull Request resolved: react#50927 Annotate Interop Event APIs changelog: [internal] internal Reviewed By: shwanton Differential Revision: D73407612 fbshipit-source-id: 90cd6d888b3d72c09e3eb4c5142cc50da65d9b4c
1 parent 7e4ec7d commit 906474a

6 files changed

Lines changed: 12 additions & 6 deletions

File tree

packages/react-native/ReactAndroid/src/main/java/com/facebook/react/bridge/interop/InteropModuleRegistry.kt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
package com.facebook.react.bridge.interop
99

1010
import com.facebook.react.bridge.JavaScriptModule
11-
import com.facebook.react.common.annotations.internal.LegacyArchitecture
11+
import com.facebook.react.common.annotations.internal.InteropLegacyArchitecture
1212
import com.facebook.react.common.annotations.internal.LegacyArchitectureLogger
1313
import com.facebook.react.internal.featureflags.ReactNativeNewArchitectureFeatureFlags.enableFabricRenderer
1414
import com.facebook.react.internal.featureflags.ReactNativeNewArchitectureFeatureFlags.useFabricInterop
@@ -21,7 +21,7 @@ import com.facebook.react.internal.featureflags.ReactNativeNewArchitectureFeatur
2121
* Currently we only support a `RCTEventEmitter` re-implementation, being `InteropEventEmitter` but
2222
* this class can support other re-implementation in the future.
2323
*/
24-
@LegacyArchitecture
24+
@InteropLegacyArchitecture
2525
internal class InteropModuleRegistry {
2626

2727
private val supportedModules = mutableMapOf<Class<*>, Any?>()

packages/react-native/ReactAndroid/src/main/java/com/facebook/react/internal/interop/InteropEvent.kt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
package com.facebook.react.internal.interop
99

1010
import com.facebook.react.bridge.WritableMap
11-
import com.facebook.react.common.annotations.internal.LegacyArchitecture
11+
import com.facebook.react.common.annotations.internal.InteropLegacyArchitecture
1212
import com.facebook.react.common.annotations.internal.LegacyArchitectureLogger
1313
import com.facebook.react.uimanager.events.Event
1414

@@ -17,7 +17,7 @@ import com.facebook.react.uimanager.events.Event
1717
* the data which is received by the `receiveEvent` method and will be passed over the the
1818
* [com.facebook.react.uimanager.events.EventDispatcher]
1919
*/
20-
@LegacyArchitecture
20+
@InteropLegacyArchitecture
2121
internal class InteropEvent(
2222
@get:JvmName("eventName") val interopEventName: String,
2323
@get:JvmName("eventData") val eventData: WritableMap?,

packages/react-native/ReactAndroid/src/main/java/com/facebook/react/internal/interop/InteropEventEmitter.kt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ import com.facebook.react.bridge.ReactContext
1313
import com.facebook.react.bridge.WritableArray
1414
import com.facebook.react.bridge.WritableMap
1515
import com.facebook.react.common.annotations.VisibleForTesting
16-
import com.facebook.react.common.annotations.internal.LegacyArchitecture
16+
import com.facebook.react.common.annotations.internal.InteropLegacyArchitecture
1717
import com.facebook.react.common.annotations.internal.LegacyArchitectureLogger
1818
import com.facebook.react.uimanager.UIManagerHelper
1919
import com.facebook.react.uimanager.events.EventDispatcher
@@ -29,7 +29,7 @@ import com.facebook.react.uimanager.events.RCTEventEmitter
2929
* is providing support for the `receiveEvent` method, so that non-Fabric ViewManagers can continue
3030
* to deliver events also when Fabric is turned on.
3131
*/
32-
@LegacyArchitecture
32+
@InteropLegacyArchitecture
3333
internal class InteropEventEmitter(private val reactContext: ReactContext) : RCTEventEmitter {
3434

3535
private var eventDispatcherOverride: EventDispatcher? = null

packages/react-native/ReactAndroid/src/main/java/com/facebook/react/uimanager/events/EventDispatcherImpl.java

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,7 @@
1515
import com.facebook.react.bridge.ReactApplicationContext;
1616
import com.facebook.react.bridge.UiThreadUtil;
1717
import com.facebook.react.common.MapBuilder;
18+
import com.facebook.react.common.annotations.internal.InteropLegacyArchitecture;
1819
import com.facebook.react.modules.core.ReactChoreographer;
1920
import com.facebook.systrace.Systrace;
2021
import java.util.ArrayList;
@@ -55,6 +56,7 @@
5556
* 0x0000ffff00000000 COALESCING_KEY_MASK = 0xffff000000000000
5657
*/
5758
@Nullsafe(Nullsafe.Mode.LOCAL)
59+
@InteropLegacyArchitecture
5860
public class EventDispatcherImpl implements EventDispatcher, LifecycleEventListener {
5961

6062
private static final Comparator<Event> EVENT_COMPARATOR =

packages/react-native/ReactAndroid/src/main/java/com/facebook/react/uimanager/events/EventEmitterImpl.kt

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,7 @@ import com.facebook.react.bridge.ReactNoCrashSoftException
1515
import com.facebook.react.bridge.ReactSoftExceptionLogger.logSoftException
1616
import com.facebook.react.bridge.WritableArray
1717
import com.facebook.react.bridge.WritableMap
18+
import com.facebook.react.common.annotations.internal.InteropLegacyArchitecture
1819
import com.facebook.react.uimanager.common.UIManagerType
1920
import com.facebook.react.uimanager.common.ViewUtil.getUIManagerType
2021

@@ -25,6 +26,7 @@ import com.facebook.react.uimanager.common.ViewUtil.getUIManagerType
2526
*
2627
* This class is constructed both by Paper's EventDispatcherImpl and the FabricEventDispatcher.
2728
*/
29+
@InteropLegacyArchitecture
2830
internal class EventEmitterImpl(
2931
private val reactContext: ReactApplicationContext,
3032
) : RCTModernEventEmitter {

packages/react-native/ReactAndroid/src/main/java/com/facebook/react/uimanager/events/RCTEventEmitter.kt

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,13 +11,15 @@ import com.facebook.proguard.annotations.DoNotStripAny
1111
import com.facebook.react.bridge.JavaScriptModule
1212
import com.facebook.react.bridge.WritableArray
1313
import com.facebook.react.bridge.WritableMap
14+
import com.facebook.react.common.annotations.internal.InteropLegacyArchitecture
1415

1516
/**
1617
* Paper JS interface to emit events from native to JS.
1718
*
1819
* Deprecated in favor of [RCTModernEventEmitter], which works with both the old and new renderer.
1920
*/
2021
@DoNotStripAny
22+
@InteropLegacyArchitecture
2123
@Deprecated("Use [RCTModernEventEmitter] instead")
2224
public interface RCTEventEmitter : JavaScriptModule {
2325
/**

0 commit comments

Comments
 (0)