react-native-windows 0.73.11 → 0.74.0-preview.2

package/Microsoft.ReactNative/Microsoft.ReactNative.vcxproj

@@ -13,8 +13,6 @@
     <AppContainerApplication>true</AppContainerApplication>
     <ApplicationType>Windows Store</ApplicationType>
     <ApplicationTypeRevision>10.0</ApplicationTypeRevision>
-    <!-- Overriding for WinUI3 compatibility. See property UseWinUI3. -->
-    <WindowsTargetPlatformMinVersion>10.0.17763.0</WindowsTargetPlatformMinVersion>
     <CppWinRTNamespaceMergeDepth>
     </CppWinRTNamespaceMergeDepth>
     <CppWinRTLibs>true</CppWinRTLibs>
@@ -92,7 +90,7 @@
   <ItemDefinitionGroup>
     <ClCompile>
       <PrecompiledHeader>Use</PrecompiledHeader>
-      <RuntimeTypeInfo Condition="'$(UseFabric)' == 'true' AND '$(Configuration)'=='Debug'">true</RuntimeTypeInfo>
+      <RuntimeTypeInfo Condition="'$(Configuration)'=='Debug' OR '$(UseFabric)' == 'true'">true</RuntimeTypeInfo>
       <PrecompiledHeaderFile>pch.h</PrecompiledHeaderFile>
       <PrecompiledHeaderOutputFile>$(IntDir)pch.pch</PrecompiledHeaderOutputFile>
       <ForcedIncludeFiles>pch.h</ForcedIncludeFiles>
@@ -107,17 +105,17 @@
         $(ReactNativeWindowsDir)Microsoft.ReactNative\Views;
         $(ReactNativeWindowsDir);
         $(ReactNativeWindowsDir)codegen;
+        $(ReactNativeWindowsDir)codegen\react\components\rnwcore;
         $(ReactNativeWindowsDir)Common;
         $(ReactNativeWindowsDir)include;
         $(ReactNativeWindowsDir)Shared;
         $(ReactNativeWindowsDir)Shared\tracing;
         $(ReactNativeWindowsDir)include\Shared;
-        $(ReactNativeDir)\ReactCommon\react\renderer\graphics\platform\cxx;
         $(YogaDir);
         $(GeneratedFilesDir);
         %(AdditionalIncludeDirectories)
       </AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>DISABLE_XAML_GENERATED_MAIN;FOLLY_NO_CONFIG;NOMINMAX;_HAS_AUTO_PTR_ETC;_USE_MATH_DEFINES;RN_EXPORT=;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>DISABLE_XAML_GENERATED_MAIN;FOLLY_CFG_NO_COROUTINES;FOLLY_NO_CONFIG;NOMINMAX;_HAS_AUTO_PTR_ETC;_USE_MATH_DEFINES;RN_EXPORT=;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <!--
         REACTWINDOWS_BUILD - building with REACTWINDOWS_API as dll exports
         OLD_CPPWINRT is a workaround to make target version to 19H1
@@ -126,12 +124,15 @@
         REACTWINDOWS_BUILD;
         RN_PLATFORM=windows;
         NOMINMAX;
+        FOLLY_CFG_NO_COROUTINES;
         FOLLY_NO_CONFIG;
         RN_EXPORT=;
         JSI_EXPORT=;
         WIN32=0;
         WINRT=1;
         _HAS_AUTO_PTR_ETC;
+        <!-- See https://cplusplus.github.io/LWG/issue3840 -->
+        _SILENCE_CXX20_U8PATH_DEPRECATION_WARNING;
         %(PreprocessorDefinitions)
       </PreprocessorDefinitions>
       <AdditionalUsingDirectories>$(WindowsSDK_WindowsMetadata);$(AdditionalUsingDirectories)</AdditionalUsingDirectories>
@@ -187,10 +188,6 @@
     <ClInclude Include="ABIViewManager.h" />
     <ClInclude Include="Base\CxxReactIncludes.h" />
     <ClInclude Include="Base\FollyIncludes.h" />
