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

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

@@ -5,16 +5,12 @@
   </ItemGroup>
   <ItemGroup>
     <ClCompile Include="$(GeneratedFilesDir)module.g.cpp" />
-    <ClCompile Include="ABICxxModule.cpp" />
-    <ClCompile Include="ABIViewManager.cpp" />
     <ClCompile Include="XamlLoadState.cpp" />
     <ClCompile Include="XamlView.cpp" />
     <ClCompile Include="Pch\pch.cpp">
       <Filter>Pch</Filter>
     </ClCompile>
     <ClCompile Include="ReactSupport.cpp" />
-    <ClCompile Include="TestHook.cpp" />
-    <ClCompile Include="ViewManagersProvider.cpp" />
     <ClCompile Include="Base\CoreUIManagers.cpp">
       <Filter>Base</Filter>
     </ClCompile>
@@ -126,108 +122,18 @@
     <ClCompile Include="Modules\TimingModule.cpp">
       <Filter>Modules</Filter>
     </ClCompile>
-    <ClCompile Include="Views\Image\ImageViewManager.cpp">
-      <Filter>Views\Image</Filter>
-    </ClCompile>
-    <ClCompile Include="Views\Image\ReactImage.cpp">
-      <Filter>Views\Image</Filter>
-    </ClCompile>
-    <ClCompile Include="Views\Image\ReactImageBrush.cpp">
-      <Filter>Views\Image</Filter>
-    </ClCompile>
-    <ClCompile Include="Views\Impl\ScrollViewUWPImplementation.cpp">
-      <Filter>Views\Impl</Filter>
-    </ClCompile>
-    <ClCompile Include="Views\Impl\SnapPointManagingContentControl.cpp">
-      <Filter>Views\Impl</Filter>
-    </ClCompile>
-    <ClCompile Include="Views\ActivityIndicatorViewManager.cpp">
-      <Filter>Views</Filter>
-    </ClCompile>
     <ClCompile Include="Views\ConfigureBundlerDlg.cpp">
       <Filter>Views</Filter>
     </ClCompile>
-    <ClCompile Include="Views\ControlViewManager.cpp">
-      <Filter>Views</Filter>
-    </ClCompile>
-    <ClCompile Include="Views\DynamicAutomationPeer.cpp">
-      <Filter>Views</Filter>
-    </ClCompile>
-    <ClCompile Include="Views\DynamicAutomationProperties.cpp">
-      <Filter>Views</Filter>
-    </ClCompile>
     <ClCompile Include="Views\DynamicValueProvider.cpp">
       <Filter>Views</Filter>
     </ClCompile>
     <ClCompile Include="Views\ExpressionAnimationStore.cpp">
       <Filter>Views</Filter>
     </ClCompile>
-    <ClCompile Include="Views\FlyoutViewManager.cpp">
-      <Filter>Views</Filter>
-    </ClCompile>
-    <ClCompile Include="Views\FrameworkElementViewManager.cpp">
-      <Filter>Views</Filter>
-    </ClCompile>
     <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>
-    <ClCompile Include="Views\RawTextViewManager.cpp">
-      <Filter>Views</Filter>
-    </ClCompile>
-    <ClCompile Include="Views\RefreshControlManager.cpp">
-      <Filter>Views</Filter>
-    </ClCompile>
-    <ClCompile Include="Views\RootViewManager.cpp">
-      <Filter>Views</Filter>
-    </ClCompile>
-    <ClCompile Include="Views\ScrollContentViewManager.cpp">
-      <Filter>Views</Filter>
-    </ClCompile>
-    <ClCompile Include="Views\ScrollViewManager.cpp">
-      <Filter>Views</Filter>
-    </ClCompile>
-    <ClCompile Include="Views\ShadowNodeBase.cpp">
-      <Filter>Views</Filter>
-    </ClCompile>
-    <ClCompile Include="Views\SIPEventHandler.cpp">
-      <Filter>Views</Filter>
-    </ClCompile>
-    <ClCompile Include="Views\SliderViewManager.cpp">
-      <Filter>Views</Filter>
-    </ClCompile>
-    <ClCompile Include="Views\SwitchViewManager.cpp">
-      <Filter>Views</Filter>
-    </ClCompile>
-    <ClCompile Include="Views\TextInputViewManager.cpp">
-      <Filter>Views</Filter>
-    </ClCompile>
-    <ClCompile Include="Views\TextViewManager.cpp">
-      <Filter>Views</Filter>
-    </ClCompile>
-    <ClCompile Include="Views\TouchEventHandler.cpp">
-      <Filter>Views</Filter>
-    </ClCompile>
-    <ClCompile Include="Views\ViewControl.cpp">
-      <Filter>Views</Filter>
-    </ClCompile>
-    <ClCompile Include="Views\ViewManagerBase.cpp">
-      <Filter>Views</Filter>
-    </ClCompile>
-    <ClCompile Include="Views\ViewPanel.cpp">
-      <Filter>Views</Filter>
-    </ClCompile>
-    <ClCompile Include="Views\ViewViewManager.cpp">
-      <Filter>Views</Filter>
-    </ClCompile>
-    <ClCompile Include="Views\VirtualTextViewManager.cpp">
-      <Filter>Views</Filter>
-    </ClCompile>
     <ClCompile Include="Views\XamlFeatures.cpp">
       <Filter>Views</Filter>
     </ClCompile>
