react-native-windows 0.72.13 → 0.73.0-preview.1

package/Microsoft.ReactNative/Fabric/platform/react/renderer/graphics/Color.cpp

@@ -4,9 +4,16 @@
 #include "Color.h"
 #include <Utils/ValueUtils.h>
 
+#ifndef CORE_ABI
+#include <XamlUtils.h>
+#endif // CORE_ABI
+
+#include <UI.Xaml.Media.h>
+#include <winrt/Windows.UI.ViewManagement.h>
+
 namespace facebook::react {
 
-bool isColorMeaningful(SharedColor const &color) noexcept {
+bool isColorMeaningful(const SharedColor &color) noexcept {
   if (!color) {
     return false;
   }
@@ -14,12 +21,156 @@ bool isColorMeaningful(SharedColor const &color) noexcept {
   return colorComponentsFromColor(color).alpha > 0;
 }
 
+winrt::Windows::UI::Color ResolvePlatformColor(Color const *const color) {
+  if (!color->m_platformColor.empty()) {
+    for (auto platformColor : color->m_platformColor) {
+#ifndef CORE_ABI
+      // If XAML is loaded, look in application resources
+      if (xaml::TryGetCurrentApplication()) {
+        xaml::Media::Brush brush{Microsoft::ReactNative::BrushFromColorObject(platformColor)};
+        if (auto scb{brush.try_as<xaml::Media::SolidColorBrush>()}) {
+          return scb.Color();
+        }
+      }
+#endif // CORE_ABI
+
+      // Accent colors
+      // https://learn.microsoft.com/en-us/uwp/api/windows.ui.viewmanagement.uicolortype?view=winrt-22621
+      static std::unordered_map<
+          std::string,
+          winrt::Windows::UI::ViewManagement::UIColorType,
+          std::hash<std::string_view>,
+          std::equal_to<>>
+          s_uiColorTypes = {
+              {"Accent", winrt::Windows::UI::ViewManagement::UIColorType::Accent},
+              {"AccentDark1", winrt::Windows::UI::ViewManagement::UIColorType::AccentDark1},
+              {"AccentDark2", winrt::Windows::UI::ViewManagement::UIColorType::AccentDark2},
+              {"AccentDark3", winrt::Windows::UI::ViewManagement::UIColorType::AccentDark3},
+              {"AccentLight1", winrt::Windows::UI::ViewManagement::UIColorType::AccentLight1},
+              {"AccentLight2", winrt::Windows::UI::ViewManagement::UIColorType::AccentLight2},
+              {"AccentLight3", winrt::Windows::UI::ViewManagement::UIColorType::AccentLight3},
+              {"Background", winrt::Windows::UI::ViewManagement::UIColorType::Background},
+              {"Complement", winrt::Windows::UI::ViewManagement::UIColorType::Complement},
+              {"Foreground", winrt::Windows::UI::ViewManagement::UIColorType::Foreground}};
+
+      auto uiColor = s_uiColorTypes.find(platformColor);
+      if (uiColor != s_uiColorTypes.end()) {
+        auto uiSettings{winrt::Windows::UI::ViewManagement::UISettings()};
+        return uiSettings.GetColorValue(uiColor->second);
+      }
+
+      // UI element colors
+      // https://learn.microsoft.com/en-us/uwp/api/windows.ui.viewmanagement.uielementtype?view=winrt-22621
+      static std::unordered_map<
+          std::string,
+          winrt::Windows::UI::ViewManagement::UIElementType,
+          std::hash<std::string_view>,
+          std::equal_to<>>
+          s_uiElementTypes = {
+              {"AccentColor", winrt::Windows::UI::ViewManagement::UIElementType::AccentColor},
+              {"ActiveCaption", winrt::Windows::UI::ViewManagement::UIElementType::ActiveCaption},
+              {"Background", winrt::Windows::UI::ViewManagement::UIElementType::Background},
+              {"ButtonFace", winrt::Windows::UI::ViewManagement::UIElementType::ButtonFace},
+              {"ButtonText", winrt::Windows::UI::ViewManagement::UIElementType::ButtonText},
+              {"CaptionText", winrt::Windows::UI::ViewManagement::UIElementType::CaptionText},
+              {"GrayText", winrt::Windows::UI::ViewManagement::UIElementType::GrayText},
+              {"Highlight", winrt::Windows::UI::ViewManagement::UIElementType::Highlight},
+              {"HighlightText", winrt::Windows::UI::ViewManagement::UIElementType::HighlightText},
+              {"Hotlight", winrt::Windows::UI::ViewManagement::UIElementType::Hotlight},
+              {"InactiveCaption", winrt::Windows::UI::ViewManagement::UIElementType::InactiveCaption},
+              {"InactiveCaptionText", winrt::Windows::UI::ViewManagement::UIElementType::InactiveCaptionText},
+              {"NonTextHigh", winrt::Windows::UI::ViewManagement::UIElementType::NonTextHigh},
+              {"NonTextLow", winrt::Windows::UI::ViewManagement::UIElementType::NonTextLow},
+              {"NonTextMedium", winrt::Windows::UI::ViewManagement::UIElementType::NonTextMedium},
+              {"NonTextMediumHigh", winrt::Windows::UI::ViewManagement::UIElementType::NonTextMediumHigh},
+              {"NonTextMediumLow", winrt::Windows::UI::ViewManagement::UIElementType::NonTextMediumLow},
+              {"OverlayOutsidePopup", winrt::Windows::UI::ViewManagement::UIElementType::OverlayOutsidePopup},
+              {"PageBackground", winrt::Windows::UI::ViewManagement::UIElementType::PageBackground},
+              {"PopupBackground", winrt::Windows::UI::ViewManagement::UIElementType::PopupBackground},
+              {"TextContrastWithHigh", winrt::Windows::UI::ViewManagement::UIElementType::TextContrastWithHigh},
+              {"TextHigh", winrt::Windows::UI::ViewManagement::UIElementType::TextHigh},
+              {"TextLow", winrt::Windows::UI::ViewManagement::UIElementType::TextLow},
+              {"TextMedium", winrt::Windows::UI::ViewManagement::UIElementType::TextMedium},
+              {"Window", winrt::Windows::UI::ViewManagement::UIElementType::Window},
+              {"WindowText", winrt::Windows::UI::ViewManagement::UIElementType::WindowText}};
+
+      auto uiElement = s_uiElementTypes.find(platformColor);
+      if (uiElement != s_uiElementTypes.end()) {
+        auto uiSettings{winrt::Windows::UI::ViewManagement::UISettings()};
+        return uiSettings.UIElementColor(uiElement->second);
+      }
+
+      // Fallback light-theme XAML brushes
+      // Issue #11489. These are all the light-theme values. Which is better than no values.
+      // Where did these values come from? WinUI's common theme resources:
+      // https://github.com/microsoft/microsoft-ui-xaml/blob/7a33ad772d77d908aa6b316ec24e6d2eb3ebf571/dev/CommonStyles/Common_themeresources_any.xaml
+      // Specifically these are pulled from the "Light" ResourceDictionary. If any additional values
+      // are needed, they should be taken from that section (not "Dark" or "HighContrast").
+      // For control-specific values, they will be in a theme resource file for that control. Example:
+      // https://github.com/microsoft/microsoft-ui-xaml/blob/9052972906c8a0a1b6cb5d5c61b27d6d27cd7f11/dev/CommonStyles/Button_themeresources.xaml
+      static std::unordered_map<std::string, winrt::Windows::UI::Color, std::hash<std::string_view>, std::equal_to<>>
+          s_xamlBrushes = {
+              {"SolidBackgroundFillColorBase", {0xFF, 0xF3, 0xF3, 0xF3}},
+              {"ControlFillColorDefault", {0xB3, 0xFF, 0xFF, 0xFF}},
+              {"ControlFillColorSecondary", {0x80, 0xF9, 0xF9, 0xF9}},
+              {"ControlFillColorTertiary", {0x4D, 0xF9, 0xF9, 0xF9}},
+              {"ControlFillColorDisabled", {0x4D, 0xF9, 0xF9, 0xF9}},
+              {"ControlFillColorTransparent", {0x00, 0xFF, 0xFF, 0xFF}},
+              {"ControlStrokeColorDefault", {0x0F, 0x00, 0x00, 0x00}},
+              {"ControlStrokeColorSecondary", {0x29, 0x00, 0x00, 0x00}},
+              {"ControlStrokeColorOnAccentSecondary", {0x66, 0x00, 0x00, 0x00}},
+              {"TextFillColorPrimary", {0xE4, 0x00, 0x00, 0x00}},
+              {"TextFillColorSecondary", {0x9E, 0x00, 0x00, 0x00}},
+              {"TextFillColorDisabled", {0x5C, 0x00, 0x00, 0x00}},
+              // Arguably only the control-agnostic platform colors should be respected, and
+              // Button should be updated to use those instead, assuming that still holds up
+              // in high contrast and such.
+              {"ButtonBackgroundPressed", {0x4D, 0xF9, 0xF9, 0xF9}}, // ControlFillColorTertiary
+              {"ButtonForegroundPressed", {0x9E, 0x00, 0x00, 0x00}}, // TextFillColorSecondary
+              {"ButtonForegroundPointerOver", {0xE4, 0x00, 0x00, 0x00}}, // TextFillColorPrimary
+              {"ButtonBackground", {0xB3, 0xFF, 0xFF, 0xFF}}, // ControlFillColorDefault
+              {"ButtonBorderBrush",
+               {0x29, 0x00, 0x00, 0x00}}, // from ControlStrokeColorSecondary to ControlStrokeColorDefault
+              {"ButtonForeground", {0xE4, 0x00, 0x00, 0x00}}, // TextFillColorPrimary
+              {"ButtonBackgroundDisabled", {0x4D, 0xF9, 0xF9, 0xF9}}, // ControlFillColorDisabled
+              {"ButtonBorderBrushDisabled", {0x0F, 0x00, 0x00, 0x00}}, // ControlStrokeColorDefault
+              {"ButtonForegroundDisabled", {0x5C, 0x00, 0x00, 0x00}}, // TextFillColorDisabled
+              {"ButtonBackgroundPointerOver", {0x80, 0xF9, 0xF9, 0xF9}}, // ControlFillColorSecondary
+              {"ButtonBorderBrushPointerOver", {0x66, 0x00, 0x00, 0x00}}, // from ControlStrokeColorOnAccentSecondary to
+                                                                          // ControlStrokeColorOnAccentDefault
+              {"ButtonBorderBrushPressed", {0x00, 0xFF, 0xFF, 0xFF}}, // ControlFillColorTransparent
+          };
+
+      auto result = s_xamlBrushes.find(platformColor);
+      if (result != s_xamlBrushes.end()) {
+        return result->second;
+      }
+    }
+  }
+  return color->m_color;
+}
+
+D2D1::ColorF SharedColor::AsD2DColor() const {
+  if (!m_color) {
+    return D2D1::ColorF{0, 0.0};
+  }
+  winrt::Windows::UI::Color color = ResolvePlatformColor(m_color.get());
+  return {color.R / 255.0f, color.G / 255.0f, color.B / 255.0f, color.A / 255.0f};
+}
+
+winrt::Windows::UI::Color SharedColor::AsWindowsColor() const {
+  if (!m_color) {
+    return winrt::Windows::UI::Color{0, 0, 0, 0};
+  }
+  return ResolvePlatformColor(m_color.get());
+}
+
 #ifndef CORE_ABI
 xaml::Media::Brush SharedColor::AsWindowsBrush() const {
   if (!m_color)
     return nullptr;
   if (!m_color->m_platformColor.empty()) {
-    return Microsoft::ReactNative::BrushFromColorObject(winrt::to_hstring(m_color->m_platformColor));
+    return Microsoft::ReactNative::BrushFromColorObject(m_color->m_platformColor);
   }
   return xaml::Media::SolidColorBrush(m_color->m_color);
 }
@@ -27,11 +178,11 @@ xaml::Media::Brush SharedColor::AsWindowsBrush() const {
 
 SharedColor colorFromComponents(ColorComponents components) {
   float ratio = 255;
-  return {ui::ColorHelper::FromArgb(
-      (int)round(components.alpha * ratio) & 0xff,
-      (int)round(components.red * ratio) & 0xff,
-      (int)round(components.green * ratio) & 0xff,
-      (int)round(components.blue * ratio) & 0xff)};
+  return winrt::Windows::UI::Color{
+      static_cast<uint8_t>((int)round(components.alpha * ratio) & 0xff),
+      static_cast<uint8_t>((int)round(components.red * ratio) & 0xff),
+      static_cast<uint8_t>((int)round(components.green * ratio) & 0xff),
+      static_cast<uint8_t>((int)round(components.blue * ratio) & 0xff)};
 }
 
 ColorComponents colorComponentsFromColor(SharedColor const &sharedColor) {

package/Microsoft.ReactNative/Fabric/platform/react/renderer/graphics/Color.h

@@ -7,7 +7,6 @@
 
 #pragma once
 
-#include <cmath>
 #include <functional>
 #include <limits>
 
@@ -28,14 +27,16 @@ struct Color {
   }
 
   winrt::Windows::UI::Color m_color;
-  std::string m_platformColor;
+  std::vector<std::string> m_platformColor;
 };
 
 /*
  * On Android, a color can be represented as 32 bits integer, so there is no
  * need to instantiate complex color objects and then pass them as shared
- * pointers. Hense instead of using shared_ptr, we use a simple wrapper class
- * which provides a pointer-like interface.
+ * pointers. Hence instead of using shared_ptr, we use a simple wrapper class
+ * which provides a pointer-like interface. On other platforms, colors may be
+ * represented by more complex objects that cannot be represented as 32-bits
+ * integers, so we hide the implementation detail in HostPlatformColor.h.
  */
 class SharedColor {
   friend std::hash<SharedColor>;
@@ -50,7 +51,7 @@ class SharedColor {
     m_color->m_color = color;
   }
 
-  SharedColor(std::string &&windowsBrush) {
+  SharedColor(std::vector<std::string> &&windowsBrush) {
     m_color = std::make_shared<Color>();
     m_color->m_platformColor = std::move(windowsBrush);
   }
@@ -84,17 +85,9 @@ class SharedColor {
     return m_color != nullptr;
   }
 
-  D2D1::ColorF AsD2DColor() const {
-    return {
-        m_color->m_color.R / 255.0f,
-        m_color->m_color.G / 255.0f,
-        m_color->m_color.B / 255.0f,
-        m_color->m_color.A / 255.0f};
-  }
+  D2D1::ColorF AsD2DColor() const;
 
-  winrt::Windows::UI::Color AsWindowsColor() const {
-    return m_color->m_color;
-  }
+  winrt::Windows::UI::Color AsWindowsColor() const;
 
   COLORREF AsColorRefNoAlpha() const {
     return RGB(m_color->m_color.R, m_color->m_color.G, m_color->m_color.B);
@@ -112,7 +105,7 @@ class SharedColor {
   std::shared_ptr<Color> m_color;
 };
 
-bool isColorMeaningful(SharedColor const &color) noexcept;
+bool isColorMeaningful(const SharedColor &color) noexcept;
 SharedColor colorFromComponents(ColorComponents components);
 ColorComponents colorComponentsFromColor(SharedColor const &color);
 
@@ -130,7 +123,12 @@ struct hash<facebook::react::SharedColor> {
   size_t operator()(const facebook::react::SharedColor &sharedColor) const {
     size_t h = sharedColor.m_color->m_color.A + (sharedColor.m_color->m_color.B << 8) +
         (sharedColor.m_color->m_color.G << 16) + (sharedColor.m_color->m_color.R << 24);
-    return h ^ hash<decltype(sharedColor.m_color->m_platformColor)>{}(sharedColor.m_color->m_platformColor);
+
+    for (auto s : sharedColor.m_color->m_platformColor) {
+      h ^= hash<decltype(s)>{}(s);
+    }
+
+    return h;
   }
 };
 } // namespace std

package/Microsoft.ReactNative/Fabric/platform/react/renderer/textlayoutmanager/TextLayoutManager.cpp

@@ -54,7 +54,7 @@ void TextLayoutManager::GetTextLayout(
         // Recommended ratio of baseline to lineSpacing is 80%
         // https://learn.microsoft.com/en-us/windows/win32/api/dwrite/nf-dwrite-idwritetextformat-getlinespacing
         // It is possible we need to load full font metrics to calculate a better baseline value.
-        // For a particular font, you can determine what lineSpacing and baseline should be by examing a
+        // For a particular font, you can determine what lineSpacing and baseline should be by examining a
         // DWRITE_FONT_METRICS method available from the GetMetrics method of IDWriteFont or IDWriteFontFace. For normal
         // behavior, you'd set lineSpacing to the sum of ascent, descent and lineGap (adjusted for the em size, of
         // course), and baseline to the ascent value.

package/Microsoft.ReactNative/GlyphViewManager.cpp

@@ -101,7 +101,7 @@ void GlyphShadowNode::updateProperties(winrt::Microsoft::ReactNative::JSValueObj
     // Default emSize to match height, unless its been explicitly set
 
     // FUTURE: enable some default scaling of 0.75 to convert height px to em?
-    // The SegouUI Emoji font renders the full area of the emSize
+    // The SegoeUI Emoji font renders the full area of the emSize
     // where emSize should be height * 0.75, but office icon fonts
     // do not and applying a scale would be wrong
 

package/Microsoft.ReactNative/IJSValueReader.idl

@@ -43,8 +43,8 @@ namespace Microsoft.ReactNative
     "The `Microsoft.ReactNative.Cxx` and `Microsoft.ReactNative.Managed` projects offer "
     "serializer/deserializer functions for many standard types. Use them directly or to define "
     "serializer/deserializer functions for your types.")
-  // TODO: [vmorozov] Add a reference to serializer and deserializer functions for some standard types.
-  // TODO: [vmorozov] Add a reference to usage examples.
+  // TODO: [@vmoroz] Add a reference to serializer and deserializer functions for some standard types.
+  // TODO: [@vmoroz] Add a reference to usage examples.
   interface IJSValueReader
   {
     DOC_STRING("Gets the type of the current value.")

package/Microsoft.ReactNative/IJSValueWriter.idl

@@ -24,8 +24,8 @@ namespace Microsoft.ReactNative
     "The `Microsoft.ReactNative.Cxx` and `Microsoft.ReactNative.Managed` projects offer "
     "serializer/deserializer functions for many standard types. Use them directly or to define "
     "serializer/deserializer functions for your types.")
-  // TODO: [vmorozov] Add a reference to serializer and deserializer functions for some standard types.
-  // TODO: [vmorozov] Add a reference to usage examples.
+  // TODO: [@vmoroz] Add a reference to serializer and deserializer functions for some standard types.
+  // TODO: [@vmoroz] Add a reference to usage examples.
   interface IJSValueWriter
   {
     DOC_STRING("Writes a `Null` value.")

package/Microsoft.ReactNative/IReactCompositionViewComponentBuilder.idl

@@ -2,8 +2,10 @@
 // Licensed under the MIT License.
 
 #include "DocString.h"
+import "Composition.Input.idl";
 import "CompositionSwitcher.idl";
 import "IJSValueReader.idl";
+import "IReactContext.idl";
 import "ViewProps.idl";
 
 namespace Microsoft.ReactNative.Composition
@@ -17,7 +19,7 @@ namespace Microsoft.ReactNative.Composition
 
   [experimental]
   DOC_STRING("Provides a factory method to create an instance of a ViewComponent. See @IReactCompositionViewComponentBuilder.SetCreateView")
-  delegate Object CompositionComponentFactory(ICompositionContext context);
+  delegate Object CompositionComponentFactory(Microsoft.ReactNative.IReactContext reactContext, ICompositionContext context);
 
   // TODO should make an event args, with a handled bit instead of return value
   [experimental]
@@ -44,6 +46,12 @@ namespace Microsoft.ReactNative.Composition
   DOC_STRING("A delegate that handles input messages for an instance of a ViewComponent. See @IReactCompositionViewComponentBuilder.SetMessageHandler")
   delegate Int64 MessageHandler(Object handle, UInt32 Msg, UInt64 WParam, Int64 LParam);
 
+  [experimental]
+  delegate void KeyHandler(Object handle, Microsoft.ReactNative.Composition.Input.KeyboardSource source, Microsoft.ReactNative.Composition.Input.KeyRoutedEventArgs args);
+
+  [experimental]
+  delegate void PointerHandler(Object handle, Microsoft.ReactNative.Composition.Input.PointerRoutedEventArgs args);
+
   [webhosthidden]
   [experimental]
   DOC_STRING(".")
@@ -79,6 +87,20 @@ namespace Microsoft.ReactNative.Composition
     DOC_STRING("Used to handle native input into this component.")
     // (Object handle, UInt32 Msg, UInt64 WParam, Int64 LParam) => Int64
     void SetMessageHandler(MessageHandler impl);
+
+    DOC_STRING("Used to handle key down events when this component is focused, or if a child component did not handle the key down")
+    void SetKeyDownHandler(KeyHandler impl);
+
+    DOC_STRING("Used to handle key up events when this component is focused, or if a child component did not handle the key up")
+    void SetKeyUpHandler(KeyHandler impl);
+
+    void SetPointerPressedHandler(PointerHandler impl);
+    void SetPointerReleasedHandler(PointerHandler impl);
+    void SetPointerMovedHandler(PointerHandler impl);
+    void SetPointerWheelChangedHandler(PointerHandler impl);
+    void SetPointerEnteredHandler(PointerHandler impl);
+    void SetPointerExitedHandler(PointerHandler impl);
+
   };
 
 

package/Microsoft.ReactNative/IReactContext.cpp

@@ -100,7 +100,7 @@ IReactDispatcher ReactContext::JSDispatcher() noexcept {
   return Properties().Get(ReactDispatcherHelper::JSDispatcherProperty()).try_as<IReactDispatcher>();
 }
 
-Windows::Foundation::IInspectable ReactContext::JSRuntime() noexcept {
+winrt::Windows::Foundation::IInspectable ReactContext::JSRuntime() noexcept {
   return m_context->JsiRuntime();
 }
 

package/Microsoft.ReactNative/IReactNotificationService.cpp

@@ -16,8 +16,8 @@ MSO_GUID(IReactNotificationSubscriptionPrivate, "09437980-3508-4690-930c-7c310e2
 struct IReactNotificationSubscriptionPrivate : ::IUnknown {
   virtual void SetParent(IReactNotificationSubscription const &parentSubscription) noexcept = 0;
   virtual void CallHandler(
-      Windows::Foundation::IInspectable const &sender,
-      Windows::Foundation::IInspectable const &data) noexcept = 0;
+      winrt::Windows::Foundation::IInspectable const &sender,
+      winrt::Windows::Foundation::IInspectable const &data) noexcept = 0;
 };
 
 // The Notification subscription class.
@@ -123,7 +123,8 @@ struct ReactNotificationSubscriptionView : implements<
   ReactNotificationSubscriptionView(
       weak_ref<ReactNotificationService> &&notificationService,
       IReactNotificationSubscription const &childSubscription) noexcept
-      : m_notificationService{std::move(notificationService)}, m_childSubscription{weak_ref(childSubscription)} {
+      : m_notificationService{std::move(notificationService)},
+        m_childSubscription{weak_ref<IReactNotificationSubscription>(childSubscription)} {
     childSubscription.as<IReactNotificationSubscriptionPrivate>()->SetParent(*this);
   }
 

package/Microsoft.ReactNative/Microsoft.ReactNative.vcxproj

@@ -637,15 +637,12 @@
     <PackageReference Include="Microsoft.Windows.CppWinRT" Version="$(CppWinRTVersion)" PrivateAssets="all" />
     <PackageReference Include="Microsoft.JavaScript.Hermes" Version="$(HermesVersion)" />
     <PackageReference Include="$(WinUIPackageName)" Version="$(WinUIPackageVersion)" Condition="'$(OverrideWinUIPackage)'!='true'" />
-    <PackageReference Include="Microsoft.Windows.SDK.BuildTools" Version="10.0.22000.194" />
     <PackageReference Include="$(V8PackageName)" Version="$(V8Version)" Condition="'$(UseV8)' == 'true'" />
   </ItemGroup>
   <Choose>
     <When Condition="'$(EnableSourceLink)' == 'true'">
       <ItemGroup>
-        <PackageReference Include="Microsoft.Build.Tasks.Git" Version="1.0.0" />
-        <PackageReference Include="Microsoft.SourceLink.Common" Version="1.0.0" />
-        <PackageReference Include="Microsoft.SourceLink.GitHub" Version="1.0.0" />
+        <PackageReference Include="Microsoft.SourceLink.GitHub" Version="1.1.1" />
       </ItemGroup>
     </When>
   </Choose>

package/Microsoft.ReactNative/Modules/AlertModule.cpp

@@ -191,7 +191,7 @@ void Alert::ProcessPendingAlertRequestsMessageDialog() noexcept {
   }
 
   if (!args.cancelable.value_or(true)) {
-    messageDialog.CancelCommandIndex(0xffffffff /* -1 doesn't allow cancelation of message dialog */);
+    messageDialog.CancelCommandIndex(0xffffffff /* -1 doesn't allow cancellation of message dialog */);
   }
 
   auto hwnd = winrt::Microsoft::ReactNative::implementation::ReactCoreInjection::GetTopLevelWindowId(
@@ -223,7 +223,7 @@ void Alert::ProcessPendingAlertRequests() noexcept {
   }
 #ifdef USE_FABRIC
   else {
-    // If we dont have xaml loaded, fallback to using MessageDialog
+    // If we don't have xaml loaded, fallback to using MessageDialog
     ProcessPendingAlertRequestsMessageDialog();
   }
 #endif

package/Microsoft.ReactNative/Modules/Animated/NativeAnimatedNodeManager.cpp

@@ -46,8 +46,7 @@ comp::Compositor NativeAnimatedNodeManager::Compositor() const noexcept {
       winrt::Microsoft::ReactNative::Composition::implementation::CompositionUIService::GetCompositionContext(
           m_context.Properties().Handle());
   if (compositionContext) {
-    return winrt::Microsoft::ReactNative::Composition::implementation::CompositionContextHelper::InnerCompositor(
-        compositionContext);
+    return winrt::Microsoft::ReactNative::Composition::CompositionContextHelper::InnerCompositor(compositionContext);
   }
 #endif
 #ifndef CORE_ABI

package/Microsoft.ReactNative/Modules/Animated/NativeAnimatedNodeManager.h

@@ -25,7 +25,7 @@ namespace Microsoft::ReactNative {
 /// implementation drives UI changes.
 ///
 /// It implements a management interface for animated nodes graph and
-/// establishes a number of composistion animations and property sets to
+/// establishes a number of composition animations and property sets to
 /// drive the animating of the nodes to the Xaml elements off the UI Thread
 ///
 /// </summary>

package/Microsoft.ReactNative/Modules/Animated/PropsAnimatedNode.cpp

@@ -181,9 +181,8 @@ void PropsAnimatedNode::StartAnimations() {
             view.m_element.RotationAxis(m_rotationAxis);
 #ifdef USE_FABRIC
           } else {
-            auto visual =
-                winrt::Microsoft::ReactNative::Composition::implementation::CompositionContextHelper::InnerVisual(
-                    view.m_componentView->Visual());
+            auto visual = winrt::Microsoft::ReactNative::Composition::CompositionContextHelper::InnerVisual(
+                view.m_componentView->Visual());
             visual.RotationAxis(m_rotationAxis);
 #endif
           }
@@ -393,7 +392,7 @@ void PropsAnimatedNode::StartAnimation(
     view.m_element.StartAnimation(animation);
 #ifdef USE_FABRIC
   } else if (view.m_componentView) {
-    auto visual = winrt::Microsoft::ReactNative::Composition::implementation::CompositionContextHelper::InnerVisual(
+    auto visual = winrt::Microsoft::ReactNative::Composition::CompositionContextHelper::InnerVisual(
         view.m_componentView->Visual());
     if (visual) {
       auto targetProp = animation.Target();

package/Microsoft.ReactNative/Modules/AppStateModule.cpp

@@ -88,7 +88,7 @@ void AppState::RemoveListeners(double /*count*/) noexcept {
   // noop
 }
 
-ReactNativeSpecs::AppStateSpec_Constants AppState::GetConstants() noexcept {
+ReactNativeSpecs::AppStateSpec_AppStateConstants AppState::GetConstants() noexcept {
   return {GetAppState()};
 }
 

package/Microsoft.ReactNative/Modules/AppStateModule.h

@@ -14,7 +14,7 @@ namespace Microsoft::ReactNative {
 REACT_MODULE(AppState)
 struct AppState : public std::enable_shared_from_this<AppState> {
   using ModuleSpec = ReactNativeSpecs::AppStateSpec;
-  using AppStateChangeArgs = ReactNativeSpecs::AppStateSpec_getCurrentAppState_success_appState;
+  using AppStateChangeArgs = ReactNativeSpecs::AppStateSpec_AppState;
 
   REACT_INIT(Initialize)
   void Initialize(winrt::Microsoft::ReactNative::ReactContext const &reactContext) noexcept;
@@ -31,7 +31,7 @@ struct AppState : public std::enable_shared_from_this<AppState> {
   void RemoveListeners(double count) noexcept;
 
   REACT_GET_CONSTANTS(GetConstants)
-  ReactNativeSpecs::AppStateSpec_Constants GetConstants() noexcept;
+  ReactNativeSpecs::AppStateSpec_AppStateConstants GetConstants() noexcept;
 
   REACT_EVENT(AppStateDidChange, L"appStateDidChange")
   std::function<void(AppStateChangeArgs const &)> AppStateDidChange;

package/Microsoft.ReactNative/Modules/AppearanceModule.h

@@ -3,7 +3,7 @@
 
 #pragma once
 
-#include "../../codegen/NativeAppearanceSpec.g.h"
+#include "codegen/NativeAppearanceSpec.g.h"
 #include <React.h>
 #include <winrt/Windows.UI.ViewManagement.h>
 

package/Microsoft.ReactNative/Modules/DeviceInfoModule.cpp

@@ -6,7 +6,9 @@
 #include <DesktopWindowBridge.h>
 #include <IReactDispatcher.h>
 #include <IReactPropertyBag.h>
+#ifndef USE_WINUI3
 #include <UI.Xaml.Hosting.DesktopWindowXamlSource.h>
+#endif
 #include <Utils/Helpers.h>
 #include <XamlUIService.h>
 #include <XamlUtils.h>
@@ -175,8 +177,8 @@ void DeviceInfoHolder::updateDeviceInfo() noexcept {
   }
 }
 
-ReactNativeSpecs::DeviceInfoSpec_Constants DeviceInfo::GetConstants() noexcept {
-  ReactNativeSpecs::DeviceInfoSpec_Constants constants;
+ReactNativeSpecs::DeviceInfoSpec_DeviceInfoConstants DeviceInfo::GetConstants() noexcept {
+  ReactNativeSpecs::DeviceInfoSpec_DeviceInfoConstants constants;
   constants.Dimensions = DeviceInfoHolder::GetDimensions(m_context.Properties());
   return constants;
 }

package/Microsoft.ReactNative/Modules/DeviceInfoModule.h

@@ -56,7 +56,7 @@ struct DeviceInfo : public std::enable_shared_from_this<DeviceInfo> {
   void Initialize(React::ReactContext const &reactContext) noexcept;
 
   REACT_GET_CONSTANTS(GetConstants)
-  ReactNativeSpecs::DeviceInfoSpec_Constants GetConstants() noexcept;
+  ReactNativeSpecs::DeviceInfoSpec_DeviceInfoConstants GetConstants() noexcept;
 
  private:
   winrt::Microsoft::ReactNative::ReactContext m_context;

package/Microsoft.ReactNative/Modules/I18nManagerModule.cpp

@@ -61,7 +61,7 @@ void I18nManager::SwapLeftAndRightInRTL(bool /*flipStyles*/) noexcept {
   // TODO - https://github.com/microsoft/react-native-windows/issues/4662
 }
 
-ReactNativeSpecs::I18nManagerSpec_Constants I18nManager::GetConstants() noexcept {
+ReactNativeSpecs::I18nManagerSpec_I18nManagerConstants I18nManager::GetConstants() noexcept {
   std::string locale = "en-us";
 
   auto langs = winrt::Windows::Globalization::ApplicationLanguages::Languages();
@@ -69,7 +69,7 @@ ReactNativeSpecs::I18nManagerSpec_Constants I18nManager::GetConstants() noexcept
     locale = Microsoft::Common::Unicode::Utf16ToUtf8(langs.GetAt(0));
   }
 
-  ReactNativeSpecs::I18nManagerSpec_Constants constants;
+  ReactNativeSpecs::I18nManagerSpec_I18nManagerConstants constants;
   constants.localeIdentifier = locale;
   constants.doLeftAndRightSwapInRTL = false;
   constants.isRTL = IsRTL(m_context.Properties());

package/Microsoft.ReactNative/Modules/I18nManagerModule.h

@@ -24,7 +24,7 @@ struct I18nManager {
   void Initialize(React::ReactContext const &reactContext) noexcept;
 
   REACT_GET_CONSTANTS(GetConstants)
-  ReactNativeSpecs::I18nManagerSpec_Constants GetConstants() noexcept;
+  ReactNativeSpecs::I18nManagerSpec_I18nManagerConstants GetConstants() noexcept;
 
   REACT_METHOD(AllowRTL, L"allowRTL")
   void AllowRTL(bool allowRTL) noexcept;