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

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

@@ -227,6 +227,22 @@ void ReactCompositionViewComponentBuilder::SetUnmountChildComponentViewHandler(
   m_unmountChildComponentViewHandler = impl;
 }
 
+void ReactCompositionViewComponentBuilder::SetCreateAutomationPeerHandler(CreateAutomationPeerDelegate impl) noexcept {
+  m_createAutomationPeerHandler = impl;
+}
+
+const CreateAutomationPeerDelegate &ReactCompositionViewComponentBuilder::CreateAutomationPeerHandler() const noexcept {
+  return m_createAutomationPeerHandler;
+}
+
+bool ReactCompositionViewComponentBuilder::XamlSupport() const noexcept {
+  return m_xamlSupport;
+}
+
+void ReactCompositionViewComponentBuilder::XamlSupport(bool isRequired) noexcept {
+  m_xamlSupport = isRequired;
+}
+
 const UnmountChildComponentViewDelegate &ReactCompositionViewComponentBuilder::UnmountChildComponentViewHandler()
     const noexcept {
   return m_unmountChildComponentViewHandler;

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

@@ -39,6 +39,9 @@ struct ReactCompositionViewComponentBuilder
   void SetUpdateEventEmitterHandler(UpdateEventEmitterDelegate impl) noexcept;
   void SetMountChildComponentViewHandler(MountChildComponentViewDelegate impl) noexcept;
   void SetUnmountChildComponentViewHandler(UnmountChildComponentViewDelegate impl) noexcept;
+  void SetCreateAutomationPeerHandler(CreateAutomationPeerDelegate impl) noexcept;
+  bool XamlSupport() const noexcept;
+  void XamlSupport(bool isRequired) noexcept;
 
  public: // Composition::IReactCompositionViewComponentBuilder
   void SetViewComponentViewInitializer(const ViewComponentViewInitializer &initializer) noexcept;
@@ -77,6 +80,7 @@ struct ReactCompositionViewComponentBuilder
   const CreateVisualDelegate &CreateVisualHandler() const noexcept;
   const winrt::Microsoft::ReactNative::Composition::Experimental::IVisualToMountChildrenIntoDelegate &
   VisualToMountChildrenIntoHandler() const noexcept;
+  const CreateAutomationPeerDelegate &CreateAutomationPeerHandler() const noexcept;
 
  private:
   void InitializeComponentView(const winrt::Microsoft::ReactNative::ComponentView &view) noexcept;
@@ -103,11 +107,13 @@ struct ReactCompositionViewComponentBuilder
   winrt::Microsoft::ReactNative::UpdateEventEmitterDelegate m_updateEventEmitterHandler;
   winrt::Microsoft::ReactNative::MountChildComponentViewDelegate m_mountChildComponentViewHandler;
   winrt::Microsoft::ReactNative::UnmountChildComponentViewDelegate m_unmountChildComponentViewHandler;
+  winrt::Microsoft::ReactNative::CreateAutomationPeerDelegate m_createAutomationPeerHandler;
 
   winrt::Microsoft::ReactNative::Composition::CreateVisualDelegate m_createVisualHandler;
   winrt::Microsoft::ReactNative::Composition::Experimental::IVisualToMountChildrenIntoDelegate
       m_visualToMountChildrenIntoHandler;
   UpdateLayoutMetricsDelegate m_updateLayoutMetricsHandler;
+  bool m_xamlSupport{false};
 };
 
 } // namespace winrt::Microsoft::ReactNative::Composition

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

@@ -33,10 +33,8 @@
 #include "RootComponentView.h"
 #include "TextDrawing.h"
 
-#ifdef USE_WINUI3
 #include <winrt/Microsoft.UI.Content.h>
 #include <winrt/Microsoft.UI.Input.h>