@@ -237,9 +143,6 @@
     <ClCompile Include="Utils\LocalBundleReader.cpp">
       <Filter>Utils</Filter>
     </ClCompile>
-    <ClCompile Include="Utils\ResourceBrushUtils.cpp">
-      <Filter>Utils</Filter>
-    </ClCompile>
     <ClCompile Include="Utils\UwpPreparedScriptStore.cpp">
       <Filter>Utils</Filter>
     </ClCompile>
@@ -249,53 +152,14 @@
     <ClCompile Include="Utils\ValueUtils.cpp">
       <Filter>Utils</Filter>
     </ClCompile>
-    <ClCompile Include="Utils\XamlIslandUtils.cpp">
-      <Filter>Utils</Filter>
-    </ClCompile>
     <ClCompile Include="Modules\CreateModules.cpp">
       <Filter>Modules</Filter>
     </ClCompile>
-    <ClCompile Include="GlyphViewManager.cpp">
-      <Filter>Modules</Filter>
-    </ClCompile>
-    <ClCompile Include="Modules\PaperUIManagerModule.cpp" />
-    <ClCompile Include="Views\PaperShadowNode.cpp" />
-    <ClCompile Include="Views\ShadowNodeRegistry.cpp" />
-    <ClCompile Include="Utils\BatchingEventEmitter.cpp">
-      <Filter>Utils</Filter>
-    </ClCompile>
-    <ClCompile Include="Views\Text\TextHighlighterVisitor.cpp">
-      <Filter>Views\Text</Filter>
-    </ClCompile>
-    <ClCompile Include="Views\Text\TextHitTestUtils.cpp">
-      <Filter>Views\Text</Filter>
-    </ClCompile>
-    <ClCompile Include="Views\Text\TextHitTestVisitor.cpp">
-      <Filter>Views\Text</Filter>
-    </ClCompile>
-    <ClCompile Include="Views\Text\TextParentVisitor.cpp">
-      <Filter>Views\Text</Filter>
-    </ClCompile>
-    <ClCompile Include="Views\Text\TextPropertyChangedParentVisitor.cpp">
-      <Filter>Views\Text</Filter>
-    </ClCompile>
-    <ClCompile Include="Views\Text\TextTransformParentVisitor.cpp">
-      <Filter>Views\Text</Filter>
-    </ClCompile>
-    <ClCompile Include="Views\Text\TextTransformVisitor.cpp">
-      <Filter>Views\Text</Filter>
-    </ClCompile>
-    <ClCompile Include="Views\Text\TextVisitor.cpp">
-      <Filter>Views\Text</Filter>
-    </ClCompile>
-    <ClCompile Include="ReactPointerEventArgs.cpp" />
     <ClCompile Include="Views\FrameworkElementTransferProperties.cpp" />
     <ClCompile Include="Views\ReactViewInstance.cpp" />
     <ClCompile Include="Utils\KeyboardUtils.cpp" />
   </ItemGroup>
   <ItemGroup>
-    <ClInclude Include="ABICxxModule.h" />
-    <ClInclude Include="ABIViewManager.h" />
     <ClInclude Include="Base\CxxReactIncludes.h">
       <Filter>Base</Filter>
     </ClInclude>
