react-native-windows 0.74.20 → 0.74.22

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

@@ -42,7 +42,7 @@ struct ScrollBarComponent {
       const winrt::Microsoft::ReactNative::Composition::Experimental::ICompositionContext &compContext,
       winrt::Microsoft::ReactNative::ReactContext const &reactContext,
       bool vertical)
-      : m_outer(outer), m_compContext(compContext), m_reactContext(reactContext), m_vertical(vertical) {
+      : m_wkOuter(outer), m_compContext(compContext), m_reactContext(reactContext), m_vertical(vertical) {
     m_rootVisual = m_compContext.CreateSpriteVisual();
     m_trackVisual = m_compContext.CreateRoundedRectangleVisual();
     m_thumbVisual = m_compContext.CreateRoundedRectangleVisual();
@@ -73,9 +73,11 @@ struct ScrollBarComponent {
     updateHighlight(ScrollbarHitRegion::ArrowLast);
     updateHighlight(ScrollbarHitRegion::Thumb);
 
-    m_trackVisual.Brush(
-        winrt::get_self<winrt::Microsoft::ReactNative::Composition::implementation::Theme>(m_outer.Theme())
-            ->InternalPlatformBrush(L"ScrollBarTrackFill"));
+    if (auto outer = m_wkOuter.get()) {
+      m_trackVisual.Brush(
+          winrt::get_self<winrt::Microsoft::ReactNative::Composition::implementation::Theme>(outer.Theme())
+              ->InternalPlatformBrush(L"ScrollBarTrackFill"));
+    }
   }
 
   void ContentSize(winrt::Windows::Foundation::Size contentSize) noexcept {
@@ -293,19 +295,21 @@ struct ScrollBarComponent {
   }
 
   void OnPointerReleased(const winrt::Microsoft::ReactNative::Composition::Input::PointerRoutedEventArgs &args) {
-    if (!m_visible)
-      return;
-    auto pt = args.GetCurrentPoint(m_outer.Tag());
-    if (m_nTrackInputOffset != -1 &&
-        pt.PointerDeviceType() == winrt::Microsoft::ReactNative::Composition::Input::PointerDeviceType::Mouse &&
-        pt.Properties().PointerUpdateKind() ==
-            winrt::Microsoft::ReactNative::Composition::Input::PointerUpdateKind::LeftButtonReleased) {
-      handleMoveThumb(args);
-      stopTrackingThumb();
-      m_outer.ReleasePointerCapture(args.Pointer());
-
-      auto reg = HitTest(pt.Position());
-      updateShy(reg == ScrollbarHitRegion::Unknown);
+    if (auto outer = m_wkOuter.get()) {
+      if (!m_visible)
+        return;
+      auto pt = args.GetCurrentPoint(outer.Tag());
+      if (m_nTrackInputOffset != -1 &&
+          pt.PointerDeviceType() == winrt::Microsoft::ReactNative::Composition::Input::PointerDeviceType::Mouse &&
+          pt.Properties().PointerUpdateKind() ==
+              winrt::Microsoft::ReactNative::Composition::Input::PointerUpdateKind::LeftButtonReleased) {
+        handleMoveThumb(args);
+        stopTrackingThumb();
+        outer.ReleasePointerCapture(args.Pointer());
+
+        auto reg = HitTest(pt.Position());
+        updateShy(reg == ScrollbarHitRegion::Unknown);
+      }
     }
   }
 
@@ -318,78 +322,85 @@ struct ScrollBarComponent {
   }
 
   void handleMoveThumb(const winrt::Microsoft::ReactNative::Composition::Input::PointerRoutedEventArgs &args) {
-    auto pt = args.GetCurrentPoint(m_outer.Tag());
-    auto pos = pt.Position();
-
-    auto newTrackingPosition = static_cast<int>((m_vertical ? pos.Y : pos.X) * m_scaleFactor) - m_nTrackInputOffset;
-    winrt::get_self<ScrollViewComponentView>(m_outer)->scrollTo(
-        m_vertical ? winrt::Windows::Foundation::Numerics::
-                         float3{m_offset.x, scrollOffsetFromThumbPos(newTrackingPosition), m_offset.z}
-                   : winrt::Windows::Foundation::Numerics::
-                         float3{scrollOffsetFromThumbPos(newTrackingPosition), m_offset.y, m_offset.z},
-        false);
+    if (auto outer = m_wkOuter.get()) {
+      auto pt = args.GetCurrentPoint(outer.Tag());
+      auto pos = pt.Position();
+
+      auto newTrackingPosition = static_cast<int>((m_vertical ? pos.Y : pos.X) * m_scaleFactor) - m_nTrackInputOffset;
+      winrt::get_self<ScrollViewComponentView>(outer)->scrollTo(
+          m_vertical ? winrt::Windows::Foundation::Numerics::
+                           float3{m_offset.x, scrollOffsetFromThumbPos(newTrackingPosition), m_offset.z}
+                     : winrt::Windows::Foundation::Numerics::
+                           float3{scrollOffsetFromThumbPos(newTrackingPosition), m_offset.y, m_offset.z},
+          false);
+    }
     args.Handled(true);
   }
 
   void OnPointerPressed(const winrt::Microsoft::ReactNative::Composition::Input::PointerRoutedEventArgs &args) {
-    if (!m_visible)
-      return;
-    auto pt = args.GetCurrentPoint(m_outer.Tag());
-    if (pt.PointerDeviceType() == winrt::Microsoft::ReactNative::Composition::Input::PointerDeviceType::Mouse) {
-      auto pos = pt.Position();
-      auto reg = HitTest(pos);
+    if (auto outer = m_wkOuter.get()) {
+      if (!m_visible)
+        return;
+      auto pt = args.GetCurrentPoint(outer.Tag());
+      if (pt.PointerDeviceType() == winrt::Microsoft::ReactNative::Composition::Input::PointerDeviceType::Mouse) {
+        auto pos = pt.Position();
+        auto reg = HitTest(pos);
 
-      switch (reg) {
-        case ScrollbarHitRegion::ArrowFirst:
-          if (m_vertical) {
-            winrt::get_self<ScrollViewComponentView>(m_outer)->lineUp(false);
-          } else {
-            winrt::get_self<ScrollViewComponentView>(m_outer)->lineLeft(false);
-          }
-          args.Handled(true);
-          break;
-        case ScrollbarHitRegion::ArrowLast:
-          if (m_vertical) {
-            winrt::get_self<ScrollViewComponentView>(m_outer)->lineDown(false);
-          } else {
-            winrt::get_self<ScrollViewComponentView>(m_outer)->lineRight(false);
-          }
-          args.Handled(true);
-          break;
-        case ScrollbarHitRegion::PageUp:
-          if (m_vertical) {
-            winrt::get_self<ScrollViewComponentView>(m_outer)->pageUp(false);
-          }
-          args.Handled(true);
-          break;
-        case ScrollbarHitRegion::PageDown:
-          if (m_vertical) {
-            winrt::get_self<ScrollViewComponentView>(m_outer)->pageDown(false);
+        switch (reg) {
+          case ScrollbarHitRegion::ArrowFirst:
+            if (m_vertical) {
+              winrt::get_self<ScrollViewComponentView>(outer)->lineUp(false);
+            } else {
+              winrt::get_self<ScrollViewComponentView>(outer)->lineLeft(false);
+            }
+            args.Handled(true);
+            break;
+          case ScrollbarHitRegion::ArrowLast:
+            if (m_vertical) {
+              winrt::get_self<ScrollViewComponentView>(outer)->lineDown(false);
+            } else {
+              winrt::get_self<ScrollViewComponentView>(outer)->lineRight(false);
+            }
+            args.Handled(true);
+            break;
+          case ScrollbarHitRegion::PageUp:
+            if (m_vertical) {
+              winrt::get_self<ScrollViewComponentView>(outer)->pageUp(false);
+            }
+            args.Handled(true);
+            break;
+          case ScrollbarHitRegion::PageDown:
+            if (m_vertical) {
+              winrt::get_self<ScrollViewComponentView>(outer)->pageDown(false);
+            }
+            args.Handled(true);
+            break;
+          case ScrollbarHitRegion::Thumb: {
+            outer.CapturePointer(args.Pointer());
+            m_nTrackInputOffset = static_cast<int>((m_vertical ? pos.Y : pos.X) * m_scaleFactor) - m_thumbPos;
+            m_thumbVisual.AnimationClass(
+                winrt::Microsoft::ReactNative::Composition::Experimental::AnimationClass::None);
+            handleMoveThumb(args);
           }
-          args.Handled(true);
-          break;
-        case ScrollbarHitRegion::Thumb: {
-          m_outer.CapturePointer(args.Pointer());
-          m_nTrackInputOffset = static_cast<int>((m_vertical ? pos.Y : pos.X) * m_scaleFactor) - m_thumbPos;
-          m_thumbVisual.AnimationClass(winrt::Microsoft::ReactNative::Composition::Experimental::AnimationClass::None);
-          handleMoveThumb(args);
         }
       }
     }
   }
 
   void OnPointerMoved(const winrt::Microsoft::ReactNative::Composition::Input::PointerRoutedEventArgs &args) {
-    if (!m_visible)
-      return;
-    auto pt = args.GetCurrentPoint(m_outer.Tag());
-    if (pt.PointerDeviceType() == winrt::Microsoft::ReactNative::Composition::Input::PointerDeviceType::Mouse) {
-      if (m_nTrackInputOffset != -1) {
-        handleMoveThumb(args);
-      } else {
-        auto pos = pt.Position();
-        auto reg = HitTest(pos);
-        updateShy(reg == ScrollbarHitRegion::Unknown);
-        setHighlightedRegion(reg);
+    if (auto outer = m_wkOuter.get()) {
+      if (!m_visible)
+        return;
+      auto pt = args.GetCurrentPoint(outer.Tag());
+      if (pt.PointerDeviceType() == winrt::Microsoft::ReactNative::Composition::Input::PointerDeviceType::Mouse) {
+        if (m_nTrackInputOffset != -1) {
+          handleMoveThumb(args);
+        } else {
+          auto pos = pt.Position();
+          auto reg = HitTest(pos);
+          updateShy(reg == ScrollbarHitRegion::Unknown);
+          setHighlightedRegion(reg);
+        }
       }
     }
   }
@@ -427,122 +438,126 @@ struct ScrollBarComponent {
 
   // Renders the text into our composition surface
   void drawArrow(ScrollbarHitRegion region, bool disabled, bool hovered) noexcept {
-    auto &drawingSurface =
-        (region == ScrollbarHitRegion::ArrowFirst) ? m_arrowFirstDrawingSurface : m_arrowLastDrawingSurface;
-    if (!drawingSurface) {
-      drawingSurface = m_compContext.CreateDrawingSurfaceBrush(
-          {m_arrowSize, m_arrowSize},
-          winrt::Windows::Graphics::DirectX::DirectXPixelFormat::B8G8R8A8UIntNormalized,
-          winrt::Windows::Graphics::DirectX::DirectXAlphaMode::Premultiplied);
-    }
+    if (auto outer = m_wkOuter.get()) {
+      auto &drawingSurface =
+          (region == ScrollbarHitRegion::ArrowFirst) ? m_arrowFirstDrawingSurface : m_arrowLastDrawingSurface;
+      if (!drawingSurface) {
+        drawingSurface = m_compContext.CreateDrawingSurfaceBrush(
+            {m_arrowSize, m_arrowSize},
+            winrt::Windows::Graphics::DirectX::DirectXPixelFormat::B8G8R8A8UIntNormalized,
+            winrt::Windows::Graphics::DirectX::DirectXAlphaMode::Premultiplied);
+      }
 
-    if (winrt::get_self<ScrollViewComponentView>(m_outer)->theme()->IsEmpty()) {
-      return;
-    }
+      if (winrt::get_self<ScrollViewComponentView>(outer)->theme()->IsEmpty()) {
+        return;
+      }
 
-    winrt::com_ptr<IDWriteTextFormat> spTextFormat;
-    winrt::check_hresult(::Microsoft::ReactNative::DWriteFactory()->CreateTextFormat(
-        L"Segoe Fluent Icons",
-        nullptr, // Font collection (nullptr sets it to use the system font collection).
-        DWRITE_FONT_WEIGHT_REGULAR,
-        DWRITE_FONT_STYLE_NORMAL,
-        DWRITE_FONT_STRETCH_NORMAL,
-        8, //  Xaml resource: ScrollBarButtonArrowIconFontSize
-        L"",
-        spTextFormat.put()));
-
-    winrt::check_hresult(spTextFormat->SetTextAlignment(DWRITE_TEXT_ALIGNMENT_CENTER));
-
-    winrt::com_ptr<IDWriteTextLayout> spTextLayout;
-    winrt::check_hresult(::Microsoft::ReactNative::DWriteFactory()->CreateTextLayout(
-        m_vertical ? ((region == ScrollbarHitRegion::ArrowFirst) ? L"\uEDDB" : L"\uEDDC")
-                   : ((region == ScrollbarHitRegion::ArrowFirst) ? L"\uEDD9" : L"\uEDDA"),
-        1, // The length of the string.
-        spTextFormat.get(), // The text format to apply to the string (contains font information, etc).
-        (m_arrowSize / m_scaleFactor), // The width of the layout box.
-        (m_arrowSize / m_scaleFactor), // The height of the layout box.
-        spTextLayout.put() // The IDWriteTextLayout interface pointer.
-        ));
-
-    POINT offset;
-    {
-      ::Microsoft::ReactNative::Composition::AutoDrawDrawingSurface autoDraw(drawingSurface, m_scaleFactor, &offset);
-      if (auto d2dDeviceContext = autoDraw.GetRenderTarget()) {
-        d2dDeviceContext->Clear(D2D1::ColorF(D2D1::ColorF::Black, 0.0f));
-        assert(d2dDeviceContext->GetUnitMode() == D2D1_UNIT_MODE_DIPS);
-
-        // Create a solid color brush for the text. A more sophisticated application might want
-        // to cache and reuse a brush across all text elements instead, taking care to recreate
-        // it in the event of device removed.
-        winrt::com_ptr<ID2D1SolidColorBrush> brush;
-
-        D2D1::ColorF color{0};
-        if (disabled) {
-          color = winrt::get_self<ScrollViewComponentView>(m_outer)->theme()->D2DPlatformColor(
-              "ScrollBarButtonArrowForegroundDisabled");
-        } else if (hovered) {
-          color = winrt::get_self<ScrollViewComponentView>(m_outer)->theme()->D2DPlatformColor(
-              "ScrollBarButtonArrowForegroundPointerOver");
-        } else {
-          color = winrt::get_self<ScrollViewComponentView>(m_outer)->theme()->D2DPlatformColor(
-              "ScrollBarButtonArrowForeground");
-        }
-        winrt::check_hresult(d2dDeviceContext->CreateSolidColorBrush(color, brush.put()));
+      winrt::com_ptr<IDWriteTextFormat> spTextFormat;
+      winrt::check_hresult(::Microsoft::ReactNative::DWriteFactory()->CreateTextFormat(
+          L"Segoe Fluent Icons",
+          nullptr, // Font collection (nullptr sets it to use the system font collection).
+          DWRITE_FONT_WEIGHT_REGULAR,
+          DWRITE_FONT_STYLE_NORMAL,
+          DWRITE_FONT_STRETCH_NORMAL,
+          8, //  Xaml resource: ScrollBarButtonArrowIconFontSize
+          L"",
+          spTextFormat.put()));
+
+      winrt::check_hresult(spTextFormat->SetTextAlignment(DWRITE_TEXT_ALIGNMENT_CENTER));
+
+      winrt::com_ptr<IDWriteTextLayout> spTextLayout;
+      winrt::check_hresult(::Microsoft::ReactNative::DWriteFactory()->CreateTextLayout(
+          m_vertical ? ((region == ScrollbarHitRegion::ArrowFirst) ? L"\uEDDB" : L"\uEDDC")
+                     : ((region == ScrollbarHitRegion::ArrowFirst) ? L"\uEDD9" : L"\uEDDA"),
+          1, // The length of the string.
+          spTextFormat.get(), // The text format to apply to the string (contains font information, etc).
+          (m_arrowSize / m_scaleFactor), // The width of the layout box.
+          (m_arrowSize / m_scaleFactor), // The height of the layout box.
+          spTextLayout.put() // The IDWriteTextLayout interface pointer.
+          ));
+
+      POINT offset;
+      {
+        ::Microsoft::ReactNative::Composition::AutoDrawDrawingSurface autoDraw(drawingSurface, m_scaleFactor, &offset);
+        if (auto d2dDeviceContext = autoDraw.GetRenderTarget()) {
+          d2dDeviceContext->Clear(D2D1::ColorF(D2D1::ColorF::Black, 0.0f));
+          assert(d2dDeviceContext->GetUnitMode() == D2D1_UNIT_MODE_DIPS);
+
+          // Create a solid color brush for the text. A more sophisticated application might want
+          // to cache and reuse a brush across all text elements instead, taking care to recreate
+          // it in the event of device removed.
+          winrt::com_ptr<ID2D1SolidColorBrush> brush;
+
+          D2D1::ColorF color{0};
+          if (disabled) {
+            color = winrt::get_self<ScrollViewComponentView>(outer)->theme()->D2DPlatformColor(
+                "ScrollBarButtonArrowForegroundDisabled");
+          } else if (hovered) {
+            color = winrt::get_self<ScrollViewComponentView>(outer)->theme()->D2DPlatformColor(
+                "ScrollBarButtonArrowForegroundPointerOver");
+          } else {
+            color = winrt::get_self<ScrollViewComponentView>(outer)->theme()->D2DPlatformColor(
+                "ScrollBarButtonArrowForeground");
+          }
+          winrt::check_hresult(d2dDeviceContext->CreateSolidColorBrush(color, brush.put()));
 
-        {
-          DWRITE_TEXT_METRICS dtm{};
-          winrt::check_hresult(spTextLayout->GetMetrics(&dtm));
-          offset.y += static_cast<int>((m_arrowSize - dtm.height) / 2.0f);
-        }
+          {
+            DWRITE_TEXT_METRICS dtm{};
+            winrt::check_hresult(spTextLayout->GetMetrics(&dtm));
+            offset.y += static_cast<int>((m_arrowSize - dtm.height) / 2.0f);
+          }
 
-        // Draw the line of text at the specified offset, which corresponds to the top-left
-        // corner of our drawing surface. Notice we don't call BeginDraw on the D2D device
-        // context; this has already been done for us by the composition API.
-        d2dDeviceContext->DrawTextLayout(
-            D2D1::Point2F(
-                static_cast<FLOAT>((offset.x) / m_scaleFactor), static_cast<FLOAT>((offset.y) / m_scaleFactor)),
-            spTextLayout.get(),
-            brush.get(),
-            D2D1_DRAW_TEXT_OPTIONS_ENABLE_COLOR_FONT);
+          // Draw the line of text at the specified offset, which corresponds to the top-left
+          // corner of our drawing surface. Notice we don't call BeginDraw on the D2D device
+          // context; this has already been done for us by the composition API.
+          d2dDeviceContext->DrawTextLayout(
+              D2D1::Point2F(
+                  static_cast<FLOAT>((offset.x) / m_scaleFactor), static_cast<FLOAT>((offset.y) / m_scaleFactor)),
+              spTextLayout.get(),
+              brush.get(),
+              D2D1_DRAW_TEXT_OPTIONS_ENABLE_COLOR_FONT);
+        }
+      }
+      if (drawingSurface) {
+        drawingSurface.HorizontalAlignmentRatio(0.0f);
+        drawingSurface.VerticalAlignmentRatio(0.0f);
+        drawingSurface.Stretch(winrt::Microsoft::ReactNative::Composition::Experimental::CompositionStretch::None);
       }
-    }
-    if (drawingSurface) {
-      drawingSurface.HorizontalAlignmentRatio(0.0f);
-      drawingSurface.VerticalAlignmentRatio(0.0f);
-      drawingSurface.Stretch(winrt::Microsoft::ReactNative::Composition::Experimental::CompositionStretch::None);
-    }
 
-    auto &arrowVisual = (region == ScrollbarHitRegion::ArrowFirst) ? m_arrowVisualFirst : m_arrowVisualLast;
-    arrowVisual.Brush(drawingSurface);
+      auto &arrowVisual = (region == ScrollbarHitRegion::ArrowFirst) ? m_arrowVisualFirst : m_arrowVisualLast;
+      arrowVisual.Brush(drawingSurface);
+    }
   }
 
   void updateHighlight(ScrollbarHitRegion region) noexcept {
-    switch (region) {
-      case ScrollbarHitRegion::ArrowFirst:
-      case ScrollbarHitRegion::ArrowLast: {
-        auto disabled = !std::static_pointer_cast<const facebook::react::ScrollViewProps>(
-                             winrt::get_self<ScrollViewComponentView>(m_outer)->viewProps())
-                             ->scrollEnabled;
-        drawArrow(region, disabled, m_highlightedRegion == region);
-      }
-      case ScrollbarHitRegion::Thumb: {
-        if (!std::static_pointer_cast<const facebook::react::ScrollViewProps>(
-                 winrt::get_self<ScrollViewComponentView>(m_outer)->viewProps())
-                 ->scrollEnabled) {
-          m_thumbVisual.Brush(
-              winrt::get_self<Theme>(m_outer.Theme())->InternalPlatformBrush(L"ScrollBarThumbFillDisabled"));
-        } else if (m_highlightedRegion == region) {
-          m_thumbVisual.Brush(
-              winrt::get_self<Theme>(m_outer.Theme())->InternalPlatformBrush(L"ScrollBarThumbFillPointerOver"));
-        } else {
-          m_thumbVisual.Brush(winrt::get_self<Theme>(m_outer.Theme())->InternalPlatformBrush(L"ScrollBarThumbFill"));
+    if (auto outer = m_wkOuter.get()) {
+      switch (region) {
+        case ScrollbarHitRegion::ArrowFirst:
+        case ScrollbarHitRegion::ArrowLast: {
+          auto disabled = !std::static_pointer_cast<const facebook::react::ScrollViewProps>(
+                               winrt::get_self<ScrollViewComponentView>(outer)->viewProps())
+                               ->scrollEnabled;
+          drawArrow(region, disabled, m_highlightedRegion == region);
+        }
+        case ScrollbarHitRegion::Thumb: {
+          if (!std::static_pointer_cast<const facebook::react::ScrollViewProps>(
+                   winrt::get_self<ScrollViewComponentView>(outer)->viewProps())
+                   ->scrollEnabled) {
+            m_thumbVisual.Brush(
+                winrt::get_self<Theme>(outer.Theme())->InternalPlatformBrush(L"ScrollBarThumbFillDisabled"));
+          } else if (m_highlightedRegion == region) {
+            m_thumbVisual.Brush(
+                winrt::get_self<Theme>(outer.Theme())->InternalPlatformBrush(L"ScrollBarThumbFillPointerOver"));
+          } else {
+            m_thumbVisual.Brush(winrt::get_self<Theme>(outer.Theme())->InternalPlatformBrush(L"ScrollBarThumbFill"));
+          }
         }
       }
     }
   }
 
  private:
-  winrt::Microsoft::ReactNative::Composition::ScrollViewComponentView m_outer;
+  winrt::weak_ref<winrt::Microsoft::ReactNative::Composition::ScrollViewComponentView> m_wkOuter;
   winrt::Microsoft::ReactNative::Composition::Experimental::ICompositionContext m_compContext;
   winrt::Microsoft::ReactNative::ReactContext m_reactContext;
   const bool m_vertical;
@@ -593,8 +608,7 @@ ScrollViewComponentView::ScrollViewComponentView(
           compContext,
           tag,
           reactContext,
-          ComponentViewFeatures::Default & ~ComponentViewFeatures::Background,
-          false) {
+          ComponentViewFeatures::Default & ~ComponentViewFeatures::Background) {
   // m_element.Content(m_contentPanel);
 
   /*
@@ -872,6 +886,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(
@@ -895,7 +915,6 @@ void ScrollViewComponentView::OnPointerCaptureLost() noexcept {
 }
 
 void ScrollViewComponentView::OnKeyDown(
-    const winrt::Microsoft::ReactNative::Composition::Input::KeyboardSource &source,
     const winrt::Microsoft::ReactNative::Composition::Input::KeyRoutedEventArgs &args) noexcept {
   switch (args.Key()) {
     case winrt::Windows::System::VirtualKey::End:
@@ -924,7 +943,7 @@ void ScrollViewComponentView::OnKeyDown(
       break;
   }
 
-  base_type::OnKeyDown(source, args);
+  base_type::OnKeyDown(args);
 }
 
 bool ScrollViewComponentView::scrollToEnd(bool animate) noexcept {
@@ -1032,13 +1051,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,
@@ -1048,12 +1070,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

@@ -72,12 +72,9 @@ struct ScrollInteractionTrackerOwner : public winrt::implements<
       facebook::react::LayoutMetrics const &layoutMetrics,
       facebook::react::LayoutMetrics const &oldLayoutMetrics) noexcept override;
   void prepareForRecycle() noexcept override;
-  void OnKeyDown(
-      const winrt::Microsoft::ReactNative::Composition::Input::KeyboardSource &source,
-      const winrt::Microsoft::ReactNative::Composition::Input::KeyRoutedEventArgs &args) 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

@@ -33,8 +33,7 @@ SwitchComponentView::SwitchComponentView(
           compContext,
           tag,
           reactContext,
-          ComponentViewFeatures::Default & ~ComponentViewFeatures::Background,
-          false) {}
+          ComponentViewFeatures::Default & ~ComponentViewFeatures::Background) {}
 
 winrt::Microsoft::ReactNative::ComponentView SwitchComponentView::Create(
     const winrt::Microsoft::ReactNative::Composition::Experimental::ICompositionContext &compContext,
@@ -57,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);
   }
 }
 
@@ -262,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();
@@ -304,14 +303,13 @@ void SwitchComponentView::OnPointerExited(
 }
 
 void SwitchComponentView::OnKeyUp(
-    const winrt::Microsoft::ReactNative::Composition::Input::KeyboardSource &source,
     const winrt::Microsoft::ReactNative::Composition::Input::KeyRoutedEventArgs &args) noexcept {
   if (args.Key() == winrt::Windows::System::VirtualKey::Space) {
     if (toggle()) {
       args.Handled(true);
     }
   }
-  Super::OnKeyUp(source, args);
+  Super::OnKeyUp(args);
 }
 
 bool SwitchComponentView::toggle() noexcept {
@@ -341,4 +339,18 @@ const facebook::react::SwitchProps &SwitchComponentView::switchProps() const noe
   return *std::static_pointer_cast<const facebook::react::SwitchProps>(viewProps());
 }
 
+// getToggleState method for IToggleProvider
+ToggleState SwitchComponentView::getToggleState() noexcept {
+  if (switchProps().value) {
+    return ToggleState::ToggleState_On;
+  } else {
+    return ToggleState::ToggleState_Off;
+  }
+}
+
+// Toggle method for IToggleProvider
+void SwitchComponentView::Toggle() noexcept {
+  toggle();
+}
+
 } // namespace winrt::Microsoft::ReactNative::Composition::implementation

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
@@ -38,9 +37,7 @@ struct SwitchComponentView : SwitchComponentViewT<SwitchComponentView, ViewCompo
       facebook::react::LayoutMetrics const &oldLayoutMetrics) noexcept override;
   void FinalizeUpdates(winrt::Microsoft::ReactNative::ComponentViewUpdateMask updateMask) noexcept override;
   void onThemeChanged() noexcept override;
-  void OnKeyUp(
-      const winrt::Microsoft::ReactNative::Composition::Input::KeyboardSource &source,
-      const winrt::Microsoft::ReactNative::Composition::Input::KeyRoutedEventArgs &args) noexcept override;
+  void OnKeyUp(const winrt::Microsoft::ReactNative::Composition::Input::KeyRoutedEventArgs &args) noexcept override;
   void OnPointerPressed(
       const winrt::Microsoft::ReactNative::Composition::Input::PointerRoutedEventArgs &args) noexcept override;
   void OnPointerReleased(
@@ -59,6 +56,8 @@ struct SwitchComponentView : SwitchComponentViewT<SwitchComponentView, ViewCompo
 
   static facebook::react::SharedViewProps defaultProps() noexcept;
   const facebook::react::SwitchProps &switchProps() const noexcept;
+  ToggleState getToggleState() noexcept override;
+  void Toggle() noexcept override;
   winrt::Microsoft::ReactNative::Composition::Experimental::IVisual createVisual() noexcept override;
 
  private:

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

@@ -16,7 +16,7 @@
 namespace winrt::Microsoft::ReactNative::Composition {
 
 void RenderText(
-    ID2D1DeviceContext &deviceContext,
+    ID2D1RenderTarget &deviceContext,
     ::IDWriteTextLayout &textLayout,
     const facebook::react::AttributedString &attributedString,
     const facebook::react::TextAttributes &textAttributes,
@@ -26,7 +26,6 @@ void RenderText(
   float offsetX = offset.x / pointScaleFactor;
   float offsetY = offset.y / pointScaleFactor;
 
-  assert(deviceContext.GetUnitMode() == D2D1_UNIT_MODE_DIPS);
   const auto dpi = pointScaleFactor * 96.0f;
   float oldDpiX, oldDpiY;
   deviceContext.GetDpi(&oldDpiX, &oldDpiY);