-    <ClInclude Include="CoreAppPage.h">
-      <DependentUpon>CoreAppPage.xaml</DependentUpon>
-      <SubType>Code</SubType>
-    </ClInclude>
     <ClInclude Include="ReactHost\JSCallInvokerScheduler.h" />
     <ClInclude Include="Utils\ShadowNodeTypeUtils.h" />
     <ClInclude Include="Utils\BatchingEventEmitter.h" />
@@ -313,6 +310,10 @@
       <DependentUpon>ReactNativeHost.idl</DependentUpon>
       <SubType>Code</SubType>
     </ClInclude>
+    <ClInclude Include="Timer.h">
+      <DependentUpon>Timer.idl</DependentUpon>
+      <SubType>Code</SubType>
+    </ClInclude>
     <ClInclude Include="Utils\AccessibilityUtils.h" />
     <ClInclude Include="Utils\Helpers.h" />
     <ClInclude Include="Utils\KeyboardUtils.h" />
@@ -344,6 +345,7 @@
     <ClInclude Include="Views\Image\ReactImageBrush.h" />
     <ClInclude Include="Views\Impl\ScrollViewUWPImplementation.h" />
     <ClInclude Include="Views\Impl\SnapPointManagingContentControl.h" />
+    <ClInclude Include="Views\UnimplementedViewManager.h" />
     <ClInclude Include="Views\IXamlRootView.h" />
     <ClInclude Include="Views\KeyboardEventHandler.h" />
     <ClInclude Include="Views\PaperShadowNode.h" />
@@ -421,11 +423,6 @@
     <ClCompile Include="ABICxxModule.cpp" />
     <ClCompile Include="ABIViewManager.cpp" />
     <ClCompile Include="Base\CoreUIManagers.cpp" />
-    <ClCompile Include="CoreAppPage.cpp">
-      <DependentUpon>CoreAppPage.xaml</DependentUpon>
-      <SubType>Code</SubType>
-    </ClCompile>
-    <ClCompile Include="CoreApp.cpp" />
     <ClCompile Include="Utils\BatchingEventEmitter.cpp" />
     <ClCompile Include="CxxReactUWP\JSBigString.cpp" />
     <ClCompile Include="DevMenuControl.cpp">
@@ -468,7 +465,6 @@
     <ClCompile Include="Modules\LinkingManagerModule.cpp" />
     <ClCompile Include="Modules\LogBoxModule.cpp" />
     <ClCompile Include="Modules\NativeUIManager.cpp" />
-    <ClCompile Include="Modules\TimingModule.cpp" />
     <ClCompile Include="Modules\PaperUIManagerModule.cpp" />
     <ClCompile Include="ReactPointerEventArgs.cpp">
       <DependentUpon>ReactPointerEventArgs.idl</DependentUpon>
@@ -492,6 +488,7 @@
     <ClCompile Include="Views\ActivityIndicatorViewManager.cpp" />
     <ClCompile Include="Views\ConfigureBundlerDlg.cpp" />
     <ClCompile Include="Views\ControlViewManager.cpp" />
+    <ClCompile Include="Views\DebuggingOverlayViewManager.cpp" />
     <ClCompile Include="Views\DynamicAutomationPeer.cpp" />
     <ClCompile Include="Views\DynamicAutomationProperties.cpp" />
     <ClCompile Include="Views\DynamicValueProvider.cpp" />
@@ -505,6 +502,7 @@
     <ClCompile Include="Views\Impl\ScrollViewUWPImplementation.cpp" />
     <ClCompile Include="Views\Impl\SnapPointManagingContentControl.cpp" />
     <ClCompile Include="Views\KeyboardEventHandler.cpp" />
+    <ClCompile Include="Views\UnimplementedViewManager.cpp" />
     <ClCompile Include="Views\PaperShadowNode.cpp" />
     <ClCompile Include="Views\PopupViewManager.cpp" />
     <ClCompile Include="Views\RawTextViewManager.cpp" />
@@ -558,10 +556,6 @@
     </ClCompile>
   </ItemGroup>
   <ItemGroup>
-    <Midl Include="CoreAppPage.idl">
-      <DependentUpon>CoreAppPage.xaml</DependentUpon>
-      <SubType>Code</SubType>
-    </Midl>
     <Midl Include="DesktopWindowMessage.idl" />
     <Midl Include="DevMenuControl.idl">
       <DependentUpon>DevMenuControl.xaml</DependentUpon>