@@ -305,7 +169,6 @@
     <ClInclude Include="HResult.h" />
     <ClInclude Include="IReactDispatcher.h" />
     <ClInclude Include="IReactNotificationService.h" />
-    <ClInclude Include="NativeModulesProvider.h" />
     <ClInclude Include="TurboModulesProvider.h" />
     <ClInclude Include="Pch\pch.h">
       <Filter>Pch</Filter>
@@ -358,7 +221,6 @@
     <ClInclude Include="ReactSupport.h" />
     <ClInclude Include="RedBox.h" />
     <ClInclude Include="TestHook.h" />
-    <ClInclude Include="ViewManagersProvider.h" />
     <ClInclude Include="Modules\AccessibilityInfoModule.h">
       <Filter>Modules</Filter>
     </ClInclude>
@@ -482,111 +344,18 @@
     <ClInclude Include="Modules\TimingModule.h">
       <Filter>Modules</Filter>
     </ClInclude>
-    <ClInclude Include="Views\Image\ImageViewManager.h">
-      <Filter>Views\Image</Filter>
-    </ClInclude>
     <ClInclude Include="Views\Image\Microsoft.UI.Composition.Effects_Impl.h">
       <Filter>Views\Image</Filter>
     </ClInclude>
-    <ClInclude Include="Views\Image\ReactImage.h">
-      <Filter>Views\Image</Filter>
-    </ClInclude>
-    <ClInclude Include="Views\Image\ReactImageBrush.h">
-      <Filter>Views\Image</Filter>
-    </ClInclude>
-    <ClInclude Include="Views\Impl\ScrollViewUWPImplementation.h">
-      <Filter>Views\Impl</Filter>
-    </ClInclude>
-    <ClInclude Include="Views\Impl\SnapPointManagingContentControl.h">
-      <Filter>Views\Impl</Filter>
-    </ClInclude>
-    <ClInclude Include="Views\ActivityIndicatorViewManager.h">
-      <Filter>Views</Filter>
-    </ClInclude>
-    <ClInclude Include="Views\ControlViewManager.h">
-      <Filter>Views</Filter>
-    </ClInclude>
     <ClInclude Include="Views\DevMenu.h">
       <Filter>Views</Filter>
     </ClInclude>
-    <ClInclude Include="Views\DynamicAutomationPeer.h">
-      <Filter>Views</Filter>
-    </ClInclude>
-    <ClInclude Include="Views\DynamicAutomationProperties.h">
-      <Filter>Views</Filter>
-    </ClInclude>
-    <ClInclude Include="Views\DynamicValueProvider.h">
-      <Filter>Views</Filter>
-    </ClInclude>
     <ClInclude Include="Views\ExpressionAnimationStore.h">
       <Filter>Views</Filter>
     </ClInclude>
-    <ClInclude Include="Views\FlyoutViewManager.h">
-      <Filter>Views</Filter>
-    </ClInclude>
-    <ClInclude Include="Views\FrameworkElementViewManager.h">
-      <Filter>Views</Filter>
-    </ClInclude>
     <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>
-    <ClInclude Include="Views\RawTextViewManager.h">
-      <Filter>Views</Filter>
-    </ClInclude>
-    <ClInclude Include="Views\RefreshControlManager.h">
-      <Filter>Views</Filter>
-    </ClInclude>
-    <ClInclude Include="Views\RootViewManager.h">
-      <Filter>Views</Filter>
-    </ClInclude>
-    <ClInclude Include="Views\ScrollContentViewManager.h">
-      <Filter>Views</Filter>
-    </ClInclude>
-    <ClInclude Include="Views\ScrollViewManager.h">
-      <Filter>Views</Filter>
-    </ClInclude>
-    <ClInclude Include="Views\ShadowNodeBase.h">
-      <Filter>Views</Filter>
-    </ClInclude>
-    <ClInclude Include="Views\SIPEventHandler.h">
-      <Filter>Views</Filter>
-    </ClInclude>
-    <ClInclude Include="Views\SliderViewManager.h">
-      <Filter>Views</Filter>
-    </ClInclude>
-    <ClInclude Include="Views\SwitchViewManager.h">
-      <Filter>Views</Filter>
-    </ClInclude>
-    <ClInclude Include="Views\TextInputViewManager.h">
-      <Filter>Views</Filter>
-    </ClInclude>
-    <ClInclude Include="Views\TextViewManager.h">
-      <Filter>Views</Filter>
-    </ClInclude>
-    <ClInclude Include="Views\TouchEventHandler.h">
-      <Filter>Views</Filter>
-    </ClInclude>
-    <ClInclude Include="Views\ViewControl.h">
-      <Filter>Views</Filter>
-    </ClInclude>
-    <ClInclude Include="Views\ViewManagerBase.h">
-      <Filter>Views</Filter>
-    </ClInclude>
-    <ClInclude Include="Views\ViewPanel.h">
-      <Filter>Views</Filter>
-    </ClInclude>
-    <ClInclude Include="Views\ViewViewManager.h">
-      <Filter>Views</Filter>
-    </ClInclude>
-    <ClInclude Include="Views\VirtualTextViewManager.h">
-      <Filter>Views</Filter>
-    </ClInclude>
     <ClInclude Include="Views\XamlFeatures.h">
       <Filter>Views</Filter>
     </ClInclude>
