react-native-windows 0.74.23 → 0.74.24

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

@@ -0,0 +1,76 @@
+
+// Copyright (c) Microsoft Corporation.
+// Licensed under the MIT License.
+
+#pragma once
+
+#include <Fabric/ComponentView.h>
+#include <Microsoft.ReactNative.Cxx/ReactContext.h>
+#include <react/renderer/components/view/ViewEventEmitter.h>
+#include <react/renderer/components/view/ViewProps.h>
+#include "CompositionHelpers.h"
+
+namespace winrt::Microsoft::ReactNative::Composition::implementation {
+
+struct ComponentView;
+
+// Controls adding/removing appropriate visuals to a parent to render a specific border without requiring
+struct BorderPrimitive {
+  static constexpr size_t SpecialBorderLayerCount = 8;
+
+  // Use when attaching to an existing visual - We do this for View's border properties, to optimize the number of
+  // visuals for each view.
+  BorderPrimitive(
+      winrt::Microsoft::ReactNative::Composition::implementation::ComponentView &outer,
+      const winrt::Microsoft::ReactNative::Composition::Experimental::IVisual &rootVisual);
+
+  // This ctor creates a new root visual that can then be added to the visual tree
+  BorderPrimitive(winrt::Microsoft::ReactNative::Composition::implementation::ComponentView &outer);
+
+  void markNeedsUpdate() noexcept;
+
+  void updateProps(
+      const facebook::react::ViewProps &oldViewProps,
+      const facebook::react::ViewProps &newViewProps) noexcept;
+  void finalize(
+      facebook::react::LayoutMetrics const &layoutMetrics,
+      const facebook::react::BorderMetrics &borderMetrics) noexcept;
+  void onThemeChanged(
+      facebook::react::LayoutMetrics const &layoutMetrics,
+      const facebook::react::BorderMetrics &borderMetrics) noexcept;
+
+  uint8_t numberOfVisuals() const noexcept;
+  winrt::Microsoft::ReactNative::Composition::Experimental::IVisual RootVisual() const noexcept;
+
+  static facebook::react::BorderMetrics resolveAndAlignBorderMetrics(
+      facebook::react::LayoutMetrics const &layoutMetrics,
+      const facebook::react::ViewProps &viewProps) noexcept;
+
+  static bool requiresBorder(
+      const facebook::react::BorderMetrics &borderMetrics,
+      winrt::Microsoft::ReactNative::Composition::implementation::Theme *theme) noexcept;
+
+  static winrt::com_ptr<ID2D1PathGeometry> GenerateRoundedRectPathGeometry(
+      winrt::Microsoft::ReactNative::Composition::Experimental::ICompositionContext &compContext,
+      const facebook::react::RectangleCorners<float> &baseRadius,
+      const facebook::react::RectangleEdges<float> &inset,
+      const facebook::react::RectangleEdges<float> &rectPathGeometry) noexcept;
+
+ private:
+  std::array<winrt::Microsoft::ReactNative::Composition::Experimental::ISpriteVisual, SpecialBorderLayerCount>
+  FindSpecialBorderLayers() const noexcept;
+
+  bool TryUpdateSpecialBorderLayers(
+      winrt::Microsoft::ReactNative::Composition::implementation::Theme *theme,
+      std::array<winrt::Microsoft::ReactNative::Composition::Experimental::ISpriteVisual, SpecialBorderLayerCount>
+          &spBorderVisuals,
+      facebook::react::LayoutMetrics const &layoutMetrics,
+      const facebook::react::BorderMetrics &borderMetrics) noexcept;
+
+  uint8_t m_numBorderVisuals{0};
+  winrt::Microsoft::ReactNative::Composition::implementation::ComponentView *m_outer;
+  winrt::Microsoft::ReactNative::Composition::Experimental::IVisual m_rootVisual{nullptr};
+  bool m_needsUpdate{true};
+};
+
+} // namespace winrt::Microsoft::ReactNative::Composition::implementation

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

