react-native-windows 0.76.10 → 0.76.12

package/Libraries/Components/View/View.windows.js

@@ -101,6 +101,7 @@ const View: React.AbstractComponent<
     }: ViewProps,
     forwardedRef,
   ) => {
+    const hasTextAncestor = React.useContext(TextAncestor);
     const _accessibilityLabelledBy =
       ariaLabelledBy?.split(/\s*,\s*/g) ?? accessibilityLabelledBy;
 
@@ -241,64 +242,114 @@ const View: React.AbstractComponent<
       );
     }
 
+    const actualView = (
+      <ViewNativeComponent
+        {...otherProps}
+        accessibilityLiveRegion={
+          ariaLive === 'off' ? 'none' : ariaLive ?? accessibilityLiveRegion
+        }
+        accessibilityLabel={ariaLabel ?? accessibilityLabel}
+        accessibilityLevel={ariaLevel ?? accessibilityLevel}
+        accessibilityPosInSet={ariaPosinset ?? accessibilityPosInSet}
+        accessibilitySetSize={ariaSetsize ?? accessibilitySetSize}
+        focusable={_focusable}
+        disabled={disabled}
+        accessibilityState={_accessibilityState}
+        accessibilityElementsHidden={ariaHidden ?? accessibilityElementsHidden}
+        accessibilityLabelledBy={_accessibilityLabelledBy}
+        accessibilityValue={_accessibilityValue}
+        importantForAccessibility={
+          ariaHidden === true
+            ? 'no-hide-descendants'
+            : importantForAccessibility
+        }
+        nativeID={id ?? nativeID}
+        ref={forwardedRef}
+        onKeyDown={_keyDown}
+        onKeyDownCapture={_keyDownCapture}
+        onKeyUp={_keyUp}
+        onKeyUpCapture={_keyUpCapture}
+        // [Windows
+        accessible={_accessible}
+        children={
+          importantForAccessibility === 'no-hide-descendants'
+            ? childrenWithImportantForAccessibility(otherProps.children)
+            : otherProps.children
+        }
+        // Windows]
+      />
+    );
+
+    // [Windows - Paper doesn't support Views in Text while Fabric does
+    if (global.RN$Bridgeless !== true) {
+      return (
+        // [Windows
+        // In core this is a TextAncestor.Provider value={false} See
+        // https://github.com/facebook/react-native/commit/66601e755fcad10698e61d20878d52194ad0e90c
+        // But since Views are not currently supported in Text, we do not need the extra provider
+        <TextAncestor.Consumer>
+          {hasTextAncestor => {
+            invariant(
+              !hasTextAncestor,
+              'Nesting of <View> within <Text> is not currently supported.',
+            );
+            return (
+              <ViewNativeComponent
+                {...otherProps}
+                accessibilityLiveRegion={
+                  ariaLive === 'off'
+                    ? 'none'
+                    : ariaLive ?? accessibilityLiveRegion
+                }
+                accessibilityLabel={ariaLabel ?? accessibilityLabel}
+                accessibilityLevel={ariaLevel ?? accessibilityLevel}
+                accessibilityPosInSet={ariaPosinset ?? accessibilityPosInSet}
+                accessibilitySetSize={ariaSetsize ?? accessibilitySetSize}
+                focusable={_focusable}
+                disabled={disabled}
+                accessibilityState={_accessibilityState}
+                accessibilityElementsHidden={
+                  ariaHidden ?? accessibilityElementsHidden
+                }
+                accessibilityLabelledBy={_accessibilityLabelledBy}
+                accessibilityValue={_accessibilityValue}
+                importantForAccessibility={
+                  ariaHidden === true
+                    ? 'no-hide-descendants'
+                    : importantForAccessibility
+                }
+                nativeID={id ?? nativeID}
+                ref={forwardedRef}
+                onKeyDown={_keyDown}
+                onKeyDownCapture={_keyDownCapture}
+                onKeyUp={_keyUp}
+                onKeyUpCapture={_keyUpCapture}
+                // [Windows
+                accessible={_accessible}
+                children={
+                  importantForAccessibility === 'no-hide-descendants'
+                    ? childrenWithImportantForAccessibility(otherProps.children)
+                    : otherProps.children
+                }
+                // Windows]
+              />
+            );
+          }}
+        </TextAncestor.Consumer>
+        // Windows]
+      );
+    } else {
+      if (hasTextAncestor) {
+        return (
+          <TextAncestor.Provider value={false}>
+            {actualView}
+          </TextAncestor.Provider>
+        );
+      }
+    }
     // Windows]
 