@@ -605,9 +374,6 @@
     <ClInclude Include="Utils\PropertyUtils.h">
       <Filter>Utils</Filter>
     </ClInclude>
-    <ClInclude Include="Utils\ResourceBrushUtils.h">
-      <Filter>Utils</Filter>
-    </ClInclude>
     <ClInclude Include="Utils\StandardControlResourceKeyNames.h">
       <Filter>Utils</Filter>
     </ClInclude>
@@ -628,9 +394,6 @@
     <ClInclude Include="ReactHost\IReactInstance.h">
       <Filter>ReactHost</Filter>
     </ClInclude>
-    <ClInclude Include="ReactHost\ViewManagerProvider.h">
-      <Filter>ReactHost</Filter>
-    </ClInclude>
     <ClInclude Include="Views\IXamlRootView.h">
       <Filter>Views</Filter>
     </ClInclude>
@@ -642,21 +405,11 @@
     <ClInclude Include="Utils\TransformableText.h">
       <Filter>Utils</Filter>
     </ClInclude>
-    <ClInclude Include="GlyphViewManager.h" />
     <ClInclude Include="Modules\ReactRootViewTagGenerator.h" />
-    <ClInclude Include="Modules\PaperUIManagerModule.h" />
-    <ClInclude Include="Views\PaperShadowNode.h" />
-    <ClInclude Include="Views\ShadowNodeRegistry.h" />
     <ClInclude Include="DocString.h" />
-    <ClInclude Include="Utils\BatchingEventEmitter.h">
-      <Filter>Utils</Filter>
-    </ClInclude>
     <ClInclude Include="ReactHost\JSCallInvokerScheduler.h">
       <Filter>ReactHost</Filter>
     </ClInclude>
-    <ClInclude Include="Views\ViewManager.h">
-      <Filter>Views</Filter>
-    </ClInclude>
     <ClInclude Include="Utils\TextTransform.h">
       <Filter>Utils</Filter>
     </ClInclude>
@@ -693,15 +446,12 @@
     <ClInclude Include="Views\Text\TextVisitors.h">
       <Filter>Views\Text</Filter>
     </ClInclude>
-    <ClInclude Include="ReactPointerEventArgs.h" />
     <ClInclude Include="Views\FrameworkElementTransferProperties.h" />
     <ClInclude Include="Views\ReactViewInstance.h" />
     <ClInclude Include="Utils\KeyboardUtils.h" />
   </ItemGroup>
   <ItemGroup>
-    <Midl Include="IViewManager.idl" />
     <Midl Include="ReactApplication.idl" />
-    <Midl Include="ReactRootView.idl" />
     <Midl Include="XamlHelper.idl" />
     <Midl Include="LayoutService.idl" />
     <Midl Include="XamlUIService.idl" />
@@ -717,10 +467,8 @@
     <Midl Include="Views\cppwinrt\Effects.idl">
       <Filter>Views\cppwinrt</Filter>
     </Midl>
-    <Midl Include="IViewManagerCore.idl" />
     <Midl Include="DocString.idl" />
     <Midl Include="DesktopWindowMessage.idl" />
-    <Midl Include="ReactPointerEventArgs.idl" />
   </ItemGroup>
   <ItemGroup>
     <None Include="microsoft.reactnative.def" />

package/Microsoft.ReactNative/Modules/AccessibilityInfoModule.cpp

