facebook · j-piasecki · Jan 31, 2025 · Jan 31, 2025 · Jan 31, 2025
diff --git a/packages/react-native/Libraries/Animated/nodes/AnimatedValue.js b/packages/react-native/Libraries/Animated/nodes/AnimatedValue.js
@@ -8,7 +8,7 @@
  * @format
  */
 
-import type {EventSubscription} from '../../vendor/emitter/EventEmitter';
+import type {EmitterSubscription} from '../../vendor/emitter/EventEmitter';
 import type {PlatformConfig} from '../AnimatedPlatformConfig';
 import type Animation, {EndCallback} from '../animations/Animation';
 import type {InterpolationConfigType} from './AnimatedInterpolation';
@@ -86,7 +86,7 @@ function _executeAsAnimatedBatch(id: string, operation: () => void) {
  */
 export default class AnimatedValue extends AnimatedWithChildren {
   #listenerCount: number = 0;
-  #updateSubscription: ?EventSubscription = null;
+  #updateSubscription: ?EmitterSubscription = null;
 
   _value: number;
   _startingValue: number;
@@ -159,7 +159,7 @@ export default class AnimatedValue extends AnimatedWithChildren {
     }
     const nativeTag = this.__getNativeTag();
     NativeAnimatedAPI.startListeningToAnimatedNodeValue(nativeTag);
-    const subscription: EventSubscription =
+    const subscription: EmitterSubscription =
       NativeAnimatedHelper.nativeEventEmitter.addListener(
         'onAnimatedValueUpdate',
         data => {

diff --git a/packages/react-native/Libraries/Animated/useAnimatedProps.js b/packages/react-native/Libraries/Animated/useAnimatedProps.js
@@ -8,7 +8,7 @@
  * @format
  */
 
-import type {EventSubscription} from '../EventEmitter/NativeEventEmitter';
+import type {EmitterSubscription} from '../EventEmitter/NativeEventEmitter';
 import type {AnimatedPropsAllowlist} from './nodes/AnimatedProps';
 
 import NativeAnimatedHelper from '../../src/private/animated/NativeAnimatedHelper';
@@ -67,7 +67,7 @@ export default function useAnimatedProps<TProps: {...}, TInstance>(
     // If multiple components call `flushQueue`, the first one will flush the
     // queue and subsequent ones will do nothing.
     NativeAnimatedHelper.API.flushQueue();
-    let drivenAnimationEndedListener: ?EventSubscription = null;
+    let drivenAnimationEndedListener: ?EmitterSubscription = null;
     if (node.__isNative) {
       drivenAnimationEndedListener =
         NativeAnimatedHelper.nativeEventEmitter.addListener(

diff --git a/packages/react-native/Libraries/AppState/AppState.js b/packages/react-native/Libraries/AppState/AppState.js
@@ -11,7 +11,7 @@
 import NativeEventEmitter from '../EventEmitter/NativeEventEmitter';
 import logError from '../Utilities/logError';
 import Platform from '../Utilities/Platform';
-import {type EventSubscription} from '../vendor/emitter/EventEmitter';
+import {type EmitterSubscription} from '../vendor/emitter/EventEmitter';
 import NativeAppState from './NativeAppState';
 
 export type AppStateValues = 'inactive' | 'background' | 'active';
@@ -92,7 +92,7 @@ class AppState {
   addEventListener<K: $Keys<AppStateEventDefinitions>>(
     type: K,
     handler: (...$ElementType<AppStateEventDefinitions, K>) => void,
-  ): EventSubscription {
+  ): EmitterSubscription {
     const emitter = this._emitter;
     if (emitter == null) {
       throw new Error('Cannot use AppState when `isAvailable` is false.');

diff --git a/packages/react-native/Libraries/BugReporting/BugReporting.js b/packages/react-native/Libraries/BugReporting/BugReporting.js
@@ -10,7 +10,7 @@
 
 import RCTDeviceEventEmitter from '../EventEmitter/RCTDeviceEventEmitter';
 import NativeRedBox from '../NativeModules/specs/NativeRedBox';
-import {type EventSubscription} from '../vendor/emitter/EventEmitter';
+import {type EmitterSubscription} from '../vendor/emitter/EventEmitter';
 import NativeBugReporting from './NativeBugReporting';
 
 type ExtraData = {[key: string]: string, ...};
@@ -36,8 +36,8 @@ function defaultExtras() {
 class BugReporting {
   static _extraSources: Map<string, SourceCallback> = new Map();
   static _fileSources: Map<string, SourceCallback> = new Map();
-  static _subscription: ?EventSubscription = null;
-  static _redboxSubscription: ?EventSubscription = null;
+  static _subscription: ?EmitterSubscription = null;
+  static _redboxSubscription: ?EmitterSubscription = null;
 
   static _maybeInit() {
     if (!BugReporting._subscription) {

diff --git a/packages/react-native/Libraries/Components/AccessibilityInfo/AccessibilityInfo.js b/packages/react-native/Libraries/Components/AccessibilityInfo/AccessibilityInfo.js
@@ -9,7 +9,7 @@
  */
 
 import type {HostInstance} from '../../Renderer/shims/ReactNativeTypes';
-import type {EventSubscription} from '../../vendor/emitter/EventEmitter';
+import type {EmitterSubscription} from '../../vendor/emitter/EventEmitter';
 
 import RCTDeviceEventEmitter from '../../EventEmitter/RCTDeviceEventEmitter';
 import {sendAccessibilityEvent} from '../../ReactNative/RendererProxy';
@@ -398,7 +398,7 @@ const AccessibilityInfo = {
     eventName: K,
     // $FlowIssue[incompatible-type] - Flow bug with unions and generics (T128099423)
     handler: (...$ElementType<AccessibilityEventDefinitions, K>) => void,
-  ): EventSubscription {
+  ): EmitterSubscription {
     const deviceEventName = EventNames.get(eventName);
     return deviceEventName == null
       ? {remove(): void {}}

diff --git a/packages/react-native/Libraries/Components/Keyboard/Keyboard.js b/packages/react-native/Libraries/Components/Keyboard/Keyboard.js
@@ -8,7 +8,7 @@
  * @flow strict-local
  */
 
-import type {EventSubscription} from '../../vendor/emitter/EventEmitter';
+import type {EmitterSubscription} from '../../vendor/emitter/EventEmitter';
 
 import NativeEventEmitter from '../../EventEmitter/NativeEventEmitter';
 import LayoutAnimation from '../../LayoutAnimation/LayoutAnimation';
@@ -150,7 +150,7 @@ class Keyboard {
     eventType: K,
     listener: (...$ElementType<KeyboardEventDefinitions, K>) => mixed,
     context?: mixed,
-  ): EventSubscription {
+  ): EmitterSubscription {
     return this._emitter.addListener(eventType, listener);
   }
 

diff --git a/packages/react-native/Libraries/Components/Keyboard/KeyboardAvoidingView.js b/packages/react-native/Libraries/Components/Keyboard/KeyboardAvoidingView.js
@@ -19,7 +19,7 @@ import type {KeyboardEvent, KeyboardMetrics} from './Keyboard';
 import LayoutAnimation from '../../LayoutAnimation/LayoutAnimation';
 import StyleSheet from '../../StyleSheet/StyleSheet';
 import Platform from '../../Utilities/Platform';
-import {type EventSubscription} from '../../vendor/emitter/EventEmitter';
+import {type EmitterSubscription} from '../../vendor/emitter/EventEmitter';
 import AccessibilityInfo from '../AccessibilityInfo/AccessibilityInfo';
 import View from '../View/View';
 import Keyboard from './Keyboard';
@@ -62,7 +62,7 @@ type State = {
 class KeyboardAvoidingView extends React.Component<Props, State> {
   _frame: ?ViewLayout = null;
   _keyboardEvent: ?KeyboardEvent = null;
-  _subscriptions: Array<EventSubscription> = [];
+  _subscriptions: Array<EmitterSubscription> = [];
   viewRef: {current: React.ElementRef<typeof View> | null, ...};
   _initialFrameHeight: number = 0;
   _bottom: number = 0;

diff --git a/packages/react-native/Libraries/Components/ScrollView/ScrollView.js b/packages/react-native/Libraries/Components/ScrollView/ScrollView.js
@@ -18,7 +18,7 @@ import type {
   PressEvent,
   ScrollEvent,
 } from '../../Types/CoreEventTypes';
-import type {EventSubscription} from '../../vendor/emitter/EventEmitter';
+import type {EmitterSubscription} from '../../vendor/emitter/EventEmitter';
 import type {KeyboardEvent, KeyboardMetrics} from '../Keyboard/Keyboard';
 import typeof View from '../View/View';
 import type {ViewProps} from '../View/ViewPropTypes';
@@ -735,10 +735,10 @@ class ScrollView extends React.Component<Props, State> {
 
   _animated: ?boolean = null;
 
-  _subscriptionKeyboardWillShow: ?EventSubscription = null;
-  _subscriptionKeyboardWillHide: ?EventSubscription = null;
-  _subscriptionKeyboardDidShow: ?EventSubscription = null;
-  _subscriptionKeyboardDidHide: ?EventSubscription = null;
+  _subscriptionKeyboardWillShow: ?EmitterSubscription = null;
+  _subscriptionKeyboardWillHide: ?EmitterSubscription = null;
+  _subscriptionKeyboardDidShow: ?EmitterSubscription = null;
+  _subscriptionKeyboardDidHide: ?EmitterSubscription = null;
 
   state: State = {
     layoutHeight: null,

diff --git a/packages/react-native/Libraries/EventEmitter/NativeEventEmitter.js b/packages/react-native/Libraries/EventEmitter/NativeEventEmitter.js
@@ -11,7 +11,7 @@
 'use strict';
 
 import type {
-  EventSubscription,
+  EmitterSubscription,
   IEventEmitter,
 } from '../vendor/emitter/EventEmitter';
 
@@ -24,7 +24,10 @@ interface NativeModule {
   removeListeners(count: number): void;
 }
 
-export type {EventSubscription};
+export type {EmitterSubscription};
+
+// $FlowFixMe[unclear-type] unclear type of events
+type UnsafeObject = Object;
 
 /**
  * `NativeEventEmitter` is intended for use by Native Modules to emit events to
@@ -36,8 +39,11 @@ export type {EventSubscription};
  * This means event names must be globally unique, and it means that call sites
  * can theoretically listen to `RCTDeviceEventEmitter` (although discouraged).
  */
-export default class NativeEventEmitter<TEventToArgsMap: {...}>
-  implements IEventEmitter<TEventToArgsMap>
+export default class NativeEventEmitter<
+  TEventToArgsMap: $ReadOnly<
+    Record<string, $ReadOnlyArray<UnsafeObject>>,
+  > = $ReadOnly<Record<string, $ReadOnlyArray<UnsafeObject>>>,
+> implements IEventEmitter<TEventToArgsMap>
 {
   _nativeModule: ?NativeModule;
 
@@ -76,9 +82,9 @@ export default class NativeEventEmitter<TEventToArgsMap: {...}>
     eventType: TEvent,
     listener: (...args: $ElementType<TEventToArgsMap, TEvent>) => mixed,
     context?: mixed,
-  ): EventSubscription {
+  ): EmitterSubscription {
     this._nativeModule?.addListener(eventType);
-    let subscription: ?EventSubscription = RCTDeviceEventEmitter.addListener(
+    let subscription: ?EmitterSubscription = RCTDeviceEventEmitter.addListener(
       eventType,
       listener,
       context,

diff --git a/packages/react-native/Libraries/EventEmitter/RCTDeviceEventEmitter.js b/packages/react-native/Libraries/EventEmitter/RCTDeviceEventEmitter.js
@@ -23,7 +23,7 @@ type RCTDeviceEventDefinitions = {[name: string]: Array<any>};
  *
  * NativeModules that emit events should instead subclass `NativeEventEmitter`.
  */
-class RCTDeviceEventEmitter extends EventEmitter<RCTDeviceEventDefinitions> {
+class RCTDeviceEventEmitterImpl extends EventEmitter<RCTDeviceEventDefinitions> {
   // Add systrace to RCTDeviceEventEmitter.emit method for debugging
   emit<TEvent: $Keys<RCTDeviceEventDefinitions>>(
     eventType: TEvent,
@@ -34,11 +34,12 @@ class RCTDeviceEventEmitter extends EventEmitter<RCTDeviceEventDefinitions> {
     endEvent();
   }
 }
-const instance = new RCTDeviceEventEmitter();
+const RCTDeviceEventEmitter: IEventEmitter<RCTDeviceEventDefinitions> =
+  new RCTDeviceEventEmitterImpl();
 
 Object.defineProperty(global, '__rctDeviceEventEmitter', {
   configurable: true,
-  value: instance,
+  value: RCTDeviceEventEmitter,
 });
 
-export default (instance: IEventEmitter<RCTDeviceEventDefinitions>);
+export default (RCTDeviceEventEmitter: IEventEmitter<RCTDeviceEventDefinitions>);
diff --git a/packages/react-native/Libraries/EventEmitter/__mocks__/NativeEventEmitter.js b/packages/react-native/Libraries/EventEmitter/__mocks__/NativeEventEmitter.js
@@ -9,7 +9,7 @@
  */
 
 import type {
-  EventSubscription,
+  EmitterSubscription,
   IEventEmitter,
 } from '../../vendor/emitter/EventEmitter';
 
@@ -18,14 +18,15 @@ import RCTDeviceEventEmitter from '../RCTDeviceEventEmitter';
 /**
  * Mock `NativeEventEmitter` to ignore Native Modules.
  */
-export default class NativeEventEmitter<TEventToArgsMap: {...}>
-  implements IEventEmitter<TEventToArgsMap>
+export default class NativeEventEmitter<
+  TEventToArgsMap: $ReadOnly<Record<string, $ReadOnlyArray<mixed>>>,
+> implements IEventEmitter<TEventToArgsMap>
 {
   addListener<TEvent: $Keys<TEventToArgsMap>>(
     eventType: TEvent,
     listener: (...args: $ElementType<TEventToArgsMap, TEvent>) => mixed,
     context?: mixed,
-  ): EventSubscription {
+  ): EmitterSubscription {
     return RCTDeviceEventEmitter.addListener(eventType, listener, context);
   }
 

diff --git a/packages/react-native/Libraries/Interaction/InteractionManagerStub.js b/packages/react-native/Libraries/Interaction/InteractionManagerStub.js
@@ -8,7 +8,7 @@
  * @format
  */
 
-import type {EventSubscription} from '../vendor/emitter/EventEmitter';
+import type {EmitterSubscription} from '../vendor/emitter/EventEmitter';
 
 const invariant = require('invariant');
 
@@ -155,7 +155,7 @@ const InteractionManagerStub = {
   /**
    * @deprecated
    */
-  addListener(): EventSubscription {
+  addListener(): EmitterSubscription {
     return {
       remove() {},
     };

diff --git a/packages/react-native/Libraries/Linking/Linking.js b/packages/react-native/Libraries/Linking/Linking.js
@@ -8,7 +8,7 @@
  * @flow strict-local
  */
 
-import type {EventSubscription} from '../vendor/emitter/EventEmitter';
+import type {EmitterSubscription} from '../vendor/emitter/EventEmitter';
 
 import NativeEventEmitter from '../EventEmitter/NativeEventEmitter';
 import Platform from '../Utilities/Platform';
@@ -35,7 +35,7 @@ class LinkingImpl extends NativeEventEmitter<LinkingEventDefinitions> {
   addEventListener<K: $Keys<LinkingEventDefinitions>>(
     eventType: K,
     listener: (...$ElementType<LinkingEventDefinitions, K>) => mixed,
-  ): EventSubscription {
+  ): EmitterSubscription {
     return this.addListener(eventType, listener);
   }
 

diff --git a/packages/react-native/Libraries/Modal/Modal.js b/packages/react-native/Libraries/Modal/Modal.js
@@ -13,7 +13,7 @@ import type {RootTag} from '../ReactNative/RootTag';
 import type {DirectEventHandler} from '../Types/CodegenTypes';
 
 import NativeEventEmitter from '../EventEmitter/NativeEventEmitter';
-import {type EventSubscription} from '../vendor/emitter/EventEmitter';
+import {type EmitterSubscription} from '../vendor/emitter/EventEmitter';
 import ModalInjection from './ModalInjection';
 import NativeModalManager from './NativeModalManager';
 import RCTModalHostView from './RCTModalHostViewNativeComponent';
@@ -210,7 +210,7 @@ class Modal extends React.Component<Props, State> {
   static contextType: React.Context<RootTag> = RootTagContext;
 
   _identifier: number;
-  _eventSubscription: ?EventSubscription;
+  _eventSubscription: ?EmitterSubscription;
 
   constructor(props: Props) {
     super(props);

diff --git a/packages/react-native/Libraries/Network/RCTNetworking.android.js b/packages/react-native/Libraries/Network/RCTNetworking.android.js
@@ -8,7 +8,7 @@
  * @flow
  */
 
-import type {EventSubscription} from '../vendor/emitter/EventEmitter';
+import type {EmitterSubscription} from '../vendor/emitter/EventEmitter';
 import type {RequestBody} from './convertRequestBody';
 import type {RCTNetworkingEventDefinitions} from './RCTNetworkingEventDefinitions.flow';
 import type {NativeResponseType} from './XMLHttpRequest';
@@ -52,7 +52,7 @@ const RCTNetworking = {
     eventType: K,
     listener: (...$ElementType<RCTNetworkingEventDefinitions, K>) => mixed,
     context?: mixed,
-  ): EventSubscription {
+  ): EmitterSubscription {
     // $FlowFixMe[incompatible-call]
     return emitter.addListener(eventType, listener, context);
   },

diff --git a/packages/react-native/Libraries/Network/RCTNetworking.ios.js b/packages/react-native/Libraries/Network/RCTNetworking.ios.js
@@ -11,7 +11,7 @@
 'use strict';
 
 import RCTDeviceEventEmitter from '../EventEmitter/RCTDeviceEventEmitter';
-import {type EventSubscription} from '../vendor/emitter/EventEmitter';
+import {type EmitterSubscription} from '../vendor/emitter/EventEmitter';
 import convertRequestBody, {type RequestBody} from './convertRequestBody';
 import NativeNetworkingIOS from './NativeNetworkingIOS';
 import {type RCTNetworkingEventDefinitions} from './RCTNetworkingEventDefinitions.flow';
@@ -22,7 +22,7 @@ const RCTNetworking = {
     eventType: K,
     listener: (...$ElementType<RCTNetworkingEventDefinitions, K>) => mixed,
     context?: mixed,
-  ): EventSubscription {
+  ): EmitterSubscription {
     // $FlowFixMe[incompatible-call]
     return RCTDeviceEventEmitter.addListener(eventType, listener, context);
   },

diff --git a/packages/react-native/Libraries/Network/RCTNetworking.js.flow b/packages/react-native/Libraries/Network/RCTNetworking.js.flow
@@ -10,7 +10,7 @@
 
 'use strict';
 
-import type {EventSubscription} from '../vendor/emitter/EventEmitter';
+import type {EmitterSubscription} from '../vendor/emitter/EventEmitter';
 import type {RequestBody} from './convertRequestBody';
 import type {RCTNetworkingEventDefinitions} from './RCTNetworkingEventDefinitions.flow';
 import type {NativeResponseType} from './XMLHttpRequest';
@@ -21,7 +21,7 @@ declare const RCTNetworking: interface {
     // $FlowFixMe[invalid-computed-prop]
     listener: (...$ElementType<RCTNetworkingEventDefinitions, K>) => mixed,
     context?: mixed,
-  ): EventSubscription,
+  ): EmitterSubscription,
 
   sendRequest(
     method: string,

diff --git a/packages/react-native/Libraries/Network/XMLHttpRequest_new.js b/packages/react-native/Libraries/Network/XMLHttpRequest_new.js
@@ -24,7 +24,7 @@ import {
 import EventTarget from '../../src/private/webapis/dom/events/EventTarget';
 import {dispatchTrustedEvent} from '../../src/private/webapis/dom/events/internals/EventTargetInternals';
 import ProgressEvent from '../../src/private/webapis/xhr/events/ProgressEvent';
-import {type EventSubscription} from '../vendor/emitter/EventEmitter';
+import {type EmitterSubscription} from '../vendor/emitter/EventEmitter';
 
 const BlobManager = require('../Blob/BlobManager').default;
 const GlobalPerformanceLogger = require('../Utilities/GlobalPerformanceLogger');
@@ -138,7 +138,7 @@ class XMLHttpRequest extends EventTarget {
   upload: XMLHttpRequestEventTarget = new XMLHttpRequestEventTarget();
 
   _requestId: ?number;
-  _subscriptions: Array<EventSubscription>;
+  _subscriptions: Array<EmitterSubscription>;
 
   _aborted: boolean = false;
   _cachedResponse: Response;