@office-iss/react-native-win32 0.0.0-canary.291 → 0.0.0-canary.292

package/Libraries/WebSocket/WebSocket.js

@@ -8,13 +8,318 @@
  * @flow
  */
 
-import typeof WebSocket from './WebSocket_old';
+import type {EventCallback} from '../../src/private/webapis/dom/events/EventTarget';
+import type {BlobData} from '../Blob/BlobTypes';
+import type {EventSubscription} from '../vendor/emitter/EventEmitter';
 
-// Use a global instead of a flag from ReactNativeFeatureFlags because this will
-// be read before apps have a chance to set overrides.
-const useBuiltInEventTarget = global.RN$useBuiltInEventTarget?.();
+import Event from '../../src/private/webapis/dom/events/Event';
+import {
+  getEventHandlerAttribute,
+  setEventHandlerAttribute,
+} from '../../src/private/webapis/dom/events/EventHandlerAttributes';
+import EventTarget from '../../src/private/webapis/dom/events/EventTarget';
+import MessageEvent from '../../src/private/webapis/html/events/MessageEvent';
+import CloseEvent from '../../src/private/webapis/websockets/events/CloseEvent';
+import Blob from '../Blob/Blob';
+import BlobManager from '../Blob/BlobManager';
+import NativeEventEmitter from '../EventEmitter/NativeEventEmitter';
+import binaryToBase64 from '../Utilities/binaryToBase64';
+import Platform from '../Utilities/Platform';
+import NativeWebSocketModule from './NativeWebSocketModule';
+import base64 from 'base64-js';
+import invariant from 'invariant';
 