@@ -3,13 +3,7 @@
 
 #include "pch.h"
 #include "AccessibilityInfoModule.h"
-#ifndef USE_FABRIC
-#include <UI.Xaml.Automation.Peers.h>
-#include <UI.Xaml.Controls.h>
-#include <XamlUtils.h>
-#else
 #include <Fabric/Composition/ReactNativeIsland.h>
-#endif
 #include <uiautomationcore.h>
 #include <uiautomationcoreapi.h>
 #include <winrt/Windows.ApplicationModel.DataTransfer.h>
@@ -53,35 +47,6 @@ 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};
-
-    if (IsXamlIsland()) {
-      if (auto accessibleRoot =
-              winrt::Microsoft::ReactNative::XamlUIService::GetAccessibleRoot(context.Properties().Handle())) {
-        element = accessibleRoot;
-      } else {
-        return;
-      }
-    } else {
-      element = xaml::Controls::TextBlock();
-    }
-
-    auto peer = xaml::Automation::Peers::FrameworkElementAutomationPeer::FromElement(element);
-
-    if (!peer) {
-      return;
-    }
-
-    winrt::hstring hstr{announcement};
-    peer.RaiseNotificationEvent(
-        xaml::Automation::Peers::AutomationNotificationKind::Other,
-        xaml::Automation::Peers::AutomationNotificationProcessing::ImportantMostRecent,
-        hstr,
-        hstr);
-#else
     if (auto weakIslandWrapper = context.Properties().Get(
             winrt::Microsoft::ReactNative::implementation::ReactNativeIsland::LastFocusedReactNativeIslandProperty())) {
       if (auto weakIsland = weakIslandWrapper.Value()) {
@@ -107,8 +72,6 @@ void AccessibilityInfo::announceForAccessibility(std::wstring announcement) noex
         }
       }
     }
-
-#endif
   });
 }
 

package/Microsoft.ReactNative/Modules/AlertModule.cpp

@@ -5,23 +5,12 @@
 #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"
 
-#ifdef USE_FABRIC
 #include <ReactCoreInjection.h>
 #include <Shobjidl.h>
 #include <winrt/Windows.UI.Popups.h>
-#endif
 
 namespace Microsoft::ReactNative {
 
@@ -39,124 +28,6 @@ void Alert::showAlert(
   });
 }
 
