react-native-windows 0.76.8 → 0.76.9

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

@@ -15,11 +15,10 @@ namespace facebook::react {
 
 inline SharedColor
 parsePlatformColor(const ContextContainer &contextContainer, int32_t surfaceId, const RawValue &value) {
-  if (value.hasType<std::unordered_map<std::string, std::string>>()) {
+  if (value.hasType<std::unordered_map<std::string, std::vector<std::string>>>()) {
     auto map = (std::unordered_map<std::string, std::vector<std::string>>)value;
     if (map.find("windowsbrush") != map.end()) {
       facebook::react::Color color = {
-          /* .m_isDefined = */ true,
           /* .m_color = */ {},
           /* .m_platformColor = */ std::move(map["windowsbrush"]),
       };

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

@@ -16,7 +16,7 @@ winrt::Windows::UI::Color ResolvePlatformColor(const std::vector<std::string> &s
     for (auto platformColor : semanticItems) {
 #ifndef CORE_ABI
       // If XAML is loaded, look in application resources
-      if (xaml::TryGetCurrentApplication()) {
+      if (xaml::TryGetCurrentUwpXamlApplication()) {
         xaml::Media::Brush brush{Microsoft::ReactNative::BrushFromColorObject(platformColor)};
         if (auto scb{brush.try_as<xaml::Media::SolidColorBrush>()}) {
           return scb.Color();

package/Microsoft.ReactNative/IReactCompositionViewComponentBuilder.idl

@@ -21,6 +21,10 @@ namespace Microsoft.ReactNative.Composition
   [experimental]
   delegate void ComponentIslandComponentViewInitializer(ContentIslandComponentView view);
 
+  [webhosthidden]
+  [experimental]
+  delegate void PortalComponentViewInitializer(PortalComponentView view);
+
   [experimental]
   [webhosthidden]
   delegate Microsoft.UI.Composition.Visual CreateVisualDelegate(Microsoft.ReactNative.ComponentView view);
@@ -48,6 +52,15 @@ namespace Microsoft.ReactNative.Composition
     };
   }
 
+  [webhosthidden]
+  [experimental]
+  DOC_STRING("StateData type to be used with a PortalComponentView. The LayoutConstraints and PointScaleFactor will be used to layout the content of the Portal")
+  interface IPortalStateData
+  {
+    Microsoft.ReactNative.LayoutConstraints LayoutConstraints { get; };
+    Single PointScaleFactor { get; };
+  };
+
   [webhosthidden]
   [experimental]
   DOC_STRING(".")
@@ -55,10 +68,11 @@ namespace Microsoft.ReactNative.Composition
   {
     void SetViewComponentViewInitializer(ViewComponentViewInitializer initializer);
     void SetContentIslandComponentViewInitializer(ComponentIslandComponentViewInitializer initializer);
+    void SetPortalComponentViewInitializer(PortalComponentViewInitializer initializer);
     void SetCreateVisualHandler(CreateVisualDelegate impl);
     void SetViewFeatures(ComponentViewFeatures viewFeatures);
     void SetUpdateLayoutMetricsHandler(UpdateLayoutMetricsDelegate impl);
     void SetVisualToMountChildrenIntoHandler(VisualToMountChildrenIntoDelegate impl);
   };
 
-} // namespace Microsoft.ReactNative
+} // namespace Microsoft.ReactNative.Composition

package/Microsoft.ReactNative/IReactContext.cpp

@@ -4,7 +4,7 @@
 #include "pch.h"
 #include "IReactContext.h"
 #include "DynamicWriter.h"
-#ifndef CORE_ABI
+#if !defined(CORE_ABI) && !defined(USE_FABRIC)
 #include "XamlUIService.h"
 #endif
 
@@ -121,7 +121,7 @@ LoadingState ReactContext::LoadingState() noexcept {
   };
 }
 
-#ifndef CORE_ABI
+#if !defined(CORE_ABI) && !defined(USE_FABRIC)
 // Deprecated: Use XamlUIService directly.
 void ReactContext::DispatchEvent(
     xaml::FrameworkElement const &view,

package/Microsoft.ReactNative/IReactContext.h

@@ -46,7 +46,7 @@ struct ReactContext : winrt::implements<ReactContext, IReactContext> {
   IInspectable JSRuntime() noexcept;
   LoadingState LoadingState() noexcept;
 
-#ifndef CORE_ABI
+#if !defined(CORE_ABI) && !defined(USE_FABRIC)
   void DispatchEvent(
       xaml::FrameworkElement const &view,
       hstring const &eventName,

package/Microsoft.ReactNative/IReactContext.idl

@@ -5,7 +5,7 @@ import "IJSValueWriter.idl"; // The import is to be deprecated with IReactContex
 import "IReactNotificationService.idl";
 import "IReactPropertyBag.idl";
 
-#ifndef CORE_ABI
+#if !defined(CORE_ABI) && !defined(USE_FABRIC)
 #include "NamespaceRedirect.h" // The include is to be deprecated with IReactContext::DispatchEvent
 #endif
 
@@ -185,7 +185,7 @@ namespace Microsoft.ReactNative
       "It is an experimental property that may be removed or changed in a future version.")
     Object JSRuntime { get; };
 
-#ifndef CORE_ABI
+#if !defined(CORE_ABI) && !defined(USE_FABRIC)
     [deprecated("Use @XamlUIService.DispatchEvent instead", deprecate, 1)]
     DOC_STRING("Deprecated property. Use @XamlUIService.DispatchEvent instead. It will be removed in a future version.")
     void DispatchEvent(XAML_NAMESPACE.FrameworkElement view, String eventName, JSValueArgWriter eventDataArgWriter);

package/Microsoft.ReactNative/IReactPackageBuilder.idl

@@ -3,7 +3,7 @@
 
 import "IReactContext.idl";
 import "IReactModuleBuilder.idl";
-#ifndef CORE_ABI
+#if !defined(CORE_ABI) && !defined(USE_FABRIC)
 import "IViewManager.idl";
 #endif
 
@@ -14,7 +14,7 @@ namespace Microsoft.ReactNative
   DOC_STRING("Provides information about a custom native module. See @IReactModuleBuilder.")
   delegate Object ReactModuleProvider(IReactModuleBuilder moduleBuilder);
 
-#ifndef CORE_ABI
+#if !defined(CORE_ABI) && !defined(USE_FABRIC)
   DOC_STRING("Provides information about a custom view manager. See @IViewManager.")
   delegate IViewManager ReactViewManagerProvider();
 #endif
@@ -32,7 +32,7 @@ namespace Microsoft.ReactNative
     "NOTE: TurboModules using JSI directly will not run correctly while using @ReactInstanceSettings.UseWebDebugger")
     void AddTurboModule(String moduleName, ReactModuleProvider moduleProvider);
 
-#ifndef CORE_ABI
+#if !defined(CORE_ABI) && !defined(USE_FABRIC)
     DOC_STRING("Adds a custom view manager. See @ReactViewManagerProvider.")
     void AddViewManager(String viewManagerName, ReactViewManagerProvider viewManagerProvider);
 #endif

package/Microsoft.ReactNative/Microsoft.ReactNative.vcxproj

@@ -188,16 +188,11 @@
   </ItemDefinitionGroup>
   <ItemGroup>
     <ClInclude Include="ABICxxModule.h" />
-    <ClInclude Include="ABIViewManager.h" />
     <ClInclude Include="Base\CxxReactIncludes.h" />
     <ClInclude Include="Base\FollyIncludes.h" />
     <ClInclude Include="ReactHost\JSCallInvokerScheduler.h" />
     <ClInclude Include="Utils\ShadowNodeTypeUtils.h" />
     <ClInclude Include="Utils\BatchingEventEmitter.h" />
-    <ClInclude Include="DevMenuControl.h">
-      <DependentUpon>DevMenuControl.xaml</DependentUpon>
-      <SubType>Code</SubType>
-    </ClInclude>
     <ClInclude Include="DocString.h" />
     <ClInclude Include="DynamicReader.h">
       <DependentUpon>IJSValueReader.idl</DependentUpon>
@@ -208,7 +203,6 @@
     <ClInclude Include="JSDispatcherWriter.h">
       <DependentUpon>IJSValueWriter.idl</DependentUpon>
     </ClInclude>
-    <ClInclude Include="GlyphViewManager.h" />
     <ClInclude Include="HResult.h" />
     <ClInclude Include="IReactDispatcher.h">
       <DependentUpon>IReactDispatcher.idl</DependentUpon>
@@ -265,20 +259,14 @@
     <ClInclude Include="Modules\ImageViewManagerModule.h" />
     <ClInclude Include="Modules\LinkingManagerModule.h" />
     <ClInclude Include="Modules\LogBoxModule.h" />
-    <ClInclude Include="Modules\NativeUIManager.h" />
     <ClInclude Include="Modules\ReactRootViewTagGenerator.h" />
     <ClInclude Include="Modules\TimingModule.h" />
-    <ClInclude Include="Modules\PaperUIManagerModule.h" />
     <ClInclude Include="NativeModulesProvider.h" />
     <ClInclude Include="ReactHost\IReactInstance.h" />
-    <ClInclude Include="ReactHost\ViewManagerProvider.h" />
     <ClInclude Include="RedBoxErrorInfo.h" />
     <ClInclude Include="RedBoxErrorFrameInfo.h" />
     <ClInclude Include="TurboModulesProvider.h" />
     <ClInclude Include="Pch\pch.h" />
-    <ClInclude Include="ReactApplication.h">
-      <DependentUpon>ReactApplication.idl</DependentUpon>
-    </ClInclude>
     <ClInclude Include="IReactContext.h">
       <DependentUpon>IReactContext.idl</DependentUpon>
       <SubType>Code</SubType>
@@ -317,7 +305,6 @@
       <DependentUpon>Timer.idl</DependentUpon>
       <SubType>Code</SubType>
     </ClInclude>
-    <ClInclude Include="Utils\AccessibilityUtils.h" />
     <ClInclude Include="Utils\Helpers.h" />
     <ClInclude Include="Utils\KeyboardUtils.h" />
     <ClInclude Include="Utils\LocalBundleReader.h" />
@@ -331,9 +318,57 @@
     <ClInclude Include="Utils\UwpScriptStore.h" />
     <ClInclude Include="Utils\ValueUtils.h" />
     <ClInclude Include="Utils\XamlIslandUtils.h" />
+    <ClInclude Include="Utils\XamlUtils.h" />
+    <ClInclude Include="Views\DevMenu.h" />
+    <ClInclude Include="ReactPackageBuilder.h">
+      <DependentUpon>IReactPackageBuilder.idl</DependentUpon>
+    </ClInclude>
+    <ClInclude Include="IReactPropertyBag.h">
+      <DependentUpon>IReactPropertyBag.idl</DependentUpon>
+      <SubType>Code</SubType>
+    </ClInclude>
+    <ClInclude Include="RedBox.h" />
+    <ClInclude Include="ReactSupport.h" />
+    <ClInclude Include="TestHook.h" />
+    <ClInclude Include="QuirkSettings.h">
+      <DependentUpon>QuirkSettings.idl</DependentUpon>
+      <SubType>Code</SubType>
+    </ClInclude>
+    <ClInclude Include="ReactPointerEventArgs.h">
+      <DependentUpon>ReactPointerEventArgs.idl</DependentUpon>
+      <SubType>Code</SubType>
+    </ClInclude>
+    <ClInclude Include="XamlUIService.h">
+      <DependentUpon>XamlUIService.idl</DependentUpon>
+      <SubType>Code</SubType>
+    </ClInclude>
+  </ItemGroup>
+  <!-- Paper-only ClInclude -->
+  <ItemGroup Condition="'$(UseFabric)' != 'true'">
+    <ClInclude Include="ABIViewManager.h" />
+    <ClInclude Include="DevMenuControl.h">
+      <DependentUpon>DevMenuControl.xaml</DependentUpon>
+      <SubType>Code</SubType>
+    </ClInclude>
+    <ClInclude Include="GlyphViewManager.h" />
+    <ClInclude Include="LayoutService.h">
+      <DependentUpon>LayoutService.idl</DependentUpon>
+      <SubType>Code</SubType>
+    </ClInclude>
+    <ClInclude Include="Modules\NativeUIManager.h" />
+    <ClInclude Include="Modules\PaperUIManagerModule.h" />
+    <ClInclude Include="ReactApplication.h">
+      <DependentUpon>ReactApplication.idl</DependentUpon>
+    </ClInclude>
+    <ClInclude Include="ReactHost\ViewManagerProvider.h" />
+    <ClInclude Include="ReactRootView.h">
+      <DependentUpon>ReactRootView.idl</DependentUpon>
+      <SubType>Code</SubType>
+    </ClInclude>
+    <ClInclude Include="Utils\AccessibilityUtils.h" />
+    <ClInclude Include="ViewManagersProvider.h" />
     <ClInclude Include="Views\ActivityIndicatorViewManager.h" />
     <ClInclude Include="Views\ControlViewManager.h" />
-    <ClInclude Include="Views\DevMenu.h" />
     <ClInclude Include="Views\DynamicAutomationPeer.h" />
     <ClInclude Include="Views\DynamicAutomationProperties.h" />
     <ClInclude Include="Views\DynamicValueProvider.h" />
@@ -384,55 +419,17 @@
     <ClInclude Include="Views\ViewViewManager.h" />
     <ClInclude Include="Views\VirtualTextViewManager.h" />
     <ClInclude Include="Views\XamlFeatures.h" />
-    <ClInclude Include="XamlLoadState.h" />
-    <ClInclude Include="LayoutService.h">
-      <DependentUpon>LayoutService.idl</DependentUpon>
-      <SubType>Code</SubType>
-    </ClInclude>
-    <ClInclude Include="XamlUIService.h">
-      <DependentUpon>XamlUIService.idl</DependentUpon>
-      <SubType>Code</SubType>
-    </ClInclude>
-    <ClInclude Include="ReactPackageBuilder.h">
-      <DependentUpon>IReactPackageBuilder.idl</DependentUpon>
-    </ClInclude>
-    <ClInclude Include="IReactPropertyBag.h">
-      <DependentUpon>IReactPropertyBag.idl</DependentUpon>
-      <SubType>Code</SubType>
-    </ClInclude>
-    <ClInclude Include="ReactRootView.h">
-      <DependentUpon>ReactRootView.idl</DependentUpon>
-      <SubType>Code</SubType>
-    </ClInclude>
-    <ClInclude Include="RedBox.h" />
-    <ClInclude Include="ReactSupport.h" />
-    <ClInclude Include="TestHook.h" />
-    <ClInclude Include="QuirkSettings.h">
-      <DependentUpon>QuirkSettings.idl</DependentUpon>
-      <SubType>Code</SubType>
-    </ClInclude>
-    <ClInclude Include="ViewManagersProvider.h" />
     <ClInclude Include="XamlHelper.h">
       <DependentUpon>XamlHelper.idl</DependentUpon>
       <SubType>Code</SubType>
     </ClInclude>
+    <ClInclude Include="XamlLoadState.h" />
     <ClInclude Include="XamlView.h" />
-    <ClInclude Include="ReactPointerEventArgs.h">
-      <DependentUpon>ReactPointerEventArgs.idl</DependentUpon>
-      <SubType>Code</SubType>
-    </ClInclude>
   </ItemGroup>
   <ItemGroup>
     <ClCompile Include="ABICxxModule.cpp" />
-    <ClCompile Include="ABIViewManager.cpp" />
-    <ClCompile Include="Base\CoreUIManagers.cpp" />
     <ClCompile Include="Utils\BatchingEventEmitter.cpp" />
     <ClCompile Include="CxxReactUWP\JSBigString.cpp" />
-    <ClCompile Include="DevMenuControl.cpp">
-      <DependentUpon>DevMenuControl.xaml</DependentUpon>
-      <SubType>Code</SubType>
-    </ClCompile>
-    <ClCompile Include="GlyphViewManager.cpp" />
     <ClCompile Include="Modules\AccessibilityInfoModule.cpp" />
     <ClCompile Include="Modules\AlertModule.cpp" />
     <ClCompile Include="Modules\Animated\AdditionAnimatedNode.cpp" />
@@ -467,8 +464,6 @@
     <ClCompile Include="Modules\ImageViewManagerModule.cpp" />
     <ClCompile Include="Modules\LinkingManagerModule.cpp" />
     <ClCompile Include="Modules\LogBoxModule.cpp" />
-    <ClCompile Include="Modules\NativeUIManager.cpp" />
-    <ClCompile Include="Modules\PaperUIManagerModule.cpp" />
     <ClCompile Include="ReactPointerEventArgs.cpp">
       <DependentUpon>ReactPointerEventArgs.idl</DependentUpon>
       <SubType>Code</SubType>
@@ -476,11 +471,7 @@
     <ClCompile Include="Pch\pch.cpp">
       <PrecompiledHeader>Create</PrecompiledHeader>
     </ClCompile>
-    <ClCompile Include="ReactApplication.cpp">
-      <DependentUpon>ReactApplication.idl</DependentUpon>
-    </ClCompile>
     <ClCompile Include="$(GeneratedFilesDir)module.g.cpp" />
-    <ClCompile Include="Utils\AccessibilityUtils.cpp" />
     <ClCompile Include="Utils\KeyboardUtils.cpp" />
     <ClCompile Include="Utils\LocalBundleReader.cpp" />
     <ClCompile Include="Utils\ResourceBrushUtils.cpp" />
@@ -488,6 +479,37 @@
     <ClCompile Include="Utils\UwpScriptStore.cpp" />
     <ClCompile Include="Utils\ValueUtils.cpp" />
     <ClCompile Include="Utils\XamlIslandUtils.cpp" />
+    <ClCompile Include="ReactSupport.cpp" />
+    <ClCompile Include="TestHook.cpp" />
+    <ClCompile Include="XamlUIService.cpp">
+      <DependentUpon>XamlUIService.idl</DependentUpon>
+      <SubType>Code</SubType>
+    </ClCompile>
+  </ItemGroup>
+  <!-- Paper-only ClCompile -->
+  <ItemGroup Condition="'$(UseFabric)' != 'true'">
+    <ClCompile Include="ABIViewManager.cpp" />
+    <ClCompile Include="Base\CoreUIManagers.cpp" />
+    <ClCompile Include="DevMenuControl.cpp">
+      <DependentUpon>DevMenuControl.xaml</DependentUpon>
+      <SubType>Code</SubType>
+    </ClCompile>
+    <ClCompile Include="GlyphViewManager.cpp" />
+    <ClCompile Include="LayoutService.cpp">
+      <DependentUpon>LayoutService.idl</DependentUpon>
+      <SubType>Code</SubType>
+    </ClCompile>
+    <ClCompile Include="Modules\NativeUIManager.cpp" />
+    <ClCompile Include="Modules\PaperUIManagerModule.cpp" />
+    <ClCompile Include="ReactApplication.cpp">
+      <DependentUpon>ReactApplication.idl</DependentUpon>
+    </ClCompile>
+    <ClCompile Include="ReactRootView.cpp">
+      <DependentUpon>ReactRootView.idl</DependentUpon>
+      <SubType>Code</SubType>
+    </ClCompile>
+    <ClCompile Include="Utils\AccessibilityUtils.cpp" />
+    <ClCompile Include="ViewManagersProvider.cpp" />
     <ClCompile Include="Views\ActivityIndicatorViewManager.cpp" />
     <ClCompile Include="Views\ConfigureBundlerDlg.cpp" />
     <ClCompile Include="Views\ControlViewManager.cpp" />
@@ -536,53 +558,41 @@
     <ClCompile Include="Views\ViewViewManager.cpp" />
     <ClCompile Include="Views\VirtualTextViewManager.cpp" />
     <ClCompile Include="Views\XamlFeatures.cpp" />
-    <ClCompile Include="XamlLoadState.cpp" />
-    <ClCompile Include="XamlView.cpp" />
-    <ClCompile Include="LayoutService.cpp">
-      <DependentUpon>LayoutService.idl</DependentUpon>
-      <SubType>Code</SubType>
-    </ClCompile>
-    <ClCompile Include="XamlUIService.cpp">
-      <DependentUpon>XamlUIService.idl</DependentUpon>
-      <SubType>Code</SubType>
-    </ClCompile>
-    <ClCompile Include="ReactRootView.cpp">
-      <DependentUpon>ReactRootView.idl</DependentUpon>
-      <SubType>Code</SubType>
-    </ClCompile>
-    <ClCompile Include="ReactSupport.cpp" />
-    <ClCompile Include="TestHook.cpp" />
-    <ClCompile Include="ViewManagersProvider.cpp" />
     <ClCompile Include="XamlHelper.cpp">
       <DependentUpon>XamlHelper.idl</DependentUpon>
       <SubType>Code</SubType>
     </ClCompile>
+    <ClCompile Include="XamlLoadState.cpp" />
+    <ClCompile Include="XamlView.cpp" />
   </ItemGroup>
   <ItemGroup>
     <Midl Include="DesktopWindowMessage.idl" />
+    <Midl Include="DocString.idl" />
+    <Midl Include="ReactPointerEventArgs.idl" />
+    <Midl Include="XamlUIService.idl">
+      <SubType>Designer</SubType>
+    </Midl>
+  </ItemGroup>
+  <!-- Paper-only Midl -->
+  <ItemGroup Condition="'$(UseFabric)' != 'true'">
     <Midl Include="DevMenuControl.idl">
       <DependentUpon>DevMenuControl.xaml</DependentUpon>
       <SubType>Code</SubType>
     </Midl>
-    <Midl Include="DocString.idl" />
     <Midl Include="IViewManager.idl" />
     <Midl Include="IViewManagerCore.idl" />
-    <Midl Include="ReactApplication.idl" />
-    <Midl Include="Views\cppwinrt\AccessibilityAction.idl" />
-    <Midl Include="Views\cppwinrt\Effects.idl" />
-    <Midl Include="Views\cppwinrt\DynamicAutomationPeer.idl" />
-    <Midl Include="Views\cppwinrt\ViewPanel.idl" />
     <Midl Include="LayoutService.idl">
       <SubType>Designer</SubType>
     </Midl>
-    <Midl Include="XamlUIService.idl">
-      <SubType>Designer</SubType>
-    </Midl>
+    <Midl Include="ReactApplication.idl" />
     <Midl Include="ReactRootView.idl">
       <SubType>Designer</SubType>
     </Midl>
+    <Midl Include="Views\cppwinrt\AccessibilityAction.idl" />
+    <Midl Include="Views\cppwinrt\Effects.idl" />
+    <Midl Include="Views\cppwinrt\DynamicAutomationPeer.idl" />
+    <Midl Include="Views\cppwinrt\ViewPanel.idl" />
     <Midl Include="XamlHelper.idl" />
-    <Midl Include="ReactPointerEventArgs.idl" />
   </ItemGroup>
   <ItemGroup>
     <None Include="microsoft.reactnative.def" />
@@ -621,7 +631,7 @@
       <Project>{a9d95a91-4db7-4f72-beb6-fe8a5c89bfbd}</Project>
     </ProjectReference>
   </ItemGroup>
-  <ItemGroup>
+  <ItemGroup Condition="'$(UseFabric)' != 'true'">
     <Page Include="DevMenuControl.xaml">
       <SubType>Designer</SubType>
     </Page>

package/Microsoft.ReactNative/Modules/AccessibilityInfoModule.cpp

@@ -3,9 +3,11 @@
 
 #include "pch.h"
 #include "AccessibilityInfoModule.h"
+#ifndef USE_FABRIC
 #include <UI.Xaml.Automation.Peers.h>
 #include <UI.Xaml.Controls.h>
 #include <XamlUtils.h>
+#endif
 #include <uiautomationcore.h>
 #include <uiautomationcoreapi.h>
 #include <winrt/Windows.ApplicationModel.DataTransfer.h>
@@ -40,6 +42,7 @@ void AccessibilityInfo::setAccessibilityFocus(double /*reactTag*/) noexcept {
 
 void AccessibilityInfo::announceForAccessibility(std::wstring announcement) noexcept {
   m_context.UIDispatcher().Post([context = m_context, announcement = std::move(announcement)] {
+#ifndef USE_FABRIC
     // Windows requires a specific element to announce from. Unfortunately the react-native API does not provide a tag
     // So we need to find something to raise the notification event from.
     xaml::UIElement element{nullptr};
@@ -67,6 +70,7 @@ void AccessibilityInfo::announceForAccessibility(std::wstring announcement) noex
         xaml::Automation::Peers::AutomationNotificationProcessing::ImportantMostRecent,
         hstr,
         hstr);
+#endif
   });
 }
 

package/Microsoft.ReactNative/Modules/AlertModule.cpp

@@ -5,12 +5,15 @@
 #include "AlertModule.h"
 #include "Unicode.h"
 
+#ifndef USE_FABRIC
 #include <UI.Xaml.Controls.Primitives.h>
 #include <UI.Xaml.Controls.h>
 #include <UI.Xaml.Media.h>
 #include <UI.Xaml.Shapes.h>
 #include <Utils/ValueUtils.h>
 #include <XamlUtils.h>
+#endif
+
 #include <winrt/Windows.UI.ViewManagement.h>
 #include "Utils/Helpers.h"
 
@@ -36,6 +39,7 @@ void Alert::showAlert(
   });
 }
 
+#ifndef USE_FABRIC
 void Alert::ProcessPendingAlertRequestsXaml() noexcept {
   const auto &pendingAlert = pendingAlerts.front();
   const auto &args = pendingAlert.args;
@@ -155,8 +159,7 @@ void Alert::ProcessPendingAlertRequestsXaml() noexcept {
         ProcessPendingAlertRequests();
       });
 }
-
-#ifdef USE_FABRIC
+#else
 void Alert::ProcessPendingAlertRequestsMessageDialog() noexcept {
   const auto &pendingAlert = pendingAlerts.front();
   const auto &args = pendingAlert.args;
@@ -220,16 +223,18 @@ void Alert::ProcessPendingAlertRequests() noexcept {
   if (pendingAlerts.empty())
     return;
 
-  if (xaml::TryGetCurrentApplication()) {
+#ifndef USE_FABRIC
+  if (xaml::TryGetCurrentUwpXamlApplication()) {
     ProcessPendingAlertRequestsXaml();
   }
-#ifdef USE_FABRIC
+#else
   else {
     // If we don't have xaml loaded, fallback to using MessageDialog
     ProcessPendingAlertRequestsMessageDialog();
   }
 #endif
 }
+
 Alert::Constants Alert::GetConstants() noexcept {
   return m_constants;
 }

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

@@ -50,7 +50,7 @@ comp::Compositor NativeAnimatedNodeManager::Compositor() const noexcept {
         compositionContext);
   }
 #endif
-#ifndef CORE_ABI
+#if !defined(CORE_ABI) && !defined(USE_FABRIC)
   // TODO: Islands - need to get the XamlView associated with this animation in order to
   // use the compositor Microsoft::ReactNative::GetCompositor(xamlView)
   return Microsoft::ReactNative::GetCompositor();