-export default (useBuiltInEventTarget
-  ? // $FlowExpectedError[incompatible-cast]
-    require('./WebSocket_new').default
-  : require('./WebSocket_old').default) as WebSocket;
+type ArrayBufferView =
+  | Int8Array
+  | Uint8Array
+  | Uint8ClampedArray
+  | Int16Array
+  | Uint16Array
+  | Int32Array
+  | Uint32Array
+  | Float32Array
+  | Float64Array
+  | DataView;
+
+type BinaryType = 'blob' | 'arraybuffer';
+
+const CONNECTING = 0;
+const OPEN = 1;
+const CLOSING = 2;
+const CLOSED = 3;
+
+const CLOSE_NORMAL = 1000;
+
+// Abnormal closure where no code is provided in a control frame
+// https://www.rfc-editor.org/rfc/rfc6455.html#section-7.1.5
+const CLOSE_ABNORMAL = 1006;
+
+let nextWebSocketId = 0;
+
+type WebSocketEventDefinitions = {
+  websocketOpen: [{id: number, protocol: string}],
+  websocketClosed: [{id: number, code: number, reason: string}],
+  websocketMessage: [
+    | {type: 'binary', id: number, data: string}
+    | {type: 'text', id: number, data: string}
+    | {type: 'blob', id: number, data: BlobData},
+  ],
+  websocketFailed: [{id: number, message: string}],
+};
+
+/**
+ * Browser-compatible WebSockets implementation.
+ *
+ * See https://developer.mozilla.org/en-US/docs/Web/API/WebSocket
+ * See https://github.com/websockets/ws
+ */
+class WebSocket extends EventTarget {
+  static CONNECTING: number = CONNECTING;
+  static OPEN: number = OPEN;
+  static CLOSING: number = CLOSING;
+  static CLOSED: number = CLOSED;
+
+  CONNECTING: number = CONNECTING;
+  OPEN: number = OPEN;
+  CLOSING: number = CLOSING;
+  CLOSED: number = CLOSED;
+
+  _socketId: number;
+  _eventEmitter: NativeEventEmitter<WebSocketEventDefinitions>;
+  _subscriptions: Array<EventSubscription>;
+  _binaryType: ?BinaryType;
+
+  bufferedAmount: number;
+  extension: ?string;
+  protocol: ?string;
+  readyState: number = CONNECTING;
+  url: ?string;
+
+  constructor(
+    url: string,
+    protocols: ?string | ?Array<string>,
+    options: ?{headers?: {origin?: string, ...}, ...},
+  ) {
+    super();
+    this.url = url;
+    if (typeof protocols === 'string') {
+      protocols = [protocols];
+    }
+
+    const {headers = {}, ...unrecognized} = options || {};
+
+    // Preserve deprecated backwards compatibility for the 'origin' option
+    // $FlowFixMe[prop-missing]
+    if (unrecognized && typeof unrecognized.origin === 'string') {
+      console.warn(
+        'Specifying `origin` as a WebSocket connection option is deprecated. Include it under `headers` instead.',
+      );
+      /* $FlowFixMe[prop-missing] (>=0.54.0 site=react_native_fb,react_native_
+       * oss) This comment suppresses an error found when Flow v0.54 was
+       * deployed. To see the error delete this comment and run Flow. */
+      headers.origin = unrecognized.origin;
+      /* $FlowFixMe[prop-missing] (>=0.54.0 site=react_native_fb,react_native_
+       * oss) This comment suppresses an error found when Flow v0.54 was
+       * deployed. To see the error delete this comment and run Flow. */
+      delete unrecognized.origin;
+    }
+
+    // Warn about and discard anything else
+    if (Object.keys(unrecognized).length > 0) {
+      console.warn(
+        'Unrecognized WebSocket connection option(s) `' +
+          Object.keys(unrecognized).join('`, `') +
+          '`. ' +
+          'Did you mean to put these under `headers`?',
+      );
+    }
+
+    if (!Array.isArray(protocols)) {
+      protocols = null;
+    }
+
+    this._eventEmitter = new NativeEventEmitter(
+      // T88715063: NativeEventEmitter only used this parameter on iOS. Now it uses it on all platforms, so this code was modified automatically to preserve its behavior
+      // If you want to use the native module on other platforms, please remove this condition and test its behavior
+      Platform.OS !== 'ios' ? null : NativeWebSocketModule,
+    );
+    this._socketId = nextWebSocketId++;
+    this._registerEvents();
+    NativeWebSocketModule.connect(url, protocols, {headers}, this._socketId);
+  }
+
+  get binaryType(): ?BinaryType {
+    return this._binaryType;
+  }
+
+  set binaryType(binaryType: BinaryType): void {
+    if (binaryType !== 'blob' && binaryType !== 'arraybuffer') {
+      throw new Error("binaryType must be either 'blob' or 'arraybuffer'");
+    }
+    if (this._binaryType === 'blob' || binaryType === 'blob') {
+      invariant(
+        BlobManager.isAvailable,
+        'Native module BlobModule is required for blob support',
+      );
+      if (binaryType === 'blob') {
+        BlobManager.addWebSocketHandler(this._socketId);
+      } else {
+        BlobManager.removeWebSocketHandler(this._socketId);
+      }
+    }
+    this._binaryType = binaryType;
+  }
+
+  close(code?: number, reason?: string): void {
+    if (this.readyState === this.CLOSING || this.readyState === this.CLOSED) {
+      return;
+    }
+
+    this.readyState = this.CLOSING;
+    this._close(code, reason);
+  }
+
+  send(data: string | ArrayBuffer | ArrayBufferView | Blob): void {
+    if (this.readyState === this.CONNECTING) {
+      throw new Error('INVALID_STATE_ERR');
+    }
+
+    if (data instanceof Blob) {
+      invariant(
+        BlobManager.isAvailable,
+        'Native module BlobModule is required for blob support',
+      );
+      BlobManager.sendOverSocket(data, this._socketId);
+      return;
+    }
+
+    if (typeof data === 'string') {
+      NativeWebSocketModule.send(data, this._socketId);
+      return;
+    }
+
+    if (data instanceof ArrayBuffer || ArrayBuffer.isView(data)) {
+      NativeWebSocketModule.sendBinary(binaryToBase64(data), this._socketId);
+      return;
+    }
+
+    throw new Error('Unsupported data type');
+  }
+
+  ping(): void {
+    if (this.readyState === this.CONNECTING) {
+      throw new Error('INVALID_STATE_ERR');
+    }
+
+    NativeWebSocketModule.ping(this._socketId);
+  }
+
+  _close(code?: number, reason?: string): void {
+    // See https://developer.mozilla.org/en-US/docs/Web/API/CloseEvent
+    const statusCode = typeof code === 'number' ? code : CLOSE_NORMAL;
+    const closeReason = typeof reason === 'string' ? reason : '';
+    NativeWebSocketModule.close(statusCode, closeReason, this._socketId);
+
+    if (BlobManager.isAvailable && this._binaryType === 'blob') {
+      BlobManager.removeWebSocketHandler(this._socketId);
+    }
+  }
+
+  _unregisterEvents(): void {
+    this._subscriptions.forEach(e => e.remove());
+    this._subscriptions = [];
+  }
+
+  _registerEvents(): void {
+    this._subscriptions = [
+      this._eventEmitter.addListener('websocketMessage', ev => {
+        if (ev.id !== this._socketId) {
+          return;
+        }
+        let data: Blob | BlobData | ArrayBuffer | string = ev.data;
+        switch (ev.type) {
+          case 'binary':
+            data = base64.toByteArray(ev.data).buffer;
+            break;
+          case 'blob':
+            data = BlobManager.createFromOptions(ev.data);
+            break;
+        }
+        this.dispatchEvent(new MessageEvent('message', {data}));
+      }),
+      this._eventEmitter.addListener('websocketOpen', ev => {
+        if (ev.id !== this._socketId) {
+          return;
+        }
+        this.readyState = this.OPEN;
+        this.protocol = ev.protocol;
+        this.dispatchEvent(new Event('open'));
+      }),
+      this._eventEmitter.addListener('websocketClosed', ev => {
+        if (ev.id !== this._socketId) {
+          return;
+        }
+        this.readyState = this.CLOSED;
+        this.dispatchEvent(
+          new CloseEvent('close', {
+            code: ev.code,
+            reason: ev.reason,
+            // TODO: missing `wasClean` (exposed on iOS as `clean` but missing on Android)
+          }),
+        );
+        this._unregisterEvents();
+        this.close();
+      }),
+      this._eventEmitter.addListener('websocketFailed', ev => {
+        if (ev.id !== this._socketId) {
+          return;
+        }
+        this.readyState = this.CLOSED;
+        this.dispatchEvent(new Event('error'));
+        this.dispatchEvent(
+          new CloseEvent('close', {
+            code: CLOSE_ABNORMAL,
+            reason: ev.message,
+            // TODO: Expose `wasClean`
+          }),
+        );
+        this._unregisterEvents();
+        this.close();
+      }),
+    ];
+  }
+
+  get onclose(): EventCallback | null {
+    return getEventHandlerAttribute(this, 'close');
+  }
+
+  set onclose(listener: ?EventCallback) {
+    setEventHandlerAttribute(this, 'close', listener);
+  }
+
+  get onerror(): EventCallback | null {
+    return getEventHandlerAttribute(this, 'error');
+  }
+
+  set onerror(listener: ?EventCallback) {
+    setEventHandlerAttribute(this, 'error', listener);
+  }
+
+  get onmessage(): EventCallback | null {
+    return getEventHandlerAttribute(this, 'message');
+  }
+
+  set onmessage(listener: ?EventCallback) {
+    setEventHandlerAttribute(this, 'message', listener);
+  }
+
+  get onopen(): EventCallback | null {
+    return getEventHandlerAttribute(this, 'open');
+  }
+
+  set onopen(listener: ?EventCallback) {
+    setEventHandlerAttribute(this, 'open', listener);
+  }
+}
+
+export default WebSocket;