-#ifndef USE_FABRIC
-void Alert::ProcessPendingAlertRequestsXaml() noexcept {
-  const auto &pendingAlert = pendingAlerts.front();
-  const auto &args = pendingAlert.args;
-  const auto &result = pendingAlert.result;
-
-  xaml::Controls::ContentDialog dialog{};
-  xaml::Controls::TextBlock titleTextBlock;
-  xaml::Controls::TextBlock messageTextBlock;
-  titleTextBlock.Text(Microsoft::Common::Unicode::Utf8ToUtf16(args.title.value_or(std::string{})));
-  titleTextBlock.IsTextSelectionEnabled(true);
-  titleTextBlock.MaxLines(2);
-  titleTextBlock.TextWrapping(xaml::TextWrapping::Wrap);
-  messageTextBlock.Text(Microsoft::Common::Unicode::Utf8ToUtf16(args.message.value_or(std::string{})));
-  messageTextBlock.IsTextSelectionEnabled(true);
-  messageTextBlock.TextWrapping(xaml::TextWrapping::Wrap);
-  dialog.Title(titleTextBlock);
-  dialog.Content(messageTextBlock);
-  dialog.PrimaryButtonText(Microsoft::Common::Unicode::Utf8ToUtf16(args.buttonPositive.value_or(std::string{})));
-  dialog.SecondaryButtonText(Microsoft::Common::Unicode::Utf8ToUtf16(args.buttonNegative.value_or(std::string{})));
-  dialog.CloseButtonText(Microsoft::Common::Unicode::Utf8ToUtf16(args.buttonNeutral.value_or(std::string{})));
-  int defaultButton = args.defaultButton.value_or(0);
-  if (defaultButton >= 0 && defaultButton <= 3) {
-    dialog.DefaultButton(static_cast<xaml::Controls::ContentDialogButton>(defaultButton));
-  }
-
-  auto useXamlRootForThemeBugWorkaround = false;
-
-  if (Is19H1OrHigher()) {
-    // XamlRoot added in 19H1
-    const auto xamlUIService = React::XamlUIService::FromContext(m_context.Handle());
-    xaml::XamlRoot xamlRoot = nullptr;
-    if (args.rootTag) {
-      if (const auto element = xamlUIService.ElementFromReactTag(args.rootTag.value()).try_as<xaml::UIElement>()) {
-        xamlRoot = element.XamlRoot();
-      }
-    }
-    if (!xamlRoot) {
-      xamlRoot = React::XamlUIService::GetXamlRoot(m_context.Properties().Handle());
-    }
-    if (xamlRoot) {
-      useXamlRootForThemeBugWorkaround = true;
-      dialog.XamlRoot(xamlRoot);
-      auto rootChangedToken = xamlRoot.Changed([=](auto &&, auto &&) {
-        const auto rootSize = xamlRoot.Size();
-        const auto popupRoot = xaml::Media::VisualTreeHelper::GetParent(dialog);
-        const auto nChildren = xaml::Media::VisualTreeHelper::GetChildrenCount(popupRoot);
-        xaml::Shapes::Rectangle smoke = nullptr;
-        xaml::Controls::ContentDialog assertDialog = nullptr;
-        for (int32_t i = 0; i < nChildren - 1; ++i) {
-          smoke = xaml::Media::VisualTreeHelper::GetChild(popupRoot, i).try_as<xaml::Shapes::Rectangle>();
-          assertDialog =
-              xaml::Media::VisualTreeHelper::GetChild(popupRoot, i + 1).try_as<xaml::Controls::ContentDialog>();
-          if (smoke && assertDialog == dialog) {
-            break;
-          }
-        }
-
-        if (smoke && assertDialog == dialog) {
-          smoke.Width(rootSize.Width);
-          smoke.Height(rootSize.Height);
-          dialog.Width(rootSize.Width);
-          dialog.Height(rootSize.Height);
-        }
-      });
-
-      dialog.Closed([=](auto &&, auto &&) { xamlRoot.Changed(rootChangedToken); });
-    } else if (IsXamlIsland()) {
-      // We cannot show a ContentDialog in a XAML Island unless it is assigned a
-      // XamlRoot instance. In such cases, we just treat the alert as dismissed.
-      result(m_constants.dismissed, m_constants.buttonNeutral);
-      pendingAlerts.pop();
-      ProcessPendingAlertRequests();
-      return;
-    }
-  }
-
-  // Workaround XAML bug with ContentDialog and dark theme:
-  // https://github.com/microsoft/microsoft-ui-xaml/issues/2331
-  dialog.Opened([useXamlRootForThemeBugWorkaround](winrt::IInspectable const &sender, auto &&) {
-    auto contentDialog = sender.as<xaml::Controls::ContentDialog>();
-    auto popups = useXamlRootForThemeBugWorkaround
-        ? xaml::Media::VisualTreeHelper::GetOpenPopupsForXamlRoot(contentDialog.XamlRoot())
-        : xaml::Media::VisualTreeHelper::GetOpenPopups(xaml::Window::Current());
-
-    auto contentAsFrameworkElement = useXamlRootForThemeBugWorkaround
-        ? contentDialog.XamlRoot().Content().try_as<xaml::FrameworkElement>()
-        : xaml::Window::Current().Content().try_as<xaml::FrameworkElement>();
-    if (contentAsFrameworkElement) {
-      for (uint32_t i = 0; i < popups.Size(); i++) {
-        popups.GetAt(i).RequestedTheme(contentAsFrameworkElement.ActualTheme());
-      }
-    }
-  });
-
-  const auto hasCloseButton = dialog.CloseButtonText().size() > 0;
-  auto asyncOp = dialog.ShowAsync();
-  asyncOp.Completed(
-      [hasCloseButton, result, this](
-          const winrt::IAsyncOperation<xaml::Controls::ContentDialogResult> &asyncOp, winrt::AsyncStatus status) {
-        switch (asyncOp.GetResults()) {
-          case xaml::Controls::ContentDialogResult::Primary:
-            result(m_constants.buttonClicked, m_constants.buttonPositive);
-            break;
-          case xaml::Controls::ContentDialogResult::Secondary:
-            result(m_constants.buttonClicked, m_constants.buttonNegative);
-            break;
-          case xaml::Controls::ContentDialogResult::None:
-            result(hasCloseButton ? m_constants.buttonClicked : m_constants.dismissed, m_constants.buttonNeutral);
-            break;
-          default:
-            break;
-        }
-        pendingAlerts.pop();
-        ProcessPendingAlertRequests();
-      });
-}
-#else
 void Alert::ProcessPendingAlertRequestsMessageDialog() noexcept {
   const auto &pendingAlert = pendingAlerts.front();
   const auto &args = pendingAlert.args;
@@ -212,22 +83,13 @@ void Alert::ProcessPendingAlertRequestsMessageDialog() noexcept {
         ProcessPendingAlertRequests();
       });
 }