@@ -625,9 +619,6 @@
     </ProjectReference>
   </ItemGroup>
   <ItemGroup>
-    <Page Include="CoreAppPage.xaml">
-      <SubType>Designer</SubType>
-    </Page>
     <Page Include="DevMenuControl.xaml">
       <SubType>Designer</SubType>
     </Page>

package/Microsoft.ReactNative/Microsoft.ReactNative.vcxproj.filters

@@ -171,6 +171,9 @@
     <ClCompile Include="Views\KeyboardEventHandler.cpp">
       <Filter>Views</Filter>
     </ClCompile>
+    <ClCompile Include="Views\UnimplementedViewManager.cpp">
+      <Filter>Views</Filter>
+    </ClCompile>
     <ClCompile Include="Views\PopupViewManager.cpp">
       <Filter>Views</Filter>
     </ClCompile>
@@ -288,7 +291,6 @@
     <ClCompile Include="ReactPointerEventArgs.cpp" />
     <ClCompile Include="Views\FrameworkElementTransferProperties.cpp" />
     <ClCompile Include="Views\ReactViewInstance.cpp" />
-    <ClCompile Include="CoreApp.cpp" />
     <ClCompile Include="Utils\KeyboardUtils.cpp" />
   </ItemGroup>
   <ItemGroup>
@@ -525,6 +527,9 @@
     <ClInclude Include="Views\KeyboardEventHandler.h">
       <Filter>Views</Filter>
     </ClInclude>
+    <ClInclude Include="Views\UnimplementedViewManager.h">
+      <Filter>Views</Filter>
+    </ClInclude>
     <ClInclude Include="Views\PopupViewManager.h">
       <Filter>Views</Filter>
     </ClInclude>
@@ -767,6 +772,5 @@
   </ItemGroup>
   <ItemGroup>
     <Page Include="DevMenuControl.xaml" />
-    <Page Include="CoreAppPage.xaml" />
   </ItemGroup>
 </Project>

package/Microsoft.ReactNative/Modules/AccessibilityInfoModule.h

@@ -33,7 +33,7 @@ struct AccessibilityInfo : public std::enable_shared_from_this<AccessibilityInfo
   void isAccessibilityServiceEnabled(std::function<void(bool)> const &onSuccess) noexcept;
 
  private:
-  React::ReactContext m_context;
+  winrt::Microsoft::ReactNative::ReactContext m_context;
 };
 
 } // namespace Microsoft::ReactNative

package/Microsoft.ReactNative/Modules/AlertModule.h

