@office-iss/react-native-win32 0.0.0-canary.285 → 0.0.0-canary.286

package/Libraries/Components/View/ViewPropTypes.win32.js

@@ -15,25 +15,21 @@ import type {ViewStyleProp} from '../../StyleSheet/StyleSheet';
 import type {
   BlurEvent,
   FocusEvent,
-  Layout,
-  LayoutEvent,
+  LayoutChangeEvent,
+  LayoutRectangle,
   MouseEvent,
   PointerEvent,
-  PressEvent,
+  GestureResponderEvent,
   KeyEvent, // [Windows]
 } from '../../Types/CoreEventTypes';
 import type {
   AccessibilityActionEvent,
-  AccessibilityActionInfo,
-  AccessibilityRole,
-  AccessibilityState,
-  AccessibilityValue,
-  Role,
+  AccessibilityProps,
 } from './ViewAccessibility';
 import type {Node} from 'react';
 
-export type ViewLayout = Layout;
-export type ViewLayoutEvent = LayoutEvent;
+export type ViewLayout = LayoutRectangle;
+export type ViewLayoutEvent = LayoutChangeEvent;
 
 type DirectEventProps = $ReadOnly<{
   /**
@@ -62,7 +58,7 @@ type DirectEventProps = $ReadOnly<{
    *
    * See https://reactnative.dev/docs/view#onlayout
    */
-  onLayout?: ?(event: LayoutEvent) => mixed,
+  onLayout?: ?(event: LayoutChangeEvent) => mixed,
 
   /**
    * When `accessible` is `true`, the system will invoke this function when the
@@ -120,14 +116,14 @@ type FocusEventProps = $ReadOnly<{
 }>;
 
 type TouchEventProps = $ReadOnly<{
-  onTouchCancel?: ?(e: PressEvent) => void,
-  onTouchCancelCapture?: ?(e: PressEvent) => void,
-  onTouchEnd?: ?(e: PressEvent) => void,
-  onTouchEndCapture?: ?(e: PressEvent) => void,
-  onTouchMove?: ?(e: PressEvent) => void,
-  onTouchMoveCapture?: ?(e: PressEvent) => void,
-  onTouchStart?: ?(e: PressEvent) => void,
-  onTouchStartCapture?: ?(e: PressEvent) => void,
+  onTouchCancel?: ?(e: GestureResponderEvent) => void,
+  onTouchCancelCapture?: ?(e: GestureResponderEvent) => void,
+  onTouchEnd?: ?(e: GestureResponderEvent) => void,
+  onTouchEndCapture?: ?(e: GestureResponderEvent) => void,
+  onTouchMove?: ?(e: GestureResponderEvent) => void,
+  onTouchMoveCapture?: ?(e: GestureResponderEvent) => void,
+  onTouchStart?: ?(e: GestureResponderEvent) => void,
+  onTouchStartCapture?: ?(e: GestureResponderEvent) => void,
 }>;
 
 /**
@@ -135,7 +131,7 @@ type TouchEventProps = $ReadOnly<{
  * `TouchableHighlight` or `TouchableOpacity`. Check out `Touchable.js`,
  * `ScrollResponder.js` and `ResponderEventPlugin.js` for more discussion.
  */
-type GestureResponderEventProps = $ReadOnly<{
+export type GestureResponderHandlers = $ReadOnly<{
   /**
    * Does this view want to "claim" touch responsiveness? This is called for
    * every touch move on the `View` when it is not the responder.
@@ -145,7 +141,7 @@ type GestureResponderEventProps = $ReadOnly<{
    *
    * See https://reactnative.dev/docs/view#onmoveshouldsetresponder
    */
-  onMoveShouldSetResponder?: ?(e: PressEvent) => boolean,
+  onMoveShouldSetResponder?: ?(e: GestureResponderEvent) => boolean,
 
   /**
    * If a parent `View` wants to prevent a child `View` from becoming responder
@@ -156,7 +152,7 @@ type GestureResponderEventProps = $ReadOnly<{
    *
    * See https://reactnative.dev/docs/view#onMoveShouldsetrespondercapture
    */
-  onMoveShouldSetResponderCapture?: ?(e: PressEvent) => boolean,
+  onMoveShouldSetResponderCapture?: ?(e: GestureResponderEvent) => boolean,
 
   /**
    * The View is now responding for touch events. This is the time to highlight
@@ -170,7 +166,7 @@ type GestureResponderEventProps = $ReadOnly<{
    *
    * See https://reactnative.dev/docs/view#onrespondergrant
    */
-  onResponderGrant?: ?(e: PressEvent) => void | boolean,
+  onResponderGrant?: ?(e: GestureResponderEvent) => void | boolean,
 
   /**
    * The user is moving their finger.
@@ -180,7 +176,7 @@ type GestureResponderEventProps = $ReadOnly<{
    *
    * See https://reactnative.dev/docs/view#onrespondermove
    */
-  onResponderMove?: ?(e: PressEvent) => void,
+  onResponderMove?: ?(e: GestureResponderEvent) => void,
 
   /**
    * Another responder is already active and will not release it to that `View`
@@ -191,7 +187,7 @@ type GestureResponderEventProps = $ReadOnly<{
    *
    * See https://reactnative.dev/docs/view#onresponderreject
    */
-  onResponderReject?: ?(e: PressEvent) => void,
+  onResponderReject?: ?(e: GestureResponderEvent) => void,
 
   /**
    * Fired at the end of the touch.
@@ -201,10 +197,10 @@ type GestureResponderEventProps = $ReadOnly<{
    *
    * See https://reactnative.dev/docs/view#onresponderrelease
    */
-  onResponderRelease?: ?(e: PressEvent) => void,
+  onResponderRelease?: ?(e: GestureResponderEvent) => void,
 
-  onResponderStart?: ?(e: PressEvent) => void,
-  onResponderEnd?: ?(e: PressEvent) => void,
+  onResponderStart?: ?(e: GestureResponderEvent) => void,
+  onResponderEnd?: ?(e: GestureResponderEvent) => void,
 
   /**
    * The responder has been taken from the `View`. Might be taken by other
@@ -217,7 +213,7 @@ type GestureResponderEventProps = $ReadOnly<{
    *
    * See https://reactnative.dev/docs/view#onresponderterminate
    */
-  onResponderTerminate?: ?(e: PressEvent) => void,
+  onResponderTerminate?: ?(e: GestureResponderEvent) => void,
 
   /**
    * Some other `View` wants to become responder and is asking this `View` to
@@ -228,7 +224,7 @@ type GestureResponderEventProps = $ReadOnly<{
    *
    * See https://reactnative.dev/docs/view#onresponderterminationrequest
    */
-  onResponderTerminationRequest?: ?(e: PressEvent) => boolean,
+  onResponderTerminationRequest?: ?(e: GestureResponderEvent) => boolean,
 
   /**
    * Does this view want to become responder on the start of a touch?
@@ -238,7 +234,7 @@ type GestureResponderEventProps = $ReadOnly<{
    *
    * See https://reactnative.dev/docs/view#onstartshouldsetresponder
    */
-  onStartShouldSetResponder?: ?(e: PressEvent) => boolean,
+  onStartShouldSetResponder?: ?(e: GestureResponderEvent) => boolean,
 
   /**
    * If a parent `View` wants to prevent a child `View` from becoming responder
@@ -249,7 +245,7 @@ type GestureResponderEventProps = $ReadOnly<{
    *
    * See https://reactnative.dev/docs/view#onstartshouldsetrespondercapture
    */
-  onStartShouldSetResponderCapture?: ?(e: PressEvent) => boolean,
+  onStartShouldSetResponderCapture?: ?(e: GestureResponderEvent) => boolean,
 }>;
 
 type AndroidDrawableThemeAttr = $ReadOnly<{
@@ -266,43 +262,7 @@ type AndroidDrawableRipple = $ReadOnly<{
 
 type AndroidDrawable = AndroidDrawableThemeAttr | AndroidDrawableRipple;
 
-type AndroidViewProps = $ReadOnly<{
-  /**
-   * Identifies the element that labels the element it is applied to. When the assistive technology focuses on the component with this props,
-   * the text is read aloud. The value should should match the nativeID of the related element.
-   *
-   * @platform android
-   */
-  accessibilityLabelledBy?: ?string | ?Array<string>,
-
-  /**
-   * Identifies the element that labels the element it is applied to. When the assistive technology focuses on the component with this props,
-   * the text is read aloud. The value should should match the nativeID of the related element.
-   *
-   * @platform android
-   */
-  'aria-labelledby'?: ?string,
-
-  /**
-   * Indicates to accessibility services whether the user should be notified
-   * when this view changes. Works for Android API >= 19 only.
-   *
-   * @platform android
-   *
-   * See https://reactnative.dev/docs/view#accessibilityliveregion
-   */
-  accessibilityLiveRegion?: ?('none' | 'polite' | 'assertive'),
-
-  /**
-   * Indicates to accessibility services whether the user should be notified
-   * when this view changes. Works for Android API >= 19 only.
-   *
-   * @platform android
-   *
-   * See https://reactnative.dev/docs/view#accessibilityliveregion
-   */
-  'aria-live'?: ?('polite' | 'assertive' | 'off'),
-
+export type ViewPropsAndroid = $ReadOnly<{
   nativeBackgroundAndroid?: ?AndroidDrawable,
   nativeForegroundAndroid?: ?AndroidDrawable,
 
@@ -316,17 +276,6 @@ type AndroidViewProps = $ReadOnly<{
    */
   renderToHardwareTextureAndroid?: ?boolean,
 
-  /**
-   * Controls how view is important for accessibility which is if it
-   * fires accessibility events and if it is reported to accessibility services
-   * that query the screen. Works for Android only.
-   *
-   * @platform android
-   *
-   * See https://reactnative.dev/docs/view#importantforaccessibility
-   */
-  importantForAccessibility?: ?('auto' | 'yes' | 'no' | 'no-hide-descendants'),
-
   /**
    * Whether to force the Android TV focus engine to move focus to this view.
    *
@@ -394,70 +343,10 @@ type AndroidViewProps = $ReadOnly<{
    *
    * @platform android
    */
-  onClick?: ?(event: PressEvent) => mixed,
+  onClick?: ?(event: GestureResponderEvent) => mixed,
 }>;
 
-type IOSViewProps = $ReadOnly<{
-  /**
-   * Prevents view from being inverted if set to true and color inversion is turned on.
-   *
-   * @platform ios
-   */
-  accessibilityIgnoresInvertColors?: ?boolean,
-
-  /**
-   * A value indicating whether VoiceOver should ignore the elements
-   * within views that are siblings of the receiver.
-   * Default is `false`.
-   *
-   * @platform ios
-   *
-   * See https://reactnative.dev/docs/view#accessibilityviewismodal
-   */
-  accessibilityViewIsModal?: ?boolean,
-
-  /**
-   * @platform ios
-   *
-   * See https://reactnative.dev/docs/view#accessibilityshowslargecontentviewer
-   */
-  accessibilityShowsLargeContentViewer?: ?boolean,
-
-  /**
-   * @platform ios
-   *
-   * See https://reactnative.dev/docs/view#accessibilitylargecontenttitle
-   */
-  accessibilityLargeContentTitle?: ?string,
-
-  /**
-   * The aria-modal attribute indicates content contained within a modal with aria-modal="true"
-   * should be accessible to the user.
-   * Default is `false`.
-   *
-   *  @platform ios
-   */
-  'aria-modal'?: ?boolean,
-
-  /**
-   * A value indicating whether the accessibility elements contained within
-   * this accessibility element are hidden.
-   *
-   * @platform ios
-   *
-   * See https://reactnative.dev/docs/view#accessibilityElementsHidden
-   */
-  accessibilityElementsHidden?: ?boolean,
-
-  /**
-   * Indicates to the accessibility services that the UI component is in
-   * a specific language. The provided string should be formatted following
-   * the BCP 47 specification (https://www.rfc-editor.org/info/bcp47).
-   *
-   * @platform ios
-   */
-  accessibilityLanguage?: ?Stringish,
-
+export type ViewPropsIOS = $ReadOnly<{
   /**
    * Whether this `View` should be rendered as a bitmap before compositing.
    *
@@ -479,7 +368,7 @@ export type HandledKeyboardEvent = $ReadOnly<{|
   handledEventPhase?: number,
 |}>;
 
-type WindowsViewProps = $ReadOnly<{|
+type ViewPropsWindows = $ReadOnly<{|
   /**
    * Key up event
    *
@@ -529,99 +418,18 @@ type WindowsViewProps = $ReadOnly<{|
 
 export type ViewProps = $ReadOnly<{
   ...DirectEventProps,
-  ...GestureResponderEventProps,
+  ...GestureResponderHandlers,
   ...MouseEventProps,
   ...PointerEventProps,
   ...FocusEventProps,
   ...TouchEventProps,
-  ...AndroidViewProps,
-  ...IOSViewProps,
-  ...WindowsViewProps, // [Windows]
-
+  ...ViewPropsAndroid,
+  ...ViewPropsIOS,
+  ...AccessibilityProps,
+  ...ViewPropsWindows, // [Windows]
   children?: Node,
   style?: ?ViewStyleProp,
 
-  /**
-   * When `true`, indicates that the view is an accessibility element.
-   * By default, all the touchable elements are accessible.
-   *
-   * See https://reactnative.dev/docs/view#accessible
-   */
-  accessible?: ?boolean,
-
-  /**
-   * Overrides the text that's read by the screen reader when the user interacts
-   * with the element. By default, the label is constructed by traversing all
-   * the children and accumulating all the `Text` nodes separated by space.
-   *
-   * See https://reactnative.dev/docs/view#accessibilitylabel
-   */
-  accessibilityLabel?: ?Stringish,
-
-  /**
-   * An accessibility hint helps users understand what will happen when they perform
-   * an action on the accessibility element when that result is not obvious from the
-   * accessibility label.
-   *
-   *
-   * See https://reactnative.dev/docs/view#accessibilityHint
-   */
-  accessibilityHint?: ?Stringish,
-
-  /**
-   * Alias for accessibilityLabel  https://reactnative.dev/docs/view#accessibilitylabel
-   * https://github.com/facebook/react-native/issues/34424
-   */
-  'aria-label'?: ?Stringish,
-
-  /**
-   * Indicates to accessibility services to treat UI component like a specific role.
-   */
-  accessibilityRole?: ?AccessibilityRole,
-
-  /**
-   * Alias for accessibilityRole
-   */
-  role?: ?Role,
-
-  /**
-   * Indicates to accessibility services that UI Component is in a specific State.
-   */
-  accessibilityState?: ?AccessibilityState,
-  accessibilityValue?: ?AccessibilityValue,
-
-  /**
-   * alias for accessibilityState
-   * It represents textual description of a component's value, or for range-based components, such as sliders and progress bars.
-   */
-  'aria-valuemax'?: ?AccessibilityValue['max'],
-  'aria-valuemin'?: ?AccessibilityValue['min'],
-  'aria-valuenow'?: ?AccessibilityValue['now'],
-  'aria-valuetext'?: ?AccessibilityValue['text'],
-
-  /**
-   * Provides an array of custom actions available for accessibility.
-   *
-   */
-  accessibilityActions?: ?$ReadOnlyArray<AccessibilityActionInfo>,
-
-  /**
-   * alias for accessibilityState
-   *
-   * see https://reactnative.dev/docs/accessibility#accessibilitystate
-   */
-  'aria-busy'?: ?boolean,
-  'aria-checked'?: ?boolean | 'mixed',
-  'aria-disabled'?: ?boolean,
-  'aria-expanded'?: ?boolean,
-  'aria-selected'?: ?boolean,
-  /** A value indicating whether the accessibility elements contained within
-   * this accessibility element are hidden.
-   *
-   * See https://reactnative.dev/docs/view#aria-hidden
-   */
-  'aria-hidden'?: ?boolean,
-
   /**
    * Views that are only used to layout their children or otherwise don't draw
    * anything may be automatically removed from the native hierarchy as an

package/Libraries/Core/Devtools/symbolicateStackTrace.js

@@ -39,7 +39,7 @@ export default async function symbolicateStackTrace(
   }
 
   // Lazy-load `fetch` until the first symbolication call to avoid circular requires.
-  const fetch = global.fetch ?? require('../../Network/fetch');
+  const fetch = global.fetch ?? require('../../Network/fetch').fetch;
   const response = await fetch(devServer.url + 'symbolicate', {
     method: 'POST',
     headers: {

package/Libraries/Core/InitializeCore.js

@@ -51,7 +51,8 @@ if (__DEV__) {
 
 require('../ReactNative/AppRegistry');
 
-const GlobalPerformanceLogger = require('../Utilities/GlobalPerformanceLogger');
+const GlobalPerformanceLogger =
+  require('../Utilities/GlobalPerformanceLogger').default;
 // We could just call GlobalPerformanceLogger.markPoint at the top of the file,
 // but then we'd be excluding the time it took to require the logger.
 // Instead, we just use Date.now and backdate the timestamp.

package/Libraries/Core/ReactNativeVersion.js

@@ -17,5 +17,5 @@ export const version: $ReadOnly<{
   major: 0,
   minor: 79,
   patch: 0,
-  prerelease: 'nightly-20250206-fb8a6a5bb',
+  prerelease: 'nightly-20250220-41b597c73',
 };

package/Libraries/Core/Timers/JSTimers.js

@@ -36,6 +36,7 @@ const IDLE_CALLBACK_FRAME_DEADLINE = 1;
 const callbacks: Array<?Function> = [];
 const types: Array<?JSTimerType> = [];
 const timerIDs: Array<?number> = [];
+const freeIdxs: Array<number> = [];
 let reactNativeMicrotasks: Array<number> = [];
 let requestIdleCallbacks: Array<number> = [];
 const requestIdleCallbackTimeouts: {[number]: number, ...} = {};
@@ -47,11 +48,11 @@ let hasEmittedTimeDriftWarning = false;
 
 // Returns a free index if one is available, and the next consecutive index otherwise.
 function _getFreeIndex(): number {
-  let freeIndex = timerIDs.indexOf(null);
-  if (freeIndex === -1) {
-    freeIndex = timerIDs.length;
+  const freeIdx = freeIdxs.pop();
+  if (freeIdx === undefined) {
+    return timerIDs.length;
   }
-  return freeIndex;
+  return freeIdx;
 }
 
 function _allocateCallback(func: Function, type: JSTimerType): number {
@@ -171,6 +172,7 @@ function _clearIndex(i: number) {
   timerIDs[i] = null;
   callbacks[i] = null;
   types[i] = null;
+  freeIdxs.push(i);
 }
 
 function _freeCallback(timerID: number) {

package/Libraries/Core/setUpBatchedBridge.js

@@ -16,7 +16,7 @@ registerModule('Systrace', () => require('../Performance/Systrace'));
 if (!(global.RN$Bridgeless === true)) {
   registerModule('JSTimers', () => require('./Timers/JSTimers').default);
 }
-registerModule('RCTLog', () => require('../Utilities/RCTLog'));
+registerModule('RCTLog', () => require('../Utilities/RCTLog').default);
 registerModule(
   'RCTDeviceEventEmitter',
   () => require('../EventEmitter/RCTDeviceEventEmitter').default,
@@ -25,12 +25,16 @@ registerModule(
   'RCTNativeAppEventEmitter',
   () => require('../EventEmitter/RCTNativeAppEventEmitter').default,
 );
-registerModule('GlobalPerformanceLogger', () =>
-  require('../Utilities/GlobalPerformanceLogger'),
+registerModule(
+  'GlobalPerformanceLogger',
+  () => require('../Utilities/GlobalPerformanceLogger').default,
 );
 
 if (__DEV__) {
-  registerModule('HMRClient', () => require('../Utilities/HMRClient'));
+  registerModule('HMRClient', () => require('../Utilities/HMRClient').default);
 } else {
-  registerModule('HMRClient', () => require('../Utilities/HMRClientProdShim'));
+  registerModule(
+    'HMRClient',
+    () => require('../Utilities/HMRClientProdShim').default,
+  );
 }

package/Libraries/Core/setUpDeveloperTools.js

@@ -17,28 +17,11 @@ declare var console: {[string]: $FlowFixMe};
  * You can use this module directly, or just require InitializeCore.
  */
 if (__DEV__) {
-  // Note we can't check if console is "native" because it would appear "native" in JSC and Hermes.
-  // We also can't check any properties that don't exist in the Chrome worker environment.
-  // So we check a navigator property that's set to a particular value ("Netscape") in all real browsers.
-  const isLikelyARealBrowser =
-    global.navigator != null &&
-    /*              _
-     *             | |
-     *   _ __   ___| |_ ___  ___ __ _ _ __   ___
-     *  | '_ \ / _ \ __/ __|/ __/ _` | '_ \ / _ \
-     *  | | | |  __/ |_\__ \ (_| (_| | |_) |  __/
-     *  |_| |_|\___|\__|___/\___\__,_| .__/ \___|
-     *                               | |
-     *                               |_|
-     */
-    global.navigator.appName === 'Netscape'; // Any real browser
-
   if (!Platform.isTesting) {
-    const HMRClient = require('../Utilities/HMRClient');
+    const HMRClient = require('../Utilities/HMRClient').default;
 
-    if (global.__FUSEBOX_HAS_FULL_CONSOLE_SUPPORT__) {
-      HMRClient.unstable_notifyFuseboxConsoleEnabled();
-    } else if (console._isPolyfilled) {
+    // TODO(T214991636): Remove legacy Metro log forwarding
+    if (console._isPolyfilled) {
       // We assume full control over the console and send JavaScript logs to Metro.
       [
         'trace',
@@ -57,15 +40,6 @@ if (__DEV__) {
           originalFunction.apply(console, args);
         };
       });
-    } else {
-      // We assume the environment has a real rich console (like Chrome), and don't hijack it to log to Metro.
-      // It's likely the developer is using rich console to debug anyway, and hijacking it would
-      // lose the filenames in console.log calls: https://github.com/facebook/react-native/issues/26788.
-      HMRClient.log('log', [
-        `JavaScript logs will appear in your ${
-          isLikelyARealBrowser ? 'browser' : 'environment'
-        } console`,
-      ]);
     }
   }
 

package/Libraries/Core/setUpReactDevTools.js

@@ -72,7 +72,7 @@ if (__DEV__) {
 
   const ReactNativeStyleAttributes =
     require('../Components/View/ReactNativeStyleAttributes').default;
-  const resolveRNStyle = require('../StyleSheet/flattenStyle');
+  const resolveRNStyle = require('../StyleSheet/flattenStyle').default;
 
   function handleReactDevToolsSettingsUpdate(settings: Object) {
     reactDevToolsSettingsManager.setGlobalHookSettings(

package/Libraries/Core/setUpReactRefresh.js

@@ -11,7 +11,7 @@
 'use strict';
 
 if (__DEV__) {
-  const DevSettings = require('../Utilities/DevSettings');
+  const DevSettings = require('../Utilities/DevSettings').default;
 
   if (typeof DevSettings.reload !== 'function') {
     throw new Error('Could not find the reload() implementation.');

package/Libraries/Core/setUpXHR.js

@@ -18,8 +18,11 @@ const {polyfillGlobal} = require('../Utilities/PolyfillFunctions');
  *
  * You can use this module directly, or just require InitializeCore.
  */
-polyfillGlobal('XMLHttpRequest', () => require('../Network/XMLHttpRequest'));
-polyfillGlobal('FormData', () => require('../Network/FormData'));
+polyfillGlobal(
+  'XMLHttpRequest',
+  () => require('../Network/XMLHttpRequest').default,
+);
+polyfillGlobal('FormData', () => require('../Network/FormData').default);
 
 polyfillGlobal('fetch', () => require('../Network/fetch').fetch);
 polyfillGlobal('Headers', () => require('../Network/fetch').Headers);

package/Libraries/EventEmitter/NativeEventEmitter.js

@@ -26,6 +26,9 @@ interface NativeModule {
 
 export type {EventSubscription};
 
+// $FlowFixMe[unclear-type] unclear type of events
+type UnsafeObject = Object;
+
 /**
  * `NativeEventEmitter` is intended for use by Native Modules to emit events to
  * JavaScript listeners. If a `NativeModule` is supplied to the constructor, it
@@ -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;
 

package/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>);

package/Libraries/EventEmitter/__mocks__/NativeEventEmitter.js

@@ -18,8 +18,9 @@ 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,

package/Libraries/Events/CustomEvent.js

@@ -25,7 +25,7 @@ class CustomEvent extends EventPolyfill {
     const {bubbles, cancelable, composed} = options;
     super(typeArg, {bubbles, cancelable, composed});
 
-    this.detail = options.detail; // this would correspond to `NativeEvent` in SyntheticEvent
+    this.detail = options.detail; // this would correspond to `NativeEvent` in NativeSyntheticEvent
   }
 }
 

package/Libraries/Events/EventPolyfill.js

@@ -152,9 +152,9 @@ class EventPolyfill implements IEvent {
   /** @deprecated */
   srcElement: Element; // TODO: nullable
 
-  // React Native-specific: proxy data to a SyntheticEvent when
+  // React Native-specific: proxy data to a NativeSyntheticEvent when
   // certain methods are called.
-  // SyntheticEvent will also have a reference to this instance -
+  // NativeSyntheticEvent will also have a reference to this instance -
   // it is circular - and both classes use this reference to keep
   // data with the other in sync.
   _syntheticEvent: mixed;