package/flow/global.js

@@ -86,5 +86,3 @@ declare var global: {
   // Undeclared properties are implicitly `any`.
   [string | symbol]: any,
 };
-
-type $PropertyType<T, K> = T[K];

package/index.win32.js

@@ -26,6 +26,9 @@ import typeof FocusManager from './Libraries/Utilities/FocusManager';
 import typeof NativeModules from './Libraries/BatchedBridge/NativeModules';
 import typeof codegenNativeCommands from './Libraries/Utilities/codegenNativeCommands';
 import typeof codegenNativeComponent from './Libraries/Utilities/codegenNativeComponent';
+import {findNodeHandle} from './Libraries/ReactNative/RendererProxy';
+import {unstable_batchedUpdates} from './Libraries/ReactNative/RendererProxy';
+
 // Components
 import typeof AccessibilityInfo from './Libraries/Components/AccessibilityInfo/AccessibilityInfo';
 import typeof ActivityIndicator from './Libraries/Components/ActivityIndicator/ActivityIndicator';
@@ -283,7 +286,7 @@ module.exports = {
   get Easing(): Easing {
     return require('./Libraries/Animated/Easing').default;
   },
-  get findNodeHandle(): $PropertyType<ReactNative, 'findNodeHandle'> {
+  get findNodeHandle(): typeof findNodeHandle {
     return require('./Libraries/ReactNative/RendererProxy').findNodeHandle;
   },
   get FocusManager(): FocusManager {
@@ -389,10 +392,7 @@ module.exports = {
   get UIManager(): UIManager {
     return require('./Libraries/ReactNative/UIManager').default;
   },
-  get unstable_batchedUpdates(): $PropertyType<
-    ReactNative,
-    'unstable_batchedUpdates',
-  > {
+  get unstable_batchedUpdates(): typeof unstable_batchedUpdates {
     return require('./Libraries/ReactNative/RendererProxy')
       .unstable_batchedUpdates;
   },

package/overrides.json

@@ -7,13 +7,13 @@
     "**/__snapshots__/**",
     "src-win/rntypes/**"
   ],
-  "baseVersion": "0.80.0-nightly-20250331-398ac1f71",
+  "baseVersion": "0.80.0-nightly-20250414-70cdf12c4",
   "overrides": [
     {
       "type": "derived",
       "file": ".flowconfig",
       "baseFile": ".flowconfig",
-      "baseHash": "5b774dab8f68093cccdd7609b16bde8546765414"
+      "baseHash": "635f6473853a94bd7de26e582a2a03c6869344ea"
     },
     {
       "type": "derived",
@@ -60,7 +60,7 @@
       "type": "derived",
       "file": "src-win/Libraries/Components/Button.win32.js",
       "baseFile": "packages/react-native/Libraries/Components/Button.js",
-      "baseHash": "c61bda5775588b9dd85622f691b89e6b3e3a9fc8"
+      "baseHash": "4e77e13aa5774e813fbd874a13a920ea12e3ed91"
     },
     {
       "type": "platform",
@@ -74,7 +74,7 @@
       "type": "copy",
       "file": "src-win/Libraries/Components/DrawerAndroid/DrawerLayoutAndroid.js",
       "baseFile": "packages/react-native/Libraries/Components/DrawerAndroid/DrawerLayoutAndroid.js",
-      "baseHash": "8909ad50924f46afa7cabb15cf9cf4ade7021a90",
+      "baseHash": "fe92a96a2bfd0e92b99b2803ce133c7a3cf2b022",
       "issue": 14290
     },
     {
@@ -85,14 +85,14 @@
       "type": "patch",
       "file": "src-win/Libraries/Components/Pressable/Pressable.win32.js",
       "baseFile": "packages/react-native/Libraries/Components/Pressable/Pressable.js",
-      "baseHash": "09575f26ef614b81330d27d6cb950580774e3c1f",
+      "baseHash": "47e088807b206707cec6b17359c4d3017e61aaea",
       "issue": 6240
     },
     {
       "type": "patch",
       "file": "src-win/Libraries/Components/ProgressBarAndroid/ProgressBarAndroid.js",
       "baseFile": "packages/react-native/Libraries/Components/ProgressBarAndroid/ProgressBarAndroid.js",
-      "baseHash": "454f8b04bd6203c70b48aa6ec26e1c05dee42124"
+      "baseHash": "c96925930d9664306a8aef8b4102c43055ea03be"
     },
     {
       "type": "copy",
@@ -104,11 +104,17 @@
       "type": "platform",
       "file": "src-win/Libraries/Components/TextInput/Tests/TextInputTest.tsx"
     },
+    {
+      "type": "derived",
+      "file": "src-win/Libraries/Components/TextInput/TextInput.flow.win32.js",
+      "baseFile": "packages/react-native/Libraries/Components/TextInput/TextInput.flow.js",
+      "baseHash": "de4c9224bac0ba920b41573b8d3c27b332a843de"
+    },
     {
       "type": "derived",
       "file": "src-win/Libraries/Components/TextInput/TextInput.win32.js",
       "baseFile": "packages/react-native/Libraries/Components/TextInput/TextInput.js",
-      "baseHash": "b4e722883e25dfa4864a1285b577c5adfc90ce9d"
+      "baseHash": "32d0f756ca2cbd454a5c2d8aa18f3b1ea1d20557"
     },
     {
       "type": "patch",
@@ -124,7 +130,7 @@
       "type": "copy",
       "file": "src-win/Libraries/Components/ToastAndroid/ToastAndroid.win32.js",
       "baseFile": "packages/react-native/Libraries/Components/ToastAndroid/ToastAndroid.js",
-      "baseHash": "4948464c2ad124338c1ce6ac68b6b2f01af28876",
+      "baseHash": "a623c5a09b665a36e84e7fc943bd619c8ca3cc14",
       "issue": 4378
     },
     {
@@ -135,7 +141,7 @@
       "type": "patch",
       "file": "src-win/Libraries/Components/Touchable/Touchable.win32.js",
       "baseFile": "packages/react-native/Libraries/Components/Touchable/Touchable.js",
-      "baseHash": "5e13ce3ef1cfeb38a1a9695c3013617527c21175"
+      "baseHash": "2f7db68acd47af643bc0625d31d199332d519871"
     },
     {
       "type": "derived",
@@ -147,7 +153,7 @@
       "type": "derived",
       "file": "src-win/Libraries/Components/Touchable/TouchableNativeFeedback.win32.js",
       "baseFile": "packages/react-native/Libraries/Components/Touchable/TouchableNativeFeedback.js",
-      "baseHash": "2f2263f5e6c7a2bd827b065db20d1ba632561774"
+      "baseHash": "8706705c1f8d3dd5390ea631ce5ae60e300ae50d"
     },
     {
       "type": "platform",
@@ -183,7 +189,7 @@
       "type": "derived",
       "file": "src-win/Libraries/Components/View/ViewAccessibility.win32.js",
       "baseFile": "packages/react-native/Libraries/Components/View/ViewAccessibility.js",
-      "baseHash": "c057d139f953c09d6f1021d5842840873e878db8"
+      "baseHash": "c30dab3926869e84edafebd485e78637d69ccd61"
     },
     {
       "type": "derived",
@@ -195,7 +201,7 @@
       "type": "patch",
       "file": "src-win/Libraries/Components/View/ViewPropTypes.win32.js",
       "baseFile": "packages/react-native/Libraries/Components/View/ViewPropTypes.js",
-      "baseHash": "714722715a4562ef22a7f630e45781e80506a6bd",
+      "baseHash": "ec1ffd005b6631e6af027731b087a7620fbf5cf5",
       "issue": 6240
     },
     {
@@ -388,7 +394,7 @@
       "type": "derived",
       "file": "src-win/Libraries/Settings/Settings.win32.js",
       "baseFile": "packages/react-native/Libraries/Settings/Settings.js",
-      "baseHash": "a089870c24dfac3fd1d5ca28e7dbebd22da73b9a"
+      "baseHash": "84da45c9a1bf8cec6d5044433f3c10e7298381d7"
     },
     {
       "type": "platform",
@@ -412,7 +418,7 @@
       "type": "derived",
       "file": "src-win/Libraries/Text/Text.win32.js",
       "baseFile": "packages/react-native/Libraries/Text/Text.js",
-      "baseHash": "3e4c3fe47759433ac3604a33fef65c7578556b29"
+      "baseHash": "1f802db19830e468b84640fc5c7740a11e154250"
     },
     {
       "type": "derived",
@@ -425,7 +431,7 @@
       "type": "derived",
       "file": "src-win/Libraries/Text/TextProps.win32.js",
       "baseFile": "packages/react-native/Libraries/Text/TextProps.js",
-      "baseHash": "1646b5a9467049adeb7d9e070913ab327214b04d"
+      "baseHash": "d31f973c14140792d9d28d208fca15d092a8a4e2"
     },
     {
       "type": "patch",
@@ -471,7 +477,7 @@
       "type": "patch",
       "file": "src-win/Libraries/Utilities/PlatformTypes.js",
       "baseFile": "packages/react-native/Libraries/Utilities/PlatformTypes.js",
-      "baseHash": "323895a47d9a31a5502843aae5aa833d225abb08",
+      "baseHash": "0bd36210528f74f9081d858c9ab64ead92c54950",
       "issue": 14686
     },
     {
@@ -484,7 +490,7 @@
       "type": "patch",
       "file": "src-win/src/private/animated/NativeAnimatedHelper.win32.js",
       "baseFile": "packages/react-native/src/private/animated/NativeAnimatedHelper.js",
-      "baseHash": "f07ba42819770210251c4c38db4399b7c07d96e8",
+      "baseHash": "3247a8e436a7beeda45ce7d77343229b5204cbfc",
       "issue": 11041
     },
     {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@office-iss/react-native-win32",
-  "version": "0.0.0-canary.291",
+  "version": "0.0.0-canary.292",
   "description": "Implementation of react native on top of Office's Win32 platform.",
   "repository": {
     "type": "git",
@@ -30,13 +30,13 @@
     "@react-native-community/cli-platform-android": "17.0.0",
     "@react-native-community/cli-platform-ios": "17.0.0",
     "@react-native/assets": "1.0.0",
-    "@react-native/assets-registry": "0.80.0-nightly-20250331-398ac1f71",
-    "@react-native/codegen": "0.80.0-nightly-20250331-398ac1f71",
-    "@react-native/community-cli-plugin": "0.80.0-nightly-20250331-398ac1f71",
-    "@react-native/gradle-plugin": "0.80.0-nightly-20250331-398ac1f71",
-    "@react-native/js-polyfills": "0.80.0-nightly-20250331-398ac1f71",
-    "@react-native/normalize-colors": "0.80.0-nightly-20250331-398ac1f71",
-    "@react-native/virtualized-lists": "0.80.0-nightly-20250331-398ac1f71",
+    "@react-native/assets-registry": "0.80.0-nightly-20250414-70cdf12c4",
+    "@react-native/codegen": "0.80.0-nightly-20250414-70cdf12c4",
+    "@react-native/community-cli-plugin": "0.80.0-nightly-20250414-70cdf12c4",
+    "@react-native/gradle-plugin": "0.80.0-nightly-20250414-70cdf12c4",
+    "@react-native/js-polyfills": "0.80.0-nightly-20250414-70cdf12c4",
+    "@react-native/normalize-colors": "0.80.0-nightly-20250414-70cdf12c4",
+    "@react-native/virtualized-lists": "0.80.0-nightly-20250414-70cdf12c4",
     "abort-controller": "^3.0.0",
     "anser": "^1.4.9",
     "ansi-regex": "^5.0.0",
@@ -72,7 +72,7 @@
   "devDependencies": {
     "@babel/core": "^7.25.2",
     "@babel/eslint-parser": "^7.25.1",
-    "@react-native/metro-config": "0.80.0-nightly-20250331-398ac1f71",
+    "@react-native/metro-config": "0.80.0-nightly-20250414-70cdf12c4",
     "@rnw-scripts/babel-react-native-config": "0.0.0",
     "@rnw-scripts/eslint-config": "1.2.36",
     "@rnw-scripts/jest-out-of-tree-snapshot-resolver": "^1.1.40",
@@ -83,19 +83,19 @@
     "@types/prop-types": "15.7.1",
     "@types/react": "^19.0.0",
     "eslint": "^8.19.0",
-    "flow-bin": "^0.261.2",
+    "flow-bin": "^0.267.0",
     "jscodeshift": "^0.14.0",
     "just-scripts": "^1.3.3",
     "prettier": "2.8.8",
     "react": "19.0.0",
-    "react-native": "0.80.0-nightly-20250331-398ac1f71",
+    "react-native": "0.80.0-nightly-20250414-70cdf12c4",
     "react-native-platform-override": "^1.9.55",
     "typescript": "5.0.4"
   },
   "peerDependencies": {
     "@types/react": "^19.0.0",
     "react": "^19.0.0",
-    "react-native": "0.80.0-nightly-20250331-398ac1f71"
+    "react-native": "0.80.0-nightly-20250414-70cdf12c4"
   },
   "beachball": {
     "defaultNpmTag": "canary",

package/src/private/animated/NativeAnimatedHelper.js

@@ -384,7 +384,7 @@ function assertNativeAnimatedModule(): void {
 let _warnedMissingNativeAnimated = false;
 
 function shouldUseNativeDriver(
-  config: $ReadOnly<{...AnimationConfig, ...}> | EventConfig,
+  config: $ReadOnly<{...AnimationConfig, ...}> | EventConfig<mixed>,
 ): boolean {
   if (config.useNativeDriver == null) {
     console.warn(

package/src/private/animated/NativeAnimatedHelper.win32.js

@@ -387,7 +387,7 @@ function assertNativeAnimatedModule(): void {
 let _warnedMissingNativeAnimated = false;
 
 function shouldUseNativeDriver(
-  config: $ReadOnly<{...AnimationConfig, ...}> | EventConfig,
+  config: $ReadOnly<{...AnimationConfig, ...}> | EventConfig<mixed>,
 ): boolean {
   if (config.useNativeDriver == null) {
     console.warn(

package/src/private/animated/createAnimatedPropsHook.js

@@ -11,7 +11,6 @@
 import type {AnimatedPropsAllowlist} from '../../../Libraries/Animated/nodes/AnimatedProps';
 import type {EventSubscription} from '../../../Libraries/EventEmitter/NativeEventEmitter';
 
-import {AnimatedEvent} from '../../../Libraries/Animated/AnimatedEvent';
 import AnimatedNode from '../../../Libraries/Animated/nodes/AnimatedNode';
 import AnimatedProps from '../../../Libraries/Animated/nodes/AnimatedProps';
 import AnimatedValue from '../../../Libraries/Animated/nodes/AnimatedValue';
@@ -24,7 +23,6 @@ import {
   useCallback,
   useEffect,
   useInsertionEffect,
-  useMemo,
   useReducer,
   useRef,
 } from 'react';
@@ -55,28 +53,6 @@ export default function createAnimatedPropsHook(
   const useNativePropsInFabric =
     ReactNativeFeatureFlags.shouldUseSetNativePropsInFabric();
 
-  const useNativeAnimatedEvents: <TProps: {...}>(
-    node: AnimatedProps,
-    props: TProps,
-  ) => $ReadOnlyArray<[string, AnimatedEvent]> =
-    ReactNativeFeatureFlags.avoidAnimatedRefInvalidation()
-      ? function useNativeAnimatedEventsFromAnimatedProps(node, props) {
-          return useMemo(() => node.__getNativeAnimatedEventTuples(), [node]);
-        }
-      : function useNativeAnimatedEventsFromProps(node, props) {
-          return useMemo(() => {
-            const tuples = [];
-            for (const propName in props) {
-              // $FlowFixMe[invalid-computed-prop]
-              const propValue = props[propName];
-              if (propValue instanceof AnimatedEvent && propValue.__isNative) {
-                tuples.push([propName, propValue]);
-              }
-            }
-            return tuples;
-          }, [props]);
-        };
-
   return function useAnimatedProps<TProps: {...}, TInstance>(
     props: TProps,
   ): [ReducedProps<TProps>, CallbackRef<TInstance | null>] {
@@ -118,8 +94,6 @@ export default function createAnimatedPropsHook(
 
     useAnimatedPropsLifecycle(node);
 
-    const eventTuples = useNativeAnimatedEvents(node, props);
-
     // TODO: This "effect" does three things:
     //
     //   1) Call `setNativeView`.
@@ -209,6 +183,7 @@ export default function createAnimatedPropsHook(
 
         const target = getEventTarget(instance);
         const animatedValueListeners: AnimatedValueListeners = [];
+        const eventTuples = node.__getNativeAnimatedEventTuples();
 
         for (const [propName, propValue] of eventTuples) {
           propValue.__attach(target, propName);
@@ -228,7 +203,7 @@ export default function createAnimatedPropsHook(
           }
         };
       },
-      [eventTuples, node],
+      [node],
     );
     const callbackRef = useRefEffect<TInstance>(refEffect);