@office-iss/react-native-win32 0.79.0-preview.2 → 0.80.0-preview.1

package/overrides.json

@@ -7,19 +7,19 @@
     "**/__snapshots__/**",
     "src-win/rntypes/**"
   ],
-  "baseVersion": "0.79.0-rc.4",
+  "baseVersion": "0.80.0",
   "overrides": [
     {
       "type": "derived",
       "file": ".flowconfig",
       "baseFile": ".flowconfig",
-      "baseHash": "23e4ec639f146691148b6736f4e84478ae2a5416"
+      "baseHash": "70ed729d5f52c241530e8459cc40263d4e9fa9c0"
     },
     {
       "type": "derived",
       "file": "src-win/index.win32.js",
       "baseFile": "packages/react-native/index.js",
-      "baseHash": "62b4752ea0e271645cc0fff8b54f2c1167284d43"
+      "baseHash": "96361b83bfc122f1d78cc7d87ea0d7c3bfac138f"
     },
     {
       "type": "platform",
@@ -29,7 +29,7 @@
       "type": "patch",
       "file": "src-win/Libraries/Alert/Alert.win32.js",
       "baseFile": "packages/react-native/Libraries/Alert/Alert.js",
-      "baseHash": "95ce9fad7e029b50ff6f1598e38aa420660913dc"
+      "baseHash": "bd8f474e454f2b703ca7fb55cb022f24046bc0f8"
     },
     {
       "type": "derived",
@@ -41,7 +41,7 @@
       "type": "derived",
       "file": "src-win/Libraries/Components/AccessibilityInfo/AccessibilityInfo.win32.js",
       "baseFile": "packages/react-native/Libraries/Components/AccessibilityInfo/AccessibilityInfo.js",
-      "baseHash": "fa025a1dabfb8c73f72cab48393ef1720273690d"
+      "baseHash": "5a43c9cf537c5cb89e7f634e45be708f4b021493"
     },
     {
       "type": "copy",
@@ -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,15 +85,14 @@
       "type": "patch",
       "file": "src-win/Libraries/Components/Pressable/Pressable.win32.js",
       "baseFile": "packages/react-native/Libraries/Components/Pressable/Pressable.js",
-      "baseHash": "d213d6885bf028350b8f4c79bdcb847289317d86",
+      "baseHash": "96bdd4aebf4133fd2fe6d1b448f9d7b4cd3e8982",
       "issue": 6240
     },
     {
       "type": "patch",
       "file": "src-win/Libraries/Components/ProgressBarAndroid/ProgressBarAndroid.js",
       "baseFile": "packages/react-native/Libraries/Components/ProgressBarAndroid/ProgressBarAndroid.js",
-      "baseHash": "454f8b04bd6203c70b48aa6ec26e1c05dee42124",
-      "issue": 0
+      "baseHash": "d1cc663442d184b62799b748c475a5a2c5c558c7"
     },
     {
       "type": "copy",
@@ -105,17 +104,23 @@
       "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": "f407548782cade71af32a52ecb440f72a403f06e"
+    },
     {
       "type": "derived",
       "file": "src-win/Libraries/Components/TextInput/TextInput.win32.js",
       "baseFile": "packages/react-native/Libraries/Components/TextInput/TextInput.js",
-      "baseHash": "eb047724db45395fe5d6487e269a00a198807eb8"
+      "baseHash": "9965c0079652083ab549bc2799eb9528b56a1b2d"
     },
     {
       "type": "patch",
       "file": "src-win/Libraries/Components/TextInput/TextInputState.win32.js",
       "baseFile": "packages/react-native/Libraries/Components/TextInput/TextInputState.js",
-      "baseHash": "5603046411826837d1f8003f2d6784221bdef674"
+      "baseHash": "400af173e846317c705487f51f3cb165e7378a4f"
     },
     {
       "type": "platform",
@@ -125,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
     },
     {
@@ -136,8 +141,7 @@
       "type": "patch",
       "file": "src-win/Libraries/Components/Touchable/Touchable.win32.js",
       "baseFile": "packages/react-native/Libraries/Components/Touchable/Touchable.js",
-      "baseHash": "5e13ce3ef1cfeb38a1a9695c3013617527c21175",
-      "issue": 0
+      "baseHash": "2f7db68acd47af643bc0625d31d199332d519871"
     },
     {
       "type": "derived",
@@ -149,7 +153,7 @@
       "type": "derived",
       "file": "src-win/Libraries/Components/Touchable/TouchableNativeFeedback.win32.js",
       "baseFile": "packages/react-native/Libraries/Components/Touchable/TouchableNativeFeedback.js",
-      "baseHash": "c64be122b6011941423d60bc1aa03f5dab8fd7b1"
+      "baseHash": "8706705c1f8d3dd5390ea631ce5ae60e300ae50d"
     },
     {
       "type": "platform",
@@ -173,19 +177,19 @@
       "type": "patch",
       "file": "src-win/Libraries/Components/View/View.win32.js",
       "baseFile": "packages/react-native/Libraries/Components/View/View.js",
-      "baseHash": "5721d3baf49a611a12939b03840ef73b6974db26"
+      "baseHash": "2dd3e58cf6c4bc0882550eedd8150435972365eb"
     },
     {
       "type": "derived",
       "file": "src-win/Libraries/Components/View/ViewAccessibility.d.ts",
       "baseFile": "packages/react-native/Libraries/Components/View/ViewAccessibility.d.ts",
-      "baseHash": "d97e29f01e57cc2b0de209a03f8584b984cfe190"
+      "baseHash": "1e4e3a89397960e8f08b86be62496473829c0ac3"
     },
     {
       "type": "derived",
       "file": "src-win/Libraries/Components/View/ViewAccessibility.win32.js",
       "baseFile": "packages/react-native/Libraries/Components/View/ViewAccessibility.js",
-      "baseHash": "7b90ff2ca0ede95e456afd76aeb859f539ade3ff"
+      "baseHash": "04981261b2ed61b31bfbb396478bb6b103d99253"
     },
     {
       "type": "derived",
@@ -197,7 +201,7 @@
       "type": "patch",
       "file": "src-win/Libraries/Components/View/ViewPropTypes.win32.js",
       "baseFile": "packages/react-native/Libraries/Components/View/ViewPropTypes.js",
-      "baseHash": "dbab30f1cad27a647149a61e1d63f7b81e6aed2e",
+      "baseHash": "ec1ffd005b6631e6af027731b087a7620fbf5cf5",
       "issue": 6240
     },
     {
@@ -301,6 +305,12 @@
       "baseFile": "packages/react-native/Libraries/LogBox/UI/LogBoxInspectorReactFrames.js",
       "baseHash": "3a3d7da499937cce35c9bd17a11f10b2eeac04cc"
     },
+    {
+      "type": "derived",
+      "file": "src-win/Libraries/LogBox/UI/LogBoxInspectorSourceMapStatus.win32.js",
+      "baseFile": "packages/react-native/Libraries/LogBox/UI/LogBoxInspectorSourceMapStatus.js",
+      "baseHash": "b355418205aa52cf33fb7e4d521b26083eada49d"
+    },
     {
       "type": "derived",
       "file": "src-win/Libraries/LogBox/UI/LogBoxInspectorStackFrame.win32.js",
@@ -319,13 +329,13 @@
       "type": "derived",
       "file": "src-win/Libraries/NativeComponent/BaseViewConfig.win32.js",
       "baseFile": "packages/react-native/Libraries/NativeComponent/BaseViewConfig.ios.js",
-      "baseHash": "1f6068ed8762edc516d9679832fee7f12a31858e"
+      "baseHash": "b520e2bdb2be31bdb6ad7e3769dbe69168870c8c"
     },
     {
       "type": "copy",
       "file": "src-win/Libraries/Network/RCTNetworking.win32.js",
       "baseFile": "packages/react-native/Libraries/Network/RCTNetworking.ios.js",
-      "baseHash": "cdda150c411ef03de0f52d5dbbd3976d094d136b",
+      "baseHash": "4b96609d7e8d0596d2960aacfda35af73cec1085",
       "issue": 4318
     },
     {
@@ -355,7 +365,7 @@
       "type": "patch",
       "file": "src-win/Libraries/Pressability/Pressability.win32.js",
       "baseFile": "packages/react-native/Libraries/Pressability/Pressability.js",
-      "baseHash": "97027444d74f5a2f03a966753c23f86145f3fc0b",
+      "baseHash": "b52df7d819237b8acdd08f84631e3c257a9cb390",
       "issue": 6240
     },
     {
@@ -384,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",
@@ -398,42 +408,36 @@
       "type": "platform",
       "file": "src-win/Libraries/StyleSheet/PlatformColorValueTypesWin32.js"
     },
-    {
-      "type": "patch",
-      "file": "src-win/Libraries/StyleSheet/StyleSheet.win32.js",
-      "baseFile": "packages/react-native/Libraries/StyleSheet/StyleSheet.js",
-      "baseHash": "6c83ae0478119480b693eeab590fa4ba5af98084"
-    },
     {
       "type": "derived",
       "file": "src-win/Libraries/Text/Text.d.ts",
       "baseFile": "packages/react-native/Libraries/Text/Text.d.ts",
-      "baseHash": "26bf1ec0ad4cae2049298d3ec95b387fa2fe854b"
+      "baseHash": "b5f44957bc61497fcb7203934bdbc6ca9725cf42"
     },
     {
       "type": "derived",
       "file": "src-win/Libraries/Text/Text.win32.js",
       "baseFile": "packages/react-native/Libraries/Text/Text.js",
-      "baseHash": "3e4c3fe47759433ac3604a33fef65c7578556b29"
+      "baseHash": "1f802db19830e468b84640fc5c7740a11e154250"
     },
     {
       "type": "derived",
       "file": "src-win/Libraries/Text/TextNativeComponent.win32.js",
       "baseFile": "packages/react-native/Libraries/Text/TextNativeComponent.js",
-      "baseHash": "aad3be91ad4e326d5da431a57f9461b7420700e1",
+      "baseHash": "19efb0b15014c3e11be035a67c9e46b8e25f3090",
       "issue": 7074
     },
     {
       "type": "derived",
       "file": "src-win/Libraries/Text/TextProps.win32.js",
       "baseFile": "packages/react-native/Libraries/Text/TextProps.js",
-      "baseHash": "fadd5d092aa22ca59d2c33b0ac0191fe90f4f123"
+      "baseHash": "b0e5a0c71f35c962049d73191ed4b7ace570ca92"
     },
     {
       "type": "patch",
       "file": "src-win/Libraries/Types/CoreEventTypes.win32.js",
       "baseFile": "packages/react-native/Libraries/Types/CoreEventTypes.js",
-      "baseHash": "038c14d702490acd25dab824b1b10f5db42eece8",
+      "baseHash": "ed736df6081d2fbbf54a646b8373bf485449255a",
       "issue": 6240
     },
     {
@@ -443,17 +447,11 @@
       "baseHash": "dfaab027e0fe3a2d7b6dccd92c1de2a558a5d36c",
       "issue": 4629
     },
-    {
-      "type": "derived",
-      "file": "src-win/Libraries/Utilities/DeviceInfo.win32.js",
-      "baseFile": "packages/react-native/Libraries/Utilities/DeviceInfo.js",
-      "baseHash": "e40e5c968968ee7c3115df57e6c07f8383719ee2"
-    },
     {
       "type": "derived",
       "file": "src-win/Libraries/Utilities/Dimensions.win32.js",
       "baseFile": "packages/react-native/Libraries/Utilities/Dimensions.js",
-      "baseHash": "1c9f7f698bba91e98afb5cc8ec3511a30343f3bd"
+      "baseHash": "07b59b2dd822c45eb9bccba8da0ce361eeb67bc1"
     },
     {
       "type": "platform",
@@ -479,7 +477,7 @@
       "type": "patch",
       "file": "src-win/Libraries/Utilities/PlatformTypes.js",
       "baseFile": "packages/react-native/Libraries/Utilities/PlatformTypes.js",
-      "baseHash": "95e01d9774ac3afdcdacdc049e9c647dbec3055d",
+      "baseHash": "0bd36210528f74f9081d858c9ab64ead92c54950",
       "issue": 14686
     },
     {
@@ -492,14 +490,14 @@
       "type": "patch",
       "file": "src-win/src/private/animated/NativeAnimatedHelper.win32.js",
       "baseFile": "packages/react-native/src/private/animated/NativeAnimatedHelper.js",
-      "baseHash": "8c67d57575cccb7281b15ca2591e4edf5c5c36dd",
+      "baseHash": "3247a8e436a7beeda45ce7d77343229b5204cbfc",
       "issue": 11041
     },
     {
       "type": "copy",
-      "file": "src-win/src/private/debugging/ReactDevToolsSettingsManager.win32.js",
-      "baseFile": "packages/react-native/src/private/debugging/ReactDevToolsSettingsManager.android.js",
-      "baseHash": "1e0309d141da6c7a6a9afa571aae831ca221bbe2"
+      "file": "src-win/src/private/devsupport/rndevtools/ReactDevToolsSettingsManager.win32.js",
+      "baseFile": "packages/react-native/src/private/devsupport/rndevtools/ReactDevToolsSettingsManager.android.js",
+      "baseHash": "2d33789b0c7a45996dc23f26c4b09fb2026a9285"
     },
     {
       "type": "derived",

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@office-iss/react-native-win32",
-  "version": "0.79.0-preview.2",
+  "version": "0.80.0-preview.1",
   "description": "Implementation of react native on top of Office's Win32 platform.",
   "repository": {
     "type": "git",
@@ -26,23 +26,23 @@
   "dependencies": {
     "@babel/runtime": "^7.0.0",
     "@jest/create-cache-key-function": "^29.7.0",
-    "@react-native-community/cli": "15.0.0-alpha.2",
-    "@react-native-community/cli-platform-android": "15.0.0-alpha.2",
-    "@react-native-community/cli-platform-ios": "15.0.0-alpha.2",
+    "@react-native-community/cli": "17.0.0",
+    "@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.79.0-rc.4",
-    "@react-native/codegen": "0.79.0-rc.4",
-    "@react-native/community-cli-plugin": "0.79.0-rc.4",
-    "@react-native/gradle-plugin": "0.79.0-rc.4",
-    "@react-native/js-polyfills": "0.79.0-rc.4",
-    "@react-native/normalize-colors": "0.79.0-rc.4",
-    "@react-native/virtualized-lists": "0.79.0-rc.4",
+    "@react-native/assets-registry": "0.80.0",
+    "@react-native/codegen": "0.80.0",
+    "@react-native/community-cli-plugin": "0.80.0",
+    "@react-native/gradle-plugin": "0.80.0",
+    "@react-native/js-polyfills": "0.80.0",
+    "@react-native/normalize-colors": "0.80.0",
+    "@react-native/virtualized-lists": "0.80.0",
     "abort-controller": "^3.0.0",
     "anser": "^1.4.9",
     "ansi-regex": "^5.0.0",
     "art": "^0.10.0",
     "babel-jest": "^29.7.0",
-    "babel-plugin-syntax-hermes-parser": "0.25.1",
+    "babel-plugin-syntax-hermes-parser": "0.28.1",
     "base64-js": "^1.5.1",
     "chalk": "^4.0.0",
     "commander": "^12.0.0",
@@ -52,8 +52,8 @@
     "invariant": "^2.2.4",
     "jest-environment-node": "^29.7.0",
     "memoize-one": "^5.0.0",
-    "metro-runtime": "^0.82.0",
-    "metro-source-map": "^0.82.0",
+    "metro-runtime": "^0.82.2",
+    "metro-source-map": "^0.82.2",
     "mkdirp": "^0.5.1",
     "nullthrows": "^1.1.1",
     "pretty-format": "^29.7.0",
@@ -62,7 +62,7 @@
     "react-devtools-core": "^6.1.1",
     "react-refresh": "^0.14.0",
     "regenerator-runtime": "^0.13.2",
-    "scheduler": "0.25.0",
+    "scheduler": "0.26.0",
     "semver": "^7.1.3",
     "stacktrace-parser": "^0.1.10",
     "whatwg-fetch": "^3.0.0",
@@ -72,30 +72,30 @@
   "devDependencies": {
     "@babel/core": "^7.25.2",
     "@babel/eslint-parser": "^7.25.1",
-    "@react-native/metro-config": "0.79.0-rc.4",
+    "@react-native/metro-config": "0.80.0",
     "@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",
-    "@rnw-scripts/just-task": "2.3.53",
+    "@rnw-scripts/just-task": "2.3.54",
     "@rnw-scripts/metro-dev-config": "0.0.0",
     "@rnx-kit/jest-preset": "^0.1.17",
     "@types/node": "^18.0.0",
     "@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.79.0-rc.4",
-    "react-native-platform-override": "^1.9.55",
+    "react": "19.1.0",
+    "react-native": "0.80.0",
+    "react-native-platform-override": "^1.9.56",
     "typescript": "5.0.4"
   },
   "peerDependencies": {
-    "@types/react": "^19.0.0",
-    "react": "^19.0.0",
-    "react-native": "0.79.0-rc.4"
+    "@types/react": "^19.1.0",
+    "react": "^19.1.0",
+    "react-native": "^0.80.0"
   },
   "beachball": {
     "defaultNpmTag": "preview",

package/src/private/animated/NativeAnimatedHelper.js

@@ -57,6 +57,10 @@ const eventListenerAnimationFinishedCallbacks: {
 let globalEventEmitterGetValueListener: ?EventSubscription = null;
 let globalEventEmitterAnimationFinishedListener: ?EventSubscription = null;
 
+const shouldSignalBatch =
+  ReactNativeFeatureFlags.animatedShouldSignalBatch() ||
+  ReactNativeFeatureFlags.cxxNativeAnimatedEnabled();
+
 function createNativeOperations(): $NonMaybeType<typeof NativeAnimatedModule> {
   const methodNames = [
     'createAnimatedNode', // 1
@@ -106,6 +110,11 @@ function createNativeOperations(): $NonMaybeType<typeof NativeAnimatedModule> {
         if (queueOperations || queue.length !== 0) {
           // $FlowExpectedError[incompatible-call] - Dynamism.
           queue.push(() => method(...args));
+        } else if (shouldSignalBatch) {
+          // $FlowExpectedError[incompatible-call] - Dynamism.
+          queue.push(() => method(...args));
+          clearImmediate(flushQueueImmediate);
+          flushQueueImmediate = setImmediate(API.flushQueue);
         } else {
           // $FlowExpectedError[incompatible-call] - Dynamism.
           method(...args);
@@ -138,21 +147,25 @@ const API = {
       }) as $NonMaybeType<typeof NativeAnimatedModule>['getValue'],
 
   setWaitingForIdentifier(id: string): void {
+    if (shouldSignalBatch) {
+      return;
+    }
+
     waitingForQueuedOperations.add(id);
     queueOperations = true;
     if (
       ReactNativeFeatureFlags.animatedShouldDebounceQueueFlush() &&
       flushQueueImmediate
     ) {
-      if (ReactNativeFeatureFlags.enableAnimatedClearImmediateFix()) {
-        clearImmediate(flushQueueImmediate);
-      } else {
-        clearTimeout(flushQueueImmediate);
-      }
+      clearImmediate(flushQueueImmediate);
     }
   },
 
   unsetWaitingForIdentifier(id: string): void {
+    if (shouldSignalBatch) {
+      return;
+    }
+
     waitingForQueuedOperations.delete(id);
 
     if (waitingForQueuedOperations.size === 0) {
@@ -206,7 +219,7 @@ const API = {
           return;
         }
 
-        if (Platform.OS === 'android') {
+        if (Platform.OS === 'android' || shouldSignalBatch) {
           NativeAnimatedModule?.startOperationBatch?.();
         }
 
@@ -215,7 +228,7 @@ const API = {
         }
         queue.length = 0;
 
-        if (Platform.OS === 'android') {
+        if (Platform.OS === 'android' || shouldSignalBatch) {
           NativeAnimatedModule?.finishOperationBatch?.();
         }
       }) as () => void,
@@ -371,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

@@ -57,6 +57,10 @@ const eventListenerAnimationFinishedCallbacks: {
 let globalEventEmitterGetValueListener: ?EventSubscription = null;
 let globalEventEmitterAnimationFinishedListener: ?EventSubscription = null;
 
+const shouldSignalBatch =
+  ReactNativeFeatureFlags.animatedShouldSignalBatch() ||
+  ReactNativeFeatureFlags.cxxNativeAnimatedEnabled();
+
 function createNativeOperations(): $NonMaybeType<typeof NativeAnimatedModule> {
   const methodNames = [
     'createAnimatedNode', // 1
@@ -106,6 +110,11 @@ function createNativeOperations(): $NonMaybeType<typeof NativeAnimatedModule> {
         if (queueOperations || queue.length !== 0) {
           // $FlowExpectedError[incompatible-call] - Dynamism.
           queue.push(() => method(...args));
+        } else if (shouldSignalBatch) {
+          // $FlowExpectedError[incompatible-call] - Dynamism.
+          queue.push(() => method(...args));
+          clearImmediate(flushQueueImmediate);
+          flushQueueImmediate = setImmediate(API.flushQueue);
         } else {
           // $FlowExpectedError[incompatible-call] - Dynamism.
           method(...args);
@@ -138,21 +147,25 @@ const API = {
       }) as $NonMaybeType<typeof NativeAnimatedModule>['getValue'],
 
   setWaitingForIdentifier(id: string): void {
+    if (shouldSignalBatch) {
+      return;
+    }
+
     waitingForQueuedOperations.add(id);
     queueOperations = true;
     if (
       ReactNativeFeatureFlags.animatedShouldDebounceQueueFlush() &&
       flushQueueImmediate
     ) {
-      if (ReactNativeFeatureFlags.enableAnimatedClearImmediateFix()) {
-        clearImmediate(flushQueueImmediate);
-      } else {
-        clearTimeout(flushQueueImmediate);
-      }
+      clearImmediate(flushQueueImmediate);
     }
   },
 
   unsetWaitingForIdentifier(id: string): void {
+    if (shouldSignalBatch) {
+      return;
+    }
+
     waitingForQueuedOperations.delete(id);
 
     if (waitingForQueuedOperations.size === 0) {
@@ -209,7 +222,7 @@ const API = {
           return;
         }
 
-        if (Platform.OS === 'android') {
+        if (Platform.OS === 'android' || shouldSignalBatch) {
           NativeAnimatedModule?.startOperationBatch?.();
         }
 
@@ -218,7 +231,7 @@ const API = {
         }
         queue.length = 0;
 
-        if (Platform.OS === 'android') {
+        if (Platform.OS === 'android' || shouldSignalBatch) {
           NativeAnimatedModule?.finishOperationBatch?.();
         }
       }) as () => void,
@@ -374,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';
@@ -51,6 +50,9 @@ export default function createAnimatedPropsHook(
 ): AnimatedPropsHook {
   const useAnimatedPropsMemo = createAnimatedPropsMemoHook(allowlist);
 
+  const useNativePropsInFabric =
+    ReactNativeFeatureFlags.shouldUseSetNativePropsInFabric();
+
   return function useAnimatedProps<TProps: {...}, TInstance>(
     props: TProps,
   ): [ReducedProps<TProps>, CallbackRef<TInstance | null>] {
@@ -63,9 +65,6 @@ export default function createAnimatedPropsHook(
       props,
     );
 
-    const useNativePropsInFabric =
-      ReactNativeFeatureFlags.shouldUseSetNativePropsInFabric();
-
     useEffect(() => {
       // If multiple components call `flushQueue`, the first one will flush the
       // queue and subsequent ones will do nothing.
@@ -112,6 +111,7 @@ export default function createAnimatedPropsHook(
       (instance: TInstance) => {
         // NOTE: This may be called more often than necessary (e.g. when `props`
         // changes), but `setNativeView` already optimizes for that.
+        // $FlowFixMe[incompatible-call]
         node.setNativeView(instance);
 
         // NOTE: When using the JS animation driver, this callback is called on
@@ -182,24 +182,19 @@ export default function createAnimatedPropsHook(
         };
 
         const target = getEventTarget(instance);
-        const events = [];
         const animatedValueListeners: AnimatedValueListeners = [];
+        const eventTuples = node.__getNativeAnimatedEventTuples();
 
-        for (const propName in props) {
-          // $FlowFixMe[invalid-computed-prop]
-          const propValue = props[propName];
-          if (propValue instanceof AnimatedEvent && propValue.__isNative) {
-            propValue.__attach(target, propName);
-            events.push([propName, propValue]);
-            // $FlowFixMe[incompatible-call] - the `addListenersToPropsValue` drills down the propValue.
-            addListenersToPropsValue(propValue, animatedValueListeners);
-          }
+        for (const [propName, propValue] of eventTuples) {
+          propValue.__attach(target, propName);
+          // $FlowFixMe[incompatible-call] - the `addListenersToPropsValue` drills down the propValue.
+          addListenersToPropsValue(propValue, animatedValueListeners);
         }
 
         return () => {
           onUpdateRef.current = null;
 
-          for (const [propName, propValue] of events) {
+          for (const [propName, propValue] of eventTuples) {
             propValue.__detach(target, propName);
           }
 
@@ -208,7 +203,7 @@ export default function createAnimatedPropsHook(
           }
         };
       },
-      [node, useNativePropsInFabric, props],
+      [node],
     );
     const callbackRef = useRefEffect<TInstance>(refEffect);
 

package/src/private/animated/createAnimatedPropsMemoHook.js

@@ -91,8 +91,7 @@ export function createAnimatedPropsMemoHook(
     const prev = prevRef.current;
 
     const next =
-      prev != null &&
-      areCompositeKeysEqual(prev.compositeKey, compositeKey, allowlist)
+      prev != null && areCompositeKeysEqual(prev.compositeKey, compositeKey)
         ? prev
         : {
             compositeKey,