react-native-windows 0.81.1 → 0.82.0-preview.1

package/Libraries/Text/TextNativeComponent.js

@@ -67,7 +67,7 @@ const virtualTextViewConfig = {
 
 export const NativeText: HostComponent<NativeTextProps> =
   (createReactNativeComponentClass('RCTText', () =>
-    /* $FlowFixMe[incompatible-call] Natural Inference rollout. See
+    /* $FlowFixMe[incompatible-type] Natural Inference rollout. See
      * https://fburl.com/workplace/6291gfvu */
     createViewConfig(textViewConfig),
   ): any);
@@ -76,7 +76,7 @@ export const NativeVirtualText: HostComponent<NativeTextProps> =
   !global.RN$Bridgeless && !UIManager.hasViewManagerConfig('RCTVirtualText')
     ? NativeText
     : (createReactNativeComponentClass('RCTVirtualText', () =>
-        /* $FlowFixMe[incompatible-call] Natural Inference rollout. See
+        /* $FlowFixMe[incompatible-type] Natural Inference rollout. See
          * https://fburl.com/workplace/6291gfvu */
         createViewConfig(virtualTextViewConfig),
       ): any);

package/Libraries/Utilities/Appearance.d.ts

@@ -9,7 +9,7 @@
 
 import {NativeEventSubscription} from '../EventEmitter/RCTNativeAppEventEmitter';
 
-type ColorSchemeName = 'light' | 'dark' | null | undefined;
+type ColorSchemeName = 'light' | 'dark' | 'unspecified';
 
 export namespace Appearance {
   type AppearancePreferences = {
@@ -26,7 +26,7 @@ export namespace Appearance {
    *
    * Example: `const colorScheme = Appearance.getColorScheme();`
    */
-  export function getColorScheme(): ColorSchemeName;
+  export function getColorScheme(): ColorSchemeName | null | undefined;
 
   /**
    * Set the color scheme preference. This is useful for overriding the default
@@ -34,9 +34,7 @@ export namespace Appearance {
    * appearance of the system UI, only the appearance of the app.
    * Only available on iOS 13+ and Android 10+.
    */
-  export function setColorScheme(
-    scheme: ColorSchemeName | null | undefined,
-  ): void;
+  export function setColorScheme(scheme: ColorSchemeName): void;
 
   /**
    * Add an event handler that is fired when appearance preferences change.

package/Libraries/Utilities/Appearance.js

@@ -14,7 +14,6 @@ import typeof INativeAppearance from './NativeAppearance';
 
 import NativeEventEmitter from '../EventEmitter/NativeEventEmitter';
 import EventEmitter from '../vendor/emitter/EventEmitter';
-import invariant from 'invariant';
 
 export type {AppearancePreferences};
 
@@ -60,7 +59,7 @@ function getState(): $NonMaybeType<typeof lazyState> {
       appearanceChanged: [AppearancePreferences],
     }>(NativeAppearance).addListener('appearanceChanged', newAppearance => {
       state.appearance = {
-        colorScheme: toColorScheme(newAppearance.colorScheme),
+        colorScheme: newAppearance.colorScheme,
       };
       eventEmitter.emit('change', state.appearance);
     });
@@ -83,7 +82,7 @@ export function getColorScheme(): ?ColorSchemeName {
       // Lazily initialize `state.appearance`. This should only
       // happen once because we never reassign a null value to it.
       state.appearance = {
-        colorScheme: toColorScheme(NativeAppearance.getColorScheme()),
+        colorScheme: NativeAppearance.getColorScheme(),
       };
     }
     colorScheme = state.appearance.colorScheme;
@@ -94,13 +93,13 @@ export function getColorScheme(): ?ColorSchemeName {
 /**
  * Updates the current color scheme to the supplied value.
  */
-export function setColorScheme(colorScheme: ?ColorSchemeName): void {
+export function setColorScheme(colorScheme: ColorSchemeName): void {
   const state = getState();
   const {NativeAppearance} = state;
   if (NativeAppearance != null) {
-    NativeAppearance.setColorScheme(colorScheme ?? 'unspecified');
+    NativeAppearance.setColorScheme(colorScheme);
     state.appearance = {
-      colorScheme: toColorScheme(NativeAppearance.getColorScheme()),
+      colorScheme,
     };
   }
 }
@@ -114,14 +113,3 @@ export function addChangeListener(
   const {eventEmitter} = getState();
   return eventEmitter.addListener('change', listener);
 }
-
-/**
- * TODO: (hramos) T52919652 Use ?ColorSchemeName once codegen supports union
- */
-function toColorScheme(colorScheme: ?string): ?ColorSchemeName {
-  invariant(
-    colorScheme === 'dark' || colorScheme === 'light' || colorScheme == null,
-    "Unrecognized color scheme. Did you mean 'dark', 'light' or null?",
-  );
-  return colorScheme;
-}

package/Libraries/Utilities/HMRClient.js

@@ -128,7 +128,6 @@ const HMRClient: HMRClientNativeInterface = {
         JSON.stringify({
           type: 'log',
           level,
-          mode: global.RN$Bridgeless === true ? 'NOBRIDGE' : 'BRIDGE',
           data: data.map(item =>
             typeof item === 'string'
               ? item
@@ -166,6 +165,8 @@ const HMRClient: HMRClientNativeInterface = {
     // Moving to top gives errors due to NativeModules not being initialized
     const DevLoadingView = require('./DevLoadingView').default;
 
+    /* $FlowFixMe[invalid-compare] Error discovered during Constant Condition
+     * roll out. See https://fburl.com/workplace/5whu3i34. */
     const serverHost = port !== null && port !== '' ? `${host}:${port}` : host;
 
     const serverScheme = scheme;

package/Libraries/Utilities/Platform.android.js

@@ -72,12 +72,12 @@ const Platform: PlatformType = {
   },
   select: <T>(spec: PlatformSelectSpec<T>): T =>
     'android' in spec
-      ? // $FlowFixMe[incompatible-return]
+      ? // $FlowFixMe[incompatible-type]
         spec.android
       : 'native' in spec
-        ? // $FlowFixMe[incompatible-return]
+        ? // $FlowFixMe[incompatible-type]
           spec.native
-        : // $FlowFixMe[incompatible-return]
+        : // $FlowFixMe[incompatible-type]
           spec.default,
 };
 

package/Libraries/Utilities/Platform.d.ts

@@ -94,6 +94,7 @@ interface PlatformWindowsOSStatic extends PlatformStatic {
 
 interface PlatformWebStatic extends PlatformStatic {
   OS: 'web';
+  Version: string;
 }
 
 export type Platform =

package/Libraries/Utilities/Platform.ios.js

@@ -78,7 +78,7 @@ const Platform: PlatformType = {
     return this.constants.isMacCatalyst ?? false;
   },
   select: <T>(spec: PlatformSelectSpec<T>): T =>
-    // $FlowFixMe[incompatible-return]
+    // $FlowFixMe[incompatible-type]
     'ios' in spec ? spec.ios : 'native' in spec ? spec.native : spec.default,
 };
 

package/Libraries/Utilities/Platform.windows.js

@@ -64,12 +64,12 @@ const Platform: PlatformType = {
   },
   select: <T>(spec: PlatformSelectSpec<T>): T =>
     'windows' in spec
-      ? // $FlowFixMe[incompatible-return]
+      ? // $FlowFixMe[incompatible-type]
         spec.windows
       : 'native' in spec
-        ? // $FlowFixMe[incompatible-return]
+        ? // $FlowFixMe[incompatible-type]
           spec.native
-        : // $FlowFixMe[incompatible-return]
+        : // $FlowFixMe[incompatible-type]
           spec.default,
 };
 

package/Libraries/Utilities/PlatformTypes.js

@@ -159,7 +159,7 @@ type MacOSPlatform = {
 type WebPlatform = {
   OS: 'web',
   // $FlowFixMe[unsafe-getters-setters]
-  get Version(): void,
+  get Version(): string,
   // $FlowFixMe[unsafe-getters-setters]
   get constants(): {
     reactNativeVersion: {

package/Libraries/Utilities/ReactNativeTestTools.js

@@ -38,13 +38,21 @@ function byClickable(): Predicate {
     node =>
       // note: <Text /> lazy-mounts press handlers after the first press,
       //       so this is a workaround for targeting text nodes.
+      /* $FlowFixMe[invalid-compare] Error discovered during Constant Condition
+       * roll out. See https://fburl.com/workplace/4oq3zi07. */
       (node.type === Text &&
         node.props &&
         typeof node.props.onPress === 'function') ||
       // note: Special casing <Switch /> since it doesn't use touchable
+      /* $FlowFixMe[invalid-compare] Error discovered during Constant Condition
+       * roll out. See https://fburl.com/workplace/4oq3zi07. */
       (node.type === Switch && node.props && node.props.disabled !== true) ||
+      /* $FlowFixMe[invalid-compare] Error discovered during Constant Condition
+       * roll out. See https://fburl.com/workplace/4oq3zi07. */
       (node.type === View &&
         node?.props?.onStartShouldSetResponder?.testOnly_pressabilityConfig) ||
+      /* $FlowFixMe[invalid-compare] Error discovered during Constant Condition
+       * roll out. See https://fburl.com/workplace/4oq3zi07. */
       (node.type === TouchableWithoutFeedback &&
         node.props &&
         typeof node.props.onPress === 'function') ||
@@ -174,8 +182,12 @@ function renderWithStrictMode(element: React.Node): ReactTestRendererType {
 
 function tap(instance: ReactTestInstance) {
   const touchable = instance.find(byClickable());
+  /* $FlowFixMe[invalid-compare] Error discovered during Constant Condition
+   * roll out. See https://fburl.com/workplace/4oq3zi07. */
   if (touchable.type === Text && touchable.props && touchable.props.onPress) {
     touchable.props.onPress();
+    /* $FlowFixMe[invalid-compare] Error discovered during Constant Condition
+     * roll out. See https://fburl.com/workplace/4oq3zi07. */
   } else if (touchable.type === Switch && touchable.props) {
     const value = !touchable.props.value;
     const {onChange, onValueChange} = touchable.props;

package/Libraries/Utilities/SceneTracker.js

@@ -14,7 +14,7 @@ export type Scene = {name: string, [string]: mixed, ...};
 
 let _listeners: Array<(scene: Scene) => void> = [];
 
-let _activeScene = {name: 'default'};
+let _activeScene: Scene = {name: 'default'};
 
 const SceneTracker = {
   setActiveScene(scene: Scene) {

package/Libraries/Utilities/codegenNativeCommands.js

@@ -22,7 +22,7 @@ function codegenNativeCommands<T: interface {}>(
   options.supportedCommands.forEach(command => {
     // $FlowFixMe[missing-local-annot]
     commandObj[command] = (ref, ...args) => {
-      // $FlowFixMe[incompatible-call]
+      // $FlowFixMe[incompatible-type]
       dispatchCommand(ref, command, args);
     };
   });

package/Libraries/Utilities/codegenNativeComponent.js

@@ -65,7 +65,7 @@ function codegenNativeComponent<Props: {...}>(
   }
 
   return (requireNativeComponent<Props>(
-    // $FlowFixMe[incompatible-call]
+    // $FlowFixMe[incompatible-type]
     componentNameInUse,
   ): HostComponent<Props>);
 }

package/Libraries/Utilities/createPerformanceLogger.js

@@ -35,6 +35,8 @@ class PerformanceLogger implements IPerformanceLogger {
     endExtras?: Extras,
   ) {
     if (this._closed) {
+      /* $FlowFixMe[constant-condition] Error discovered during Constant
+       * Condition roll out. See https://fburl.com/workplace/1v97vimq. */
       if (PRINT_TO_CONSOLE && __DEV__) {
         console.log(
           'PerformanceLogger: addTimespan - has closed ignoring: ',
@@ -44,6 +46,8 @@ class PerformanceLogger implements IPerformanceLogger {
       return;
     }
     if (this._timespans[key]) {
+      /* $FlowFixMe[constant-condition] Error discovered during Constant
+       * Condition roll out. See https://fburl.com/workplace/1v97vimq. */
       if (PRINT_TO_CONSOLE && __DEV__) {
         console.log(
           'PerformanceLogger: Attempting to add a timespan that already exists ',
@@ -79,6 +83,8 @@ class PerformanceLogger implements IPerformanceLogger {
     this._timespans = {};
     this._extras = {};
     this._points = {};
+    /* $FlowFixMe[constant-condition] Error discovered during Constant
+     * Condition roll out. See https://fburl.com/workplace/1v97vimq. */
     if (PRINT_TO_CONSOLE) {
       console.log('PerformanceLogger.js', 'clear');
     }
@@ -92,6 +98,8 @@ class PerformanceLogger implements IPerformanceLogger {
     }
     this._extras = {};
     this._points = {};
+    /* $FlowFixMe[constant-condition] Error discovered during Constant
+     * Condition roll out. See https://fburl.com/workplace/1v97vimq. */
     if (PRINT_TO_CONSOLE) {
       console.log('PerformanceLogger.js', 'clearCompleted');
     }
@@ -130,6 +138,8 @@ class PerformanceLogger implements IPerformanceLogger {
   }
 
   logEverything() {
+    /* $FlowFixMe[constant-condition] Error discovered during Constant
+     * Condition roll out. See https://fburl.com/workplace/1v97vimq. */
     if (PRINT_TO_CONSOLE) {
       // log timespans
       for (const key in this._timespans) {
@@ -156,6 +166,8 @@ class PerformanceLogger implements IPerformanceLogger {
     extras?: Extras,
   ) {
     if (this._closed) {
+      /* $FlowFixMe[constant-condition] Error discovered during Constant
+       * Condition roll out. See https://fburl.com/workplace/1v97vimq. */
       if (PRINT_TO_CONSOLE && __DEV__) {
         console.log(
           'PerformanceLogger: markPoint - has closed ignoring: ',
@@ -165,6 +177,8 @@ class PerformanceLogger implements IPerformanceLogger {
       return;
     }
     if (this._points[key] != null) {
+      /* $FlowFixMe[constant-condition] Error discovered during Constant
+       * Condition roll out. See https://fburl.com/workplace/1v97vimq. */
       if (PRINT_TO_CONSOLE && __DEV__) {
         console.log(
           'PerformanceLogger: Attempting to mark a point that has been already logged ',
@@ -187,6 +201,8 @@ class PerformanceLogger implements IPerformanceLogger {
 
   setExtra(key: string, value: ExtraValue) {
     if (this._closed) {
+      /* $FlowFixMe[constant-condition] Error discovered during Constant
+       * Condition roll out. See https://fburl.com/workplace/1v97vimq. */
       if (PRINT_TO_CONSOLE && __DEV__) {
         console.log('PerformanceLogger: setExtra - has closed ignoring: ', key);
       }
@@ -194,6 +210,8 @@ class PerformanceLogger implements IPerformanceLogger {
     }
 
     if (this._extras.hasOwnProperty(key)) {
+      /* $FlowFixMe[constant-condition] Error discovered during Constant
+       * Condition roll out. See https://fburl.com/workplace/1v97vimq. */
       if (PRINT_TO_CONSOLE && __DEV__) {
         console.log(
           'PerformanceLogger: Attempting to set an extra that already exists ',
@@ -211,6 +229,8 @@ class PerformanceLogger implements IPerformanceLogger {
     extras?: Extras,
   ) {
     if (this._closed) {
+      /* $FlowFixMe[constant-condition] Error discovered during Constant
+       * Condition roll out. See https://fburl.com/workplace/1v97vimq. */
       if (PRINT_TO_CONSOLE && __DEV__) {
         console.log(
           'PerformanceLogger: startTimespan - has closed ignoring: ',
@@ -221,6 +241,8 @@ class PerformanceLogger implements IPerformanceLogger {
     }
 
     if (this._timespans[key]) {
+      /* $FlowFixMe[constant-condition] Error discovered during Constant
+       * Condition roll out. See https://fburl.com/workplace/1v97vimq. */
       if (PRINT_TO_CONSOLE && __DEV__) {
         console.log(
           'PerformanceLogger: Attempting to start a timespan that already exists ',
@@ -234,6 +256,8 @@ class PerformanceLogger implements IPerformanceLogger {
       startTime: timestamp,
       startExtras: extras,
     };
+    /* $FlowFixMe[constant-condition] Error discovered during Constant
+     * Condition roll out. See https://fburl.com/workplace/1v97vimq. */
     if (PRINT_TO_CONSOLE) {
       console.log('PerformanceLogger.js', 'start: ' + key);
     }
@@ -245,6 +269,8 @@ class PerformanceLogger implements IPerformanceLogger {
     extras?: Extras,
   ) {
     if (this._closed) {
+      /* $FlowFixMe[constant-condition] Error discovered during Constant
+       * Condition roll out. See https://fburl.com/workplace/1v97vimq. */
       if (PRINT_TO_CONSOLE && __DEV__) {
         console.log(
           'PerformanceLogger: stopTimespan - has closed ignoring: ',
@@ -256,6 +282,8 @@ class PerformanceLogger implements IPerformanceLogger {
 
     const timespan = this._timespans[key];
     if (!timespan || timespan.startTime == null) {
+      /* $FlowFixMe[constant-condition] Error discovered during Constant
+       * Condition roll out. See https://fburl.com/workplace/1v97vimq. */
       if (PRINT_TO_CONSOLE && __DEV__) {
         console.log(
           'PerformanceLogger: Attempting to end a timespan that has not started ',
@@ -265,6 +293,8 @@ class PerformanceLogger implements IPerformanceLogger {
       return;
     }
     if (timespan.endTime != null) {
+      /* $FlowFixMe[constant-condition] Error discovered during Constant
+       * Condition roll out. See https://fburl.com/workplace/1v97vimq. */
       if (PRINT_TO_CONSOLE && __DEV__) {
         console.log(
           'PerformanceLogger: Attempting to end a timespan that has already ended ',
@@ -277,6 +307,8 @@ class PerformanceLogger implements IPerformanceLogger {
     timespan.endExtras = extras;
     timespan.endTime = timestamp;
     timespan.totalTime = timespan.endTime - (timespan.startTime || 0);
+    /* $FlowFixMe[constant-condition] Error discovered during Constant
+     * Condition roll out. See https://fburl.com/workplace/1v97vimq. */
     if (PRINT_TO_CONSOLE) {
       console.log('PerformanceLogger.js', 'end: ' + key);
     }

package/Libraries/Utilities/deepFreezeAndThrowOnMutationInDev.js

@@ -33,6 +33,8 @@ function deepFreezeAndThrowOnMutationInDev<T: {...} | Array<mixed>>(
   if (__DEV__) {
     if (
       typeof object !== 'object' ||
+      /* $FlowFixMe[invalid-compare] Error discovered during Constant Condition
+       * roll out. See https://fburl.com/workplace/5whu3i34. */
       object === null ||
       Object.isFrozen(object) ||
       Object.isSealed(object)

package/Libraries/Utilities/differ/pointsDiffer.js

@@ -16,7 +16,7 @@ type Point = {
   ...
 };
 
-const dummyPoint = {x: undefined, y: undefined};
+const dummyPoint: Point = {x: undefined, y: undefined};
 
 function pointsDiffer(one: ?Point, two: ?Point): boolean {
   one = one || dummyPoint;

package/Libraries/Utilities/useMergeRefs.js

@@ -31,7 +31,7 @@ export default function useMergeRefs<Instance>(
           return undefined;
         } else {
           if (typeof ref === 'function') {
-            // $FlowIssue[incompatible-type] - Flow does not understand ref cleanup.
+            // $FlowFixMe[incompatible-type] - Flow does not understand ref cleanup.
             const cleanup: void | (() => void) = ref(current);
             return typeof cleanup === 'function'
               ? cleanup

package/Libraries/WebSocket/WebSocketInterceptor.js

@@ -232,6 +232,8 @@ const WebSocketInterceptor = {
 
   _arrayBufferToString(data: string): ArrayBuffer | string {
     const value = base64.toByteArray(data).buffer;
+    /* $FlowFixMe[invalid-compare] Error discovered during Constant Condition
+     * roll out. See https://fburl.com/workplace/5whu3i34. */
     if (value === undefined || value === null) {
       return '(no value)';
     }

package/Libraries/promiseRejectionTrackingOptions.js

@@ -10,21 +10,21 @@
 
 import typeof {enable} from 'promise/setimmediate/rejection-tracking';
 
-import LogBox from './LogBox/LogBox';
+import ExceptionsManager from './Core/ExceptionsManager';
 
 let rejectionTrackingOptions: $NonMaybeType<Parameters<enable>[0]> = {
   allRejections: true,
-  onUnhandled: (id, rejection = {}) => {
+  onUnhandled: (id, rejection) => {
     let message: string;
-    let stack: ?string;
 
-    // $FlowFixMe[method-unbinding] added when improving typing for this parameters
-    const stringValue = Object.prototype.toString.call(rejection);
-    if (stringValue === '[object Error]') {
+    if (rejection === undefined) {
+      message = '';
+    } else if (
+      // $FlowFixMe[method-unbinding] added when improving typing for this parameters
+      Object.prototype.toString.call(rejection) === '[object Error]'
+    ) {
       // $FlowFixMe[method-unbinding] added when improving typing for this parameters
       message = Error.prototype.toString.call(rejection);
-      const error: Error = (rejection: $FlowFixMe);
-      stack = error.stack;
     } else {
       try {
         message = require('pretty-format').format(rejection);
@@ -34,37 +34,23 @@ let rejectionTrackingOptions: $NonMaybeType<Parameters<enable>[0]> = {
             ? rejection
             : JSON.stringify((rejection: $FlowFixMe));
       }
-      // It could although this object is not a standard error, it still has stack information to unwind
-      // $FlowFixMe ignore types just check if stack is there
-      if (rejection?.stack && typeof rejection.stack === 'string') {
-        stack = rejection.stack;
-      }
     }
 
-    const warning = `Possible unhandled promise rejection (id: ${id}):\n${
-      message ?? ''
-    }`;
-    if (__DEV__) {
-      LogBox.addLog({
-        level: 'warn',
-        message: {
-          content: warning,
-          substitutions: [],
+    ExceptionsManager.handleException(
+      new Error(
+        `Uncaught (in promise, id: ${id})${message ? `: "${message}"` : ''}`,
+        {
+          cause: rejection,
         },
-        componentStack: [],
-        componentStackType: null,
-        stack,
-        category: 'possible_unhandled_promise_rejection',
-      });
-    } else {
-      console.warn(warning);
-    }
+      ),
+      false /* isFatal */,
+    );
   },
   onHandled: id => {
     const warning =
       `Promise rejection handled (id: ${id})\n` +
       'This means you can ignore any previous messages of the form ' +
-      `"Possible unhandled promise rejection (id: ${id}):"`;
+      `"Uncaught (in promise, id: ${id})"`;
     console.warn(warning);
   },
 };

package/Libraries/vendor/emitter/EventEmitter.js

@@ -126,7 +126,7 @@ export default class EventEmitter<
       // Copy `registrations` to take a snapshot when we invoke `emit`, in case
       // registrations are added or removed when listeners are invoked.
       for (const registration of Array.from(registrations)) {
-        // $FlowFixMe[incompatible-call]
+        // $FlowFixMe[incompatible-type]
         registration.listener.apply(registration.context, args);
       }
     }

package/Microsoft.ReactNative/App.xaml

@@ -0,0 +1,5 @@
+<Application
+    x:Class="Microsoft.ReactNative.Xaml.XamlApplication"
+    xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
+</Application>

package/Microsoft.ReactNative/Base/CxxReactIncludes.h

@@ -7,10 +7,7 @@
 
 #include "FollyIncludes.h"
 
-#include <cxxreact/CxxModule.h>
-#include <cxxreact/Instance.h>
 #include <cxxreact/JSBigString.h>
-#include <cxxreact/JSExecutor.h>
 #include <cxxreact/MessageQueueThread.h>
 #include <fbsystrace.h>
 #include <yoga/Yoga.h>

package/Microsoft.ReactNative/CompositionContext.idl

@@ -28,7 +28,6 @@ namespace Microsoft.ReactNative.Composition.Experimental
     static Windows.UI.Composition.ICompositionSurface InnerSurface(IDrawingSurfaceBrush surface);
   }
 
-#ifdef USE_WINUI3
   [webhosthidden]
   [default_interface]
   [experimental]
@@ -49,6 +48,5 @@ namespace Microsoft.ReactNative.Composition.Experimental
     static Microsoft.UI.Composition.CompositionBrush InnerBrush(IBrush brush);
     static Microsoft.UI.Composition.ICompositionSurface InnerSurface(IDrawingSurfaceBrush surface);
   }
-#endif
 
 } // namespace Microsoft.ReactNative.Composition

package/Microsoft.ReactNative/Fabric/AbiViewProps.cpp

@@ -53,13 +53,13 @@ winrt::Windows::UI::Color Color::AsWindowsColor(
     const winrt::Microsoft::ReactNative::Composition::Theme &theme) noexcept {
   return winrt::get_self<winrt::Microsoft::ReactNative::Composition::implementation::Theme>(theme)->Color(*m_color);
 }
-#ifdef USE_WINUI3
+
 winrt::Microsoft::UI::Composition::CompositionBrush Color::AsBrush(
     const winrt::Microsoft::ReactNative::Composition::Theme theme) noexcept {
   return winrt::Microsoft::ReactNative::Composition::Experimental::MicrosoftCompositionContextHelper::InnerBrush(
       winrt::get_self<winrt::Microsoft::ReactNative::Composition::implementation::Theme>(theme)->Brush(*m_color));
 }
-#endif
+
 winrt::Microsoft::ReactNative::Composition::Experimental::IBrush Color::AsInternalBrush(
     const winrt::Microsoft::ReactNative::Composition::Theme theme) noexcept {
   return winrt::get_self<winrt::Microsoft::ReactNative::Composition::implementation::Theme>(theme)->Brush(*m_color);

package/Microsoft.ReactNative/Fabric/AbiViewProps.h

@@ -43,10 +43,8 @@ struct Color : ColorT<Color, Composition::Experimental::IInternalColor> {
   Color(facebook::react::SharedColor color);
 
   winrt::Windows::UI::Color AsWindowsColor(const winrt::Microsoft::ReactNative::Composition::Theme &theme) noexcept;
-#ifdef USE_WINUI3
   winrt::Microsoft::UI::Composition::CompositionBrush AsBrush(
       const winrt::Microsoft::ReactNative::Composition::Theme theme) noexcept;
-#endif
   winrt::Microsoft::ReactNative::Composition::Experimental::IBrush AsInternalBrush(
       const winrt::Microsoft::ReactNative::Composition::Theme theme) noexcept;
 

package/Microsoft.ReactNative/Fabric/ComponentView.cpp

@@ -8,6 +8,7 @@
 #include "DynamicReader.h"
 
 #include "ComponentView.g.cpp"
+#include "CreateAutomationPeerArgs.g.h"
 #include "LayoutMetricsChangedArgs.g.cpp"
 #include "MountChildComponentViewArgs.g.cpp"
 #include "UnmountChildComponentViewArgs.g.cpp"
@@ -641,7 +642,32 @@ facebook::react::Tag ComponentView::hitTest(
   return -1;
 }
 
+struct CreateAutomationPeerArgs
+    : public winrt::Microsoft::ReactNative::implementation::CreateAutomationPeerArgsT<CreateAutomationPeerArgs> {
+  CreateAutomationPeerArgs(winrt::Windows::Foundation::IInspectable defaultAutomationPeer)
+      : m_defaultAutomationPeer(defaultAutomationPeer) {}
+
+  winrt::Windows::Foundation::IInspectable DefaultAutomationPeer() const noexcept {
+    return m_defaultAutomationPeer;
+  }
+
+ private:
+  winrt::Windows::Foundation::IInspectable m_defaultAutomationPeer;
+};
+
 winrt::IInspectable ComponentView::EnsureUiaProvider() noexcept {
+  if (m_uiaProvider == nullptr) {
+    if (m_builder && m_builder->CreateAutomationPeerHandler()) {
+      m_uiaProvider = m_builder->CreateAutomationPeerHandler()(
+          *this, winrt::make<CreateAutomationPeerArgs>(CreateAutomationProvider()));
+    } else {
+      m_uiaProvider = CreateAutomationProvider();
+    }
+  }
+  return m_uiaProvider;
+}
+
+winrt::Windows::Foundation::IInspectable ComponentView::CreateAutomationProvider() noexcept {
   return nullptr;
 }
 

package/Microsoft.ReactNative/Fabric/ComponentView.h

@@ -208,6 +208,7 @@ struct ComponentView
   virtual facebook::react::Tag
   hitTest(facebook::react::Point pt, facebook::react::Point &localPt, bool ignorePointerEvents = false) const noexcept;
   virtual winrt::Windows::Foundation::IInspectable EnsureUiaProvider() noexcept;
+  virtual winrt::Windows::Foundation::IInspectable CreateAutomationProvider() noexcept;
   virtual std::optional<std::string> getAccessiblityValue() noexcept;
   virtual void setAcccessiblityValue(std::string &&value) noexcept;
   virtual bool getAcccessiblityIsReadOnly() noexcept;
@@ -265,6 +266,7 @@ struct ComponentView
   facebook::react::LayoutMetrics m_layoutMetrics;
   winrt::Windows::Foundation::Collections::IVector<winrt::Microsoft::ReactNative::ComponentView> m_children{
       winrt::single_threaded_vector<winrt::Microsoft::ReactNative::ComponentView>()};
+  winrt::Windows::Foundation::IInspectable m_uiaProvider{nullptr};
 
   winrt::event<
       winrt::Windows::Foundation::EventHandler<winrt::Microsoft::ReactNative::Composition::Input::KeyRoutedEventArgs>>

package/Microsoft.ReactNative/Fabric/Composition/ActivityIndicatorComponentView.cpp

@@ -4,7 +4,6 @@
 #pragma once
 
 #include "ActivityIndicatorComponentView.h"
-#include "CompositionDynamicAutomationProvider.h"
 
 #include <Windows.UI.Composition.h>
 #include <Windows.h>