react-native-windows 0.81.1 → 0.81.3

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

@@ -1,6 +1,5 @@
 #pragma once
 
-#include <Fabric/Composition/CompositionDynamicAutomationProvider.h>
 #include <Fabric/Composition/CompositionTextProvider.h>
 #include <Fabric/Composition/CompositionViewComponentView.h>
 #include <Fabric/ReactTaggedView.h>
@@ -12,9 +11,7 @@ namespace winrt::Microsoft::ReactNative::implementation {
 
 class CompositionTextRangeProvider : public winrt::implements<CompositionTextRangeProvider, ITextRangeProvider> {
  public:
-  CompositionTextRangeProvider(
-      const winrt::Microsoft::ReactNative::Composition::ComponentView &componentView,
-      CompositionDynamicAutomationProvider *parentProvider) noexcept;
+  CompositionTextRangeProvider(const winrt::Microsoft::ReactNative::ComponentView &componentView) noexcept;
 
   // inherited via ITextRangeProvider
   virtual HRESULT __stdcall Clone(ITextRangeProvider **pRetVal) override;
@@ -53,7 +50,6 @@ class CompositionTextRangeProvider : public winrt::implements<CompositionTextRan
 
  private:
   ::Microsoft::ReactNative::ReactTaggedView m_view;
-  winrt::com_ptr<CompositionDynamicAutomationProvider> m_parentProvider;
 };
 
 } // namespace winrt::Microsoft::ReactNative::implementation

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

@@ -801,8 +801,8 @@ void ComponentView::updateAccessibilityProps(
   winrt::Microsoft::ReactNative::implementation::UpdateUiaProperty(
       EnsureUiaProvider(),
       UIA_LiveSettingPropertyId,
-      oldViewProps.accessibilityLiveRegion,
-      newViewProps.accessibilityLiveRegion);
+      winrt::Microsoft::ReactNative::implementation::GetLiveSetting(oldViewProps.accessibilityLiveRegion),
+      winrt::Microsoft::ReactNative::implementation::GetLiveSetting(newViewProps.accessibilityLiveRegion));
 
   winrt::Microsoft::ReactNative::implementation::UpdateUiaProperty(
       EnsureUiaProvider(), UIA_LevelPropertyId, oldViewProps.accessibilityLevel, newViewProps.accessibilityLevel);
