react-native-windows 0.74.12 → 0.75.0-preview.2

package/Libraries/Utilities/HMRClient.js

@@ -26,6 +26,7 @@ let hmrUnavailableReason: string | null = null;
 let currentCompileErrorMessage: string | null = null;
 let didConnect: boolean = false;
 let pendingLogs: Array<[LogLevel, $ReadOnlyArray<mixed>]> = [];
+let pendingFuseboxConsoleNotification = false;
 
 type LogLevel =
   | 'trace'
@@ -51,6 +52,7 @@ export type HMRClientNativeInterface = {|
     isEnabled: boolean,
     scheme?: string,
   ): void,
+  unstable_notifyFuseboxConsoleEnabled(): void,
 |};
 
 /**
@@ -68,7 +70,7 @@ const HMRClient: HMRClientNativeInterface = {
     }
 
     invariant(hmrClient, 'Expected HMRClient.setup() call at startup.');
-    const LoadingView = require('./LoadingView');
+    const DevLoadingView = require('./DevLoadingView');
 
     // We use this for internal logging only.
     // It doesn't affect the logic.
@@ -79,13 +81,13 @@ const HMRClient: HMRClientNativeInterface = {
     const hasUpdates = hmrClient.hasPendingUpdates();
 
     if (hasUpdates) {
-      LoadingView.showMessage('Refreshing...', 'refresh');
+      DevLoadingView.showMessage('Refreshing...', 'refresh');
     }
     try {
       hmrClient.enable();
     } finally {
       if (hasUpdates) {
-        LoadingView.hide();
+        DevLoadingView.hide();
       }
     }
 
@@ -140,6 +142,29 @@ const HMRClient: HMRClientNativeInterface = {
     }
   },
 
+  unstable_notifyFuseboxConsoleEnabled() {
+    if (!hmrClient) {
+      pendingFuseboxConsoleNotification = true;
+      return;
+    }
+    hmrClient.send(
+      JSON.stringify({
+        type: 'log',
+        level: 'info',
+        data: [
+          '\n' +
+            '\x1b[7m' +
+            ' \x1b[1mJavaScript logs have moved!\x1b[22m They will now appear in the debugger console. ' +
+            'Tip: Type \x1b[1mj\x1b[22m in the terminal to open the debugger (requires Google Chrome ' +
+            'or Microsoft Edge).' +
+            '\x1b[27m' +
+            '\n',
+        ],
+      }),
+    );
+    pendingFuseboxConsoleNotification = false;
+  },
+
   // Called once by the bridge on startup, even if Fast Refresh is off.
   // It creates the HMR client but doesn't actually set up the socket yet.
   setup(
@@ -156,7 +181,7 @@ const HMRClient: HMRClientNativeInterface = {
     invariant(!hmrClient, 'Cannot initialize hmrClient twice');
 
     // Moving to top gives errors due to NativeModules not being initialized
-    const LoadingView = require('./LoadingView');
+    const DevLoadingView = require('./DevLoadingView');
 
     const serverHost = port !== null && port !== '' ? `${host}:${port}` : host;
 
@@ -205,7 +230,7 @@ Error: ${e.message}`;
       didConnect = true;
 
       if (client.isEnabled() && !isInitialUpdate) {
-        LoadingView.showMessage('Refreshing...', 'refresh');
+        DevLoadingView.showMessage('Refreshing...', 'refresh');
       }
     });
 
@@ -217,11 +242,11 @@ Error: ${e.message}`;
     });
 
     client.on('update-done', () => {
-      LoadingView.hide();
+      DevLoadingView.hide();
     });
 
     client.on('error', data => {
-      LoadingView.hide();
+      DevLoadingView.hide();
 
       if (data.type === 'GraphNotFoundError') {
         client.close();
@@ -242,7 +267,7 @@ Error: ${e.message}`;
     });
 
     client.on('close', closeEvent => {
-      LoadingView.hide();
+      DevLoadingView.hide();
 
       // https://www.rfc-editor.org/rfc/rfc6455.html#section-7.4.1
       // https://www.rfc-editor.org/rfc/rfc6455.html#section-7.1.5
@@ -316,6 +341,9 @@ function flushEarlyLogs(client: MetroHMRClient) {
     pendingLogs.forEach(([level, data]) => {
       HMRClient.log(level, data);
     });
+    if (pendingFuseboxConsoleNotification) {
+      HMRClient.unstable_notifyFuseboxConsoleEnabled();
+    }
   } finally {
     pendingLogs.length = 0;
   }

package/Libraries/Utilities/HMRClientProdShim.js

@@ -25,6 +25,7 @@ const HMRClientProdShim: HMRClientNativeInterface = {
   disable() {},
   registerBundle() {},
   log() {},
+  unstable_notifyFuseboxConsoleEnabled() {},
 };
 
 module.exports = HMRClientProdShim;

package/Libraries/Utilities/NativePlatformConstantsWin.js

@@ -6,6 +6,6 @@
  * @flow strict
  */
 
