@office-iss/react-native-win32 0.0.0-canary.295 → 0.0.0-canary.297

package/Libraries/Text/TextProps.js

@@ -12,9 +12,7 @@
 
 import type {
   AccessibilityActionEvent,
-  AccessibilityActionInfo,
-  AccessibilityRole,
-  AccessibilityState,
+  AccessibilityProps,
   Role,
 } from '../Components/View/ViewAccessibility';
 import type {ColorValue, TextStyleProp} from '../StyleSheet/StyleSheet';
@@ -124,20 +122,7 @@ export type TextPropsAndroid = {
 };
 
 type TextBaseProps = $ReadOnly<{
-  /**
-   * Indicates whether the view is an accessibility element.
-   *
-   * See https://reactnative.dev/docs/text#accessible
-   */
-  accessible?: ?boolean,
-  accessibilityActions?: ?$ReadOnlyArray<AccessibilityActionInfo>,
   onAccessibilityAction?: ?(event: AccessibilityActionEvent) => mixed,
-  accessibilityHint?: ?Stringish,
-  accessibilityLanguage?: ?Stringish,
-  accessibilityLabel?: ?Stringish,
-  accessibilityRole?: ?AccessibilityRole,
-  accessibilityState?: ?AccessibilityState,
-  'aria-label'?: ?string,
 
   /**
    * Whether fonts should scale to respect Text Size accessibility settings.
@@ -152,24 +137,6 @@ type TextBaseProps = $ReadOnly<{
    *
    */
   android_hyphenationFrequency?: ?('normal' | 'none' | 'full'),
-
-  /**
-   * 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,
-
-  /**
-   * Represents the nativeID of the associated label text. When the assistive technology focuses on the component with this props, the text is read aloud.
-   * This prop is listed for cross-platform reasons and has no real effect on Android or iOS.
-   */
-  'aria-labelledby'?: ?string,
-
   children?: ?React.Node,
 
   /**
@@ -306,4 +273,5 @@ export type TextProps = $ReadOnly<{
   ...TextPropsIOS,
   ...TextPropsAndroid,
   ...TextBaseProps,
+  ...AccessibilityProps,
 }>;

package/Libraries/Text/TextProps.win32.js

@@ -12,9 +12,7 @@
 
 import type {
   AccessibilityActionEvent,
-  AccessibilityActionInfo,
-  AccessibilityRole,
-  AccessibilityState,
+  AccessibilityProps,
   Role,
 } from '../Components/View/ViewAccessibility';
 import type {ColorValue, TextStyleProp} from '../StyleSheet/StyleSheet';
@@ -124,27 +122,13 @@ export type TextPropsAndroid = {
 };
 
 type TextBaseProps = $ReadOnly<{
-  /**
-   * Indicates whether the view is an accessibility element.
-   *
-   * See https://reactnative.dev/docs/text#accessible
-   */
-  accessible?: ?boolean,
-  accessibilityActions?: ?$ReadOnlyArray<AccessibilityActionInfo>,
   onAccessibilityAction?: ?(event: AccessibilityActionEvent) => mixed,
-  accessibilityHint?: ?Stringish,
-  accessibilityLanguage?: ?Stringish,
-  accessibilityLabel?: ?Stringish,
-  accessibilityRole?: ?AccessibilityRole,
-  accessibilityState?: ?AccessibilityState,
-  'aria-label'?: ?string,
   accessibilityControls?: ?Stringish, // Win32
   accessibilityDescribedBy?: ?Stringish, // Win32
   accessibilityDescription?: ?Stringish, // Win32
   accessibilityLevel?: ?number, // Win32
   accessibilityPositionInSet?: ?number, // Win32
   accessibilitySetSize?: ?number, // Win32
-
   /**
    * Whether fonts should scale to respect Text Size accessibility settings.
    * The default is `true`.
@@ -158,17 +142,6 @@ type TextBaseProps = $ReadOnly<{
    *
    */
   android_hyphenationFrequency?: ?('normal' | 'none' | 'full'),
-
-  /**
-   * 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,
   'aria-multiselectable'?: ?boolean, // Win32
   'aria-required'?: ?boolean, // Win32
   'aria-controls'?: ?Stringish, // Win32
@@ -177,11 +150,6 @@ type TextBaseProps = $ReadOnly<{
   'aria-level'?: ?number, // Win32
   'aria-posinset'?: ?number, // Win32
   'aria-setsize'?: ?number, // Win32
-  /**
-   * Represents the nativeID of the associated label text. When the assistive technology focuses on the component with this props, the text is read aloud.
-   * This prop is listed for cross-platform reasons and has no real effect on Android or iOS.
-   */
-  'aria-labelledby'?: ?string,
 
   children?: ?React.Node,
 
@@ -319,4 +287,5 @@ export type TextProps = $ReadOnly<{
   ...TextPropsIOS,
   ...TextPropsAndroid,
   ...TextBaseProps,
+  ...AccessibilityProps,
 }>;

package/Libraries/Types/ReactDevToolsTypes.js

@@ -6,7 +6,6 @@
  *
  * @flow strict-local
  * @format
- * @oncall react_native
  */
 
 import type {HostInstance} from '../../src/private/types/HostInstance';

package/Libraries/Utilities/PerformanceLoggerContext.js

@@ -12,7 +12,7 @@ import type {IPerformanceLogger} from './createPerformanceLogger';
 
 import GlobalPerformanceLogger from './GlobalPerformanceLogger';
 import * as React from 'react';
-import {useContext} from 'react';
+import {createContext, useContext} from 'react';
 
 /**
  * This is a React Context that provides a scoped instance of IPerformanceLogger.
@@ -21,7 +21,7 @@ import {useContext} from 'react';
  * See React docs about using Context: https://react.dev/docs/context.html
  */
 const PerformanceLoggerContext: React.Context<IPerformanceLogger> =
-  React.createContext(GlobalPerformanceLogger);
+  createContext(GlobalPerformanceLogger);
 if (__DEV__) {
   PerformanceLoggerContext.displayName = 'PerformanceLoggerContext';
 }

package/Libraries/Utilities/PlatformTypes.js

@@ -18,7 +18,7 @@ export type PlatformOSType =
   | 'native';
 
 type OptionalPlatformSelectSpec<T> = {
-  [_key in PlatformOSType]?: T,
+  [key in PlatformOSType]?: T, // eslint-disable-line no-unused-vars
 };
 
 export type PlatformSelectSpec<T> =

package/Libraries/vendor/core/ErrorUtils.js

@@ -8,9 +8,33 @@
  * @flow strict
  */
 
-import type {ErrorUtilsT} from '@react-native/js-polyfills/error-guard';
-
-export type ErrorUtils = ErrorUtilsT;
+// From @react-native/js-polyfills
+type ErrorHandler = (error: mixed, isFatal: boolean) => void;
+type Fn<Args: $ReadOnlyArray<mixed>, Return> = (...Args) => Return;
+export type ErrorUtils = {
+  applyWithGuard<TArgs: $ReadOnlyArray<mixed>, TOut>(
+    fun: Fn<TArgs, TOut>,
+    context?: mixed,
+    args?: ?TArgs,
+    unused_onError?: null,
+    unused_name?: ?string,
+  ): ?TOut,
+  applyWithGuardIfNeeded<TArgs: $ReadOnlyArray<mixed>, TOut>(
+    fun: Fn<TArgs, TOut>,
+    context?: mixed,
+    args?: ?TArgs,
+  ): ?TOut,
+  getGlobalHandler(): ErrorHandler,
+  guard<TArgs: $ReadOnlyArray<mixed>, TOut>(
+    fun: Fn<TArgs, TOut>,
+    name?: ?string,
+    context?: mixed,
+  ): ?(...TArgs) => ?TOut,
+  inGuard(): boolean,
+  reportError(error: mixed): void,
+  reportFatalError(error: mixed): void,
+  setGlobalHandler(fun: ErrorHandler): void,
+};
 
 /**
  * The particular require runtime that we are using looks for a global
@@ -24,4 +48,4 @@ export type ErrorUtils = ErrorUtilsT;
  * that use it aren't just using a global variable, so simply export the global
  * variable here. ErrorUtils is originally defined in a file named error-guard.js.
  */
-export default (global.ErrorUtils: ErrorUtilsT);
+export default global.ErrorUtils as ErrorUtils;

package/index.js

@@ -9,7 +9,6 @@
  */
 
 // flowlint unsafe-getters-setters:off
-/* eslint-disable lint/no-commonjs-exports */
 
 'use strict';
 'use client';

package/jest/mockNativeComponent.js

@@ -10,6 +10,7 @@
 'use strict';
 
 const React = require('react');
+const {createElement} = require('react');
 
 let nativeTag = 1;
 
@@ -18,7 +19,7 @@ export default viewName => {
     _nativeTag = nativeTag++;
 
     render() {
-      return React.createElement(viewName, this.props, this.props.children);
+      return createElement(viewName, this.props, this.props.children);
     }
 
     // The methods that exist on host components

package/jest/renderer.js

@@ -6,7 +6,6 @@
  *
  * @flow
  * @format
- * @oncall react_native
  */
 
 import type {ReactTestRenderer} from 'react-test-renderer';

package/jest/resolver.js

@@ -0,0 +1,31 @@
+/**
+ * Copyright (c) Meta Platforms, Inc. and affiliates.
+ *
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
+ *
+ * @format
+ */
+
+'use strict';
+
+module.exports = (path, options) => {
+  const originalPackageFilter = options.packageFilter;
+
+  return options.defaultResolver(path, {
+    ...options,
+    packageFilter: pkg => {
+      const filteredPkg = originalPackageFilter
+        ? originalPackageFilter(pkg)
+        : pkg;
+
+      // Temporarily allow any react-native subpaths to be resolved and
+      // mocked by Jest (backwards compatibility around RFC0894)
+      if (filteredPkg.name === 'react-native') {
+        delete filteredPkg.exports;
+      }
+
+      return filteredPkg;
+    },
+  });
+};

package/jest/setup.js

@@ -203,7 +203,7 @@ jest
     __esModule: true,
     default: jest.requireActual(
       '../Libraries/Components/RefreshControl/__mocks__/RefreshControlMock',
-    ),
+    ).default,
   }))
   .mock('../Libraries/Components/ScrollView/ScrollView', () => {
     const baseComponent = mockComponent(

package/overrides.json

@@ -7,19 +7,19 @@
     "**/__snapshots__/**",
     "src-win/rntypes/**"
   ],
-  "baseVersion": "0.80.0-nightly-20250506-3ac16dd6a",
+  "baseVersion": "0.81.0-nightly-20250521-3cb70bb6a",
   "overrides": [
     {
       "type": "derived",
       "file": ".flowconfig",
       "baseFile": ".flowconfig",
-      "baseHash": "70ed729d5f52c241530e8459cc40263d4e9fa9c0"
+      "baseHash": "dbea35126905a8314fa0a64ed2912896bc6d307b"
     },
     {
       "type": "derived",
       "file": "src-win/index.win32.js",
       "baseFile": "packages/react-native/index.js",
-      "baseHash": "96361b83bfc122f1d78cc7d87ea0d7c3bfac138f"
+      "baseHash": "b447e699186ab3e95da9dc4520b9c2517776e723"
     },
     {
       "type": "platform",
@@ -60,7 +60,7 @@
       "type": "derived",
       "file": "src-win/Libraries/Components/Button.win32.js",
       "baseFile": "packages/react-native/Libraries/Components/Button.js",
-      "baseHash": "4e77e13aa5774e813fbd874a13a920ea12e3ed91"
+      "baseHash": "6063d726e6255d1c55e07587f9ce09f1b7284301"
     },
     {
       "type": "platform",
@@ -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": "96bdd4aebf4133fd2fe6d1b448f9d7b4cd3e8982",
+      "baseHash": "eff51d201199c68c6f7ca268e315e538dcc01ab9",
       "issue": 6240
     },
     {
       "type": "patch",
       "file": "src-win/Libraries/Components/ProgressBarAndroid/ProgressBarAndroid.js",
       "baseFile": "packages/react-native/Libraries/Components/ProgressBarAndroid/ProgressBarAndroid.js",
-      "baseHash": "c96925930d9664306a8aef8b4102c43055ea03be"
+      "baseHash": "d1cc663442d184b62799b748c475a5a2c5c558c7"
     },
     {
       "type": "copy",
@@ -108,13 +108,13 @@
       "type": "derived",
       "file": "src-win/Libraries/Components/TextInput/TextInput.flow.win32.js",
       "baseFile": "packages/react-native/Libraries/Components/TextInput/TextInput.flow.js",
-      "baseHash": "f407548782cade71af32a52ecb440f72a403f06e"
+      "baseHash": "b611f4e98e9c7818dfac087e4f14384d3cc16b6a"
     },
     {
       "type": "derived",
       "file": "src-win/Libraries/Components/TextInput/TextInput.win32.js",
       "baseFile": "packages/react-native/Libraries/Components/TextInput/TextInput.js",
-      "baseHash": "9965c0079652083ab549bc2799eb9528b56a1b2d"
+      "baseHash": "2a5835c5cbdb36bd110e26f9be737aaaeb1fd97c"
     },
     {
       "type": "patch",
@@ -153,7 +153,7 @@
       "type": "derived",
       "file": "src-win/Libraries/Components/Touchable/TouchableNativeFeedback.win32.js",
       "baseFile": "packages/react-native/Libraries/Components/Touchable/TouchableNativeFeedback.js",
-      "baseHash": "8706705c1f8d3dd5390ea631ce5ae60e300ae50d"
+      "baseHash": "1cad0522ba348d657e7857bf84628d88e776170b"
     },
     {
       "type": "platform",
@@ -177,7 +177,7 @@
       "type": "patch",
       "file": "src-win/Libraries/Components/View/View.win32.js",
       "baseFile": "packages/react-native/Libraries/Components/View/View.js",
-      "baseHash": "2dd3e58cf6c4bc0882550eedd8150435972365eb"
+      "baseHash": "121c2126d26c94c8e508e3fb19ffe33f7be814b1"
     },
     {
       "type": "derived",
@@ -218,7 +218,7 @@
       "type": "patch",
       "file": "src-win/Libraries/Core/Devtools/loadBundleFromServer.win32.js",
       "baseFile": "packages/react-native/Libraries/Core/Devtools/loadBundleFromServer.js",
-      "baseHash": "e0158fd16d4a787e5a94d69e2b7a721e81b7c3da",
+      "baseHash": "ac08c96a4bebd677597a40ea1525a2d5d1ee8742",
       "issue": 12704
     },
     {
@@ -236,7 +236,7 @@
       "type": "derived",
       "file": "src-win/Libraries/Image/Image.win32.js",
       "baseFile": "packages/react-native/Libraries/Image/Image.ios.js",
-      "baseHash": "c0bc913aa95b6d1309ba44ef7968ba58fc488427",
+      "baseHash": "5d62f4a6c4edfe3007eb3b80704a1dfb68e5ff8a",
       "issue": 4320
     },
     {
@@ -303,13 +303,13 @@
       "type": "derived",
       "file": "src-win/Libraries/LogBox/UI/LogBoxInspectorReactFrames.win32.js",
       "baseFile": "packages/react-native/Libraries/LogBox/UI/LogBoxInspectorReactFrames.js",
-      "baseHash": "3a3d7da499937cce35c9bd17a11f10b2eeac04cc"
+      "baseHash": "cdf958aebabbe9067d34a2df3e6f2fe7ce09f51e"
     },
     {
       "type": "derived",
       "file": "src-win/Libraries/LogBox/UI/LogBoxInspectorSourceMapStatus.win32.js",
       "baseFile": "packages/react-native/Libraries/LogBox/UI/LogBoxInspectorSourceMapStatus.js",
-      "baseHash": "b355418205aa52cf33fb7e4d521b26083eada49d"
+      "baseHash": "987653809d7838bb80d3a975abc9f0fd3bc13d93"
     },
     {
       "type": "derived",
@@ -390,6 +390,13 @@
       "baseFile": "packages/react-native/Libraries/ReactNative/PaperUIManager.js",
       "baseHash": "7a14c3d42ba7442848bd90329f6d31bda323c6d4"
     },
+    {
+      "type": "patch",
+      "file": "src-win/Libraries/Renderer/shims/ReactNativeTypes.win32.js",
+      "baseFile": "packages/react-native/Libraries/Renderer/shims/ReactNativeTypes.js",
+      "baseHash": "4e0c2fba71006410b3effa3979aea91e0f711144",
+      "issue": 0
+    },
     {
       "type": "derived",
       "file": "src-win/Libraries/Settings/Settings.win32.js",
@@ -412,13 +419,13 @@
       "type": "derived",
       "file": "src-win/Libraries/Text/Text.d.ts",
       "baseFile": "packages/react-native/Libraries/Text/Text.d.ts",
-      "baseHash": "b5f44957bc61497fcb7203934bdbc6ca9725cf42"
+      "baseHash": "d3807571f477ef8ba4bb20c1ee899b1a5814941d"
     },
     {
       "type": "derived",
       "file": "src-win/Libraries/Text/Text.win32.js",
       "baseFile": "packages/react-native/Libraries/Text/Text.js",
-      "baseHash": "1f802db19830e468b84640fc5c7740a11e154250"
+      "baseHash": "108e59816ed3b3c8183d0687a66088755580c00d"
     },
     {
       "type": "derived",
@@ -431,7 +438,7 @@
       "type": "derived",
       "file": "src-win/Libraries/Text/TextProps.win32.js",
       "baseFile": "packages/react-native/Libraries/Text/TextProps.js",
-      "baseHash": "d31f973c14140792d9d28d208fca15d092a8a4e2"
+      "baseHash": "6ee62a1b3a4384c2b5bd1dd10a13664c72e5dc88"
     },
     {
       "type": "patch",
@@ -477,7 +484,7 @@
       "type": "patch",
       "file": "src-win/Libraries/Utilities/PlatformTypes.js",
       "baseFile": "packages/react-native/Libraries/Utilities/PlatformTypes.js",
-      "baseHash": "0bd36210528f74f9081d858c9ab64ead92c54950",
+      "baseHash": "8beb4d8d786f33f9eeb6edcff939c38765e19055",
       "issue": 14686
     },
     {
@@ -490,14 +497,14 @@
       "type": "patch",
       "file": "src-win/src/private/animated/NativeAnimatedHelper.win32.js",
       "baseFile": "packages/react-native/src/private/animated/NativeAnimatedHelper.js",
-      "baseHash": "3247a8e436a7beeda45ce7d77343229b5204cbfc",
+      "baseHash": "e897f1bd33ed982044b97a01d9f606b9ebcd4505",
       "issue": 11041
     },
     {
       "type": "copy",
       "file": "src-win/src/private/devsupport/rndevtools/ReactDevToolsSettingsManager.win32.js",
       "baseFile": "packages/react-native/src/private/devsupport/rndevtools/ReactDevToolsSettingsManager.android.js",
-      "baseHash": "2d33789b0c7a45996dc23f26c4b09fb2026a9285"
+      "baseHash": "f2cc01b07b779b75002daec9c2761616ad01f4ca"
     },
     {
       "type": "derived",

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@office-iss/react-native-win32",
-  "version": "0.0.0-canary.295",
+  "version": "0.0.0-canary.297",
   "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-20250506-3ac16dd6a",
-    "@react-native/codegen": "0.80.0-nightly-20250506-3ac16dd6a",
-    "@react-native/community-cli-plugin": "0.80.0-nightly-20250506-3ac16dd6a",
-    "@react-native/gradle-plugin": "0.80.0-nightly-20250506-3ac16dd6a",
-    "@react-native/js-polyfills": "0.80.0-nightly-20250506-3ac16dd6a",
-    "@react-native/normalize-colors": "0.80.0-nightly-20250506-3ac16dd6a",
-    "@react-native/virtualized-lists": "0.80.0-nightly-20250506-3ac16dd6a",
+    "@react-native/assets-registry": "0.81.0-nightly-20250521-3cb70bb6a",
+    "@react-native/codegen": "0.81.0-nightly-20250521-3cb70bb6a",
+    "@react-native/community-cli-plugin": "0.81.0-nightly-20250521-3cb70bb6a",
+    "@react-native/gradle-plugin": "0.81.0-nightly-20250521-3cb70bb6a",
+    "@react-native/js-polyfills": "0.81.0-nightly-20250521-3cb70bb6a",
+    "@react-native/normalize-colors": "0.81.0-nightly-20250521-3cb70bb6a",
+    "@react-native/virtualized-lists": "0.81.0-nightly-20250521-3cb70bb6a",
     "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-20250506-3ac16dd6a",
+    "@react-native/metro-config": "0.81.0-nightly-20250521-3cb70bb6a",
     "@rnw-scripts/babel-react-native-config": "0.0.0",
     "@rnw-scripts/eslint-config": "1.2.37",
     "@rnw-scripts/jest-out-of-tree-snapshot-resolver": "^1.1.41",
@@ -83,19 +83,19 @@
     "@types/prop-types": "15.7.1",
     "@types/react": "^19.0.0",
     "eslint": "^8.19.0",
-    "flow-bin": "^0.269.0",
+    "flow-bin": "^0.271.0",
     "jscodeshift": "^0.14.0",
     "just-scripts": "^1.3.3",
     "prettier": "2.8.8",
     "react": "19.1.0",
-    "react-native": "0.80.0-nightly-20250506-3ac16dd6a",
-    "react-native-platform-override": "^1.9.57",
+    "react-native": "0.81.0-nightly-20250521-3cb70bb6a",
+    "react-native-platform-override": "^1.9.58",
     "typescript": "5.0.4"
   },
   "peerDependencies": {
     "@types/react": "^19.1.0",
     "react": "^19.1.0",
-    "react-native": "0.80.0-nightly-20250506-3ac16dd6a"
+    "react-native": "0.81.0-nightly-20250521-3cb70bb6a"
   },
   "beachball": {
     "defaultNpmTag": "canary",

package/src/private/animated/NativeAnimatedHelper.js

@@ -57,7 +57,7 @@ const eventListenerAnimationFinishedCallbacks: {
 let globalEventEmitterGetValueListener: ?EventSubscription = null;
 let globalEventEmitterAnimationFinishedListener: ?EventSubscription = null;
 
-const shouldSignalBatch =
+const shouldSignalBatch: boolean =
   ReactNativeFeatureFlags.animatedShouldSignalBatch() ||
   ReactNativeFeatureFlags.cxxNativeAnimatedEnabled();
 
@@ -97,6 +97,10 @@ function createNativeOperations(): $NonMaybeType<typeof NativeAnimatedModule> {
         // is possible because # arguments is fixed for each operation. For more
         // details, see `NativeAnimatedModule.queueAndExecuteBatchedOperations`.
         singleOpQueue.push(operationID, ...args);
+        if (shouldSignalBatch) {
+          clearImmediate(flushQueueImmediate);
+          flushQueueImmediate = setImmediate(API.flushQueue);
+        }
       };
     }
   } else {
@@ -436,6 +440,7 @@ export default {
   generateNewAnimationId,
   assertNativeAnimatedModule,
   shouldUseNativeDriver,
+  shouldSignalBatch,
   transformDataType,
   // $FlowExpectedError[unsafe-getters-setters] - unsafe getter lint suppression
   // $FlowExpectedError[missing-type-arg] - unsafe getter lint suppression

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

@@ -57,7 +57,7 @@ const eventListenerAnimationFinishedCallbacks: {
 let globalEventEmitterGetValueListener: ?EventSubscription = null;
 let globalEventEmitterAnimationFinishedListener: ?EventSubscription = null;
 
-const shouldSignalBatch =
+const shouldSignalBatch: boolean =
   ReactNativeFeatureFlags.animatedShouldSignalBatch() ||
   ReactNativeFeatureFlags.cxxNativeAnimatedEnabled();
 
@@ -97,6 +97,10 @@ function createNativeOperations(): $NonMaybeType<typeof NativeAnimatedModule> {
         // is possible because # arguments is fixed for each operation. For more
         // details, see `NativeAnimatedModule.queueAndExecuteBatchedOperations`.
         singleOpQueue.push(operationID, ...args);
+        if (shouldSignalBatch) {
+          clearImmediate(flushQueueImmediate);
+          flushQueueImmediate = setImmediate(API.flushQueue);
+        }
       };
     }
   } else {
@@ -439,6 +443,7 @@ export default {
   generateNewAnimationId,
   assertNativeAnimatedModule,
   shouldUseNativeDriver,
+  shouldSignalBatch,
   transformDataType,
   // $FlowExpectedError[unsafe-getters-setters] - unsafe getter lint suppression
   // $FlowExpectedError[missing-type-arg] - unsafe getter lint suppression

package/src/private/animated/createAnimatedPropsHook.js

@@ -66,9 +66,13 @@ export default function createAnimatedPropsHook(
     );
 
     useEffect(() => {
-      // If multiple components call `flushQueue`, the first one will flush the
-      // queue and subsequent ones will do nothing.
-      NativeAnimatedHelper.API.flushQueue();
+      // Animated queue flush is handled deterministically in setImmediate for the following feature flags:
+      // animatedShouldSignalBatch, cxxNativeAnimatedEnabled
+      if (!NativeAnimatedHelper.shouldSignalBatch) {
+        // If multiple components call `flushQueue`, the first one will flush the
+        // queue and subsequent ones will do nothing.
+        NativeAnimatedHelper.API.flushQueue();
+      }
       let drivenAnimationEndedListener: ?EventSubscription = null;
       if (node.__isNative) {
         drivenAnimationEndedListener =
@@ -128,7 +132,10 @@ export default function createAnimatedPropsHook(
           if (node.__isNative) {
             // Check 2: this is an animation driven by native.
             // In native driven animations, this callback is only called once the animation completes.
-            if (isFabricNode) {
+            if (
+              isFabricNode &&
+              !ReactNativeFeatureFlags.cxxNativeAnimatedEnabled()
+            ) {
               // Call `scheduleUpdate` to synchronise Fiber and Shadow tree.
               // Must not be called in Paper.
               scheduleUpdate();

package/src/private/animated/createAnimatedPropsMemoHook.js

@@ -6,7 +6,6 @@
  *
  * @flow strict-local
  * @format
- * @oncall react_native
  */
 
 import type AnimatedProps from '../../../Libraries/Animated/nodes/AnimatedProps';

package/src/private/components/safeareaview/SafeAreaView_INTERNAL_DO_NOT_USE.js

@@ -6,7 +6,6 @@
  *
  * @flow strict-local
  * @format
- * @oncall react_native
  */
 
 import type {ViewProps} from '../../../../Libraries/Components/View/ViewPropTypes';

package/src/private/components/scrollview/HScrollViewNativeComponents.js

@@ -6,7 +6,6 @@
  *
  * @flow strict-local
  * @format
- * @oncall react_native
  */
 
 import type {ScrollViewNativeProps} from '../../../../Libraries/Components/ScrollView/ScrollViewNativeComponentType';

package/src/private/components/scrollview/VScrollViewNativeComponents.js

@@ -6,7 +6,6 @@
  *
  * @flow strict-local
  * @format
- * @oncall react_native
  */
 
 import type {ScrollViewNativeProps} from '../../../../Libraries/Components/ScrollView/ScrollViewNativeComponentType';