-#endif
 
 void Alert::ProcessPendingAlertRequests() noexcept {
   if (pendingAlerts.empty())
     return;
 
-#ifndef USE_FABRIC
-  if (xaml::TryGetCurrentUwpXamlApplication()) {
-    ProcessPendingAlertRequestsXaml();
-  }
-#else
-  else {
-    // If we don't have xaml loaded, fallback to using MessageDialog
-    ProcessPendingAlertRequestsMessageDialog();
-  }
-#endif
+  // If we don't have xaml loaded, fallback to using MessageDialog
+  ProcessPendingAlertRequestsMessageDialog();
 }
 
 Alert::Constants Alert::GetConstants() noexcept {

package/Microsoft.ReactNative/Modules/AlertModule.h

@@ -45,9 +45,7 @@ struct Alert : public std::enable_shared_from_this<Alert> {
 
   void ProcessPendingAlertRequests() noexcept;
   void ProcessPendingAlertRequestsXaml() noexcept;
-#ifdef USE_FABRIC
   void ProcessPendingAlertRequestsMessageDialog() noexcept;
-#endif
 };
 
 } // namespace Microsoft::ReactNative

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

@@ -26,10 +26,8 @@
 #include <Windows.Foundation.h>
 #include <queue>
 
-#ifdef USE_FABRIC
 #include <Fabric/Composition/CompositionContextHelper.h>
 #include <Fabric/Composition/CompositionUIService.h>
-#endif
 
 namespace Microsoft::ReactNative {
 
@@ -41,7 +39,6 @@ const winrt::Microsoft::ReactNative::ReactContext &NativeAnimatedNodeManager::Re
 }
 
 comp::Compositor NativeAnimatedNodeManager::Compositor() const noexcept {
-#ifdef USE_FABRIC
   auto compositionContext =
       winrt::Microsoft::ReactNative::Composition::implementation::CompositionUIService::GetCompositionContext(
           m_context.Properties().Handle());
@@ -49,14 +46,7 @@ comp::Compositor NativeAnimatedNodeManager::Compositor() const noexcept {
     return winrt::Microsoft::ReactNative::Composition::Experimental::CompositionContextHelper::InnerCompositor(
         compositionContext);
   }
-#endif
-#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();
-#else
   return nullptr;
-#endif
 }
 
 void NativeAnimatedNodeManager::CreateAnimatedNode(
@@ -594,14 +584,18 @@ void NativeAnimatedNodeManager::RunUpdates(winrt::TimeSpan renderingTime) {
 }
 
 void NativeAnimatedNodeManager::EnsureRendering() {
+  /*
+  * Reenable to enable composition = false animations
   m_renderingRevoker =
       xaml::Media::CompositionTarget::Rendering(winrt::auto_revoke, {this, &NativeAnimatedNodeManager::OnRendering});
+      */
 }
 
 void NativeAnimatedNodeManager::OnRendering(winrt::IInspectable const &sender, winrt::IInspectable const &args) {
   // The `UpdateActiveAnimationIds` method only tracks animations where
   // composition is not used, so if only UI.Composition animations are active,
   // this rendering callback will not run.
+  /*
   UpdateActiveAnimationIds();
   if (m_activeAnimationIds.size() > 0 || m_updatedNodes.size() > 0) {
     if (const auto renderingArgs = args.try_as<xaml::Media::RenderingEventArgs>()) {
@@ -610,6 +604,7 @@ void NativeAnimatedNodeManager::OnRendering(winrt::IInspectable const &sender, w
   } else {
     m_renderingRevoker.revoke();
   }
+  */
 }
 
 void NativeAnimatedNodeManager::StopAnimationsForNode(int64_t tag) {