@@ -18,7 +18,7 @@ struct Alert : public std::enable_shared_from_this<Alert> {
   using Constants = ReactNativeSpecs::DialogManagerWindowsSpec_Constants;
 
   REACT_INIT(Initialize)
-  void Initialize(React::ReactContext const &reactContext) noexcept;
+  void Initialize(winrt::Microsoft::ReactNative::ReactContext const &reactContext) noexcept;
 
   REACT_METHOD(showAlert)
   void showAlert(
@@ -30,7 +30,7 @@ struct Alert : public std::enable_shared_from_this<Alert> {
   Constants GetConstants() noexcept;
 
  private:
-  React::ReactContext m_context;
+  winrt::Microsoft::ReactNative::ReactContext m_context;
   Constants m_constants;
 
   struct AlertRequest {

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

@@ -182,7 +182,8 @@ void PropsAnimatedNode::StartAnimations() {
 #ifdef USE_FABRIC
           } else {
             auto visual = winrt::Microsoft::ReactNative::Composition::CompositionContextHelper::InnerVisual(
-                view.m_componentView->Visual());
+                view.m_componentView.as<winrt::Microsoft::ReactNative::Composition::implementation::ComponentView>()
+                    ->Visual());
             visual.RotationAxis(m_rotationAxis);
 #endif
           }
@@ -360,7 +361,7 @@ PropsAnimatedNode::AnimationView PropsAnimatedNode::GetAnimationView() {
     auto componentView = fabricuiManager->GetViewRegistry().findComponentViewWithTag(
         static_cast<facebook::react::Tag>(m_connectedViewTag));
     if (componentView) {
-      return {nullptr, std::static_pointer_cast<CompositionBaseComponentView>(componentView)};
+      return {nullptr, componentView};
     }
   }
 #endif // USE_FABRIC
@@ -392,18 +393,20 @@ void PropsAnimatedNode::StartAnimation(
     view.m_element.StartAnimation(animation);
 #ifdef USE_FABRIC
   } else if (view.m_componentView) {
-    auto visual = winrt::Microsoft::ReactNative::Composition::CompositionContextHelper::InnerVisual(
-        view.m_componentView->Visual());
+    auto baseComponentView =
+        view.m_componentView.as<winrt::Microsoft::ReactNative::Composition::implementation::ComponentView>();
+    auto visual =
+        winrt::Microsoft::ReactNative::Composition::CompositionContextHelper::InnerVisual(baseComponentView->Visual());
     if (visual) {
       auto targetProp = animation.Target();
       if (targetProp == L"Rotation") {
         targetProp = L"RotationAngleInDegrees";
       } else if (targetProp == L"Transform") {
-        view.m_componentView->EnsureCenterPointPropertySet().StartAnimation(L"transform", animation);
+        baseComponentView->EnsureCenterPointPropertySet().StartAnimation(L"transform", animation);
         return;
       } else if (targetProp == L"Translation") {
-        view.m_componentView->EnsureTransformMatrixFacade();
-        view.m_componentView->EnsureCenterPointPropertySet().StartAnimation(L"translation", animation);
+        baseComponentView->EnsureTransformMatrixFacade();
+        baseComponentView->EnsureCenterPointPropertySet().StartAnimation(L"translation", animation);
 
         return;
       }
@@ -421,7 +424,8 @@ comp::CompositionPropertySet PropsAnimatedNode::EnsureCenterPointPropertySet(con
 #endif
 #ifdef USE_FABRIC
   if (view.m_componentView) {
-    return view.m_componentView->EnsureCenterPointPropertySet();
+    return view.m_componentView.as<winrt::Microsoft::ReactNative::Composition::implementation::ComponentView>()
+        ->EnsureCenterPointPropertySet();
   }
 #endif
   return nullptr;

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

@@ -38,7 +38,7 @@ class PropsAnimatedNode final : public AnimatedNode {
   struct AnimationView {
     xaml::UIElement m_element;
 #ifdef USE_FABRIC
-    std::shared_ptr<CompositionBaseComponentView> m_componentView;
+    winrt::Microsoft::ReactNative::ComponentView m_componentView;
 #endif
     operator bool() const noexcept {
 #ifdef USE_FABRIC

package/Microsoft.ReactNative/Modules/AppStateModule.h

@@ -22,7 +22,7 @@ struct AppState : public std::enable_shared_from_this<AppState> {
   REACT_METHOD(GetCurrentAppState, L"getCurrentAppState")
   void GetCurrentAppState(
       std::function<void(AppStateChangeArgs const &)> const &success,
-      std::function<void(React::JSValue const &)> const &error) noexcept;
+      std::function<void(winrt::Microsoft::ReactNative::JSValue const &)> const &error) noexcept;
 
   REACT_METHOD(AddListener, L"addListener")
   void AddListener(std::string &&eventName) noexcept;
@@ -45,7 +45,7 @@ struct AppState : public std::enable_shared_from_this<AppState> {
   std::atomic<bool> m_deactivated;
   std::atomic<bool> m_enteredBackground;
   char const *m_lastState{nullptr};
-  React::ReactContext m_context;
+  winrt::Microsoft::ReactNative::ReactContext m_context;
 #ifndef USE_WINUI3
   xaml::Application::EnteredBackground_revoker m_enteredBackgroundRevoker;
   xaml::Application::LeavingBackground_revoker m_leavingBackgroundRevoker;

package/Microsoft.ReactNative/Modules/AppThemeModuleUwp.cpp

@@ -9,6 +9,7 @@
 #include <IReactContext.h>
 #include <ReactPropertyBag.h>
 #include <Utils/Helpers.h>
+#include <Utils/ThemeUtils.h>
 #include <Utils/ValueUtils.h>
 #include <XamlUIService.h>
 #include <XamlUtils.h>
@@ -41,9 +42,9 @@ static const React::ReactPropertyId<React::ReactNonAbiValue<std::shared_ptr<AppT
 //
 
 AppThemeHolder::AppThemeHolder(const Mso::React::IReactContext &context) : m_context(&context) {
-  if (auto currentApp = xaml::TryGetCurrentApplication()) {
-    NotifyHighContrastChanged();
+  NotifyHighContrastChanged();
 
+  if (auto currentApp = xaml::TryGetCurrentApplication()) {
     if (IsWinUI3Island()) {
       m_wmSubscription = SubscribeToWindowMessage(
           ReactNotificationService(m_context->Notifications()), WM_THEMECHANGED, [this](const auto &, const auto &) {
@@ -75,7 +76,8 @@ void AppThemeHolder::SetCallback(
 }
 
 void AppThemeHolder::NotifyHighContrastChanged() noexcept {
-  m_appThemeData.isHighContrast = m_accessibilitySettings.HighContrast();
+  m_appThemeData.isHighContrast =
+      xaml::TryGetCurrentApplication() ? m_accessibilitySettings.HighContrast() : IsInHighContrastWin32();
   m_appThemeData.highContrastColors.ButtonFaceColor =
       FormatRGB(m_uiSettings.UIElementColor(winrt::UIElementType::ButtonFace));
   m_appThemeData.highContrastColors.ButtonTextColor =

package/Microsoft.ReactNative/Modules/AppThemeModuleUwp.h

@@ -21,8 +21,8 @@ class AppThemeHolder {
   static void InitAppThemeHolder(const Mso::React::IReactContext &context) noexcept;
   ReactNativeSpecs::AppThemeSpec_AppThemeData GetConstants() noexcept;
   static void SetCallback(
-      const React::ReactPropertyBag &propertyBag,
-      Mso::Functor<void(React::JSValueObject &&)> &&callback) noexcept;
+      const winrt::Microsoft::ReactNative::ReactPropertyBag &propertyBag,
+      Mso::Functor<void(winrt::Microsoft::ReactNative::JSValueObject &&)> &&callback) noexcept;
 
  private:
   // High Contrast Color helper method
@@ -30,7 +30,7 @@ class AppThemeHolder {
   void NotifyHighContrastChanged() noexcept;
 
   Mso::CntPtr<const Mso::React::IReactContext> m_context;
-  Mso::Functor<void(React::JSValueObject &&)> m_notifyCallback;
+  Mso::Functor<void(winrt::Microsoft::ReactNative::JSValueObject &&)> m_notifyCallback;
   ReactNativeSpecs::AppThemeSpec_AppThemeData m_appThemeData;
   winrt::Windows::UI::ViewManagement::AccessibilitySettings m_accessibilitySettings{};
   winrt::Windows::UI::ViewManagement::AccessibilitySettings::HighContrastChanged_revoker m_highContrastChangedRevoker{};
@@ -46,7 +46,7 @@ struct AppTheme : public std::enable_shared_from_this<AppTheme> {
   ReactNativeSpecs::AppThemeSpec_AppThemeData GetConstants() noexcept;
 
   REACT_INIT(Initialize)
-  void Initialize(React::ReactContext const &reactContext) noexcept;
+  void Initialize(winrt::Microsoft::ReactNative::ReactContext const &reactContext) noexcept;
 
  private:
   winrt::Microsoft::ReactNative::ReactContext m_context;

package/Microsoft.ReactNative/Modules/AppearanceModule.cpp

@@ -3,6 +3,7 @@
 
 #include "pch.h"
 #include "AppearanceModule.h"
+#include <Utils/ThemeUtils.h>
 #include <XamlUtils.h>
 #include <winrt/Windows.UI.ViewManagement.h>
 
@@ -41,13 +42,19 @@ void Appearance::Initialize(winrt::Microsoft::ReactNative::ReactContext const &r
       });
 }
 
+ApplicationTheme CurrentThemeFromUISettings(const winrt::Windows::UI::ViewManagement::UISettings &uiSettings) {
+  return IsColorLight(uiSettings.GetColorValue(winrt::Windows::UI::ViewManagement::UIColorType::Foreground))
+      ? ApplicationTheme::Dark
+      : ApplicationTheme::Light;
+}
+
 ApplicationTheme Appearance::GetCurrentTheme() noexcept {
   assert(m_context.UIDispatcher().HasThreadAccess()); // xaml::Application is only accessible on the UI thread
   if (auto currentApp = xaml::TryGetCurrentApplication()) {
     return currentApp.RequestedTheme();
   }
 
-  return ApplicationTheme::Light;
+  return CurrentThemeFromUISettings(m_uiSettings);
 }
 
 const char *Appearance::ToString(ApplicationTheme theme) noexcept {
@@ -69,6 +76,8 @@ void Appearance::InitOnUIThread(const Mso::React::IReactContext &context) noexce
   xaml::ApplicationTheme theme = ApplicationTheme::Light;
   if (auto currentApp = xaml::TryGetCurrentApplication()) {
     theme = currentApp.RequestedTheme();
+  } else {
+    theme = CurrentThemeFromUISettings(winrt::Windows::UI::ViewManagement::UISettings());
   }
 
   winrt::Microsoft::ReactNative::ReactPropertyBag pb{context.Properties()};

package/Microsoft.ReactNative/Modules/ClipboardModule.h

@@ -15,7 +15,7 @@ struct Clipboard {
   void Initialize(winrt::Microsoft::ReactNative::ReactContext const &reactContext) noexcept;
 
   REACT_METHOD(getString)
-  void getString(React::ReactPromise<std::string> result) noexcept;
+  void getString(winrt::Microsoft::ReactNative::ReactPromise<std::string> result) noexcept;
 
   REACT_METHOD(setString)
   void setString(std::wstring content) noexcept;

package/Microsoft.ReactNative/Modules/DeviceInfoModule.cpp

@@ -16,6 +16,10 @@
 #include <winrt/Windows.UI.Core.h>
 #include <winrt/Windows.UI.ViewManagement.h>
 
+#ifdef USE_FABRIC
+#include <ReactCoreInjection.h>
+#endif
+
 using namespace winrt::Microsoft::ReactNative;
 
 namespace Microsoft::ReactNative {
@@ -32,42 +36,54 @@ DeviceInfoHolder::DeviceInfoHolder(const Mso::React::IReactContext &context) : m
 }
 
 void DeviceInfoHolder::InitDeviceInfoHolder(const Mso::React::IReactContext &context) noexcept {
-  if (xaml::TryGetCurrentApplication()) {
+  if (xaml::TryGetCurrentApplication() || IsFabricEnabled(context.Properties())) {
     auto deviceInfoHolder = std::make_shared<DeviceInfoHolder>(context);
 
     deviceInfoHolder->updateDeviceInfo();
     winrt::Microsoft::ReactNative::ReactPropertyBag pb{context.Properties()};
     pb.Set(DeviceInfoHolderPropertyId(), std::move(deviceInfoHolder));
 
-    if (auto window = xaml::Window::Current()) {
-      auto const &coreWindow = window.CoreWindow();
+    uint64_t hwnd = 0;
 
-      deviceInfoHolder->m_sizeChangedRevoker =
-          coreWindow.SizeChanged(winrt::auto_revoke, [weakHolder = std::weak_ptr(deviceInfoHolder)](auto &&, auto &&) {
-            if (auto strongHolder = weakHolder.lock()) {
-              strongHolder->updateDeviceInfo();
-            }
-          });
-    } else {
-      assert(IsXamlIsland());
-      // This is either a WinUI 3 island or a system XAML island
-      // system XAML islands have a CoreWindow so we want to use the GetForCurrentView APIs
-      // For WinUI 3 islands we require the app to forward window messages as ReactNotifications
+#ifdef USE_FABRIC
+    if (IsFabricEnabled(context.Properties())) {
+      hwnd = winrt::Microsoft::ReactNative::implementation::ReactCoreInjection::GetTopLevelWindowId(pb.Handle());
     }
+#endif
 
-    if (!IsWinUI3Island()) {
-      // UWP or system XAML island
-      auto const &displayInfo = winrt::Windows::Graphics::Display::DisplayInformation::GetForCurrentView();
+    if (xaml::TryGetCurrentApplication()) {
+      if (auto window = xaml::Window::Current()) {
+        auto const &coreWindow = window.CoreWindow();
 
-      deviceInfoHolder->m_dpiChangedRevoker = displayInfo.DpiChanged(
-          winrt::auto_revoke, [weakHolder = std::weak_ptr(deviceInfoHolder)](const auto &, const auto &) {
-            if (auto strongHolder = weakHolder.lock()) {
-              strongHolder->updateDeviceInfo();
-            }
-          });
-    } else if (
-        auto hwnd =
-            reinterpret_cast<HWND>(XamlUIService::GetIslandWindowHandle(deviceInfoHolder->m_context->Properties()))) {
+        deviceInfoHolder->m_sizeChangedRevoker = coreWindow.SizeChanged(
+            winrt::auto_revoke, [weakHolder = std::weak_ptr(deviceInfoHolder)](auto &&, auto &&) {
+              if (auto strongHolder = weakHolder.lock()) {
+                strongHolder->updateDeviceInfo();
+              }
+            });
+      } else {
+        assert(IsXamlIsland());
+        // This is either a WinUI 3 island or a system XAML island
+        // system XAML islands have a CoreWindow so we want to use the GetForCurrentView APIs
+        // For WinUI 3 islands we require the app to forward window messages as ReactNotifications
+      }
+
+      if (!IsWinUI3Island()) {
+        // UWP or system XAML island
+        auto const &displayInfo = winrt::Windows::Graphics::Display::DisplayInformation::GetForCurrentView();
+
+        deviceInfoHolder->m_dpiChangedRevoker = displayInfo.DpiChanged(
+            winrt::auto_revoke, [weakHolder = std::weak_ptr(deviceInfoHolder)](const auto &, const auto &) {
+              if (auto strongHolder = weakHolder.lock()) {
+                strongHolder->updateDeviceInfo();
+              }
+            });
+      } else {
+        hwnd = XamlUIService::GetIslandWindowHandle(deviceInfoHolder->m_context->Properties());
+      }
+    }
+
+    if (hwnd) {
       deviceInfoHolder->m_wmSubscription = SubscribeToWindowMessage(
           ReactNotificationService(context.Notifications()),
           WM_WINDOWPOSCHANGED,
@@ -141,16 +157,27 @@ void DeviceInfoHolder::SetCallback(
 }
 
 void DeviceInfoHolder::updateDeviceInfo() noexcept {
-  if (xaml::Window::Current()) {
+  if (xaml::TryGetCurrentApplication() && xaml::Window::Current()) {
     auto const window = xaml::Window::Current().CoreWindow();
 
     m_windowWidth = window.Bounds().Width;
     m_windowHeight = window.Bounds().Height;
-  } else if (auto hwnd = reinterpret_cast<HWND>(XamlUIService::GetIslandWindowHandle(m_context->Properties()))) {
-    RECT rect{};
-    if (CALL_INDIRECT(L"user32.dll", GetWindowRect, hwnd, &rect)) {
-      m_windowWidth = (float)(rect.right - rect.left);
-      m_windowHeight = (float)(rect.bottom - rect.top);
+  } else {
+    auto hwnd = XamlUIService::GetIslandWindowHandle(m_context->Properties());
+
+#ifdef USE_FABRIC
+    if (IsFabricEnabled(m_context->Properties())) {
+      winrt::Microsoft::ReactNative::ReactPropertyBag pb{m_context->Properties()};
+      hwnd = winrt::Microsoft::ReactNative::implementation::ReactCoreInjection::GetTopLevelWindowId(pb.Handle());
+    }
+#endif
+
+    if (hwnd) {
+      RECT rect{};
+      if (CALL_INDIRECT(L"user32.dll", GetWindowRect, reinterpret_cast<HWND>(hwnd), &rect)) {
+        m_windowWidth = (float)(rect.right - rect.left);
+        m_windowHeight = (float)(rect.bottom - rect.top);
+      }
     }
   }
 
@@ -165,14 +192,20 @@ void DeviceInfoHolder::updateDeviceInfo() noexcept {
     notifyChanged();
   } else {
     RECT desktopRect{};
-    if (CALL_INDIRECT(L"user32.dll", GetWindowRect, nullptr, &desktopRect)) {
+
+    auto hwnd = XamlUIService::GetIslandWindowHandle(m_context->Properties());
+
+#ifdef USE_FABRIC
+    if (IsFabricEnabled(m_context->Properties())) {
+      winrt::Microsoft::ReactNative::ReactPropertyBag pb{m_context->Properties()};
+      hwnd = winrt::Microsoft::ReactNative::implementation::ReactCoreInjection::GetTopLevelWindowId(pb.Handle());
+    }
+#endif
+
+    if (hwnd && CALL_INDIRECT(L"user32.dll", GetWindowRect, reinterpret_cast<HWND>(hwnd), &desktopRect)) {
       m_screenWidth = static_cast<uint32_t>(desktopRect.right - desktopRect.left);
       m_screenHeight = static_cast<uint32_t>(desktopRect.bottom - desktopRect.top);
-      m_dpi = static_cast<float>(CALL_INDIRECT(
-          L"user32.dll",
-          GetDpiForWindow,
-          reinterpret_cast<HWND>(
-              winrt::Microsoft::ReactNative::XamlUIService::GetIslandWindowHandle(m_context->Properties()))));
+      m_dpi = static_cast<float>(CALL_INDIRECT(L"user32.dll", GetDpiForWindow, reinterpret_cast<HWND>(hwnd)));
     }
   }
 }

package/Microsoft.ReactNative/Modules/DeviceInfoModule.h

@@ -20,11 +20,11 @@ struct DeviceInfoHolder {
   DeviceInfoHolder(const Mso::React::IReactContext &context);
 
   static void SetCallback(
-      const React::ReactPropertyBag &propertyBag,
-      Mso::Functor<void(React::JSValueObject &&)> &&callback) noexcept;
+      const winrt::Microsoft::ReactNative::ReactPropertyBag &propertyBag,
+      Mso::Functor<void(winrt::Microsoft::ReactNative::JSValueObject &&)> &&callback) noexcept;
   static void InitDeviceInfoHolder(const Mso::React::IReactContext &context) noexcept;
   static ReactNativeSpecs::DeviceInfoSpec_DimensionsPayload GetDimensions(
-      const React::ReactPropertyBag &propertyBag) noexcept;
+      const winrt::Microsoft::ReactNative::ReactPropertyBag &propertyBag) noexcept;
 
  private:
   ReactNativeSpecs::DeviceInfoSpec_DisplayMetricsAndroid getWindow() noexcept;
@@ -43,7 +43,7 @@ struct DeviceInfoHolder {
 
   winrt::Windows::UI::Core::CoreWindow::SizeChanged_revoker m_sizeChangedRevoker;
   winrt::Windows::Graphics::Display::DisplayInformation::DpiChanged_revoker m_dpiChangedRevoker{};
-  Mso::Functor<void(React::JSValueObject &&)> m_notifyCallback;
+  Mso::Functor<void(winrt::Microsoft::ReactNative::JSValueObject &&)> m_notifyCallback;
   winrt::Microsoft::ReactNative::ReactNotificationSubscription m_wmSubscription{};
   Mso::CntPtr<const Mso::React::IReactContext> m_context{};
 };
@@ -53,7 +53,7 @@ struct DeviceInfo : public std::enable_shared_from_this<DeviceInfo> {
   using ModuleSpec = ReactNativeSpecs::DeviceInfoSpec;
 
   REACT_INIT(Initialize)
-  void Initialize(React::ReactContext const &reactContext) noexcept;
+  void Initialize(winrt::Microsoft::ReactNative::ReactContext const &reactContext) noexcept;
 
   REACT_GET_CONSTANTS(GetConstants)
   ReactNativeSpecs::DeviceInfoSpec_DeviceInfoConstants GetConstants() noexcept;