react-native-windows 0.77.4 → 0.77.6

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

@@ -3,6 +3,7 @@
 #include <Fabric/ComponentView.h>
 #include <Fabric/Composition/CompositionTextRangeProvider.h>
 #include <Fabric/Composition/ParagraphComponentView.h>
+#include <Fabric/Composition/ScrollViewComponentView.h>
 #include <Fabric/Composition/SwitchComponentView.h>
 #include <Fabric/Composition/TextInput/WindowsTextInputComponentView.h>
 #include <Unicode.h>
@@ -215,6 +216,12 @@ HRESULT __stdcall CompositionDynamicAutomationProvider::GetPatternProvider(PATTE
     AddRef();
   }
 
+  if (patternId == UIA_ScrollPatternId &&
+      strongView.try_as<winrt::Microsoft::ReactNative::Composition::implementation::ScrollViewComponentView>()) {
+    *pRetVal = static_cast<IScrollProvider *>(this);
+    AddRef();
+  }
+
   if (patternId == UIA_ValuePatternId &&
       ((strongView
             .try_as<winrt::Microsoft::ReactNative::Composition::implementation::WindowsTextInputComponentView>() &&
@@ -325,6 +332,8 @@ long GetControlTypeFromString(const std::string &role) noexcept {
     return UIA_TreeControlTypeId;
   } else if (role == "treeitem") {
     return UIA_TreeItemControlTypeId;
+  } else if (role == "pane") {
+    return UIA_PaneControlTypeId;
   }
   assert(false);
   return UIA_GroupControlTypeId;
@@ -590,6 +599,156 @@ HRESULT __stdcall CompositionDynamicAutomationProvider::ScrollIntoView() {
   return S_OK;
 }
 
+HRESULT __stdcall CompositionDynamicAutomationProvider::get_HorizontalScrollPercent(double *pRetVal) {
+  BOOL horizontallyScrollable;
+  auto hr = get_HorizontallyScrollable(&horizontallyScrollable);
+  if (!SUCCEEDED(hr)) {
+    return hr;
+  }
+  if (!horizontallyScrollable) {
+    *pRetVal = UIA_ScrollPatternNoScroll;
+  } else {
+    auto strongView = m_view.view();
+    auto scrollComponentView =
+        strongView.try_as<winrt::Microsoft::ReactNative::Composition::implementation::ScrollViewComponentView>();
+    *pRetVal = scrollComponentView->getScrollPositionX();
+  }
+  return S_OK;
+}
+
+HRESULT __stdcall CompositionDynamicAutomationProvider::get_VerticalScrollPercent(double *pRetVal) {
+  BOOL verticallyScrollable;
+  auto hr = get_VerticallyScrollable(&verticallyScrollable);
+  if (!SUCCEEDED(hr)) {
+    return hr;
+  }
+  if (!verticallyScrollable) {
+    *pRetVal = UIA_ScrollPatternNoScroll;
+  } else {
+    auto strongView = m_view.view();
+    auto scrollComponentView =
+        strongView.try_as<winrt::Microsoft::ReactNative::Composition::implementation::ScrollViewComponentView>();
+    *pRetVal = scrollComponentView->getScrollPositionY();
+  }
+  return S_OK;
+}
+
+HRESULT __stdcall CompositionDynamicAutomationProvider::get_HorizontalViewSize(double *pRetVal) {
+  BOOL horizontallyScrollable;
+  auto hr = get_HorizontallyScrollable(&horizontallyScrollable);
+  if (!SUCCEEDED(hr)) {
+    return hr;
+  }
+  if (!horizontallyScrollable) {
+    *pRetVal = 100;
+  } else {
+    auto strongView = m_view.view();
+    auto scrollComponentView =
+        strongView.try_as<winrt::Microsoft::ReactNative::Composition::implementation::ScrollViewComponentView>();
+    *pRetVal = scrollComponentView->getHorizontalSize();
+  }
+  return S_OK;
+}
+
+HRESULT __stdcall CompositionDynamicAutomationProvider::get_VerticalViewSize(double *pRetVal) {
+  BOOL verticallyScrollable;
+  auto hr = get_VerticallyScrollable(&verticallyScrollable);
+  if (!SUCCEEDED(hr)) {
+    return hr;
+  }
+  if (!verticallyScrollable) {
+    *pRetVal = 100;
+  } else {
+    auto strongView = m_view.view();
+    auto scrollComponentView =
+        strongView.try_as<winrt::Microsoft::ReactNative::Composition::implementation::ScrollViewComponentView>();
+    *pRetVal = scrollComponentView->getVerticalSize();
+  }
+  return S_OK;
+}
+
+HRESULT __stdcall CompositionDynamicAutomationProvider::get_HorizontallyScrollable(BOOL *pRetVal) {
+  if (pRetVal == nullptr)
+    return E_POINTER;
+  auto strongView = m_view.view();
+
+  if (!strongView)
+    return UIA_E_ELEMENTNOTAVAILABLE;
+
+  auto props = std::static_pointer_cast<const facebook::react::ScrollViewProps>(
+      winrt::get_self<winrt::Microsoft::ReactNative::implementation::ComponentView>(strongView)->props());
+  if (props == nullptr)
+    return UIA_E_ELEMENTNOTAVAILABLE;
+  *pRetVal = (props->horizontal && props->scrollEnabled);
+  return S_OK;
+}
+
+HRESULT __stdcall CompositionDynamicAutomationProvider::get_VerticallyScrollable(BOOL *pRetVal) {
+  if (pRetVal == nullptr)
+    return E_POINTER;
+  auto strongView = m_view.view();
+
+  if (!strongView)
+    return UIA_E_ELEMENTNOTAVAILABLE;
+
+  auto props = std::static_pointer_cast<const facebook::react::ScrollViewProps>(
+      winrt::get_self<winrt::Microsoft::ReactNative::implementation::ComponentView>(strongView)->props());
+  if (props == nullptr)
+    return UIA_E_ELEMENTNOTAVAILABLE;
+  *pRetVal = (!props->horizontal && props->scrollEnabled);
+  return S_OK;
+}
+
+HRESULT __stdcall CompositionDynamicAutomationProvider::Scroll(
+    ScrollAmount horizontalAmount,
+    ScrollAmount verticalAmount) {
+  DispatchAccessibilityAction(m_view, "scroll");
+  auto strongView = m_view.view();
+  auto scrollComponentView =
+      strongView.try_as<winrt::Microsoft::ReactNative::Composition::implementation::ScrollViewComponentView>();
+  BOOL verticallyScrollable;
+  BOOL horizontallyScrollable;
+  float vertical = 0.0f;
+  float horizontal = 0.0f;
+  auto hr = get_VerticallyScrollable(&verticallyScrollable);
+  if (!SUCCEEDED(hr)) {
+    return hr;
+  }
+  if (verticallyScrollable) {
+    if (verticalAmount == ScrollAmount_LargeIncrement) {
+      scrollComponentView->pageDown(true);
+    } else if (verticalAmount == ScrollAmount_LargeDecrement) {
+      scrollComponentView->pageUp(true);
+    } else if (verticalAmount == ScrollAmount_SmallIncrement) {
+      scrollComponentView->lineDown(true);
+    } else if (verticalAmount == ScrollAmount_SmallDecrement) {
+      scrollComponentView->lineUp(true);
+    }
+  }
+  hr = get_HorizontallyScrollable(&horizontallyScrollable);
+  if (!SUCCEEDED(hr)) {
+    return hr;
+  }
+  if (horizontallyScrollable) {
+    if (horizontalAmount == ScrollAmount_LargeIncrement) {
+      scrollComponentView->pageDown(true);
+    } else if (horizontalAmount == ScrollAmount_LargeDecrement) {
+      scrollComponentView->pageUp(true);
+    } else if (horizontalAmount == ScrollAmount_SmallIncrement) {
+      scrollComponentView->lineRight(true);
+    } else if (horizontalAmount == ScrollAmount_SmallDecrement) {
+      scrollComponentView->lineLeft(true);
+    }
+  }
+  return S_OK;
+}
+
+HRESULT __stdcall CompositionDynamicAutomationProvider::SetScrollPercent(
+    double horiztonalPercent,
+    double verticalPercent) {
+  return S_OK;
+}
+
 BSTR StringToBSTR(const std::string &str) {
   // Calculate the required BSTR size in bytes
   int len = MultiByteToWideChar(CP_UTF8, 0, str.c_str(), -1, nullptr, 0);

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

@@ -15,6 +15,7 @@ class CompositionDynamicAutomationProvider : public winrt::implements<
                                                  IRawElementProviderSimple,
                                                  IInvokeProvider,
                                                  IScrollItemProvider,
+                                                 IScrollProvider,
                                                  IValueProvider,
                                                  IRangeValueProvider,
                                                  IToggleProvider,
@@ -46,6 +47,16 @@ class CompositionDynamicAutomationProvider : public winrt::implements<
   // inherited via IScrollItemProvider
   HRESULT __stdcall ScrollIntoView() override;
 
+  // inherited via IScrollProvider
+  HRESULT __stdcall get_HorizontalScrollPercent(double *pRetVal) override;
+  HRESULT __stdcall get_VerticalScrollPercent(double *pRetVal) override;
+  HRESULT __stdcall get_HorizontalViewSize(double *pRetVal) override;
+  HRESULT __stdcall get_VerticalViewSize(double *pRetVal) override;
+  HRESULT __stdcall get_HorizontallyScrollable(BOOL *pRetVal) override;
+  HRESULT __stdcall get_VerticallyScrollable(BOOL *pRetVal) override;
+  HRESULT __stdcall Scroll(ScrollAmount horizontalAmount, ScrollAmount verticalAmount) override;
+  HRESULT __stdcall SetScrollPercent(double horiztonalPercent, double verticalPercent) override;
+
   // inherited via IValueProvider
   virtual HRESULT __stdcall SetValue(LPCWSTR val) override;
   virtual HRESULT __stdcall get_Value(BSTR *pRetVal) override;

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

@@ -976,10 +976,16 @@ bool ScrollViewComponentView::scrollToStart(bool animate) noexcept {
 }
 
 bool ScrollViewComponentView::pageUp(bool animate) noexcept {
+  if (std::static_pointer_cast<const facebook::react::ScrollViewProps>(viewProps())->horizontal) {
+    return scrollLeft(m_layoutMetrics.frame.size.height * m_layoutMetrics.pointScaleFactor, animate);
+  }
   return scrollUp(m_layoutMetrics.frame.size.height * m_layoutMetrics.pointScaleFactor, animate);
 }
 
 bool ScrollViewComponentView::pageDown(bool animate) noexcept {
+  if (std::static_pointer_cast<const facebook::react::ScrollViewProps>(viewProps())->horizontal) {
+    return scrollRight(m_layoutMetrics.frame.size.height * m_layoutMetrics.pointScaleFactor, animate);
+  }
   return scrollDown(m_layoutMetrics.frame.size.height * m_layoutMetrics.pointScaleFactor, animate);
 }
 
@@ -1036,7 +1042,7 @@ bool ScrollViewComponentView::scrollLeft(float delta, bool animate) noexcept {
     return false;
   }
 
-  m_scrollVisual.ScrollBy({delta, 0, 0}, animate);
+  m_scrollVisual.ScrollBy({-delta, 0, 0}, animate);
   return true;
 }
 
@@ -1259,7 +1265,7 @@ facebook::react::Point ScrollViewComponentView::getClientOffset() const noexcept
 }
 
 std::string ScrollViewComponentView::DefaultControlType() const noexcept {
-  return "scrollbar";
+  return "pane";
 }
 
 winrt::com_ptr<ComponentView> ScrollViewComponentView::focusVisualRoot(
@@ -1272,4 +1278,20 @@ ScrollViewComponentView::visualToHostFocus() noexcept {
   return m_scrollVisual;
 }
 
+int ScrollViewComponentView::getScrollPositionX() noexcept {
+  return int((m_scrollVisual.ScrollPosition().x / m_horizontalScrollbarComponent->getScrollRange()) * 100);
+}
+
+int ScrollViewComponentView::getScrollPositionY() noexcept {
+  return int((m_scrollVisual.ScrollPosition().y / m_verticalScrollbarComponent->getScrollRange()) * 100);
+}
+
+double ScrollViewComponentView::getVerticalSize() noexcept {
+  return std::min((m_layoutMetrics.frame.size.height / m_contentSize.height * 100.0), 100.0);
+}
+
+double ScrollViewComponentView::getHorizontalSize() noexcept {
+  return std::min((m_layoutMetrics.frame.size.width / m_contentSize.width * 100.0), 100.0);
+}
+
 } // namespace winrt::Microsoft::ReactNative::Composition::implementation

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

@@ -113,6 +113,11 @@ struct ScrollInteractionTrackerOwner : public winrt::implements<
   winrt::Microsoft::ReactNative::Composition::Experimental::IVisual visualToHostFocus() noexcept override;
   winrt::com_ptr<ComponentView> focusVisualRoot(const facebook::react::Rect &focusRect) noexcept override;
 
+  int getScrollPositionX() noexcept;
+  int getScrollPositionY() noexcept;
+  double getVerticalSize() noexcept;
+  double getHorizontalSize() noexcept;
+
  private:
   void updateContentVisualSize() noexcept;
   bool scrollToEnd(bool animate) noexcept;

package/PropertySheets/Generated/PackageVersion.g.props

@@ -10,11 +10,11 @@
 -->
 <Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <PropertyGroup>
-    <ReactNativeWindowsVersion>0.77.4</ReactNativeWindowsVersion>
+    <ReactNativeWindowsVersion>0.77.6</ReactNativeWindowsVersion>
     <ReactNativeWindowsMajor>0</ReactNativeWindowsMajor>
     <ReactNativeWindowsMinor>77</ReactNativeWindowsMinor>
-    <ReactNativeWindowsPatch>4</ReactNativeWindowsPatch>
+    <ReactNativeWindowsPatch>6</ReactNativeWindowsPatch>
     <ReactNativeWindowsCanary>false</ReactNativeWindowsCanary>
-    <ReactNativeWindowsCommitId>657f0d9a8915223e83f1ef043045b0da2f049af3</ReactNativeWindowsCommitId>
+    <ReactNativeWindowsCommitId>faf22821e34fd9786923c6241e445b2f9fb530bd</ReactNativeWindowsCommitId>
   </PropertyGroup>
 </Project>

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "react-native-windows",
-  "version": "0.77.4",
+  "version": "0.77.6",
   "license": "MIT",
   "repository": {
     "type": "git",