-    return (
-      // [Windows
-      // In core this is a TextAncestor.Provider value={false} See
-      // https://github.com/facebook/react-native/commit/66601e755fcad10698e61d20878d52194ad0e90c
-      // But since Views are not currently supported in Text, we do not need the extra provider
-      <TextAncestor.Consumer>
-        {hasTextAncestor => {
-          invariant(
-            !hasTextAncestor,
-            'Nesting of <View> within <Text> is not currently supported.',
-          );
-          return (
-            <ViewNativeComponent
-              {...otherProps}
-              accessibilityLiveRegion={
-                ariaLive === 'off'
-                  ? 'none'
-                  : ariaLive ?? accessibilityLiveRegion
-              }
-              accessibilityLabel={ariaLabel ?? accessibilityLabel}
-              accessibilityLevel={ariaLevel ?? accessibilityLevel}
-              accessibilityPosInSet={ariaPosinset ?? accessibilityPosInSet}
-              accessibilitySetSize={ariaSetsize ?? accessibilitySetSize}
-              focusable={_focusable}
-              disabled={disabled}
-              accessibilityState={_accessibilityState}
-              accessibilityElementsHidden={
-                ariaHidden ?? accessibilityElementsHidden
-              }
-              accessibilityLabelledBy={_accessibilityLabelledBy}
-              accessibilityValue={_accessibilityValue}
-              importantForAccessibility={
-                ariaHidden === true
-                  ? 'no-hide-descendants'
-                  : importantForAccessibility
-              }
-              nativeID={id ?? nativeID}
-              ref={forwardedRef}
-              onKeyDown={_keyDown}
-              onKeyDownCapture={_keyDownCapture}
-              onKeyUp={_keyUp}
-              onKeyUpCapture={_keyUpCapture}
-              // [Windows
-              accessible={_accessible}
-              children={
-                importantForAccessibility === 'no-hide-descendants'
-                  ? childrenWithImportantForAccessibility(otherProps.children)
-                  : otherProps.children
-              }
-              // Windows]
-            />
-          );
-        }}
-      </TextAncestor.Consumer>
-      // Windows]
-    );
+    return actualView;
   },
 );
 

package/Libraries/Image/Image.windows.js

@@ -28,6 +28,7 @@ import {convertObjectFitToResizeMode} from './ImageUtils';
 import ImageViewNativeComponent from './ImageViewNativeComponent';
 import NativeImageLoaderIOS from './NativeImageLoaderIOS';
 import resolveAssetSource from './resolveAssetSource';
