react-native-windows 0.75.3 → 0.75.5

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

@@ -58,10 +58,6 @@ struct CompositionReactViewInstance
   void UpdateRootView() noexcept;
   void UninitRootView() noexcept;
 
- private:
-  template <class TAction>
-  Mso::Future<void> PostInUIQueue(TAction &&action) noexcept;
-
  private:
   winrt::weak_ref<winrt::Microsoft::ReactNative::implementation::ReactNativeIsland> m_weakRootControl;
   IReactDispatcher m_uiDispatcher{nullptr};
@@ -102,44 +98,36 @@ void CompositionReactViewInstance::UninitRootView() noexcept {
   }
 }
 
-//===========================================================================
-// ReactViewInstance inline implementation
-//===========================================================================
-
-template <class TAction>
-inline Mso::Future<void> CompositionReactViewInstance::PostInUIQueue(TAction &&action) noexcept {
-  // ReactViewInstance has shorter lifetime than ReactRootControl. Thus, we capture this WeakPtr.
-  auto promise = Mso::Promise<void>();
-
-  m_uiDispatcher.Post([promise, weakThis{get_weak()}, action{std::forward<TAction>(action)}]() mutable {
-    if (auto strongThis = weakThis.get()) {
-      if (auto rootControl = strongThis->m_weakRootControl.get()) {
-        action(rootControl);
-        promise.SetValue();
-        return;
-      }
-    }
-    promise.TryCancel();
-  });
-
-  return promise.AsFuture();
-}
-
-void ApplyConstraints(
+void ReactNativeIsland::ApplyConstraints(
     const winrt::Microsoft::ReactNative::LayoutConstraints &layoutConstraintsIn,
-    facebook::react::LayoutConstraints &layoutConstraintsOut) noexcept {
+    facebook::react::LayoutConstraints &layoutConstraintsOut) const noexcept {
   layoutConstraintsOut.minimumSize = {layoutConstraintsIn.MinimumSize.Width, layoutConstraintsIn.MinimumSize.Height};
   layoutConstraintsOut.maximumSize = {layoutConstraintsIn.MaximumSize.Width, layoutConstraintsIn.MaximumSize.Height};
-  layoutConstraintsOut.layoutDirection =
-      static_cast<facebook::react::LayoutDirection>(layoutConstraintsIn.LayoutDirection);
+  if (layoutConstraintsIn.LayoutDirection == winrt::Microsoft::ReactNative::LayoutDirection::Undefined) {
+    if (m_island) {
+      layoutConstraintsOut.layoutDirection =
+          (m_island.LayoutDirection() == winrt::Microsoft::UI::Content::ContentLayoutDirection::LeftToRight)
+          ? facebook::react::LayoutDirection::LeftToRight
+          : facebook::react::LayoutDirection::RightToLeft;
+    } else if (m_hwnd) {
+      auto styles = GetWindowLongPtrW(m_hwnd, GWL_EXSTYLE);
+      layoutConstraintsOut.layoutDirection = ((styles & WS_EX_LAYOUTRTL) == WS_EX_LAYOUTRTL)
+          ? facebook::react::LayoutDirection::RightToLeft
+          : facebook::react::LayoutDirection::LeftToRight;
+    }
+  } else {
+    layoutConstraintsOut.layoutDirection =
+        static_cast<facebook::react::LayoutDirection>(layoutConstraintsIn.LayoutDirection);
+  }
 }
 
-ReactNativeIsland::ReactNativeIsland() noexcept {}
-
-#ifdef USE_WINUI3
 ReactNativeIsland::ReactNativeIsland(const winrt::Microsoft::UI::Composition::Compositor &compositor) noexcept
-    : m_compositor(compositor) {}
-#endif
+    : m_compositor(compositor),
+      m_layoutConstraints({{0, 0}, {0, 0}, winrt::Microsoft::ReactNative::LayoutDirection::Undefined}) {
+  InitTextScaleMultiplier();
+}
+
+ReactNativeIsland::ReactNativeIsland() noexcept : ReactNativeIsland(nullptr) {}
 
 ReactNativeIsland::~ReactNativeIsland() noexcept {
 #ifdef USE_WINUI3
@@ -275,6 +263,10 @@ void ReactNativeIsland::ScaleFactor(float value) noexcept {
   }
 }
 
+float ReactNativeIsland::FontSizeMultiplier() const noexcept {
+  return m_textScaleMultiplier;
+}
+
 int64_t ReactNativeIsland::RootTag() const noexcept {
   return m_rootTag;
 }
@@ -458,10 +450,9 @@ void ReactNativeIsland::UninitRootView() noexcept {
     uiManager->stopSurface(static_cast<facebook::react::SurfaceId>(RootTag()));
 
     // This is needed to ensure that the unmount JS logic is completed before the the instance is shutdown during
-    // instance destruction. Aligns with similar code in ReactInstanceWin::DetachRootView for paper Future: Instead this
-    // method should return a Promise, which should be resolved when the JS logic is complete.
-    // The task will auto set the event on destruction to ensure that the event is set if the JS Queue has already been
-    // shutdown
+    // instance destruction. Aligns with similar code in ReactInstanceWin::DetachRootView for paper Future: Instead
+    // this method should return a Promise, which should be resolved when the JS logic is complete. The task will auto
+    // set the event on destruction to ensure that the event is set if the JS Queue has already been shutdown
     Mso::ManualResetEvent mre;
     m_context.JSDispatcher().Post([autoMRE = std::make_unique<AutoMRE>(AutoMRE{mre})]() {});
     mre.Wait();
@@ -526,9 +517,8 @@ facebook::react::AttributedStringBox CreateLoadingAttributedString() noexcept {
   return facebook::react::AttributedStringBox{attributedString};
 }
 
-facebook::react::Size MeasureLoading(
-    const winrt::Microsoft::ReactNative::LayoutConstraints &layoutConstraints,
-    float scaleFactor) {
+facebook::react::Size ReactNativeIsland::MeasureLoading(
+    const winrt::Microsoft::ReactNative::LayoutConstraints &layoutConstraints) const noexcept {
   facebook::react::LayoutConstraints fbLayoutConstraints;
   ApplyConstraints(layoutConstraints, fbLayoutConstraints);
 
@@ -541,7 +531,7 @@ facebook::react::Size MeasureLoading(
   winrt::check_hresult(textLayout->GetMetrics(&tm));
 
   return fbLayoutConstraints.clamp(
-      {loadingActivityHorizontalOffset * scaleFactor + tm.width, loadingBarHeight * scaleFactor});
+      {loadingActivityHorizontalOffset * m_scaleFactor + tm.width, loadingBarHeight * m_scaleFactor});
 }
 
 winrt::event_token ReactNativeIsland::SizeChanged(
@@ -571,7 +561,7 @@ void ReactNativeIsland::NotifySizeChanged() noexcept {
   if (rootComponentView) {
     size = rootComponentView->layoutMetrics().frame.size;
   } else if (m_loadingVisual) {
-    size = MeasureLoading(m_layoutConstraints, m_scaleFactor);
+    size = MeasureLoading(m_layoutConstraints);
   }
 
   m_size = {size.width, size.height};
@@ -665,11 +655,34 @@ void ReactNativeIsland::ShowInstanceLoading() noexcept {
   InternalRootVisual().InsertAt(m_loadingVisual, m_hasRenderedVisual ? 1 : 0);
 }
 
+void ReactNativeIsland::InitTextScaleMultiplier() noexcept {
+  m_uiSettings = winrt::Windows::UI::ViewManagement::UISettings();
+  m_textScaleMultiplier = static_cast<float>(m_uiSettings.TextScaleFactor());
+  m_textScaleChangedRevoker = m_uiSettings.TextScaleFactorChanged(
+      winrt::auto_revoke,
+      [this](const winrt::Windows::UI::ViewManagement::UISettings &uiSettings, const winrt::IInspectable &) {
+        if (m_context) {
+          m_context.UIDispatcher().Post(
+              [wkThis = get_weak(), textScaleMultiplier = static_cast<float>(uiSettings.TextScaleFactor())]() {
+                if (auto strongThis = wkThis.get()) {
+                  strongThis->m_textScaleMultiplier = textScaleMultiplier;
+                  strongThis->Arrange(strongThis->m_layoutConstraints, strongThis->m_viewportOffset);
+                }
+              });
+        }
+      });
+}
+
 winrt::Windows::Foundation::Size ReactNativeIsland::Measure(
     const winrt::Microsoft::ReactNative::LayoutConstraints &layoutConstraints,
-    const winrt::Windows::Foundation::Point &viewportOffset) const noexcept {
+    const winrt::Windows::Foundation::Point &viewportOffset) const {
   facebook::react::Size size{0, 0};
 
+  if (layoutConstraints.LayoutDirection != winrt::Microsoft::ReactNative::LayoutDirection::LeftToRight &&
+      layoutConstraints.LayoutDirection != winrt::Microsoft::ReactNative::LayoutDirection::RightToLeft &&
+      layoutConstraints.LayoutDirection != winrt::Microsoft::ReactNative::LayoutDirection::Undefined)
+    winrt::throw_hresult(E_INVALIDARG);
+
   facebook::react::LayoutConstraints constraints;
   ApplyConstraints(layoutConstraints, constraints);
 
@@ -677,15 +690,14 @@ winrt::Windows::Foundation::Size ReactNativeIsland::Measure(
     if (auto fabricuiManager = ::Microsoft::ReactNative::FabricUIManager::FromProperties(
             winrt::Microsoft::ReactNative::ReactPropertyBag(m_context.Properties()))) {
       facebook::react::LayoutContext context;
-      // TODO scaling factor
+      context.fontSizeMultiplier = m_textScaleMultiplier;
       context.pointScaleFactor = static_cast<facebook::react::Float>(m_scaleFactor);
-      context.fontSizeMultiplier = static_cast<facebook::react::Float>(m_scaleFactor);
       context.viewportOffset = {viewportOffset.X, viewportOffset.Y};
 
       size = fabricuiManager->measureSurface(static_cast<facebook::react::SurfaceId>(m_rootTag), constraints, context);
     }
   } else if (m_loadingVisual) {
-    size = MeasureLoading(layoutConstraints, m_scaleFactor);
+    size = MeasureLoading(layoutConstraints);
   }
 
   auto clampedSize = constraints.clamp(size);
@@ -694,7 +706,12 @@ winrt::Windows::Foundation::Size ReactNativeIsland::Measure(
 
 void ReactNativeIsland::Arrange(
     const winrt::Microsoft::ReactNative::LayoutConstraints &layoutConstraints,
-    const winrt::Windows::Foundation::Point &viewportOffset) noexcept {
+    const winrt::Windows::Foundation::Point &viewportOffset) {
+  if (layoutConstraints.LayoutDirection != winrt::Microsoft::ReactNative::LayoutDirection::LeftToRight &&
+      layoutConstraints.LayoutDirection != winrt::Microsoft::ReactNative::LayoutDirection::RightToLeft &&
+      layoutConstraints.LayoutDirection != winrt::Microsoft::ReactNative::LayoutDirection::Undefined)
+    winrt::throw_hresult(E_INVALIDARG);
+
   m_layoutConstraints = layoutConstraints;
   m_viewportOffset = viewportOffset;
   facebook::react::LayoutConstraints fbLayoutConstraints;
@@ -704,8 +721,8 @@ void ReactNativeIsland::Arrange(
     if (auto fabricuiManager = ::Microsoft::ReactNative::FabricUIManager::FromProperties(
             winrt::Microsoft::ReactNative::ReactPropertyBag(m_context.Properties()))) {
       facebook::react::LayoutContext context;
+      context.fontSizeMultiplier = m_textScaleMultiplier;
       context.pointScaleFactor = static_cast<facebook::react::Float>(m_scaleFactor);
-      context.fontSizeMultiplier = static_cast<facebook::react::Float>(m_scaleFactor);
       context.viewportOffset = {viewportOffset.X, viewportOffset.Y};
 
       fabricuiManager->constraintSurfaceLayout(
@@ -713,12 +730,11 @@ void ReactNativeIsland::Arrange(
     }
   } else if (m_loadingVisual) {
     // TODO: Resize to align loading
-    auto s = fbLayoutConstraints.clamp(MeasureLoading(layoutConstraints, m_scaleFactor));
+    auto s = fbLayoutConstraints.clamp(MeasureLoading(layoutConstraints));
     NotifySizeChanged();
   }
 }
 
-#ifdef USE_WINUI3
 winrt::Microsoft::UI::Content::ContentIsland ReactNativeIsland::Island() {
   if (!m_compositor) {
     return nullptr;
@@ -772,6 +788,9 @@ winrt::Microsoft::UI::Content::ContentIsland ReactNativeIsland::Island() {
             if (args.DidRasterizationScaleChange()) {
               pThis->ScaleFactor(island.RasterizationScale());
             }
+            if (args.DidLayoutDirectionChange()) {
+              pThis->Arrange(pThis->m_layoutConstraints, pThis->m_viewportOffset);
+            }
 #ifndef USE_EXPERIMENTAL_WINUI3 // Use this in place of Connected/Disconnected events for now. -- Its not quite what we
                                 // want, but it will do for now.
             if (args.DidSiteVisibleChange()) {
@@ -804,7 +823,6 @@ winrt::Microsoft::UI::Content::ContentIsland ReactNativeIsland::Island() {
   }
   return m_island;
 }
-#endif
 
 void ReactNativeIsland::OnMounted() noexcept {
   if (m_mounted)

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

@@ -10,6 +10,7 @@
 #include <react/renderer/core/LayoutConstraints.h>
 #include <winrt/Microsoft.ReactNative.Composition.Experimental.h>
 #include <winrt/Microsoft.ReactNative.h>
+#include <winrt/Windows.UI.ViewManagement.h>
 #include "CompositionEventHandler.h"
 #include "ReactHost/React.h"
 
@@ -46,10 +47,8 @@ struct ReactNativeIsland
   ReactNativeIsland() noexcept;
   ~ReactNativeIsland() noexcept;
 
-#ifdef USE_WINUI3
   ReactNativeIsland(const winrt::Microsoft::UI::Composition::Compositor &compositor) noexcept;
   winrt::Microsoft::UI::Content::ContentIsland Island();
-#endif
 
   // property ReactViewHost
   ReactNative::IReactViewHost ReactViewHost() noexcept;
@@ -72,6 +71,8 @@ struct ReactNativeIsland
   float ScaleFactor() noexcept;
   void ScaleFactor(float value) noexcept;
 
+  float FontSizeMultiplier() const noexcept;
+
   winrt::event_token SizeChanged(
       winrt::Windows::Foundation::EventHandler<winrt::Microsoft::ReactNative::RootViewSizeChangedEventArgs> const
           &handler) noexcept;
@@ -90,10 +91,10 @@ struct ReactNativeIsland
 
   winrt::Windows::Foundation::Size Measure(
       const winrt::Microsoft::ReactNative::LayoutConstraints &layoutConstraints,
-      const winrt::Windows::Foundation::Point &viewportOffset) const noexcept;
+      const winrt::Windows::Foundation::Point &viewportOffset) const;
   void Arrange(
       const winrt::Microsoft::ReactNative::LayoutConstraints &layoutConstraints,
-      const winrt::Windows::Foundation::Point &viewportOffset) noexcept;
+      const winrt::Windows::Foundation::Point &viewportOffset);
 
   winrt::Microsoft::ReactNative::FocusNavigationResult NavigateFocus(
       const winrt::Microsoft::ReactNative::FocusNavigationRequest &request) noexcept;
@@ -143,6 +144,9 @@ struct ReactNativeIsland
   winrt::IInspectable m_uiaProvider{nullptr};
   int64_t m_rootTag{-1};
   float m_scaleFactor{1.0};
+  float m_textScaleMultiplier{1.0};
+  winrt::Windows::UI::ViewManagement::UISettings::TextScaleFactorChanged_revoker m_textScaleChangedRevoker;
+  winrt::Windows::UI::ViewManagement::UISettings m_uiSettings{nullptr};
   winrt::Windows::Foundation::Size m_size{0, 0};
   winrt::Microsoft::ReactNative::ReactContext m_context;
   winrt::Microsoft::ReactNative::IReactViewHost m_reactViewHost;
@@ -168,6 +172,12 @@ struct ReactNativeIsland
   void UpdateRootVisualSize() noexcept;
   void UpdateLoadingVisualSize() noexcept;
   Composition::Experimental::IDrawingSurfaceBrush CreateLoadingVisualBrush() noexcept;
+  void ApplyConstraints(
+      const winrt::Microsoft::ReactNative::LayoutConstraints &layoutConstraintsIn,
+      facebook::react::LayoutConstraints &layoutConstraintsOut) const noexcept;
+  facebook::react::Size MeasureLoading(
+      const winrt::Microsoft::ReactNative::LayoutConstraints &layoutConstraints) const noexcept;
+  void InitTextScaleMultiplier() noexcept;
 };
 
 } // namespace winrt::Microsoft::ReactNative::implementation

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

@@ -40,8 +40,8 @@ winrt::Microsoft::ReactNative::ComponentView RootComponentView::Create(
   return winrt::make<RootComponentView>(compContext, tag, reactContext);
 }
 
-RootComponentView *RootComponentView::rootComponentView() noexcept {
-  return this;
+RootComponentView *RootComponentView::rootComponentView() const noexcept {
+  return const_cast<RootComponentView *>(this);
 }
 
 void RootComponentView::updateLayoutMetrics(
@@ -91,12 +91,18 @@ bool RootComponentView::NavigateFocus(const winrt::Microsoft::ReactNative::Focus
       ? FocusManager::FindFirstFocusableElement(*this)
       : FocusManager::FindLastFocusableElement(*this);
   if (view) {
-    TrySetFocusedComponent(view);
+    TrySetFocusedComponent(
+        view,
+        request.Reason() == winrt::Microsoft::ReactNative::FocusNavigationReason::First
+            ? winrt::Microsoft::ReactNative::FocusNavigationDirection::First
+            : winrt::Microsoft::ReactNative::FocusNavigationDirection::Last);
   }
   return view != nullptr;
 }
 
-bool RootComponentView::TrySetFocusedComponent(const winrt::Microsoft::ReactNative::ComponentView &view) noexcept {
+bool RootComponentView::TrySetFocusedComponent(
+    const winrt::Microsoft::ReactNative::ComponentView &view,
+    winrt::Microsoft::ReactNative::FocusNavigationDirection direction) noexcept {
   auto target = view;
   auto selfView = winrt::get_self<winrt::Microsoft::ReactNative::implementation::ComponentView>(target);
   if (selfView && !selfView->focusable()) {
@@ -110,7 +116,7 @@ bool RootComponentView::TrySetFocusedComponent(const winrt::Microsoft::ReactNati
     return false;
 
   auto losingFocusArgs = winrt::make<winrt::Microsoft::ReactNative::implementation::LosingFocusEventArgs>(
-      target, m_focusedComponent, target);
+      target, direction, m_focusedComponent, target);
   if (m_focusedComponent) {
     winrt::get_self<winrt::Microsoft::ReactNative::implementation::ComponentView>(m_focusedComponent)
         ->onLosingFocus(losingFocusArgs);
@@ -118,7 +124,7 @@ bool RootComponentView::TrySetFocusedComponent(const winrt::Microsoft::ReactNati
 
   if (losingFocusArgs.NewFocusedComponent()) {
     auto gettingFocusArgs = winrt::make<winrt::Microsoft::ReactNative::implementation::GettingFocusEventArgs>(
-        target, m_focusedComponent, losingFocusArgs.NewFocusedComponent());
+        target, direction, m_focusedComponent, losingFocusArgs.NewFocusedComponent());
     winrt::get_self<winrt::Microsoft::ReactNative::implementation::ComponentView>(losingFocusArgs.NewFocusedComponent())
         ->onGettingFocus(gettingFocusArgs);
 
@@ -138,13 +144,16 @@ bool RootComponentView::TryMoveFocus(bool next) noexcept {
   }
 
   Mso::Functor<bool(const winrt::Microsoft::ReactNative::ComponentView &)> fn =
-      [currentlyFocused = m_focusedComponent](const winrt::Microsoft::ReactNative::ComponentView &view) noexcept {
+      [currentlyFocused = m_focusedComponent, next](const winrt::Microsoft::ReactNative::ComponentView &view) noexcept {
         if (view == currentlyFocused)
           return false;
 
         return winrt::get_self<winrt::Microsoft::ReactNative::implementation::ComponentView>(view)
             ->rootComponentView()
-            ->TrySetFocusedComponent(view);
+            ->TrySetFocusedComponent(
+                view,
+                next ? winrt::Microsoft::ReactNative::FocusNavigationDirection::Next
+                     : winrt::Microsoft::ReactNative::FocusNavigationDirection::Previous);
       };
 
   return winrt::Microsoft::ReactNative::implementation::walkTree(m_focusedComponent, next, fn);
@@ -202,6 +211,15 @@ winrt::IInspectable RootComponentView::UiaProviderFromPoint(const POINT &ptPixel
   return winrt::get_self<winrt::Microsoft::ReactNative::implementation::ComponentView>(view)->EnsureUiaProvider();
 }
 
+float RootComponentView::FontSizeMultiplier() const noexcept {
+  if (auto rootView = m_wkRootView.get()) {
+    return winrt::get_self<winrt::Microsoft::ReactNative::implementation::ReactNativeIsland>(rootView)
+        ->FontSizeMultiplier();
+  }
+  assert(false);
+  return 1.0f;
+}
+
 winrt::Microsoft::UI::Content::ContentIsland RootComponentView::parentContentIsland() noexcept {
   if (auto rootView = m_wkRootView.get()) {
     return winrt::get_self<winrt::Microsoft::ReactNative::implementation::ReactNativeIsland>(rootView)->Island();

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

@@ -28,13 +28,15 @@ struct RootComponentView : RootComponentViewT<RootComponentView, ViewComponentVi
 
   winrt::Microsoft::ReactNative::ComponentView GetFocusedComponent() noexcept;
   void SetFocusedComponent(const winrt::Microsoft::ReactNative::ComponentView &value) noexcept;
-  bool TrySetFocusedComponent(const winrt::Microsoft::ReactNative::ComponentView &view) noexcept;
+  bool TrySetFocusedComponent(
+      const winrt::Microsoft::ReactNative::ComponentView &view,
+      winrt::Microsoft::ReactNative::FocusNavigationDirection direction) noexcept;
 
   bool NavigateFocus(const winrt::Microsoft::ReactNative::FocusNavigationRequest &request) noexcept;
 
   bool TryMoveFocus(bool next) noexcept;
 
-  RootComponentView *rootComponentView() noexcept override;
+  RootComponentView *rootComponentView() const noexcept override;
 
   winrt::Microsoft::UI::Content::ContentIsland parentContentIsland() noexcept;
 
@@ -44,6 +46,7 @@ struct RootComponentView : RootComponentViewT<RootComponentView, ViewComponentVi
 
   HRESULT GetFragmentRoot(IRawElementProviderFragmentRoot **pRetVal) noexcept;
   winrt::Microsoft::ReactNative::implementation::ClipState getClipState() noexcept override;
+  float FontSizeMultiplier() const noexcept;
 
   void updateLayoutMetrics(
       facebook::react::LayoutMetrics const &layoutMetrics,

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

@@ -749,6 +749,10 @@ void ScrollViewComponentView::updateProps(
     m_horizontalScrollbarComponent->UpdateColorForScrollBarRegions();
     m_verticalScrollbarComponent->UpdateColorForScrollBarRegions();
   }
+
+  if (!oldProps || oldViewProps.horizontal != newViewProps.horizontal) {
+    m_scrollVisual.Horizontal(newViewProps.horizontal);
+  }
 }
 
 void ScrollViewComponentView::updateState(
@@ -886,6 +890,12 @@ void ScrollViewComponentView::OnPointerPressed(
   m_verticalScrollbarComponent->OnPointerPressed(args);
   m_horizontalScrollbarComponent->OnPointerPressed(args);
   Super::OnPointerPressed(args);
+
+  if (!args.Handled()) {
+    auto f = args.Pointer();
+    auto g = f.PointerDeviceType();
+    m_scrollVisual.OnPointerPressed(args);
+  }
 }
 
 void ScrollViewComponentView::OnPointerReleased(
@@ -1045,13 +1055,16 @@ bool ScrollViewComponentView::scrollRight(float delta, bool animate) noexcept {
   return true;
 }
 
-void ScrollViewComponentView::HandleCommand(
-    winrt::hstring commandName,
-    const winrt::Microsoft::ReactNative::IJSValueReader &args) noexcept {
+void ScrollViewComponentView::HandleCommand(const winrt::Microsoft::ReactNative::HandleCommandArgs &args) noexcept {
+  Super::HandleCommand(args);
+  if (args.Handled())
+    return;
+
+  auto commandName = args.CommandName();
   if (commandName == L"scrollTo") {
     double x, y;
     bool animate;
-    winrt::Microsoft::ReactNative::ReadArgs(args, x, y, animate);
+    winrt::Microsoft::ReactNative::ReadArgs(args.CommandArgs(), x, y, animate);
     scrollTo(
         {static_cast<float>(x) * m_layoutMetrics.pointScaleFactor,
          static_cast<float>(y) * m_layoutMetrics.pointScaleFactor,
@@ -1061,12 +1074,10 @@ void ScrollViewComponentView::HandleCommand(
     // No-op for now
   } else if (commandName == L"scrollToEnd") {
     bool animate;
-    winrt::Microsoft::ReactNative::ReadArgs(args, animate);
+    winrt::Microsoft::ReactNative::ReadArgs(args.CommandArgs(), animate);
     scrollToEnd(animate);
   } else if (commandName == L"zoomToRect") {
     // No-op for now
-  } else {
-    Super::HandleCommand(commandName, args);
   }
 }
 

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

@@ -74,8 +74,7 @@ struct ScrollInteractionTrackerOwner : public winrt::implements<
   void prepareForRecycle() noexcept override;
   void OnKeyDown(const winrt::Microsoft::ReactNative::Composition::Input::KeyRoutedEventArgs &args) noexcept override;
 
-  void HandleCommand(winrt::hstring commandName, const winrt::Microsoft::ReactNative::IJSValueReader &args) noexcept
-      override;
+  void HandleCommand(const winrt::Microsoft::ReactNative::HandleCommandArgs &args) noexcept override;
   facebook::react::Tag hitTest(facebook::react::Point pt, facebook::react::Point &localPt, bool ignorePointerEvents)
       const noexcept override;
   facebook::react::Point getClientOffset() const noexcept override;

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

@@ -56,14 +56,14 @@ void SwitchComponentView::UnmountChildComponentView(
   base_type::UnmountChildComponentView(childComponentView, index);
 }
 
-void SwitchComponentView::HandleCommand(
-    winrt::hstring commandName,
-    const winrt::Microsoft::ReactNative::IJSValueReader &args) noexcept {
+void SwitchComponentView::HandleCommand(const winrt::Microsoft::ReactNative::HandleCommandArgs &args) noexcept {
+  Super::HandleCommand(args);
+  if (args.Handled())
+    return;
+  auto commandName = args.CommandName();
   if (commandName == L"setValue") {
     // TODO - Current implementation always aligns with JS value
     // This will be needed when we move to using WinUI controls
-  } else {
-    Super::HandleCommand(commandName, args);
   }
 }
 
@@ -261,7 +261,7 @@ void SwitchComponentView::OnPointerPressed(
     m_supressAnimationForNextFrame = true;
 
     if (auto root = rootComponentView()) {
-      root->TrySetFocusedComponent(*get_strong());
+      root->TrySetFocusedComponent(*get_strong(), winrt::Microsoft::ReactNative::FocusNavigationDirection::None);
     }
 
     updateVisuals();

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

@@ -27,8 +27,7 @@ struct SwitchComponentView : SwitchComponentViewT<SwitchComponentView, ViewCompo
   void UnmountChildComponentView(
       const winrt::Microsoft::ReactNative::ComponentView &childComponentView,
       uint32_t index) noexcept override;
-  void HandleCommand(winrt::hstring commandName, const winrt::Microsoft::ReactNative::IJSValueReader &args) noexcept
-      override;
+  void HandleCommand(const winrt::Microsoft::ReactNative::HandleCommandArgs &args) noexcept override;
   void updateProps(facebook::react::Props::Shared const &props, facebook::react::Props::Shared const &oldProps) noexcept
       override;
   void updateState(facebook::react::State::Shared const &state, facebook::react::State::Shared const &oldState) noexcept