@office-iss/react-native-win32 0.0.0-canary.288 → 0.0.0-canary.289

package/flow/jest.js

@@ -1040,10 +1040,12 @@ declare var describe: {
    * @param {table} table of Test
    */
   each(
-    ...table: Array<Array<mixed> | mixed> | [Array<string>, string]
+    ...table:
+      | $ReadOnlyArray<$ReadOnlyArray<mixed> | mixed>
+      | [$ReadOnlyArray<string>, string]
   ): (
     name: JestTestName,
-    fn?: (...args: Array<any>) => ?Promise<mixed>,
+    fn?: (...args: $ReadOnlyArray<any>) => ?Promise<mixed>,
     timeout?: number,
   ) => void,
   ...

package/index.js

@@ -31,14 +31,7 @@ const warnOnce = require('./Libraries/Utilities/warnOnce').default;
 const invariant = require('invariant');
 
 module.exports = {
-  get registerCallableModule() {
-    return require('./Libraries/Core/registerCallableModule').default;
-  },
   // #region Components
-  get AccessibilityInfo() {
-    return require('./Libraries/Components/AccessibilityInfo/AccessibilityInfo')
-      .default;
-  },
   get ActivityIndicator() {
     return require('./Libraries/Components/ActivityIndicator/ActivityIndicator')
       .default;
@@ -63,14 +56,14 @@ module.exports = {
     return require('./Libraries/Components/TextInput/InputAccessoryView')
       .default;
   },
-  get experimental_LayoutConformance() {
-    return require('./Libraries/Components/LayoutConformance/LayoutConformance')
-      .default;
-  },
   get KeyboardAvoidingView() {
     return require('./Libraries/Components/Keyboard/KeyboardAvoidingView')
       .default;
   },
+  get experimental_LayoutConformance() {
+    return require('./Libraries/Components/LayoutConformance/LayoutConformance')
+      .default;
+  },
   get Modal() {
     return require('./Libraries/Modal/Modal').default;
   },
@@ -141,6 +134,10 @@ module.exports = {
   },
   // #endregion
   // #region APIs
+  get AccessibilityInfo() {
+    return require('./Libraries/Components/AccessibilityInfo/AccessibilityInfo')
+      .default;
+  },
   get ActionSheetIOS() {
     return require('./Libraries/ActionSheetIOS/ActionSheetIOS').default;
   },
@@ -156,7 +153,7 @@ module.exports = {
     return require('./Libraries/Utilities/Appearance');
   },
   get AppRegistry() {
-    return require('./Libraries/ReactNative/AppRegistry').default;
+    return require('./Libraries/ReactNative/AppRegistry').AppRegistry;
   },
   get AppState() {
     return require('./Libraries/AppState/AppState').default;
@@ -173,6 +170,15 @@ module.exports = {
     );
     return require('./Libraries/Components/Clipboard/Clipboard').default;
   },
+  get codegenNativeCommands() {
+    return require('./Libraries/Utilities/codegenNativeCommands').default;
+  },
+  get codegenNativeComponent() {
+    return require('./Libraries/Utilities/codegenNativeComponent').default;
+  },
+  get DeviceEventEmitter() {
+    return require('./Libraries/EventEmitter/RCTDeviceEventEmitter').default;
+  },
   get DeviceInfo() {
     return require('./Libraries/Utilities/DeviceInfo').default;
   },
@@ -185,6 +191,10 @@ module.exports = {
   get Dimensions() {
     return require('./Libraries/Utilities/Dimensions').default;
   },
+  get DynamicColorIOS() {
+    return require('./Libraries/StyleSheet/PlatformColorValueTypesIOS')
+      .DynamicColorIOS;
+  },
   get Easing() {
     return require('./Libraries/Animated/Easing').default;
   },
@@ -209,6 +219,9 @@ module.exports = {
   get LogBox() {
     return require('./Libraries/LogBox/LogBox').default;
   },
+  get NativeAppEventEmitter() {
+    return require('./Libraries/EventEmitter/RCTNativeAppEventEmitter').default;
+  },
   get NativeDialogManagerAndroid() {
     return require('./Libraries/NativeModules/specs/NativeDialogManagerAndroid')
       .default;
@@ -216,6 +229,9 @@ module.exports = {
   get NativeEventEmitter() {
     return require('./Libraries/EventEmitter/NativeEventEmitter').default;
   },
+  get NativeModules() {
+    return require('./Libraries/BatchedBridge/NativeModules').default;
+  },
   get Networking() {
     return require('./Libraries/Network/RCTNetworking').default;
   },
@@ -228,6 +244,13 @@ module.exports = {
   get PixelRatio() {
     return require('./Libraries/Utilities/PixelRatio').default;
   },
+  get Platform() {
+    return require('./Libraries/Utilities/Platform').default;
+  },
+  get PlatformColor() {
+    return require('./Libraries/StyleSheet/PlatformColorValueTypes')
+      .PlatformColor;
+  },
   get PushNotificationIOS() {
     warnOnce(
       'pushNotificationIOS-moved',
@@ -238,6 +261,18 @@ module.exports = {
     return require('./Libraries/PushNotificationIOS/PushNotificationIOS')
       .default;
   },
+  get processColor() {
+    return require('./Libraries/StyleSheet/processColor').default;
+  },
+  get registerCallableModule() {
+    return require('./Libraries/Core/registerCallableModule').default;
+  },
+  get requireNativeComponent() {
+    return require('./Libraries/ReactNative/requireNativeComponent').default;
+  },
+  get RootTagContext() {
+    return require('./Libraries/ReactNative/RootTag').RootTagContext;
+  },
   get Settings() {
     return require('./Libraries/Settings/Settings').default;
   },
@@ -279,37 +314,6 @@ module.exports = {
     return require('./Libraries/Vibration/Vibration').default;
   },
   // #endregion
-  // #region Plugins
-  get DeviceEventEmitter() {
-    return require('./Libraries/EventEmitter/RCTDeviceEventEmitter').default;
-  },
-  get DynamicColorIOS() {
-    return require('./Libraries/StyleSheet/PlatformColorValueTypesIOS')
-      .DynamicColorIOS;
-  },
-  get NativeAppEventEmitter() {
-    return require('./Libraries/EventEmitter/RCTNativeAppEventEmitter').default;
-  },
-  get NativeModules() {
-    return require('./Libraries/BatchedBridge/NativeModules').default;
-  },
-  get Platform() {
-    return require('./Libraries/Utilities/Platform').default;
-  },
-  get PlatformColor() {
-    return require('./Libraries/StyleSheet/PlatformColorValueTypes')
-      .PlatformColor;
-  },
-  get processColor() {
-    return require('./Libraries/StyleSheet/processColor').default;
-  },
-  get requireNativeComponent() {
-    return require('./Libraries/ReactNative/requireNativeComponent').default;
-  },
-  get RootTagContext() {
-    return require('./Libraries/ReactNative/RootTag').RootTagContext;
-  },
-  // #endregion
 } as ReactNativePublicAPI;
 
 if (__DEV__) {

package/index.win32.js

@@ -24,6 +24,8 @@ import typeof useAnimatedValue from './Libraries/Animated/useAnimatedValue';
 import typeof AppState from './Libraries/AppState/AppState';
 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';
 // Components
 import typeof AccessibilityInfo from './Libraries/Components/AccessibilityInfo/AccessibilityInfo';
 import typeof ActivityIndicator from './Libraries/Components/ActivityIndicator/ActivityIndicator';
@@ -70,7 +72,7 @@ import typeof Networking from './Libraries/Network/RCTNetworking';
 import typeof * as Systrace from './Libraries/Performance/Systrace';
 import typeof PermissionsAndroid from './Libraries/PermissionsAndroid/PermissionsAndroid';
 import typeof PushNotificationIOS from './Libraries/PushNotificationIOS/PushNotificationIOS';
-import typeof AppRegistry from './Libraries/ReactNative/AppRegistry';
+import typeof {AppRegistry} from './Libraries/ReactNative/AppRegistry';
 import typeof I18nManager from './Libraries/ReactNative/I18nManager';
 import typeof {RootTagContext} from './Libraries/ReactNative/RootTag';
 import typeof UIManager from './Libraries/ReactNative/UIManager';
@@ -108,14 +110,6 @@ const invariant = require('invariant');
 import typeof {ColorGradientWin32} from './Libraries/StyleSheet/PlatformColorValueTypesWin32';
 
 module.exports = {
-  // Components
-  get AccessibilityInfo(): AccessibilityInfo {
-    return require('./Libraries/Components/AccessibilityInfo/AccessibilityInfo')
-      .default;
-  },
-  get registerCallableModule(): registerCallableModule {
-    return require('./Libraries/Core/registerCallableModule').default;
-  },
   // #region Components
   get ActivityIndicator(): ActivityIndicator {
     return require('./Libraries/Components/ActivityIndicator/ActivityIndicator')
@@ -142,14 +136,14 @@ module.exports = {
     return require('./Libraries/Components/TextInput/InputAccessoryView')
       .default;
   },
-  get experimental_LayoutConformance(): LayoutConformance {
-    return require('./Libraries/Components/LayoutConformance/LayoutConformance')
-      .default;
-  },
   get KeyboardAvoidingView(): KeyboardAvoidingView {
     return require('./Libraries/Components/Keyboard/KeyboardAvoidingView')
       .default;
   },
+  get experimental_LayoutConformance(): LayoutConformance {
+    return require('./Libraries/Components/LayoutConformance/LayoutConformance')
+      .default;
+  },
   get Modal(): Modal {
     return require('./Libraries/Modal/Modal').default;
   },
@@ -221,8 +215,12 @@ module.exports = {
   get VirtualizedSectionList(): VirtualizedSectionList {
     return require('./Libraries/Lists/VirtualizedSectionList').default;
   },
-
-  // APIs
+  // #endregion
+  // #region APIs
+  get AccessibilityInfo(): AccessibilityInfo {
+    return require('./Libraries/Components/AccessibilityInfo/AccessibilityInfo')
+      .default;
+  },
   get ActionSheetIOS(): ActionSheetIOS {
     return require('./Libraries/ActionSheetIOS/ActionSheetIOS').default;
   },
@@ -240,7 +238,7 @@ module.exports = {
     return require('./Libraries/Utilities/Appearance');
   },
   get AppRegistry(): AppRegistry {
-    return require('./Libraries/ReactNative/AppRegistry').default;
+    return require('./Libraries/ReactNative/AppRegistry').AppRegistry;
   },
   get AppState(): AppState {
     return require('./Libraries/AppState/AppState').default;
@@ -257,6 +255,15 @@ module.exports = {
     );
     return require('./Libraries/Components/Clipboard/Clipboard').default;
   },
+  get codegenNativeCommands(): codegenNativeCommands<any> {
+    return require('./Libraries/Utilities/codegenNativeCommands').default;
+  },
+  get codegenNativeComponent(): codegenNativeComponent<any> {
+    return require('./Libraries/Utilities/codegenNativeComponent').default;
+  },
+  get DeviceEventEmitter(): RCTDeviceEventEmitter {
+    return require('./Libraries/EventEmitter/RCTDeviceEventEmitter').default;
+  },
   get DeviceInfo(): DeviceInfo {
     return require('./Libraries/Utilities/DeviceInfo').default;
   },
@@ -269,6 +276,10 @@ module.exports = {
   get Dimensions(): Dimensions {
     return require('./Libraries/Utilities/Dimensions').default;
   },
+  get DynamicColorIOS(): DynamicColorIOS {
+    return require('./Libraries/StyleSheet/PlatformColorValueTypesIOS')
+      .DynamicColorIOS;
+  },
   get Easing(): Easing {
     return require('./Libraries/Animated/Easing').default;
   },
@@ -296,6 +307,9 @@ module.exports = {
   get LogBox(): LogBox {
     return require('./Libraries/LogBox/LogBox').default;
   },
+  get NativeAppEventEmitter(): RCTNativeAppEventEmitter {
+    return require('./Libraries/EventEmitter/RCTNativeAppEventEmitter').default;
+  },
   get NativeDialogManagerAndroid(): NativeDialogManagerAndroid {
     return require('./Libraries/NativeModules/specs/NativeDialogManagerAndroid')
       .default;
@@ -303,6 +317,9 @@ module.exports = {
   get NativeEventEmitter(): NativeEventEmitter {
     return require('./Libraries/EventEmitter/NativeEventEmitter').default;
   },
+  get NativeModules(): NativeModules {
+    return require('./Libraries/BatchedBridge/NativeModules').default;
+  },
   get Networking(): Networking {
     return require('./Libraries/Network/RCTNetworking').default;
   },
@@ -315,6 +332,13 @@ module.exports = {
   get PixelRatio(): PixelRatio {
     return require('./Libraries/Utilities/PixelRatio').default;
   },
+  get Platform(): Platform {
+    return require('./Libraries/Utilities/Platform').default;
+  },
+  get PlatformColor(): PlatformColor {
+    return require('./Libraries/StyleSheet/PlatformColorValueTypes')
+      .PlatformColor;
+  },
   get PushNotificationIOS(): PushNotificationIOS {
     warnOnce(
       'pushNotificationIOS-moved',
@@ -326,6 +350,20 @@ module.exports = {
       .default;
   },
   // $FlowFixMe[value-as-type]
+  get processColor(): processColor {
+    return require('./Libraries/StyleSheet/processColor').default;
+  },
+  get registerCallableModule(): registerCallableModule {
+    return require('./Libraries/Core/registerCallableModule').default;
+  },
+  get requireNativeComponent(): <T: {...}>(
+    uiViewClassName: string,
+  ) => HostComponent<T> {
+    return require('./Libraries/ReactNative/requireNativeComponent').default;
+  },
+  get RootTagContext(): RootTagContext {
+    return require('./Libraries/ReactNative/RootTag').RootTagContext;
+  },
   get Settings(): Settings {
     return require('./Libraries/Settings/Settings').default;
   },
@@ -355,6 +393,12 @@ module.exports = {
     return require('./Libraries/ReactNative/RendererProxy')
       .unstable_batchedUpdates;
   },
+  get unstable_enableLogBox(): () => void {
+    return () =>
+      console.warn(
+        'LogBox is enabled by default so there is no need to call unstable_enableLogBox() anymore. This is a no op and will be removed in the next version.',
+      );
+  },
   get useAnimatedValue(): useAnimatedValue {
     return require('./Libraries/Animated/useAnimatedValue').default;
   },
@@ -370,45 +414,6 @@ module.exports = {
   get Vibration(): Vibration {
     return require('./Libraries/Vibration/Vibration').default;
   },
-
-  // Plugins
-  get DeviceEventEmitter(): RCTDeviceEventEmitter {
-    return require('./Libraries/EventEmitter/RCTDeviceEventEmitter').default;
-  },
-  get DynamicColorIOS(): DynamicColorIOS {
-    return require('./Libraries/StyleSheet/PlatformColorValueTypesIOS')
-      .DynamicColorIOS;
-  },
-  get NativeAppEventEmitter(): RCTNativeAppEventEmitter {
-    return require('./Libraries/EventEmitter/RCTNativeAppEventEmitter').default;
-  },
-  get NativeModules(): NativeModules {
-    return require('./Libraries/BatchedBridge/NativeModules').default;
-  },
-  get Platform(): Platform {
-    return require('./Libraries/Utilities/Platform').default;
-  },
-  get PlatformColor(): PlatformColor {
-    return require('./Libraries/StyleSheet/PlatformColorValueTypes')
-      .PlatformColor;
-  },
-  get processColor(): processColor {
-    return require('./Libraries/StyleSheet/processColor').default;
-  },
-  get requireNativeComponent(): <T: {...}>(
-    uiViewClassName: string,
-  ) => HostComponent<T> {
-    return require('./Libraries/ReactNative/requireNativeComponent').default;
-  },
-  get RootTagContext(): RootTagContext {
-    return require('./Libraries/ReactNative/RootTag').RootTagContext;
-  },
-  get unstable_enableLogBox(): () => void {
-    return () =>
-      console.warn(
-        'LogBox is enabled by default so there is no need to call unstable_enableLogBox() anymore. This is a no op and will be removed in the next version.',
-      );
-  },
   // Win32 Types (Typescript components exported as flow any)
   get ColorGradientWin32(): ColorGradientWin32 {
     return require('./Libraries/StyleSheet/PlatformColorValueTypesWin32')

package/overrides.json

@@ -7,19 +7,19 @@
     "**/__snapshots__/**",
     "src-win/rntypes/**"
   ],
-  "baseVersion": "0.79.0-nightly-20250303-cee63397b",
+  "baseVersion": "0.80.0-nightly-20250317-fc7385c1e",
   "overrides": [
     {
       "type": "derived",
       "file": ".flowconfig",
       "baseFile": ".flowconfig",
-      "baseHash": "23e4ec639f146691148b6736f4e84478ae2a5416"
+      "baseHash": "b8b53bf5315c0b91d0f69c3fe9274797a55b993f"
     },
     {
       "type": "derived",
       "file": "src-win/index.win32.js",
       "baseFile": "packages/react-native/index.js",
-      "baseHash": "62b4752ea0e271645cc0fff8b54f2c1167284d43"
+      "baseHash": "7a10369d15e8b09ef772d8f229cbfc712d074cbf"
     },
     {
       "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",
@@ -92,8 +92,7 @@
       "type": "patch",
       "file": "src-win/Libraries/Components/ProgressBarAndroid/ProgressBarAndroid.js",
       "baseFile": "packages/react-native/Libraries/Components/ProgressBarAndroid/ProgressBarAndroid.js",
-      "baseHash": "454f8b04bd6203c70b48aa6ec26e1c05dee42124",
-      "issue": 0
+      "baseHash": "454f8b04bd6203c70b48aa6ec26e1c05dee42124"
     },
     {
       "type": "copy",
@@ -109,7 +108,7 @@
       "type": "derived",
       "file": "src-win/Libraries/Components/TextInput/TextInput.win32.js",
       "baseFile": "packages/react-native/Libraries/Components/TextInput/TextInput.js",
-      "baseHash": "eb047724db45395fe5d6487e269a00a198807eb8"
+      "baseHash": "f762096a46203b6bae385806087b7b7cb5744f16"
     },
     {
       "type": "patch",
@@ -136,8 +135,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": "5e13ce3ef1cfeb38a1a9695c3013617527c21175"
     },
     {
       "type": "derived",
@@ -398,12 +396,6 @@
       "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",
@@ -492,7 +484,7 @@
       "type": "patch",
       "file": "src-win/src/private/animated/NativeAnimatedHelper.win32.js",
       "baseFile": "packages/react-native/src/private/animated/NativeAnimatedHelper.js",
-      "baseHash": "8c67d57575cccb7281b15ca2591e4edf5c5c36dd",
+      "baseHash": "c511868b72abd4e0e7d0b07e0453ea56687ffddb",
       "issue": 11041
     },
     {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@office-iss/react-native-win32",
-  "version": "0.0.0-canary.288",
+  "version": "0.0.0-canary.289",
   "description": "Implementation of react native on top of Office's Win32 platform.",
   "repository": {
     "type": "git",
@@ -26,17 +26,17 @@
   "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-nightly-20250303-cee63397b",
-    "@react-native/codegen": "0.79.0-nightly-20250303-cee63397b",
-    "@react-native/community-cli-plugin": "0.79.0-nightly-20250303-cee63397b",
-    "@react-native/gradle-plugin": "0.79.0-nightly-20250303-cee63397b",
-    "@react-native/js-polyfills": "0.79.0-nightly-20250303-cee63397b",
-    "@react-native/normalize-colors": "0.79.0-nightly-20250303-cee63397b",
-    "@react-native/virtualized-lists": "0.79.0-nightly-20250303-cee63397b",
+    "@react-native/assets-registry": "0.80.0-nightly-20250317-fc7385c1e",
+    "@react-native/codegen": "0.80.0-nightly-20250317-fc7385c1e",
+    "@react-native/community-cli-plugin": "0.80.0-nightly-20250317-fc7385c1e",
+    "@react-native/gradle-plugin": "0.80.0-nightly-20250317-fc7385c1e",
+    "@react-native/js-polyfills": "0.80.0-nightly-20250317-fc7385c1e",
+    "@react-native/normalize-colors": "0.80.0-nightly-20250317-fc7385c1e",
+    "@react-native/virtualized-lists": "0.80.0-nightly-20250317-fc7385c1e",
     "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.79.0-nightly-20250303-cee63397b",
+    "@react-native/metro-config": "0.80.0-nightly-20250317-fc7385c1e",
     "@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",
@@ -88,14 +88,14 @@
     "just-scripts": "^1.3.3",
     "prettier": "2.8.8",
     "react": "19.0.0",
-    "react-native": "0.79.0-nightly-20250303-cee63397b",
+    "react-native": "0.80.0-nightly-20250317-fc7385c1e",
     "react-native-platform-override": "^1.9.55",
     "typescript": "5.0.4"
   },
   "peerDependencies": {
     "@types/react": "^19.0.0",
     "react": "^19.0.0",
-    "react-native": "0.79.0-nightly-20250303-cee63397b"
+    "react-native": "0.80.0-nightly-20250317-fc7385c1e"
   },
   "beachball": {
     "defaultNpmTag": "canary",

package/src/private/animated/NativeAnimatedHelper.js

@@ -57,6 +57,8 @@ const eventListenerAnimationFinishedCallbacks: {
 let globalEventEmitterGetValueListener: ?EventSubscription = null;
 let globalEventEmitterAnimationFinishedListener: ?EventSubscription = null;
 
+const shouldSignalBatch = ReactNativeFeatureFlags.animatedShouldSignalBatch();
+
 function createNativeOperations(): $NonMaybeType<typeof NativeAnimatedModule> {
   const methodNames = [
     'createAnimatedNode', // 1
@@ -106,6 +108,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 +145,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 +217,7 @@ const API = {
           return;
         }
 
-        if (Platform.OS === 'android') {
+        if (Platform.OS === 'android' || shouldSignalBatch) {
           NativeAnimatedModule?.startOperationBatch?.();
         }
 
@@ -215,7 +226,7 @@ const API = {
         }
         queue.length = 0;
 
-        if (Platform.OS === 'android') {
+        if (Platform.OS === 'android' || shouldSignalBatch) {
           NativeAnimatedModule?.finishOperationBatch?.();
         }
       }) as () => void,

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

@@ -57,6 +57,8 @@ const eventListenerAnimationFinishedCallbacks: {
 let globalEventEmitterGetValueListener: ?EventSubscription = null;
 let globalEventEmitterAnimationFinishedListener: ?EventSubscription = null;
 
+const shouldSignalBatch = ReactNativeFeatureFlags.animatedShouldSignalBatch();
+
 function createNativeOperations(): $NonMaybeType<typeof NativeAnimatedModule> {
   const methodNames = [
     'createAnimatedNode', // 1
@@ -106,6 +108,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 +145,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 +220,7 @@ const API = {
           return;
         }
 
-        if (Platform.OS === 'android') {
+        if (Platform.OS === 'android' || shouldSignalBatch) {
           NativeAnimatedModule?.startOperationBatch?.();
         }
 
@@ -218,7 +229,7 @@ const API = {
         }
         queue.length = 0;
 
-        if (Platform.OS === 'android') {
+        if (Platform.OS === 'android' || shouldSignalBatch) {
           NativeAnimatedModule?.finishOperationBatch?.();
         }
       }) as () => void,