+import TextInlineImageNativeComponent from './TextInlineImageNativeComponent';
 import * as React from 'react';
 
 function getSize(
@@ -171,20 +172,20 @@ let BaseImage: AbstractImageIOS = React.forwardRef((props, forwardedRef) => {
 
   const actualRef = useWrapRefWithImageAttachedCallbacks(forwardedRef);
 
-  return (
-    // [Windows
-    <TextAncestor.Consumer>
-      {hasTextAncestor => {
-        invariant(
-          !hasTextAncestor,
-          'Nesting of <Image> within <Text> is not currently supported.',
-        );
-        // windows]
-
-        return (
-          <ImageAnalyticsTagContext.Consumer>
-            {analyticTag => {
-              return (
+  // [Windows - Paper doesn't support Views in Text while Fabric does
+  if (global.RN$Bridgeless !== true) {
+    return (
+      // [Windows
+      <TextAncestor.Consumer>
+        {hasTextAncestor => {
+          invariant(
+            !hasTextAncestor,
+            'Nesting of <Image> within <Text> is not currently supported.',
+          );
+          // windows]
+          return (
+            <ImageAnalyticsTagContext.Consumer>
+              {analyticTag => (
                 <ImageViewNativeComponent
                   accessibilityState={_accessibilityState}
                   {...restProps}
@@ -197,13 +198,33 @@ let BaseImage: AbstractImageIOS = React.forwardRef((props, forwardedRef) => {
                   source={sources}
                   internal_analyticTag={analyticTag}
                 />
-              );
-            }}
-          </ImageAnalyticsTagContext.Consumer>
-        );
-      }}
-    </TextAncestor.Consumer>
-  );
+              )}
+            </ImageAnalyticsTagContext.Consumer>
+          );
+        }}
+      </TextAncestor.Consumer>
+    );
+  } else {
+    return (
+      <ImageAnalyticsTagContext.Consumer>
+        {analyticTag => (
+          <ImageViewNativeComponent
+            accessibilityState={_accessibilityState}
+            {...restProps}
+            accessible={props.alt !== undefined ? true : props.accessible}
+            accessibilityLabel={accessibilityLabel ?? props.alt}
+            ref={actualRef}
+            style={style}
+            resizeMode={resizeMode}
+            tintColor={tintColor}
+            source={sources}
+            internal_analyticTag={analyticTag}
+          />
+        )}
+      </ImageAnalyticsTagContext.Consumer>
+    );
+  }
+  // Windows]
 });
 
 const imageComponentDecorator = unstable_getImageComponentDecorator();

package/Libraries/Text/Text.d.ts

@@ -12,7 +12,7 @@ import {Constructor} from '../../types/private/Utilities';
 import {AccessibilityProps} from '../Components/View/ViewAccessibility';
 import {NativeMethods} from '../../types/public/ReactNativeTypes';
 import {ColorValue, StyleProp} from '../StyleSheet/StyleSheet';
-import {TextStyle} from '../StyleSheet/StyleSheetTypes';
+import {TextStyle, ViewStyle} from '../StyleSheet/StyleSheetTypes';
 import {
   GestureResponderEvent,
   LayoutChangeEvent,
@@ -101,10 +101,20 @@ export interface TextPropsAndroid {
   android_hyphenationFrequency?: 'normal' | 'none' | 'full' | undefined;
 }
 
+export interface TextPropsWindows {
+  /**
+   * The tooltip to show when the text is clicked.
+   */
+  // [Windows
+  tooltip?: string | undefined;
+  //  Windows]
+}
+
 // https://reactnative.dev/docs/text#props
 export interface TextProps
   extends TextPropsIOS,
     TextPropsAndroid,
+    TextPropsWindows,
     AccessibilityProps {
   /**
    * Specifies whether fonts should scale to respect Text Size accessibility settings.
@@ -209,6 +219,11 @@ export interface TextProps
    * Specifies smallest possible scale a font can reach when adjustsFontSizeToFit is enabled. (values 0.01-1.0).
    */
   minimumFontScale?: number | undefined;
+
+  /**
+   * Controls how touch events are handled. Similar to `View`'s `pointerEvents`.
+   */
+  pointerEvents?: ViewStyle['pointerEvents'] | undefined;
 }
 
 /**

package/Microsoft.ReactNative/CompositionComponentView.idl

@@ -89,11 +89,6 @@ namespace Microsoft.ReactNative.Composition
     Microsoft.ReactNative.ViewProps ViewProps { get; };
   };
 
-  // Some other interfaces we could consider implementing/exposing
-  // Use ifdef USE_EXPERIMENTAL_WINUI3 to add these
-  // Microsoft.UI.Content.IContentLink // Use ifdef USE_EXPERIMENTAL_WINUI3
-  // Microsoft.UI.Content.IContentSiteBridge 
-  // Microsoft.UI.Content.IContentSiteBridge2 // Use ifdef USE_EXPERIMENTAL_WINUI3
   [experimental]
   [webhosthidden]
   runtimeclass ContentIslandComponentView : ViewComponentView { 

package/Microsoft.ReactNative/CompositionSwitcher.idl

@@ -109,11 +109,15 @@ namespace Microsoft.ReactNative.Composition.Experimental
     void Brush(IBrush brush);
     void ScrollEnabled(Boolean isScrollEnabled);
     event Windows.Foundation.EventHandler<IScrollPositionChangedArgs> ScrollPositionChanged;
+    event Windows.Foundation.EventHandler<IScrollPositionChangedArgs> ScrollBeginDrag;
     void ContentSize(Windows.Foundation.Numerics.Vector2 size);
     Windows.Foundation.Numerics.Vector3 ScrollPosition { get; };
     void ScrollBy(Windows.Foundation.Numerics.Vector3 offset, Boolean animate);
     void TryUpdatePosition(Windows.Foundation.Numerics.Vector3 position, Boolean animate);
     void OnPointerPressed(Microsoft.ReactNative.Composition.Input.PointerRoutedEventArgs args);
+    void SetDecelerationRate(Windows.Foundation.Numerics.Vector3 decelerationRate);
+    void SetMaximumZoomScale(Single maximumZoomScale);
+    void SetMinimumZoomScale(Single minimumZoomScale);
     Boolean Horizontal;
   }
 

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

@@ -708,6 +708,8 @@ struct CompScrollerVisual : winrt::implements<
         typename TTypeRedirects::InteractionTrackerInertiaStateEnteredArgs args) noexcept {
       m_outer->m_custom = false;
       m_outer->m_inertia = true;
+      m_outer->m_currentPosition = args.NaturalRestingPosition();
+      m_outer->FireScrollBeginDrag({args.NaturalRestingPosition().x, args.NaturalRestingPosition().y});
     }
     void InteractingStateEntered(
         typename TTypeRedirects::InteractionTracker sender,
@@ -834,6 +836,18 @@ struct CompScrollerVisual : winrt::implements<
     UpdateInteractionModes();
   }
 
+  void SetDecelerationRate(winrt::Windows::Foundation::Numerics::float3 const &decelerationRate) noexcept {
+    m_interactionTracker.PositionInertiaDecayRate(decelerationRate);
+  }
+
+  void SetMaximumZoomScale(float maximumZoomScale) const noexcept {
+    m_interactionTracker.MaxScale(maximumZoomScale);
+  }
+
+  void SetMinimumZoomScale(float minimumZoomScale) noexcept {
+    m_interactionTracker.MinScale(minimumZoomScale);
+  }
+
   void Opacity(float opacity) noexcept {
     m_visual.Opacity(opacity);
   }
@@ -918,10 +932,21 @@ struct CompScrollerVisual : winrt::implements<
     return m_scrollPositionChangedEvent.add(handler);
   }
 
+  winrt::event_token ScrollBeginDrag(
+      winrt::Windows::Foundation::EventHandler<
+          winrt::Microsoft::ReactNative::Composition::Experimental::IScrollPositionChangedArgs> const
+          &handler) noexcept {
+    return m_scrollBeginDragEvent.add(handler);
+  }
+
   void ScrollPositionChanged(winrt::event_token const &token) noexcept {
     m_scrollPositionChangedEvent.remove(token);
   }
 
+  void ScrollBeginDrag(winrt::event_token const &token) noexcept {
+    m_scrollBeginDragEvent.remove(token);
+  }
+
   void ContentSize(winrt::Windows::Foundation::Numerics::float2 const &size) noexcept {
     m_contentSize = size;
     m_contentVisual.Size(size);
@@ -992,6 +1017,10 @@ struct CompScrollerVisual : winrt::implements<
     m_scrollPositionChangedEvent(*this, winrt::make<CompScrollPositionChangedArgs>(position));
   }
 
+  void FireScrollBeginDrag(winrt::Windows::Foundation::Numerics::float2 position) noexcept {
+    m_scrollBeginDragEvent(*this, winrt::make<CompScrollPositionChangedArgs>(position));
+  }
+
   void UpdateMaxPosition() noexcept {
     m_interactionTracker.MaxPosition(
         {std::max<float>(m_contentSize.x - m_visualSize.x, 0),
@@ -1010,6 +1039,9 @@ struct CompScrollerVisual : winrt::implements<
   winrt::event<winrt::Windows::Foundation::EventHandler<
       winrt::Microsoft::ReactNative::Composition::Experimental::IScrollPositionChangedArgs>>
       m_scrollPositionChangedEvent;
+  winrt::event<winrt::Windows::Foundation::EventHandler<
+      winrt::Microsoft::ReactNative::Composition::Experimental::IScrollPositionChangedArgs>>
+      m_scrollBeginDragEvent;
   typename TTypeRedirects::SpriteVisual m_visual{nullptr};
   typename TTypeRedirects::SpriteVisual m_contentVisual{nullptr};
   typename TTypeRedirects::InteractionTracker m_interactionTracker{nullptr};

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>
@@ -37,12 +38,10 @@ CompositionDynamicAutomationProvider::CompositionDynamicAutomationProvider(
   }
 }
 
-#ifdef USE_EXPERIMENTAL_WINUI3
 CompositionDynamicAutomationProvider::CompositionDynamicAutomationProvider(
     const winrt::Microsoft::ReactNative::Composition::ComponentView &componentView,
     const winrt::Microsoft::UI::Content::ChildSiteLink &childSiteLink) noexcept
     : m_view{componentView}, m_childSiteLink{childSiteLink} {}
-#endif // USE_EXPERIMENTAL_WINUI3
 
 HRESULT __stdcall CompositionDynamicAutomationProvider::Navigate(
     NavigateDirection direction,
@@ -50,7 +49,6 @@ HRESULT __stdcall CompositionDynamicAutomationProvider::Navigate(
   if (pRetVal == nullptr)
     return E_POINTER;
 
-#ifdef USE_EXPERIMENTAL_WINUI3
   if (m_childSiteLink) {
     if (direction == NavigateDirection_FirstChild || direction == NavigateDirection_LastChild) {
       auto fragment = m_childSiteLink.AutomationProvider().try_as<IRawElementProviderFragment>();
@@ -58,7 +56,6 @@ HRESULT __stdcall CompositionDynamicAutomationProvider::Navigate(
       return S_OK;
     }
   }
-#endif // USE_EXPERIMENTAL_WINUI3
 
   return UiaNavigateHelper(m_view.view(), direction, *pRetVal);
 }
@@ -231,6 +228,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>() &&
@@ -341,6 +344,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;
@@ -606,6 +611,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,
@@ -25,11 +26,9 @@ class CompositionDynamicAutomationProvider : public winrt::implements<
   CompositionDynamicAutomationProvider(
       const winrt::Microsoft::ReactNative::Composition::ComponentView &componentView) noexcept;
 
-#ifdef USE_EXPERIMENTAL_WINUI3
   CompositionDynamicAutomationProvider(
       const winrt::Microsoft::ReactNative::Composition::ComponentView &componentView,
       const winrt::Microsoft::UI::Content::ChildSiteLink &childContentLink) noexcept;
-#endif // USE_EXPERIMENTAL_WINUI3
 
   // inherited via IRawElementProviderFragment
   virtual HRESULT __stdcall Navigate(NavigateDirection direction, IRawElementProviderFragment **pRetVal) override;
@@ -52,6 +51,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;
@@ -93,10 +102,8 @@ class CompositionDynamicAutomationProvider : public winrt::implements<
   ::Microsoft::ReactNative::ReactTaggedView m_view;
   winrt::com_ptr<ITextProvider2> m_textProvider;
   std::vector<winrt::com_ptr<IRawElementProviderSimple>> m_selectionItems;
-#ifdef USE_EXPERIMENTAL_WINUI3
   // Non-null when this UIA node is the peer of a ContentIslandComponentView.
   winrt::Microsoft::UI::Content::ChildSiteLink m_childSiteLink{nullptr};
-#endif
 };
 
 } // namespace winrt::Microsoft::ReactNative::implementation