-#endif
 
 namespace winrt::Microsoft::ReactNative::implementation {
 
@@ -172,7 +170,6 @@ ReactNativeIsland::ReactNativeIsland() noexcept
     : ReactNativeIsland(winrt::Microsoft::UI::Composition::Compositor{nullptr}) {}
 
 ReactNativeIsland::~ReactNativeIsland() noexcept {
-#ifdef USE_WINUI3
   if (m_island) {
     m_island.AutomationProviderRequested(m_islandAutomationProviderRequestedToken);
     m_island.StateChanged(m_islandStateChangedToken);
@@ -181,7 +178,6 @@ ReactNativeIsland::~ReactNativeIsland() noexcept {
     m_island.Disconnected(m_islandDisconnectedToken);
 #endif
   }
-#endif
 
   if (m_uiDispatcher) {
     assert(m_uiDispatcher.HasThreadAccess());
@@ -261,12 +257,10 @@ void ReactNativeIsland::RemoveRenderedVisual(
 }
 
 bool ReactNativeIsland::TrySetFocus() noexcept {
-#ifdef USE_WINUI3
   if (m_island && m_island.IsConnected()) {
     auto focusController = winrt::Microsoft::UI::Input::InputFocusController::GetForIsland(m_island);
     return focusController.TrySetFocus();
   }
-#endif
   return false;
 }
 

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

@@ -146,7 +146,6 @@ struct ReactNativeIsland
   void UninitRootView() noexcept;
 
  private:
-#ifdef USE_WINUI3
   winrt::Microsoft::UI::Composition::Compositor m_compositor{nullptr};
   winrt::Microsoft::UI::Content::ContentIsland m_island{nullptr};
   winrt::event_token m_islandFrameworkClosedToken;
@@ -154,7 +153,6 @@ struct ReactNativeIsland
   winrt::event_token m_islandStateChangedToken;
   winrt::event_token m_islandConnectedToken;
   winrt::event_token m_islandDisconnectedToken;
-#endif
 
   HWND m_hwnd{0};
   bool m_isFragment{false};

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

@@ -8,7 +8,10 @@
 
 #include <Fabric/FabricUIManagerModule.h>
 #include <winrt/Microsoft.UI.Input.h>
+#include "CompositionDynamicAutomationProvider.h"
 #include "CompositionRootAutomationProvider.h"
+#include "ContentIslandComponentView.h"
+#include "ParagraphComponentView.h"
 #include "ReactNativeIsland.h"
 #include "Theme.h"
 
@@ -275,7 +278,7 @@ facebook::react::Point RootComponentView::getClientOffset() const noexcept {
   return {};
 }
 
-winrt::IInspectable RootComponentView::UiaProviderFromPoint(const POINT &ptPixels) noexcept {
+winrt::IUnknown RootComponentView::UiaProviderFromPoint(const POINT &ptPixels, const POINT &ptScreen) noexcept {
   facebook::react::Point ptDips{
       static_cast<facebook::react::Float>(ptPixels.x) / m_layoutMetrics.pointScaleFactor,
       static_cast<facebook::react::Float>(ptPixels.y) / m_layoutMetrics.pointScaleFactor};
@@ -295,7 +298,41 @@ winrt::IInspectable RootComponentView::UiaProviderFromPoint(const POINT &ptPixel
   if (view == nullptr)
     return nullptr;
 
-  return winrt::get_self<winrt::Microsoft::ReactNative::implementation::ComponentView>(view)->EnsureUiaProvider();
+  auto uiaProvider =
+      winrt::get_self<winrt::Microsoft::ReactNative::implementation::ComponentView>(view)->EnsureUiaProvider();
+
+  if (auto contentIsland =
+          view.try_as<winrt::Microsoft::ReactNative::Composition::implementation::ContentIslandComponentView>()) {
+    if (contentIsland->InnerAutomationProvider()) {
+      if (auto childProvider = contentIsland->InnerAutomationProvider()->TryGetChildSiteLinkAutomationProvider()) {
+        // ChildProvider is the the automation provider from the ChildSiteLink.  In the case of WinUI, this
+        // is a pointer to WinUI's internal CUIAHostWindow object.
+        // It seems odd, but even though this node doesn't behave as a fragment root in our case (the real fragment root
+        // is the RootComponentView's UIA provider), we still use its IRawElementProviderFragmentRoot -- just so
+        // we can do the ElementProviderFromPoint call.  (this was recommended by the team who did the initial
+        // architecture work).
+        if (auto fragmentRoot = childProvider.try_as<IRawElementProviderFragmentRoot>()) {
+          com_ptr<IRawElementProviderFragment> frag;
+          // WinUI then does its own hitTest inside the XAML tree.
+          fragmentRoot->ElementProviderFromPoint(
+              ptScreen
+                  .x, // Note since we're going through IRawElementProviderFragment the coordinates are in screen space.
+              ptScreen.y,
+              frag.put());
+          // We return the specific child provider(frag) when hosted XAML has an element
+          // under the cursor. This satisfies the UIA "element at point" contract and exposes
+          // the control’s patterns/properties. If the hosted tree finds nothing, we fall back
+          // to the RNW container’s provider (uiaProvider) to keep the island accessible.
+          // (A Microsoft_UI_Xaml!CUIAWrapper object)
+          if (frag) {
+            return frag.as<winrt::IUnknown>();
+          }
+        }
+      }
+    }
+  }
+
+  return uiaProvider;
 }
 
 float RootComponentView::FontSizeMultiplier() const noexcept {
@@ -349,4 +386,18 @@ HWND RootComponentView::GetHwndForParenting() noexcept {
   return base_type::GetHwndForParenting();
 }
 
+void RootComponentView::ClearCurrentTextSelection() noexcept {
+  if (auto view = m_viewWithTextSelection.view()) {
+    if (auto paragraphView = view.try_as<ParagraphComponentView>()) {
+      paragraphView->ClearSelection();
+    }
+  }
+  m_viewWithTextSelection =
+      ::Microsoft::ReactNative::ReactTaggedView{winrt::Microsoft::ReactNative::ComponentView{nullptr}};
+}
+
+void RootComponentView::SetViewWithTextSelection(const winrt::Microsoft::ReactNative::ComponentView &view) noexcept {
+  m_viewWithTextSelection = ::Microsoft::ReactNative::ReactTaggedView{view};
+}
+
 } // namespace winrt::Microsoft::ReactNative::Composition::implementation

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

@@ -5,6 +5,7 @@
 #pragma once
 
 #include <Fabric/ComponentView.h>
+#include <Fabric/ReactTaggedView.h>
 #include <Microsoft.ReactNative.Cxx/ReactContext.h>
 
 #include "CompositionViewComponentView.h"
@@ -64,7 +65,7 @@ struct RootComponentView : RootComponentViewT<RootComponentView, ViewComponentVi
       facebook::react::LayoutMetrics const &layoutMetrics,
       facebook::react::LayoutMetrics const &oldLayoutMetrics) noexcept override;
 
-  winrt::Windows::Foundation::IInspectable UiaProviderFromPoint(const POINT &ptPixels) noexcept;
+  winrt::Windows::Foundation::IUnknown UiaProviderFromPoint(const POINT &ptPixels, const POINT &ptScreen) noexcept;
 
   RootComponentView(
       const winrt::Microsoft::ReactNative::Composition::Experimental::ICompositionContext &compContext,
@@ -86,6 +87,9 @@ struct RootComponentView : RootComponentViewT<RootComponentView, ViewComponentVi
 
   HWND GetHwndForParenting() noexcept override;
 
+  void ClearCurrentTextSelection() noexcept;
+  void SetViewWithTextSelection(const winrt::Microsoft::ReactNative::ComponentView &view) noexcept;
+
  private:
   // should this be a ReactTaggedView? - It shouldn't actually matter since if the view is going away it should always
   // be clearing its focus But being a reactTaggedView might make it easier to identify cases where that isn't
@@ -94,6 +98,9 @@ struct RootComponentView : RootComponentViewT<RootComponentView, ViewComponentVi
   winrt::weak_ref<winrt::Microsoft::ReactNative::ReactNativeIsland> m_wkRootView{nullptr};
   winrt::weak_ref<winrt::Microsoft::ReactNative::Composition::PortalComponentView> m_wkPortal{nullptr};
   bool m_visualAddedToIsland{false};
+
+  ::Microsoft::ReactNative::ReactTaggedView m_viewWithTextSelection{
+      winrt::Microsoft::ReactNative::ComponentView{nullptr}};
 };
 
 } // namespace winrt::Microsoft::ReactNative::Composition::implementation

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

@@ -6,7 +6,6 @@
 
 #include "ScrollViewComponentView.h"
 
-#include <UI.Xaml.Controls.h>
 #include <Utils/ValueUtils.h>
 
 #pragma warning(push)
@@ -20,7 +19,6 @@
 #include <AutoDraw.h>
 #include <Fabric/DWriteHelpers.h>
 #include <unicode.h>
-#include "CompositionDynamicAutomationProvider.h"
 #include "JSValueReader.h"
 #include "RootComponentView.h"
 

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

@@ -7,7 +7,6 @@
 #include "SwitchComponentView.h"
 #include <AutoDraw.h>
 #include <Fabric/AbiViewProps.h>
-#include "CompositionDynamicAutomationProvider.h"
 #include "RootComponentView.h"
 #include "UiaHelpers.h"
 

package/Microsoft.ReactNative/Fabric/Composition/TextInput/WindowsTextInputComponentView.cpp

@@ -6,7 +6,6 @@
 #include "WindowsTextInputComponentView.h"
 
 #include <AutoDraw.h>
-#include <Fabric/Composition/CompositionDynamicAutomationProvider.h>
 #include <Fabric/Composition/UiaHelpers.h>
 #include <Fabric/platform/react/renderer/graphics/PlatformColorUtils.h>
 #include <Utils/ThemeUtils.h>
@@ -1677,7 +1676,8 @@ void WindowsTextInputComponentView::DrawText() noexcept {
   }
 
   bool isZeroSized =
-      m_layoutMetrics.frame.size.width <= (m_layoutMetrics.contentInsets.left + m_layoutMetrics.contentInsets.right);
+      m_layoutMetrics.frame.size.width <= (m_layoutMetrics.contentInsets.left + m_layoutMetrics.contentInsets.right) ||
+      m_layoutMetrics.frame.size.height <= (m_layoutMetrics.contentInsets.top + m_layoutMetrics.contentInsets.bottom);
   if (!m_drawingSurface || isZeroSized)
     return;
 
@@ -1782,6 +1782,9 @@ WindowsTextInputComponentView::createVisual() noexcept {
   LRESULT res;
   winrt::check_hresult(m_textServices->TxSendMessage(EM_SETTEXTMODE, TM_PLAINTEXT, 0, &res));
 
+  // Enable TSF support
+  winrt::check_hresult(m_textServices->TxSendMessage(EM_SETEDITSTYLE, SES_USECTF, SES_USECTF, nullptr));
+
   m_caretVisual = m_compContext.CreateCaretVisual();
   visual.InsertAt(m_caretVisual.InnerVisual(), 0);
   m_caretVisual.IsVisible(false);

package/Microsoft.ReactNative/Fabric/Composition/TextInput/WindowsTextInputShadowNode.cpp

@@ -5,6 +5,7 @@
 
 #include <react/featureflags/ReactNativeFeatureFlags.h>
 #include <react/renderer/attributedstring/AttributedStringBox.h>
+#include <react/renderer/attributedstring/PlaceholderAttributedString.h>
 #include <react/renderer/attributedstring/TextAttributes.h>
 #include <react/renderer/components/text/BaseTextShadowNode.h>
 #include <react/renderer/core/LayoutConstraints.h>
@@ -14,6 +15,7 @@
 
 namespace facebook::react {
 
+// NOLINTNEXTLINE(modernize-avoid-c-arrays)
 extern const char WindowsTextInputComponentName[] = "WindowsTextInput";
 
 void WindowsTextInputShadowNode::setTextLayoutManager(std::shared_ptr<const TextLayoutManager> textLayoutManager) {
@@ -185,6 +187,7 @@ AttributedString WindowsTextInputShadowNode::getPlaceholderAttributedString(cons
   const auto &props = getConcreteProps();
 
   AttributedString attributedString;
+  attributedString.setBaseTextAttributes(props.textAttributes);
   //[windows
   if (!props.placeholder.empty()) {
     auto textAttributes = TextAttributes::defaultTextAttributes();
@@ -203,7 +206,7 @@ AttributedString WindowsTextInputShadowNode::getPlaceholderAttributedString(cons
   }
   // windows]
 
-  return attributedString;
+  return ensurePlaceholderIfEmpty_DO_NOT_USE(attributedString);
 }
 
 #pragma mark - LayoutableShadowNode

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

@@ -13,13 +13,6 @@
 #include "ReactPropertyBag.h"
 #include "winrt/Microsoft.ReactNative.Composition.h"
 
-#ifndef CORE_ABI
-#include <UI.Xaml.Media.h>
-#include <Utils/ValueUtils.h>
-#include <XamlUtils.h>
-
-#endif // CORE_ABI
-
 #include "Composition.Theme.g.cpp"
 
 namespace winrt::Microsoft::ReactNative::Composition::implementation {
@@ -122,27 +115,6 @@ bool Theme::TryGetPlatformColor(const std::string &platformColor, winrt::Windows
     }
   }
 
-#ifndef CORE_ABI
-  // If XAML is loaded, look in application resources
-  if (xaml::TryGetCurrentUwpXamlApplication()) {
-    const auto appResources{xaml::Application::Current().Resources()};
-    const auto boxedResourceName{winrt::box_value(winrt::to_hstring(platformColor))};
-    if (appResources.HasKey(boxedResourceName)) {
-      winrt::IInspectable resource{appResources.Lookup(boxedResourceName)};
-
-      if (auto brush = resource.try_as<xaml::Media::SolidColorBrush>()) {
-        color = brush.Color();
-        m_colorCache[platformColor] = std::make_pair(true, brush.Color());
-        return true;
-      } else if (auto maybeColor = resource.try_as<winrt::Windows::UI::Color>()) {
-        color = maybeColor.value();
-        m_colorCache[platformColor] = std::make_pair(true, color);
-        return true;
-      }
-    }
-  }
-#endif // CORE_ABI
-
   // Accent colors
   // https://learn.microsoft.com/en-us/uwp/api/windows.ui.viewmanagement.uicolortype?view=winrt-22621
   static std::unordered_map<
@@ -174,6 +146,12 @@ bool Theme::TryGetPlatformColor(const std::string &platformColor, winrt::Windows
     return true;
   }
 
+  if (platformColor == "Highlight@40" && TryGetPlatformColor("Highlight", color)) {
+    color.A = static_cast<uint8_t>(static_cast<float>(color.A) * 0.4f);
+    m_colorCache[platformColor] = std::make_pair(true, color);
+    return true;
+  }
+
   auto uiColor = s_uiColorTypes.find(platformColor);
   if (uiColor != s_uiColorTypes.end()) {
     auto uiSettings{winrt::Windows::UI::ViewManagement::UISettings()};
@@ -469,12 +447,10 @@ winrt::Microsoft::ReactNative::Composition::Experimental::IBrush Theme::Internal
   return PlatformBrush(winrt::to_string(platformColor));
 }
 
-#ifdef USE_WINUI3
 winrt::Microsoft::UI::Composition::CompositionBrush Theme::PlatformBrush(winrt::hstring platformColor) noexcept {
   return winrt::Microsoft::ReactNative::Composition::Experimental::MicrosoftCompositionContextHelper::InnerBrush(
       PlatformBrush(winrt::to_string(platformColor)));
 }
-#endif
 
 winrt::Microsoft::ReactNative::Composition::Experimental::IBrush Theme::PlatformBrush(
     const std::string &platformColor) noexcept {

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

@@ -18,10 +18,8 @@ struct Theme : ThemeT<Theme, Experimental::IInternalTheme> {
       const winrt::Microsoft::ReactNative::ReactContext &reactContext,
       const winrt::Microsoft::ReactNative::Composition::ICustomResourceLoader &customResourceLoader) noexcept;
 
-// Public APIs
-#ifdef USE_WINUI3
+  // Public APIs
   winrt::Microsoft::UI::Composition::CompositionBrush PlatformBrush(winrt::hstring platformColor) noexcept;
-#endif
   bool TryGetPlatformColor(winrt::hstring platformColor, winrt::Windows::UI::Color &color) noexcept;
   bool IsEmpty() const noexcept;
 

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

@@ -267,7 +267,7 @@ void TooltipTracker::ShowTooltip(const winrt::Microsoft::ReactNative::ComponentV
           static_cast<int>((tm.width + tooltipHorizontalPadding + tooltipHorizontalPadding) * scaleFactor);
       tooltipData->height = static_cast<int>((tm.height + tooltipTopPadding + tooltipBottomPadding) * scaleFactor);
 
-      POINT pt = {static_cast<LONG>(m_pos.X), static_cast<LONG>(m_pos.Y)};
+      POINT pt = {static_cast<LONG>(m_pos.X * scaleFactor), static_cast<LONG>(m_pos.Y * scaleFactor)};
       ClientToScreen(parentHwnd, &pt);
 
       RegisterTooltipWndClass();

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

@@ -48,7 +48,8 @@ HRESULT UiaNavigateHelper(
         uint32_t index = children.Size() - 1;
         do {
           auto child = children.GetAt(index).as<winrt::Microsoft::ReactNative::implementation::ComponentView>();
-          if (uiaProvider = child->EnsureUiaProvider()) {
+          uiaProvider = child->EnsureUiaProvider();
+          if (uiaProvider) {
             break;
           }
         } while (index-- != 0);
@@ -60,7 +61,8 @@ HRESULT UiaNavigateHelper(
         uint32_t index = 0;
         do {
           auto child = children.GetAt(index).as<winrt::Microsoft::ReactNative::implementation::ComponentView>();
-          if (uiaProvider = child->EnsureUiaProvider()) {
+          uiaProvider = child->EnsureUiaProvider();
+          if (uiaProvider) {
             break;
           }
         } while (++index != children.Size());
@@ -74,7 +76,8 @@ HRESULT UiaNavigateHelper(
 
         while (++it != children.end()) {
           auto nextchild = (*it).as<winrt::Microsoft::ReactNative::implementation::ComponentView>();
-          if (uiaProvider = nextchild->EnsureUiaProvider()) {
+          uiaProvider = nextchild->EnsureUiaProvider();
+          if (uiaProvider) {
             break;
           }
         }
@@ -91,7 +94,8 @@ HRESULT UiaNavigateHelper(
           do {
             it--;
             auto prevchild = (*it).as<winrt::Microsoft::ReactNative::implementation::ComponentView>();
-            if (uiaProvider = prevchild->EnsureUiaProvider()) {
+            uiaProvider = prevchild->EnsureUiaProvider();
+            if (uiaProvider) {
               break;
             }
           } while (it != children.begin());
@@ -513,27 +517,45 @@ ExpandCollapseState GetExpandCollapseState(const bool &expanded) noexcept {
 }
 
 void AddSelectionItemsToContainer(CompositionDynamicAutomationProvider *provider) noexcept {
-  winrt::com_ptr<IRawElementProviderSimple> selectionContainer;
-  provider->get_SelectionContainer(selectionContainer.put());
-  if (!selectionContainer)
+  auto selectionContainerView = provider->GetSelectionContainer();
+  if (!selectionContainerView)
     return;
-  auto selectionContainerProvider = selectionContainer.as<CompositionDynamicAutomationProvider>();
+
+  auto selectionContainerCompView =
+      selectionContainerView.try_as<winrt::Microsoft::ReactNative::Composition::implementation::ComponentView>();
+  if (!selectionContainerCompView)
+    return;
+
+  selectionContainerCompView->EnsureUiaProvider();
+
+  if (!selectionContainerCompView->InnerAutomationProvider())
+    return;
+
   auto simpleProvider = static_cast<IRawElementProviderSimple *>(provider);
   winrt::com_ptr<IRawElementProviderSimple> simpleProviderPtr;
   simpleProviderPtr.copy_from(simpleProvider);
-  selectionContainerProvider->AddToSelectionItems(simpleProviderPtr);
+  selectionContainerCompView->InnerAutomationProvider()->AddToSelectionItems(simpleProviderPtr);
 }
 
 void RemoveSelectionItemsFromContainer(CompositionDynamicAutomationProvider *provider) noexcept {
-  winrt::com_ptr<IRawElementProviderSimple> selectionContainer;
-  provider->get_SelectionContainer(selectionContainer.put());
-  if (!selectionContainer)
+  auto selectionContainerView = provider->GetSelectionContainer();
+  if (!selectionContainerView)
     return;
-  auto selectionContainerProvider = selectionContainer.as<CompositionDynamicAutomationProvider>();
+
+  auto selectionContainerCompView =
+      selectionContainerView.try_as<winrt::Microsoft::ReactNative::Composition::implementation::ComponentView>();
+  if (!selectionContainerCompView)
+    return;
+
+  selectionContainerCompView->EnsureUiaProvider();
+
+  if (!selectionContainerCompView->InnerAutomationProvider())
+    return;
+
   auto simpleProvider = static_cast<IRawElementProviderSimple *>(provider);
   winrt::com_ptr<IRawElementProviderSimple> simpleProviderPtr;
   simpleProviderPtr.copy_from(simpleProvider);
-  selectionContainerProvider->RemoveFromSelectionItems(simpleProviderPtr);
+  selectionContainerCompView->InnerAutomationProvider()->RemoveFromSelectionItems(simpleProviderPtr);
 }
 
 ToggleState GetToggleState(const std::optional<facebook::react::AccessibilityState> &state) noexcept {

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

@@ -8,7 +8,6 @@
 
 #include <AutoDraw.h>
 #include <Fabric/DWriteHelpers.h>
-#include "CompositionDynamicAutomationProvider.h"
 #include "Unicode.h"
 
 namespace winrt::Microsoft::ReactNative::Composition::implementation {

package/Microsoft.ReactNative/Fabric/FabricUIManagerModule.cpp

@@ -19,7 +19,6 @@
 #include <JSI/jsi.h>
 #include <ReactCommon/RuntimeExecutor.h>
 #include <SchedulerSettings.h>
-#include <UI.Xaml.Controls.h>
 #include <react/components/rnwcore/ComponentDescriptors.h>
 #include <react/renderer/componentregistry/ComponentDescriptorProviderRegistry.h>
 #include <react/renderer/components/text/ParagraphComponentDescriptor.h>

package/Microsoft.ReactNative/Fabric/ImageManager.cpp

@@ -18,10 +18,6 @@ ImageManager::~ImageManager() {
   delete (Microsoft::ReactNative::WindowsImageManager *)self_;
 }
 
-ImageRequest ImageManager::requestImage(const ImageSource &imageSource, SurfaceId surfaceId) const {
-  return ((Microsoft::ReactNative::WindowsImageManager *)self_)->requestImage(imageSource, surfaceId);
-}
-
 ImageRequest ImageManager::requestImage(
     const ImageSource &imageSource,
     SurfaceId surfaceId,

package/Microsoft.ReactNative/Fabric/ReactTaggedView.h

@@ -16,7 +16,7 @@ namespace Microsoft::ReactNative {
  */
 struct ReactTaggedView {
   ReactTaggedView(const winrt::Microsoft::ReactNative::ComponentView &componentView)
-      : m_view(componentView), m_tag(componentView.Tag()) {}
+      : m_view(componentView), m_tag(componentView ? componentView.Tag() : -1) {}
 
   winrt::Microsoft::ReactNative::ComponentView view() noexcept {
     if (!m_view) {

package/Microsoft.ReactNative/Fabric/WindowsComponentDescriptorRegistry.cpp

@@ -54,6 +54,14 @@ bool WindowsComponentDescriptorRegistry::hasComponentProvider(const std::string
   return std::find(m_componentNames.begin(), m_componentNames.end(), name) != m_componentNames.end();
 }
 
+bool WindowsComponentDescriptorRegistry::isXamlSupportRequired() const noexcept {
+  return std::any_of(m_builderByName.cbegin(), m_builderByName.cend(), [](const auto &pair) -> bool {
+    return winrt::get_self<winrt::Microsoft::ReactNative::Composition::ReactCompositionViewComponentBuilder>(
+               pair.second)
+        ->XamlSupport();
+  });
+}
+
 void WindowsComponentDescriptorRegistry::Add(
     winrt::hstring componentName,
     winrt::Microsoft::ReactNative::ReactViewComponentProvider const &provider) noexcept {

package/Microsoft.ReactNative/Fabric/WindowsComponentDescriptorRegistry.h

@@ -34,6 +34,9 @@ struct WindowsComponentDescriptorRegistry {
 
   bool hasComponentProvider(const std::string &name) noexcept;
 
+  // Returns true if any component requested for XAML support.
+  bool isXamlSupportRequired() const noexcept;
+
  private:
   void add(const facebook::react::ComponentDescriptorProvider &provider) noexcept;
 

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

@@ -2,7 +2,6 @@
 // Licensed under the MIT License.
 
 #include "PlatformColorUtils.h"
-#include <UI.Xaml.Media.h>
 #include <Utils/ThemeUtils.h>
 #include <Utils/ValueUtils.h>
 #ifndef CORE_ABI
@@ -17,16 +16,6 @@ namespace facebook::react {
 winrt::Windows::UI::Color ResolvePlatformColor(const std::vector<std::string> &semanticItems) {
   if (!semanticItems.empty()) {
     for (auto platformColor : semanticItems) {
-#ifndef CORE_ABI
-      // If XAML is loaded, look in application resources
-      if (xaml::TryGetCurrentUwpXamlApplication()) {
-        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<

package/Microsoft.ReactNative/Fabric/platform/react/renderer/textlayoutmanager/WindowsTextLayoutManager.h

@@ -56,8 +56,9 @@ class WindowsTextLayoutManager : public TextLayoutManager {
       TextMeasurement::Attachments &attachments,
       float minimumFontScale) noexcept;
 
- private:
   static winrt::hstring GetTransformedText(const AttributedStringBox &attributedStringBox);
+
+ private:
   static void GetTextLayout(
       const AttributedStringBox &attributedStringBox,
       const ParagraphAttributes &paragraphAttributes,