-export * from '../../src/private/specs/modules/NativePlatformConstantsWin';
-import NativePlatformConstantsWin from '../../src/private/specs/modules/NativePlatformConstantsWin';
+export * from '../../src/private/specs/modules/NativePlatformConstantsWindows';
+import NativePlatformConstantsWin from '../../src/private/specs/modules/NativePlatformConstantsWindows';
 export default NativePlatformConstantsWin;

package/Libraries/Utilities/Platform.android.js

@@ -78,10 +78,10 @@ const Platform: PlatformType = {
       ? // $FlowFixMe[incompatible-return]
         spec.android
       : 'native' in spec
-      ? // $FlowFixMe[incompatible-return]
-        spec.native
-      : // $FlowFixMe[incompatible-return]
-        spec.default,
+        ? // $FlowFixMe[incompatible-return]
+          spec.native
+        : // $FlowFixMe[incompatible-return]
+          spec.default,
 };
 
 module.exports = Platform;

package/Libraries/Utilities/RCTLog.js

@@ -38,6 +38,7 @@ const RCTLog = {
 
   // Log to console regardless of nativeLoggingHook
   logToConsole(level: string, ...args: Array<mixed>): void {
+    // $FlowFixMe[invalid-computed-prop]
     const logFn = levelsMap[level];
     invariant(
       logFn,

package/Libraries/Utilities/ReactNativeTestTools.js

@@ -12,20 +12,16 @@
 
 import type {ReactTestRenderer as ReactTestRendererType} from 'react-test-renderer';
 
+import TouchableWithoutFeedback from '../Components/Touchable/TouchableWithoutFeedback';
+
 const Switch = require('../Components/Switch/Switch').default;
 const TextInput = require('../Components/TextInput/TextInput');
 const View = require('../Components/View/View');
 const Text = require('../Text/Text');
 const {VirtualizedList} = require('@react-native/virtualized-lists');
 const React = require('react');
-const ShallowRenderer = require('react-shallow-renderer');
 const ReactTestRenderer = require('react-test-renderer');
 
-/* $FlowFixMe[not-a-function] (>=0.125.1 site=react_native_fb) This comment
- * suppresses an error found when Flow v0.125.1 was deployed. To see the error,
- * delete this comment and run Flow. */
-// $FlowFixMe[invalid-constructor]
-const shallowRenderer = new ShallowRenderer();
 export type ReactTestInstance = $PropertyType<ReactTestRendererType, 'root'>;
 export type Predicate = (node: ReactTestInstance) => boolean;
 /* $FlowFixMe[value-as-type] (>=0.125.1 site=react_native_fb) This comment
@@ -49,6 +45,9 @@ function byClickable(): Predicate {
       (node.type === Switch && node.props && node.props.disabled !== true) ||
       (node.type === View &&
         node?.props?.onStartShouldSetResponder?.testOnly_pressabilityConfig) ||
+      (node.type === TouchableWithoutFeedback &&
+        node.props &&
+        typeof node.props.onPress === 'function') ||
       // HACK: Find components that use `Pressability`.
       node.instance?.state?.pressability != null ||
       // TODO: Remove this after deleting `Touchable`.
@@ -114,7 +113,7 @@ function expectNoConsoleError() {
   });
 }
 
-function expectRendersMatchingSnapshot(
+async function expectRendersMatchingSnapshot(
   name: string,
   ComponentProvider: () => React.Element<any>,
   unmockComponent: () => mixed,
@@ -123,7 +122,9 @@ function expectRendersMatchingSnapshot(
 
   jest.resetAllMocks();
 
-  instance = ReactTestRenderer.create(<ComponentProvider />);
+  await ReactTestRenderer.act(() => {
+    instance = ReactTestRenderer.create(<ComponentProvider />);
+  });
   expect(instance).toMatchSnapshot(
     'should deep render when mocked (please verify output manually)',
   );
@@ -131,22 +132,9 @@ function expectRendersMatchingSnapshot(
   jest.resetAllMocks();
   unmockComponent();
 
-  instance = shallowRenderer.render(<ComponentProvider />);
-  expect(instance).toMatchSnapshot(
-    `should shallow render as <${name} /> when not mocked`,
-  );
-
-  jest.resetAllMocks();
-
-  instance = shallowRenderer.render(<ComponentProvider />);
-  expect(instance).toMatchSnapshot(
-    `should shallow render as <${name} /> when mocked`,
-  );
-
-  jest.resetAllMocks();
-  unmockComponent();
-
-  instance = ReactTestRenderer.create(<ComponentProvider />);
+  await ReactTestRenderer.act(() => {
+    instance = ReactTestRenderer.create(<ComponentProvider />);
+  });
   expect(instance).toMatchSnapshot(
     'should deep render when not mocked (please verify output manually)',
   );

package/Libraries/Utilities/verifyComponentAttributeEquivalence.js

@@ -104,16 +104,21 @@ export function getConfigWithoutViewProps(
   viewConfig: ViewConfig,
   propName: string,
 ): {...} {
+  // $FlowFixMe[invalid-computed-prop]
   if (!viewConfig[propName]) {
     return {};
   }
 
-  return Object.keys(viewConfig[propName])
-    .filter(prop => !PlatformBaseViewConfig[propName][prop])
-    .reduce<{[string]: any}>((obj, prop) => {
-      obj[prop] = viewConfig[propName][prop];
-      return obj;
-    }, {});
+  return (
+    Object.keys(viewConfig[propName])
+      // $FlowFixMe[invalid-computed-prop]
+      .filter(prop => !PlatformBaseViewConfig[propName][prop])
+      .reduce<{[string]: any}>((obj, prop) => {
+        // $FlowFixMe[invalid-computed-prop]
+        obj[prop] = viewConfig[propName][prop];
+        return obj;
+      }, {})
+  );
 }
 
 export function stringifyViewConfig(viewConfig: any): string {

package/Libraries/__tests__/ViewWindows-test.js

@@ -2,15 +2,15 @@
 'use strict';
 
 const React = require('react');
-const ReactTestRenderer = require('react-test-renderer');
-
+const renderer = require('react-native/jest/renderer');
 const View = require('../Components/View/View');
 
 describe('View', () => {
-  it('renders basic view', () => {
-    const component = ReactTestRenderer.create(
+  it('renders basic view', async () => {
+    expect(
+      await renderer.create(
       <View/>
-    );
-    expect(component).toMatchSnapshot();
+    ),
+  ).toMatchSnapshot();
   });
 });

package/Libraries/promiseRejectionTrackingOptions.js

@@ -52,6 +52,7 @@ let rejectionTrackingOptions: $NonMaybeType<Parameters<enable>[0]> = {
           substitutions: [],
         },
         componentStack: [],
+        componentStackType: null,
         stack,
         category: 'possible_unhandled_promise_rejection',
       });

package/Microsoft.ReactNative/Base/FollyIncludes.h

@@ -17,7 +17,7 @@
 
 #pragma warning(push)
 #pragma warning(disable : 4127) // conditional expression is constant
-#include <folly/container/detail/F14table.h>
+#include <folly/container/detail/F14Table.h>
 #pragma warning(pop)
 
 #include <folly/Memory.h>

package/Microsoft.ReactNative/ComponentView.idl

@@ -20,21 +20,6 @@ namespace Microsoft.ReactNative
   [experimental]
   delegate Object StateUpdateMutation(Object props);
 
-  [webhosthidden]
-  [experimental]
-  enum EventPriority
-  {
-    SynchronousUnbatched,
-    SynchronousBatched,
-    AsynchronousUnbatched,
-    AsynchronousBatched,
-
-    Sync = SynchronousUnbatched,
-    Work = SynchronousBatched,
-    Interactive = AsynchronousUnbatched,
-    Deferred = AsynchronousBatched
-  };
-
   [flags]
   [webhosthidden]
   [experimental]
@@ -55,9 +40,7 @@ namespace Microsoft.ReactNative
   {
     Object Data { get; };
     void UpdateState(Object data);
-    void UpdateStateWithPriority(Object data, EventPriority priority);
     void UpdateStateWithMutation(StateUpdateMutation mutation);
-    void UpdateStateWithMutationAndPriority(StateUpdateMutation mutation, EventPriority priority);
   };
 
   [experimental]

package/Microsoft.ReactNative/Composition.Input.idl

@@ -8,7 +8,7 @@ namespace Microsoft.ReactNative.Composition.Input
 {
   interface KeyboardSource
   {
-    Microsoft.UI.Input.VirtualKeyStates GetKeyState(Windows.System.VirtualKey key);
+    Windows.UI.Core.CoreVirtualKeyStates GetKeyState(Windows.System.VirtualKey key);
   }
 
   interface RoutedEventArgs
@@ -21,14 +21,14 @@ namespace Microsoft.ReactNative.Composition.Input
     String DeviceId { get; };
     Boolean Handled { get; set; };
     Windows.System.VirtualKey Key { get; };
-    Microsoft.UI.Input.PhysicalKeyStatus KeyStatus { get; };
+    Windows.UI.Core.CorePhysicalKeyStatus KeyStatus { get; };
     Windows.System.VirtualKey OriginalKey { get; };
   }
 
   interface CharacterReceivedRoutedEventArgs requires RoutedEventArgs
   {
     Boolean Handled { get; set; };
-    Microsoft.UI.Input.PhysicalKeyStatus KeyStatus { get; };
+    Windows.UI.Core.CorePhysicalKeyStatus KeyStatus { get; };
     Int32 KeyCode { get; };
   };
 

package/Microsoft.ReactNative/CompositionSwitcher.idl

@@ -106,7 +106,6 @@ namespace Microsoft.ReactNative.Composition.Experimental
   interface IScrollVisual requires IVisual
   {
     void Brush(IBrush brush);
-    void ScrollEnabled(Boolean isScrollEnabled);
     event Windows.Foundation.EventHandler<IScrollPositionChangedArgs> ScrollPositionChanged;
     void ContentSize(Windows.Foundation.Numerics.Vector2 size);
     Windows.Foundation.Numerics.Vector3 ScrollPosition { get; };

package/Microsoft.ReactNative/Fabric/AbiState.cpp

@@ -19,53 +19,11 @@ void AbiComponentState::UpdateState(const winrt::Windows::Foundation::IInspectab
   m_state->updateState(std::move(state));
 }
 
-// Verify winrt::Microsoft::ReactNative::EventPriority and facebook::react::EventPriority are in sync
-static_assert(
-    winrt::Microsoft::ReactNative::EventPriority::SynchronousUnbatched ==
-    static_cast<winrt::Microsoft::ReactNative::EventPriority>(facebook::react::EventPriority::SynchronousUnbatched));
-static_assert(
-    winrt::Microsoft::ReactNative::EventPriority::SynchronousBatched ==
-    static_cast<winrt::Microsoft::ReactNative::EventPriority>(facebook::react::EventPriority::SynchronousBatched));
-static_assert(
-    winrt::Microsoft::ReactNative::EventPriority::AsynchronousUnbatched ==
-    static_cast<winrt::Microsoft::ReactNative::EventPriority>(facebook::react::EventPriority::AsynchronousUnbatched));
-static_assert(
-    winrt::Microsoft::ReactNative::EventPriority::AsynchronousBatched ==
-    static_cast<winrt::Microsoft::ReactNative::EventPriority>(facebook::react::EventPriority::AsynchronousBatched));
-static_assert(
-    winrt::Microsoft::ReactNative::EventPriority::Sync ==
-    static_cast<winrt::Microsoft::ReactNative::EventPriority>(facebook::react::EventPriority::Sync));
-static_assert(
-    winrt::Microsoft::ReactNative::EventPriority::Work ==
-    static_cast<winrt::Microsoft::ReactNative::EventPriority>(facebook::react::EventPriority::Work));
-static_assert(
-    winrt::Microsoft::ReactNative::EventPriority::Interactive ==
-    static_cast<winrt::Microsoft::ReactNative::EventPriority>(facebook::react::EventPriority::Interactive));
-static_assert(
-    winrt::Microsoft::ReactNative::EventPriority::Deferred ==
-    static_cast<winrt::Microsoft::ReactNative::EventPriority>(facebook::react::EventPriority::Deferred));
-
-void AbiComponentState::UpdateStateWithPriority(
-    const winrt::Windows::Foundation::IInspectable &data,
-    winrt::Microsoft::ReactNative::EventPriority priority) noexcept {
-  AbiStateData state;
-  state.userdata = data;
-  m_state->updateState(std::move(state), static_cast<facebook::react::EventPriority>(priority));
-}
-
 void AbiComponentState::UpdateStateWithMutation(
     const winrt::Microsoft::ReactNative::StateUpdateMutation &mutation) noexcept {
-  UpdateStateWithMutationAndPriority(mutation, winrt::Microsoft::ReactNative::EventPriority::AsynchronousUnbatched);
-}
-
-void AbiComponentState::UpdateStateWithMutationAndPriority(
-    const winrt::Microsoft::ReactNative::StateUpdateMutation &mutation,
-    winrt::Microsoft::ReactNative::EventPriority priority) noexcept {
-  m_state->updateState(
-      [mutation](const AbiStateData &oldData) {
-        return std::make_shared<AbiStateData const>(mutation(oldData.userdata));
-      },
-      static_cast<facebook::react::EventPriority>(priority));
+  m_state->updateState([mutation](const AbiStateData &oldData) {
+    return std::make_shared<AbiStateData const>(mutation(oldData.userdata));
+  });
 }
 
 } // namespace Microsoft::ReactNative

package/Microsoft.ReactNative/Fabric/AbiState.h

@@ -23,13 +23,7 @@ struct AbiComponentState : winrt::implements<AbiComponentState, winrt::Microsoft
 
   winrt::Windows::Foundation::IInspectable Data() noexcept;
   void UpdateState(const winrt::Windows::Foundation::IInspectable &data) noexcept;
-  void UpdateStateWithPriority(
-      const winrt::Windows::Foundation::IInspectable &data,
-      winrt::Microsoft::ReactNative::EventPriority priority) noexcept;
   void UpdateStateWithMutation(const winrt::Microsoft::ReactNative::StateUpdateMutation &mutation) noexcept;
-  void UpdateStateWithMutationAndPriority(
-      const winrt::Microsoft::ReactNative::StateUpdateMutation &mutation,
-      winrt::Microsoft::ReactNative::EventPriority priority) noexcept;
 
  private:
   std::shared_ptr<facebook::react::ConcreteState<AbiStateData> const> m_state;

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

@@ -120,9 +120,6 @@ void ComponentViewRegistry::enqueueComponentViewWithComponentHandle(
     ComponentViewDescriptor componentViewDescriptor) noexcept {
   assert(m_registry.find(tag) != m_registry.end());
 
-  winrt::get_self<winrt::Microsoft::ReactNative::implementation::ComponentView>(componentViewDescriptor.view)
-      ->prepareForRecycle();
-
   m_registry.erase(tag);
 }
 } // namespace Microsoft::ReactNative

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

@@ -68,7 +68,7 @@ winrt::Windows::System::VirtualKey KeyRoutedEventArgs::Key() noexcept {
   return m_key;
 }
 
-winrt::Microsoft::UI::Input::PhysicalKeyStatus KeyRoutedEventArgs::KeyStatus() noexcept {
+winrt::Windows::UI::Core::CorePhysicalKeyStatus KeyRoutedEventArgs::KeyStatus() noexcept {
   return m_keyStatus;
 }
 
@@ -118,7 +118,7 @@ void CharacterReceivedRoutedEventArgs::Handled(bool value) noexcept {
 int32_t CharacterReceivedRoutedEventArgs::KeyCode() noexcept {
   return m_keycode;
 }
-winrt::Microsoft::UI::Input::PhysicalKeyStatus CharacterReceivedRoutedEventArgs::KeyStatus() noexcept {
+winrt::Windows::UI::Core::CorePhysicalKeyStatus CharacterReceivedRoutedEventArgs::KeyStatus() noexcept {
   return m_keyStatus;
 }
 

package/Microsoft.ReactNative/Fabric/Composition/Composition.Input.h

@@ -31,14 +31,14 @@ struct KeyRoutedEventArgs : winrt::implements<
   bool Handled() noexcept;
   void Handled(bool value) noexcept;
   winrt::Windows::System::VirtualKey Key() noexcept;
-  winrt::Microsoft::UI::Input::PhysicalKeyStatus KeyStatus() noexcept;
+  winrt::Windows::UI::Core::CorePhysicalKeyStatus KeyStatus() noexcept;
   winrt::Windows::System::VirtualKey OriginalKey() noexcept;
 
  private:
   facebook::react::Tag m_tag{-1};
   bool m_handled{false};
   winrt::Windows::System::VirtualKey m_key;
-  winrt::Microsoft::UI::Input::PhysicalKeyStatus m_keyStatus;
+  winrt::Windows::UI::Core::CorePhysicalKeyStatus m_keyStatus;
 };
 
 struct CharacterReceivedRoutedEventArgs
@@ -57,13 +57,13 @@ struct CharacterReceivedRoutedEventArgs
   bool Handled() noexcept;
   void Handled(bool value) noexcept;
   int32_t KeyCode() noexcept;
-  winrt::Microsoft::UI::Input::PhysicalKeyStatus KeyStatus() noexcept;
+  winrt::Windows::UI::Core::CorePhysicalKeyStatus KeyStatus() noexcept;
 
  private:
   facebook::react::Tag m_tag{-1};
   bool m_handled{false};
   int32_t m_keycode;
-  winrt::Microsoft::UI::Input::PhysicalKeyStatus m_keyStatus;
+  winrt::Windows::UI::Core::CorePhysicalKeyStatus m_keyStatus;
 };
 
 struct Pointer : PointerT<Pointer> {

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

@@ -795,16 +795,6 @@ struct CompScrollerVisual : winrt::implements<
     m_visual.Brush(TTypeRedirects::CompositionContextHelper::InnerBrush(brush));
   }
 
-  void ScrollEnabled(bool isScrollEnabled) noexcept {
-    if (isScrollEnabled) {
-      m_visualInteractionSource.ManipulationRedirectionMode(
-          TTypeRedirects::VisualInteractionSourceRedirectionMode::CapableTouchpadAndPointerWheel);
-    } else {
-      m_visualInteractionSource.ManipulationRedirectionMode(
-          TTypeRedirects::VisualInteractionSourceRedirectionMode::Off);
-    }
-  }
-
   void Opacity(float opacity) noexcept {
     m_visual.Opacity(opacity);
   }

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

@@ -101,9 +101,9 @@ struct CompositionKeyboardSource
     : winrt::implements<CompositionKeyboardSource, winrt::Microsoft::ReactNative::Composition::Input::KeyboardSource> {
   CompositionKeyboardSource(CompositionEventHandler *outer) : m_outer(outer) {}
 
-  winrt::Microsoft::UI::Input::VirtualKeyStates GetKeyState(winrt::Windows::System::VirtualKey key) noexcept {
+  winrt::Windows::UI::Core::CoreVirtualKeyStates GetKeyState(winrt::Windows::System::VirtualKey key) noexcept {
     if (!m_outer)
-      return winrt::Microsoft::UI::Input::VirtualKeyStates::None;
+      return winrt::Windows::UI::Core::CoreVirtualKeyStates::None;
     return m_outer->GetKeyState(key);
   }
 
@@ -121,11 +121,23 @@ struct CompositionInputKeyboardSource : winrt::implements<
                                             winrt::Microsoft::ReactNative::Composition::Input::KeyboardSource> {
   CompositionInputKeyboardSource(winrt::Microsoft::UI::Input::InputKeyboardSource source) : m_source(source) {}
 
-  winrt::Microsoft::UI::Input::VirtualKeyStates GetKeyState(winrt::Windows::System::VirtualKey key) noexcept {
+  winrt::Windows::UI::Core::CoreVirtualKeyStates GetKeyState(winrt::Windows::System::VirtualKey key) noexcept {
     if (!m_source)
-      return winrt::Microsoft::UI::Input::VirtualKeyStates::None;
-
-    return m_source.GetKeyState(key);
+      return winrt::Windows::UI::Core::CoreVirtualKeyStates::None;
+
+    static_assert(
+        static_cast<winrt::Windows::UI::Core::CoreVirtualKeyStates>(
+            winrt::Microsoft::UI::Input::VirtualKeyStates::Down) ==
+        winrt::Windows::UI::Core::CoreVirtualKeyStates::Down);
+    static_assert(
+        static_cast<winrt::Windows::UI::Core::CoreVirtualKeyStates>(
+            winrt::Microsoft::UI::Input::VirtualKeyStates::Locked) ==
+        winrt::Windows::UI::Core::CoreVirtualKeyStates::Locked);
+    static_assert(
+        static_cast<winrt::Windows::UI::Core::CoreVirtualKeyStates>(
+            winrt::Microsoft::UI::Input::VirtualKeyStates::None) ==
+        winrt::Windows::UI::Core::CoreVirtualKeyStates::None);
+    return static_cast<winrt::Windows::UI::Core::CoreVirtualKeyStates>(m_source.GetKeyState(key));
   }
 
   void Disconnect() noexcept {
@@ -348,15 +360,16 @@ void CompositionEventHandler::onPointerWheelChanged(
   }
 }
 
-winrt::Microsoft::UI::Input::VirtualKeyStates CompositionEventHandler::GetKeyState(
+winrt::Windows::UI::Core::CoreVirtualKeyStates CompositionEventHandler::GetKeyState(
     winrt::Windows::System::VirtualKey key) noexcept {
-  winrt::Microsoft::UI::Input::VirtualKeyStates coreKeyState = winrt::Microsoft::UI::Input::VirtualKeyStates::None;
+  winrt::Windows::UI::Core::CoreVirtualKeyStates coreKeyState = winrt::Windows::UI::Core::CoreVirtualKeyStates::None;
   SHORT keyState = ::GetKeyState(static_cast<int>(key));
   if (keyState & 0x01) {
-    coreKeyState = winrt::Microsoft::UI::Input::VirtualKeyStates::Locked;
+    coreKeyState = winrt::Windows::UI::Core::CoreVirtualKeyStates::Locked;
   }
   if (keyState & 0x8000) {
-    coreKeyState = coreKeyState | winrt::Microsoft::UI::Input::VirtualKeyStates::Down;
+    coreKeyState = static_cast<winrt::Windows::UI::Core::CoreVirtualKeyStates>(
+        static_cast<int>(coreKeyState) | static_cast<int>(winrt::Windows::UI::Core::CoreVirtualKeyStates::Down));
   }
 
   return coreKeyState;
@@ -497,12 +510,10 @@ void CompositionEventHandler::onKeyDown(
       return;
   }
 
-  bool fShift =
-      (source.GetKeyState(winrt::Windows::System::VirtualKey::Shift) &
-       winrt::Microsoft::UI::Input::VirtualKeyStates::Down) == winrt::Microsoft::UI::Input::VirtualKeyStates::Down;
-  bool fCtrl =
-      (source.GetKeyState(winrt::Windows::System::VirtualKey::Control) &
-       winrt::Microsoft::UI::Input::VirtualKeyStates::Down) == winrt::Microsoft::UI::Input::VirtualKeyStates::Down;
+  bool fShift = source.GetKeyState(winrt::Windows::System::VirtualKey::Shift) ==
+      winrt::Windows::UI::Core::CoreVirtualKeyStates::Down;
+  bool fCtrl = source.GetKeyState(winrt::Windows::System::VirtualKey::Control) ==
+      winrt::Windows::UI::Core::CoreVirtualKeyStates::Down;
 
   if (fShift && fCtrl && args.Key() == static_cast<winrt::Windows::System::VirtualKey>(VkKeyScanA('d')) &&
       Mso::React::ReactOptions::UseDeveloperSupport(m_context.Properties().Handle())) {

package/Microsoft.ReactNative/Fabric/Composition/CompositionEventHandler.h

@@ -36,7 +36,7 @@ class CompositionEventHandler {
 
   int64_t SendMessage(HWND hwnd, uint32_t msg, uint64_t wParam, int64_t lParam) noexcept;
   void RemoveTouchHandlers();
-  winrt::Microsoft::UI::Input::VirtualKeyStates GetKeyState(winrt::Windows::System::VirtualKey key) noexcept;
+  winrt::Windows::UI::Core::CoreVirtualKeyStates GetKeyState(winrt::Windows::System::VirtualKey key) noexcept;
 
   bool CapturePointer(
       const winrt::Microsoft::ReactNative::Composition::Input::Pointer &pointer,