@@ -1,6 +1,8 @@
 #include "pch.h"
 #include "CompositionDynamicAutomationProvider.h"
 #include <Fabric/ComponentView.h>
+#include <Fabric/Composition/SwitchComponentView.h>
+#include <Fabric/Composition/TextInput/WindowsTextInputComponentView.h>
 #include <Unicode.h>
 #include "RootComponentView.h"
 #include "UiaHelpers.h"
@@ -141,6 +143,20 @@ bool expandableControl(const facebook::react::SharedViewProps props) {
   return false;
 }
 
+bool togglableControl(const facebook::react::SharedViewProps props) {
+  if (props->accessibilityState.has_value() &&
+      props->accessibilityState->checked != facebook::react::AccessibilityState::None) {
+    return true;
+  }
+  auto accessibilityActions = props->accessibilityActions;
+  for (size_t i = 0; i < accessibilityActions.size(); i++) {
+    if (accessibilityActions[i].name == "toggle") {
+      return true;
+    }
+  }
+  return false;
+}
+
 HRESULT __stdcall CompositionDynamicAutomationProvider::GetPatternProvider(PATTERNID patternId, IUnknown **pRetVal) {
   if (pRetVal == nullptr)
     return E_POINTER;
@@ -158,10 +174,7 @@ HRESULT __stdcall CompositionDynamicAutomationProvider::GetPatternProvider(PATTE
   auto accessibilityRole = props->accessibilityRole;
   // Invoke control pattern is used to support controls that do not maintain state
   // when activated but rather initiate or perform a single, unambiguous action.
-  if (patternId == UIA_InvokePatternId &&
-      (accessibilityRole == "button" || accessibilityRole == "imagebutton" || accessibilityRole == "link" ||
-       accessibilityRole == "splitbutton" || (accessibilityRole == "menuitem" && props->onAccessibilityTap) ||
-       (accessibilityRole == "treeitem" && props->onAccessibilityTap))) {
+  if (patternId == UIA_InvokePatternId && (props->onAccessibilityTap)) {
     *pRetVal = static_cast<IInvokeProvider *>(this);
     AddRef();
   }
@@ -171,21 +184,21 @@ HRESULT __stdcall CompositionDynamicAutomationProvider::GetPatternProvider(PATTE
     AddRef();
   }
 
-  if (patternId == UIA_ValuePatternId) {
+  if (patternId == UIA_ValuePatternId &&
+      (strongView.try_as<winrt::Microsoft::ReactNative::Composition::implementation::WindowsTextInputComponentView>() ||
+       accessibilityValueHasValue(props->accessibilityValue))) {
     *pRetVal = static_cast<IValueProvider *>(this);
     AddRef();
   }
 
-  if (patternId == UIA_TogglePatternId && (accessibilityRole == "switch" || accessibilityRole == "checkbox")) {
+  if (patternId == UIA_TogglePatternId &&
+      (strongView.try_as<winrt::Microsoft::ReactNative::Composition::implementation::SwitchComponentView>() ||
+       togglableControl(props))) {
     *pRetVal = static_cast<IToggleProvider *>(this);
     AddRef();
   }
 
-  if (patternId == UIA_ExpandCollapsePatternId &&
-      (accessibilityRole == "combobox" || accessibilityRole == "splitbutton" || accessibilityRole == "treeitem" ||
-       (expandableControl(props) &&
-        (accessibilityRole == "toolbar" || accessibilityRole == "menuitem" || accessibilityRole == "menubar" ||
-         accessibilityRole == "listitem" || accessibilityRole == "group" || accessibilityRole == "button")))) {
+  if (patternId == UIA_ExpandCollapsePatternId && expandableControl(props)) {
     *pRetVal = static_cast<IExpandCollapseProvider *>(this);
     AddRef();
   }
@@ -480,8 +493,13 @@ HRESULT __stdcall CompositionDynamicAutomationProvider::get_ToggleState(ToggleSt
   if (!strongView)
     return UIA_E_ELEMENTNOTAVAILABLE;
 
-  *pRetVal =
-      winrt::get_self<winrt::Microsoft::ReactNative::implementation::ComponentView>(strongView)->getToggleState();
+  auto props = std::static_pointer_cast<const facebook::react::ViewProps>(
+      winrt::get_self<winrt::Microsoft::ReactNative::implementation::ComponentView>(strongView)->props());
+
+  *pRetVal = (props->accessibilityState.has_value() &&
+              props->accessibilityState->checked != facebook::react::AccessibilityState::None)
+      ? GetToggleState(props->accessibilityState)
+      : winrt::get_self<winrt::Microsoft::ReactNative::implementation::ComponentView>(strongView)->getToggleState();
   return S_OK;
 }
 

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

@@ -139,8 +139,9 @@ struct CompositionInputKeyboardSource : winrt::implements<
 
 CompositionEventHandler::CompositionEventHandler(
     const winrt::Microsoft::ReactNative::ReactContext &context,
-    const winrt::Microsoft::ReactNative::ReactNativeIsland &reactNativeIsland)
-    : m_context(context), m_wkRootView(reactNativeIsland) {}
+    const winrt::Microsoft::ReactNative::ReactNativeIsland &reactNativeIsland,
+    const int fragmentTag)
+    : m_fragmentTag(fragmentTag), m_context(context), m_wkRootView(reactNativeIsland) {}
 
 void CompositionEventHandler::Initialize() noexcept {
 #ifdef USE_WINUI3
@@ -831,7 +832,30 @@ void CompositionEventHandler::getTargetPointerArgs(
       ptLocal.y = ptScaled.y - (clientRect.top / strongRootView.ScaleFactor());
     }
   } else {
-    tag = RootComponentView().hitTest(ptScaled, ptLocal);
+    if (m_fragmentTag == -1) {
+      tag = RootComponentView().hitTest(ptScaled, ptLocal);
+      return;
+    }
+
+    // check if the fragment tag exists
+    if (!fabricuiManager->GetViewRegistry().findComponentViewWithTag(m_fragmentTag)) {
+      return;
+    }
+
+    auto fagmentView = fabricuiManager->GetViewRegistry().componentViewDescriptorWithTag(m_fragmentTag).view;
+    auto fagmentchildren = fagmentView.Children();
+
+    // call the hitTest with the fargment as the RootComponent
+    for (auto index = fagmentchildren.Size(); index > 0; index--) {
+      auto childView = fagmentchildren.GetAt(index - 1);
+      auto targetTag =
+          winrt::get_self<winrt::Microsoft::ReactNative::implementation::ComponentView>(childView)->hitTest(
+              ptScaled, ptLocal);
+      if (targetTag != -1) {
+        tag = targetTag;
+        break;
+      }
+    }
   }
 }
 

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

@@ -31,7 +31,8 @@ class CompositionEventHandler : public std::enable_shared_from_this<CompositionE
  public:
   CompositionEventHandler(
       const winrt::Microsoft::ReactNative::ReactContext &context,
-      const winrt::Microsoft::ReactNative::ReactNativeIsland &ReactNativeIsland);
+      const winrt::Microsoft::ReactNative::ReactNativeIsland &ReactNativeIsland,
+      const int fragmentTag);
   virtual ~CompositionEventHandler();
 
   void Initialize() noexcept;
@@ -148,6 +149,7 @@ class CompositionEventHandler : public std::enable_shared_from_this<CompositionE
 
   std::map<PointerId, ActiveTouch> m_activeTouches; // iOS is map of touch event args to ActiveTouch..?
   PointerId m_touchId = 0;
+  int m_fragmentTag = -1;
 
   std::map<PointerId, std::vector<ReactTaggedView>> m_currentlyHoveredViewsPerPointer;
   winrt::weak_ref<winrt::Microsoft::ReactNative::ReactNativeIsland> m_wkRootView;