@@ -857,14 +857,13 @@ void ComponentView::updateAccessibilityProps(
 
   if ((oldViewProps.accessibilityState.has_value() && oldViewProps.accessibilityState->selected.has_value()) !=
       ((newViewProps.accessibilityState.has_value() && newViewProps.accessibilityState->selected.has_value()))) {
-    auto compProvider =
-        EnsureUiaProvider()
-            .try_as<winrt::Microsoft::ReactNative::implementation::CompositionDynamicAutomationProvider>();
-    if (compProvider) {
+    EnsureUiaProvider();
+    if (m_innerAutomationProvider) {
       if ((newViewProps.accessibilityState.has_value() && newViewProps.accessibilityState->selected.has_value())) {
-        winrt::Microsoft::ReactNative::implementation::AddSelectionItemsToContainer(compProvider.get());
+        winrt::Microsoft::ReactNative::implementation::AddSelectionItemsToContainer(m_innerAutomationProvider.get());
       } else {
-        winrt::Microsoft::ReactNative::implementation::RemoveSelectionItemsFromContainer(compProvider.get());
+        winrt::Microsoft::ReactNative::implementation::RemoveSelectionItemsFromContainer(
+            m_innerAutomationProvider.get());
       }
     }
   }
@@ -1354,12 +1353,17 @@ std::string ViewComponentView::DefaultControlType() const noexcept {
   return "group";
 }
 
-winrt::IInspectable ComponentView::EnsureUiaProvider() noexcept {
-  if (m_uiaProvider == nullptr) {
-    m_uiaProvider =
-        winrt::make<winrt::Microsoft::ReactNative::implementation::CompositionDynamicAutomationProvider>(*get_strong());
-  }
-  return m_uiaProvider;
+winrt::Windows::Foundation::IInspectable ComponentView::CreateAutomationProvider() noexcept {
+  Assert(!m_innerAutomationProvider);
+  m_innerAutomationProvider =
+      winrt::make_self<winrt::Microsoft::ReactNative::implementation::CompositionDynamicAutomationProvider>(
+          *get_strong());
+  return *m_innerAutomationProvider;
+}
+
+const winrt::com_ptr<winrt::Microsoft::ReactNative::implementation::CompositionDynamicAutomationProvider>
+    &ComponentView::InnerAutomationProvider() const noexcept {
+  return m_innerAutomationProvider;
 }
 
 bool IntersectRect(RECT *prcDst, const RECT &prcSrc1, const RECT &prcSrc2) {

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

@@ -19,8 +19,11 @@ namespace Microsoft::ReactNative {
 struct CompContext;
 } // namespace Microsoft::ReactNative
 
-namespace winrt::Microsoft::ReactNative::Composition::implementation {
+namespace winrt::Microsoft::ReactNative::implementation {
+class CompositionDynamicAutomationProvider;
+}
 
+namespace winrt::Microsoft::ReactNative::Composition::implementation {
 struct FocusPrimitive {
   std::shared_ptr<BorderPrimitive> m_focusInnerPrimitive;
   std::shared_ptr<BorderPrimitive> m_focusOuterPrimitive;
@@ -100,7 +103,9 @@ struct ComponentView : public ComponentViewT<
   comp::CompositionPropertySet EnsureCenterPointPropertySet() noexcept;
   void EnsureTransformMatrixFacade() noexcept;
 
-  winrt::IInspectable EnsureUiaProvider() noexcept override;
+  winrt::Windows::Foundation::IInspectable CreateAutomationProvider() noexcept override;
+  const winrt::com_ptr<winrt::Microsoft::ReactNative::implementation::CompositionDynamicAutomationProvider>
+      &InnerAutomationProvider() const noexcept;
   std::optional<std::string> getAccessiblityValue() noexcept override;
   void setAcccessiblityValue(std::string &&value) noexcept override;
   bool getAcccessiblityIsReadOnly() noexcept override;
@@ -130,7 +135,9 @@ struct ComponentView : public ComponentViewT<
       facebook::react::Point &ptContent,
       facebook::react::Point &localPt) const noexcept;
 
-  winrt::IInspectable m_uiaProvider{nullptr};
+  // Most access should be through EnsureUIAProvider, instead of direct access to this.
+  winrt::com_ptr<winrt::Microsoft::ReactNative::implementation::CompositionDynamicAutomationProvider>
+      m_innerAutomationProvider;
   winrt::Microsoft::ReactNative::Composition::Experimental::ICompositionContext m_compContext;
   comp::CompositionPropertySet m_centerPropSet{nullptr};
   facebook::react::SharedViewEventEmitter m_eventEmitter;

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

@@ -111,12 +111,11 @@ void ContentIslandComponentView::ParentLayoutChanged() noexcept {
   });
 }
 
-winrt::IInspectable ContentIslandComponentView::EnsureUiaProvider() noexcept {
-  if (m_uiaProvider == nullptr) {
-    m_uiaProvider = winrt::make<winrt::Microsoft::ReactNative::implementation::CompositionDynamicAutomationProvider>(
-        *get_strong(), m_childSiteLink);
-  }
-  return m_uiaProvider;
+winrt::Windows::Foundation::IInspectable ContentIslandComponentView::CreateAutomationProvider() noexcept {
+  m_innerAutomationProvider =
+      winrt::make_self<winrt::Microsoft::ReactNative::implementation::CompositionDynamicAutomationProvider>(
+          *get_strong(), m_childSiteLink);
+  return *m_innerAutomationProvider;
 }
 
 bool ContentIslandComponentView::focusable() const noexcept {
@@ -126,6 +125,27 @@ bool ContentIslandComponentView::focusable() const noexcept {
   return true;
 }
 
+facebook::react::Tag ContentIslandComponentView::hitTest(
+    facebook::react::Point pt,
+    facebook::react::Point &localPt,
+    bool ignorePointerEvents) const noexcept {
+  facebook::react::Point ptLocal{pt.x - m_layoutMetrics.frame.origin.x, pt.y - m_layoutMetrics.frame.origin.y};
+
+  // Check if the point is within the bounds of this ContentIslandComponentView.
+  // This ensures that hit tests correctly return this view's tag for UIA purposes,
+  // even when the actual content (XAML buttons, etc.) is hosted in the ContentIsland.
+  auto props = viewProps();
+  if ((ignorePointerEvents || props->pointerEvents == facebook::react::PointerEventsMode::Auto ||
+       props->pointerEvents == facebook::react::PointerEventsMode::BoxOnly) &&
+      ptLocal.x >= 0 && ptLocal.x <= m_layoutMetrics.frame.size.width && ptLocal.y >= 0 &&
+      ptLocal.y <= m_layoutMetrics.frame.size.height) {
+    localPt = ptLocal;
+    return Tag();
+  }
+
+  return -1;
+}
+
 // Helper to convert a FocusNavigationDirection to a FocusNavigationReason.
 winrt::Microsoft::UI::Input::FocusNavigationReason GetFocusNavigationReason(
     winrt::Microsoft::ReactNative::FocusNavigationDirection direction) noexcept {
@@ -178,14 +198,12 @@ ContentIslandComponentView::~ContentIslandComponentView() noexcept {
 void ContentIslandComponentView::MountChildComponentView(
     const winrt::Microsoft::ReactNative::ComponentView &childComponentView,
     uint32_t index) noexcept {
-  assert(false);
   base_type::MountChildComponentView(childComponentView, index);
 }
 
 void ContentIslandComponentView::UnmountChildComponentView(
     const winrt::Microsoft::ReactNative::ComponentView &childComponentView,
     uint32_t index) noexcept {
-  assert(false);
   base_type::UnmountChildComponentView(childComponentView, index);
 }
 
@@ -262,6 +280,10 @@ void ContentIslandComponentView::ConfigureChildSiteLinkAutomation() noexcept {
         args.AutomationProvider(nullptr);
         args.Handled(true);
       });
+
+  if (m_innerAutomationProvider) {
+    m_innerAutomationProvider->SetChildSiteLink(m_childSiteLink);
+  }
 }
 
 } // namespace winrt::Microsoft::ReactNative::Composition::implementation

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

@@ -40,7 +40,10 @@ struct ContentIslandComponentView : ContentIslandComponentViewT<ContentIslandCom
 
   bool focusable() const noexcept override;
 
-  winrt::Windows::Foundation::IInspectable EnsureUiaProvider() noexcept override;
+  facebook::react::Tag hitTest(facebook::react::Point pt, facebook::react::Point &localPt, bool ignorePointerEvents)
+      const noexcept override;
+
+  winrt::Windows::Foundation::IInspectable CreateAutomationProvider() noexcept override;
 
   void onGotFocus(const winrt::Microsoft::ReactNative::Composition::Input::RoutedEventArgs &args) noexcept override;
 

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

@@ -86,10 +86,11 @@ void DebuggingOverlayComponentView::HandleCommand(
     if (auto root = rootComponentView()) {
       auto rootVisual = root->OuterVisual();
       auto brush = m_compContext.CreateColorBrush({204, 200, 230, 255});
+      float scaleFactor = m_layoutMetrics.pointScaleFactor;
       for (auto &element : elements) {
         auto overlayVisual = m_compContext.CreateSpriteVisual();
-        overlayVisual.Size({element.width, element.height});
-        overlayVisual.Offset({element.x, element.y, 0.0f});
+        overlayVisual.Size({element.width * scaleFactor, element.height * scaleFactor});
+        overlayVisual.Offset({element.x * scaleFactor, element.y * scaleFactor, 0.0f});
         overlayVisual.Brush(brush);
 
         rootVisual.InsertAt(overlayVisual, root->overlayIndex() + m_activeOverlays);

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

@@ -22,7 +22,6 @@
 #include <winrt/Windows.UI.Composition.h>
 #include <winrt/Windows.Web.Http.Headers.h>
 #include <winrt/Windows.Web.Http.h>
-#include "CompositionDynamicAutomationProvider.h"
 #include "CompositionHelpers.h"
 #include "RootComponentView.h"