react-native-windows 0.74.4 → 0.74.6

package/Microsoft.ReactNative/Fabric/Composition/Modal/WindowsModalHostViewComponentView.cpp

@@ -23,14 +23,13 @@ WindowsModalHostComponentView::WindowsModalHostComponentView(
     facebook::react::Tag tag,
     winrt::Microsoft::ReactNative::ReactContext const &reactContext)
     : Super(
+          WindowsModalHostComponentView::defaultProps(),
           compContext,
           tag,
           reactContext,
           ComponentViewFeatures::Default & ~ComponentViewFeatures::Background,
           false) {
-  m_props = std::make_shared<facebook::react::ModalHostViewProps const>();
   m_context = reactContext; // save context
-  m_visual = compContext.CreateSpriteVisual();
 }
 
 winrt::Microsoft::ReactNative::ComponentView WindowsModalHostComponentView::Create(
@@ -201,7 +200,8 @@ void WindowsModalHostComponentView::HandleCommand(
 void WindowsModalHostComponentView::updateProps(
     facebook::react::Props::Shared const &props,
     facebook::react::Props::Shared const &oldProps) noexcept {
-  const auto &oldModalProps = *std::static_pointer_cast<const facebook::react::ModalHostViewProps>(m_props);
+  const auto &oldModalProps =
+      *std::static_pointer_cast<const facebook::react::ModalHostViewProps>(oldProps ? oldProps : viewProps());
   const auto &newModalProps = *std::static_pointer_cast<const facebook::react::ModalHostViewProps>(props);
 
   // currently Modal only gets Destroyed by closing the window
@@ -210,20 +210,15 @@ void WindowsModalHostComponentView::updateProps(
     ShowOnUIThread();
   }
 
-  // update BaseComponentView props
-  updateTransformProps(oldModalProps, newModalProps, m_visual);
-  Super::updateProps(props, oldProps);
-  m_props = std::static_pointer_cast<facebook::react::ModalHostViewProps const>(props);
+  base_type::updateProps(props, oldProps);
 }
 
 void WindowsModalHostComponentView::updateLayoutMetrics(
     facebook::react::LayoutMetrics const &layoutMetrics,
     facebook::react::LayoutMetrics const &oldLayoutMetrics) noexcept {
-  if ((layoutMetrics.displayType != m_layoutMetrics.displayType)) {
-    OuterVisual().IsVisible(layoutMetrics.displayType != facebook::react::DisplayType::None);
-  }
+  Super::updateLayoutMetrics(layoutMetrics, oldLayoutMetrics);
 
-  // Temparary placeholder for Modal, draws on main hwnd
+  // Temporary placeholder for Modal, draws on main hwnd
   if (m_layoutMetrics.frame.size != layoutMetrics.frame.size ||
       m_layoutMetrics.pointScaleFactor != layoutMetrics.pointScaleFactor || m_layoutMetrics.frame.size.width == 0) {
     // Always make visual a min size, so that even if its laid out at zero size, its clear an unimplemented view was
@@ -241,9 +236,9 @@ void WindowsModalHostComponentView::updateLayoutMetrics(
     drawingSurface.HorizontalAlignmentRatio(0.f);
     drawingSurface.VerticalAlignmentRatio(0.f);
     drawingSurface.Stretch(winrt::Microsoft::ReactNative::Composition::Experimental::CompositionStretch::None);
-    m_visual.Brush(drawingSurface);
-    m_visual.Size(surfaceSize);
-    m_visual.Offset({
+    Visual().as<Experimental::ISpriteVisual>().Brush(drawingSurface);
+    Visual().Size(surfaceSize);
+    Visual().Offset({
         layoutMetrics.frame.origin.x * layoutMetrics.pointScaleFactor,
         layoutMetrics.frame.origin.y * layoutMetrics.pointScaleFactor,
         0.0f,
@@ -290,28 +285,18 @@ void WindowsModalHostComponentView::updateLayoutMetrics(
       }
     }
   }
-
-  Super::updateLayoutMetrics(layoutMetrics, oldLayoutMetrics);
 }
 
 void WindowsModalHostComponentView::updateState(
     facebook::react::State::Shared const &state,
     facebook::react::State::Shared const &oldState) noexcept {}
 
-void WindowsModalHostComponentView::prepareForRecycle() noexcept {}
-
-facebook::react::SharedViewProps WindowsModalHostComponentView::viewProps() noexcept {
-  return m_props;
-}
-
-winrt::Microsoft::ReactNative::Composition::Experimental::IVisual WindowsModalHostComponentView::Visual()
-    const noexcept {
-  return m_visual;
+facebook::react::SharedViewProps WindowsModalHostComponentView::defaultProps() noexcept {
+  static auto const defaultProps = std::make_shared<facebook::react::ModalHostViewProps const>();
+  return defaultProps;
 }
-
-winrt::Microsoft::ReactNative::Composition::Experimental::IVisual WindowsModalHostComponentView::OuterVisual()
-    const noexcept {
-  return m_visual;
+const facebook::react::ModalHostViewProps &WindowsModalHostComponentView::modalHostViewProps() const noexcept {
+  return *std::static_pointer_cast<const facebook::react::ModalHostViewProps>(viewProps());
 }
 
 facebook::react::Tag WindowsModalHostComponentView::hitTest(
@@ -320,8 +305,8 @@ facebook::react::Tag WindowsModalHostComponentView::hitTest(
     bool ignorePointerEvents) const noexcept {
   facebook::react::Point ptLocal{pt.x - m_layoutMetrics.frame.origin.x, pt.y - m_layoutMetrics.frame.origin.y};
 
-  if ((ignorePointerEvents || m_props->pointerEvents == facebook::react::PointerEventsMode::Auto ||
-       m_props->pointerEvents == facebook::react::PointerEventsMode::BoxOnly) &&
+  if ((ignorePointerEvents || viewProps()->pointerEvents == facebook::react::PointerEventsMode::Auto ||
+       viewProps()->pointerEvents == facebook::react::PointerEventsMode::BoxOnly) &&
       ptLocal.x >= 0 && ptLocal.x <= m_layoutMetrics.frame.size.width && ptLocal.y >= 0 &&
       ptLocal.y <= m_layoutMetrics.frame.size.height) {
     localPt = ptLocal;

package/Microsoft.ReactNative/Fabric/Composition/Modal/WindowsModalHostViewComponentView.h

@@ -13,8 +13,9 @@
 
 namespace winrt::Microsoft::ReactNative::Composition::implementation {
 
-struct WindowsModalHostComponentView : WindowsModalHostComponentViewT<WindowsModalHostComponentView, ComponentView> {
-  using Super = WindowsModalHostComponentViewT<WindowsModalHostComponentView, ComponentView>;
+struct WindowsModalHostComponentView
+    : WindowsModalHostComponentViewT<WindowsModalHostComponentView, ViewComponentView> {
+  using Super = WindowsModalHostComponentViewT<WindowsModalHostComponentView, ViewComponentView>;
 
   [[nodiscard]] static winrt::Microsoft::ReactNative::ComponentView Create(
       const winrt::Microsoft::ReactNative::Composition::Experimental::ICompositionContext &compContext,
@@ -37,13 +38,11 @@ struct WindowsModalHostComponentView : WindowsModalHostComponentViewT<WindowsMod
   void updateLayoutMetrics(
       facebook::react::LayoutMetrics const &layoutMetrics,
       facebook::react::LayoutMetrics const &oldLayoutMetrics) noexcept override;
-  void prepareForRecycle() noexcept override;
-  facebook::react::SharedViewProps viewProps() noexcept override;
+  static facebook::react::SharedViewProps defaultProps() noexcept;
+  const facebook::react::ModalHostViewProps &modalHostViewProps() const noexcept;
   bool focusable() const noexcept override;
   facebook::react::Tag hitTest(facebook::react::Point pt, facebook::react::Point &localPt, bool ignorePointerEvents)
       const noexcept override;
-  winrt::Microsoft::ReactNative::Composition::Experimental::IVisual Visual() const noexcept override;
-  winrt::Microsoft::ReactNative::Composition::Experimental::IVisual OuterVisual() const noexcept override;
   virtual std::string DefaultControlType() const noexcept;
 
   WindowsModalHostComponentView(
@@ -58,8 +57,6 @@ struct WindowsModalHostComponentView : WindowsModalHostComponentViewT<WindowsMod
   static void RegisterWndClass() noexcept;
 
  private:
-  std::shared_ptr<facebook::react::ModalHostViewProps const> m_props;
-  winrt::Microsoft::ReactNative::Composition::Experimental::ISpriteVisual m_visual{nullptr};
   HWND m_hwnd{nullptr};
   winrt::Microsoft::ReactNative::ReactContext m_context;
 };

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

@@ -23,14 +23,12 @@ ParagraphComponentView::ParagraphComponentView(
     facebook::react::Tag tag,
     winrt::Microsoft::ReactNative::ReactContext const &reactContext)
     : Super(
+          ParagraphComponentView::defaultProps(),
           compContext,
           tag,
           reactContext,
           ComponentViewFeatures::Default & ~ComponentViewFeatures::Background,
-          false) {
-  static auto const defaultProps = std::make_shared<facebook::react::ParagraphProps const>();
-  m_props = defaultProps;
-}
+          false) {}
 
 void ParagraphComponentView::MountChildComponentView(
     const winrt::Microsoft::ReactNative::ComponentView &childComponentView,
@@ -49,7 +47,8 @@ void ParagraphComponentView::UnmountChildComponentView(
 void ParagraphComponentView::updateProps(
     facebook::react::Props::Shared const &props,
     facebook::react::Props::Shared const &oldProps) noexcept {
-  const auto &oldViewProps = *std::static_pointer_cast<const facebook::react::ParagraphProps>(m_props);
+  const auto &oldViewProps =
+      *std::static_pointer_cast<const facebook::react::ParagraphProps>(oldProps ? oldProps : viewProps());
   const auto &newViewProps = *std::static_pointer_cast<const facebook::react::ParagraphProps>(props);
 
   ensureVisual();
@@ -57,23 +56,16 @@ void ParagraphComponentView::updateProps(
   if (oldViewProps.textAttributes.foregroundColor != newViewProps.textAttributes.foregroundColor) {
     m_requireRedraw = true;
   }
+
   if (oldViewProps.textAttributes.opacity != newViewProps.textAttributes.opacity) {
     m_requireRedraw = true;
   }
-  if (oldViewProps.testId != newViewProps.testId) {
-    m_visual.Comment(winrt::to_hstring(newViewProps.testId));
-  }
 
   if (oldViewProps.textAttributes.alignment != newViewProps.textAttributes.alignment) {
     updateTextAlignment(newViewProps.textAttributes.alignment);
   }
 
-  // update BaseComponentView props
-  updateAccessibilityProps(oldViewProps, newViewProps);
-  updateTransformProps(oldViewProps, newViewProps, m_visual);
   Super::updateProps(props, oldProps);
-
-  m_props = std::static_pointer_cast<facebook::react::ParagraphProps const>(props);
 }
 
 void ParagraphComponentView::updateEventEmitter(facebook::react::EventEmitter::Shared const &eventEmitter) noexcept {
@@ -90,60 +82,13 @@ void ParagraphComponentView::updateState(
 
   m_textLayout = nullptr;
 }
-void ParagraphComponentView::updateLayoutMetrics(
-    facebook::react::LayoutMetrics const &layoutMetrics,
-    facebook::react::LayoutMetrics const &oldLayoutMetrics) noexcept {
-  // Set Position & Size Properties
-
-  if ((layoutMetrics.displayType != m_layoutMetrics.displayType)) {
-    OuterVisual().IsVisible(layoutMetrics.displayType != facebook::react::DisplayType::None);
-  }
 
-  Super::updateLayoutMetrics(layoutMetrics, oldLayoutMetrics);
-  m_visual.Size(
-      {layoutMetrics.frame.size.width * layoutMetrics.pointScaleFactor,
-       layoutMetrics.frame.size.height * layoutMetrics.pointScaleFactor});
-}
 void ParagraphComponentView::FinalizeUpdates(
     winrt::Microsoft::ReactNative::ComponentViewUpdateMask updateMask) noexcept {
   ensureVisual();
   updateVisualBrush();
   Super::FinalizeUpdates(updateMask);
 }
-void ParagraphComponentView::prepareForRecycle() noexcept {}
-
-facebook::react::SharedViewProps ParagraphComponentView::viewProps() noexcept {
-  return m_props;
-}
-
-facebook::react::Tag ParagraphComponentView::hitTest(
-    facebook::react::Point pt,
-    facebook::react::Point &localPt,
-    bool ignorePointerEvents) const noexcept {
-  facebook::react::Point ptLocal{pt.x - m_layoutMetrics.frame.origin.x, pt.y - m_layoutMetrics.frame.origin.y};
-
-  facebook::react::Tag targetTag;
-
-  /*
-    if ((m_props.pointerEvents == facebook::react::PointerEventsMode::Auto ||
-        m_props.pointerEvents == facebook::react::PointerEventsMode::BoxNone) && std::any_of(m_children.rbegin(),
-    m_children.rend(), [&targetTag, &ptLocal, &localPt](auto child) { targetTag = static_cast<const
-    ComponentView
-    *>(child)->hitTest(ptLocal, localPt); return targetTag != -1;
-        }))
-      return targetTag;
-      */
-
-  if ((ignorePointerEvents || m_props->pointerEvents == facebook::react::PointerEventsMode::Auto ||
-       m_props->pointerEvents == facebook::react::PointerEventsMode::BoxOnly) &&
-      ptLocal.x >= 0 && ptLocal.x <= m_layoutMetrics.frame.size.width && ptLocal.y >= 0 &&
-      ptLocal.y <= m_layoutMetrics.frame.size.height) {
-    localPt = ptLocal;
-    return Tag();
-  }
-
-  return -1;
-}
 
 facebook::react::SharedViewEventEmitter ParagraphComponentView::eventEmitterAtPoint(
     facebook::react::Point pt) noexcept {
@@ -168,13 +113,6 @@ facebook::react::SharedViewEventEmitter ParagraphComponentView::eventEmitterAtPo
   return m_eventEmitter;
 }
 
-void ParagraphComponentView::ensureVisual() noexcept {
-  if (!m_visual) {
-    m_visual = m_compContext.CreateSpriteVisual();
-    OuterVisual().InsertAt(m_visual, 0);
-  }
-}
-
 void ParagraphComponentView::updateTextAlignment(
     const std::optional<facebook::react::TextAlignment> &fbAlignment) noexcept {
   m_textLayout = nullptr;
@@ -255,11 +193,11 @@ void ParagraphComponentView::updateVisualBrush() noexcept {
 
     // The surfaceBrush's size is based on the size the text takes up, which maybe smaller than the total visual
     // So we need to align the brush within the visual to match the text alignment.
-    const auto &paragraphProps = *std::static_pointer_cast<const facebook::react::ParagraphProps>(m_props);
     float horizAlignment{0.f};
     /*
-    if (paragraphProps.textAttributes.alignment) {
-      switch (*paragraphProps.textAttributes.alignment) {
+    const auto &props = paragraphProps()
+    if (props.textAttributes.alignment) {
+      switch (*props.textAttributes.alignment) {
         case facebook::react::TextAlignment::Center:
           horizAlignment = 0.5f;
           break;
@@ -287,7 +225,7 @@ void ParagraphComponentView::updateVisualBrush() noexcept {
       m_drawingSurface.VerticalAlignmentRatio(0.f);
       m_drawingSurface.Stretch(winrt::Microsoft::ReactNative::Composition::Experimental::CompositionStretch::None);
     }
-    m_visual.Brush(m_drawingSurface);
+    Visual().as<Experimental::ISpriteVisual>().Brush(m_drawingSurface);
   }
 
   if (m_requireRedraw) {
@@ -295,6 +233,15 @@ void ParagraphComponentView::updateVisualBrush() noexcept {
   }
 }
 
+facebook::react::SharedViewProps ParagraphComponentView::defaultProps() noexcept {
+  static auto const defaultProps = std::make_shared<facebook::react::ParagraphProps const>();
+  return defaultProps;
+}
+
+const facebook::react::ParagraphProps &ParagraphComponentView::paragraphProps() const noexcept {
+  return *std::static_pointer_cast<const facebook::react::ParagraphProps>(viewProps());
+}
+
 void ParagraphComponentView::onThemeChanged() noexcept {
   DrawText();
   Super::onThemeChanged();
@@ -316,23 +263,23 @@ void ParagraphComponentView::DrawText() noexcept {
         m_drawingSurface, m_layoutMetrics.pointScaleFactor, &offset);
     if (auto d2dDeviceContext = autoDraw.GetRenderTarget()) {
       d2dDeviceContext->Clear(
-          m_props->backgroundColor ? theme()->D2DColor(*m_props->backgroundColor)
-                                   : D2D1::ColorF(D2D1::ColorF::Black, 0.0f));
+          viewProps()->backgroundColor ? theme()->D2DColor(*viewProps()->backgroundColor)
+                                       : D2D1::ColorF(D2D1::ColorF::Black, 0.0f));
 
-      const auto &paragraphProps = *std::static_pointer_cast<const facebook::react::ParagraphProps>(m_props);
+      const auto &props = paragraphProps();
 
       RenderText(
           *d2dDeviceContext,
           *m_textLayout,
           m_attributedStringBox.getValue(),
-          paragraphProps.textAttributes,
+          props.textAttributes,
           {static_cast<float>(offset.x) + m_layoutMetrics.contentInsets.left,
            static_cast<float>(offset.y) + m_layoutMetrics.contentInsets.top},
           m_layoutMetrics.pointScaleFactor,
           *theme());
 
-      if (!isnan(paragraphProps.opacity)) {
-        m_visual.Opacity(paragraphProps.opacity);
+      if (!isnan(props.opacity)) {
+        Visual().Opacity(props.opacity);
       }
     }
     m_requireRedraw = false;
@@ -347,10 +294,6 @@ std::string ParagraphComponentView::DefaultAccessibleName() const noexcept {
   return m_attributedStringBox.getValue().getString();
 }
 
-winrt::Microsoft::ReactNative::Composition::Experimental::IVisual ParagraphComponentView::Visual() const noexcept {
-  return m_visual;
-}
-
 winrt::Microsoft::ReactNative::ComponentView ParagraphComponentView::Create(
     const winrt::Microsoft::ReactNative::Composition::Experimental::ICompositionContext &compContext,
     facebook::react::Tag tag,

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

@@ -17,8 +17,8 @@
 
 namespace winrt::Microsoft::ReactNative::Composition::implementation {
 
-struct ParagraphComponentView : ParagraphComponentViewT<ParagraphComponentView, ComponentView> {
-  using Super = ParagraphComponentViewT<ParagraphComponentView, ComponentView>;
+struct ParagraphComponentView : ParagraphComponentViewT<ParagraphComponentView, ViewComponentView> {
+  using Super = ParagraphComponentViewT<ParagraphComponentView, ViewComponentView>;
 
   [[nodiscard]] static winrt::Microsoft::ReactNative::ComponentView Create(
       const winrt::Microsoft::ReactNative::Composition::Experimental::ICompositionContext &compContext,
@@ -36,21 +36,15 @@ struct ParagraphComponentView : ParagraphComponentViewT<ParagraphComponentView,
   void updateEventEmitter(facebook::react::EventEmitter::Shared const &eventEmitter) noexcept override;
   void updateState(facebook::react::State::Shared const &state, facebook::react::State::Shared const &oldState) noexcept
       override;
-  void updateLayoutMetrics(
-      facebook::react::LayoutMetrics const &layoutMetrics,
-      facebook::react::LayoutMetrics const &oldLayoutMetrics) noexcept override;
   void FinalizeUpdates(winrt::Microsoft::ReactNative::ComponentViewUpdateMask updateMask) noexcept override;
-  void prepareForRecycle() noexcept override;
-  facebook::react::SharedViewProps viewProps() noexcept override;
-  facebook::react::Tag hitTest(facebook::react::Point pt, facebook::react::Point &localPt, bool ignorePointerEvents)
-      const noexcept override;
   void OnRenderingDeviceLost() noexcept override;
   void onThemeChanged() noexcept override;
   facebook::react::SharedViewEventEmitter eventEmitterAtPoint(facebook::react::Point pt) noexcept override;
 
-  winrt::Microsoft::ReactNative::Composition::Experimental::IVisual Visual() const noexcept override;
   virtual std::string DefaultControlType() const noexcept override;
   virtual std::string DefaultAccessibleName() const noexcept override;
+  static facebook::react::SharedViewProps defaultProps() noexcept;
+  const facebook::react::ParagraphProps &paragraphProps() const noexcept;
 
   ParagraphComponentView(
       const winrt::Microsoft::ReactNative::Composition::Experimental::ICompositionContext &compContext,
@@ -58,13 +52,10 @@ struct ParagraphComponentView : ParagraphComponentViewT<ParagraphComponentView,
       winrt::Microsoft::ReactNative::ReactContext const &reactContext);
 
  private:
-  void ensureVisual() noexcept;
   void updateVisualBrush() noexcept;
   void DrawText() noexcept;
   void updateTextAlignment(const std::optional<facebook::react::TextAlignment> &fbAlignment) noexcept;
 
-  std::shared_ptr<facebook::react::ParagraphProps const> m_props;
-  winrt::Microsoft::ReactNative::Composition::Experimental::ISpriteVisual m_visual{nullptr};
   winrt::com_ptr<::IDWriteTextLayout> m_textLayout;
   facebook::react::AttributedStringBox m_attributedStringBox;
   facebook::react::ParagraphAttributes m_paragraphAttributes;

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

@@ -18,6 +18,7 @@ RootComponentView::RootComponentView(
     facebook::react::Tag tag,
     winrt::Microsoft::ReactNative::ReactContext const &reactContext)
     : base_type(
+          {}, // default viewProps
           compContext,
           tag,
           reactContext,
@@ -44,7 +45,7 @@ RootComponentView *RootComponentView::rootComponentView() noexcept {
   return this;
 }
 
-winrt::Microsoft::ReactNative::ComponentView &RootComponentView::GetFocusedComponent() noexcept {
+winrt::Microsoft::ReactNative::ComponentView RootComponentView::GetFocusedComponent() noexcept {
   return m_focusedComponent;
 }
 void RootComponentView::SetFocusedComponent(const winrt::Microsoft::ReactNative::ComponentView &value) noexcept {
@@ -52,69 +53,69 @@ void RootComponentView::SetFocusedComponent(const winrt::Microsoft::ReactNative:
     return;
 
   if (m_focusedComponent) {
-    winrt::get_self<winrt::Microsoft::ReactNative::implementation::ComponentView>(m_focusedComponent)->onFocusLost();
+    auto args = winrt::make<winrt::Microsoft::ReactNative::implementation::LostFocusEventArgs>(m_focusedComponent);
+    winrt::get_self<winrt::Microsoft::ReactNative::implementation::ComponentView>(m_focusedComponent)
+        ->onLostFocus(args);
   }
 
   if (value) {
     if (auto rootView = m_wkRootView.get()) {
       winrt::get_self<winrt::Microsoft::ReactNative::implementation::CompositionRootView>(rootView)->TrySetFocus();
     }
-    winrt::get_self<winrt::Microsoft::ReactNative::implementation::ComponentView>(value)->onFocusGained();
+    auto args = winrt::make<winrt::Microsoft::ReactNative::implementation::GotFocusEventArgs>(value);
+    winrt::get_self<winrt::Microsoft::ReactNative::implementation::ComponentView>(value)->onGotFocus(args);
   }
 
   m_focusedComponent = value;
 }
 
-winrt::Microsoft::ReactNative::implementation::ComponentView *NavigateFocusHelper(
-    winrt::Microsoft::ReactNative::implementation::ComponentView &view,
-    winrt::Microsoft::ReactNative::FocusNavigationReason reason) {
-  if (reason == winrt::Microsoft::ReactNative::FocusNavigationReason::First) {
-    if (view.focusable()) {
-      return &view;
-    }
-  }
-  winrt::Microsoft::ReactNative::implementation::ComponentView *toFocus = nullptr;
-
-  Mso::Functor<bool(::winrt::Microsoft::ReactNative::implementation::ComponentView & v)> fn =
-      [reason, &toFocus](::winrt::Microsoft::ReactNative::implementation::ComponentView &v) noexcept
-      -> bool { return (toFocus = NavigateFocusHelper(v, reason)); };
-
-  if (view.runOnChildren(reason == winrt::Microsoft::ReactNative::FocusNavigationReason::First, fn)) {
-    return toFocus;
-  }
-
-  if (reason == winrt::Microsoft::ReactNative::FocusNavigationReason::Last) {
-    if (view.focusable()) {
-      return &view;
-    }
-  }
-
-  return nullptr;
-}
-
 bool RootComponentView::NavigateFocus(const winrt::Microsoft::ReactNative::FocusNavigationRequest &request) noexcept {
   if (request.Reason() == winrt::Microsoft::ReactNative::FocusNavigationReason::Restore) {
     // No-op for now
     return m_focusedComponent != nullptr;
   }
 
-  auto view = NavigateFocusHelper(*this, request.Reason());
+  auto view = (request.Reason() == winrt::Microsoft::ReactNative::FocusNavigationReason::First)
+      ? FocusManager::FindFirstFocusableElement(*this)
+      : FocusManager::FindLastFocusableElement(*this);
   if (view) {
-    winrt::Microsoft::ReactNative::ComponentView component{nullptr};
-    winrt::check_hresult(view->QueryInterface(
-        winrt::guid_of<winrt::Microsoft::ReactNative::ComponentView>(), winrt::put_abi(component)));
-    SetFocusedComponent(component);
+    TrySetFocusedComponent(view);
   }
   return view != nullptr;
 }
 
 bool RootComponentView::TrySetFocusedComponent(const winrt::Microsoft::ReactNative::ComponentView &view) noexcept {
-  auto selfView = winrt::get_self<winrt::Microsoft::ReactNative::implementation::ComponentView>(view);
-  if (selfView->focusable()) {
-    selfView->rootComponentView()->SetFocusedComponent(view);
-    return true;
+  auto target = view;
+  auto selfView = winrt::get_self<winrt::Microsoft::ReactNative::implementation::ComponentView>(target);
+  if (selfView && !selfView->focusable()) {
+    target = FocusManager::FindFirstFocusableElement(target);
+    if (!target)
+      return false;
+    selfView = winrt::get_self<winrt::Microsoft::ReactNative::implementation::ComponentView>(target);
+  }
+
+  if (selfView && selfView->rootComponentView() != this)
+    return false;
+
+  auto losingFocusArgs = winrt::make<winrt::Microsoft::ReactNative::implementation::LosingFocusEventArgs>(
+      target, m_focusedComponent, target);
+  if (m_focusedComponent) {
+    winrt::get_self<winrt::Microsoft::ReactNative::implementation::ComponentView>(m_focusedComponent)
+        ->onLosingFocus(losingFocusArgs);
   }
-  return false;
+
+  if (losingFocusArgs.NewFocusedComponent()) {
+    auto gettingFocusArgs = winrt::make<winrt::Microsoft::ReactNative::implementation::GettingFocusEventArgs>(
+        target, m_focusedComponent, losingFocusArgs.NewFocusedComponent());
+    winrt::get_self<winrt::Microsoft::ReactNative::implementation::ComponentView>(losingFocusArgs.NewFocusedComponent())
+        ->onGettingFocus(gettingFocusArgs);
+
+    winrt::get_self<winrt::Microsoft::ReactNative::implementation::ComponentView>(losingFocusArgs.NewFocusedComponent())
+        ->rootComponentView()
+        ->SetFocusedComponent(gettingFocusArgs.NewFocusedComponent());
+  }
+
+  return true;
 }
 
 bool RootComponentView::TryMoveFocus(bool next) noexcept {

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

@@ -8,6 +8,7 @@
 #include <Microsoft.ReactNative.Cxx/ReactContext.h>
 
 #include "CompositionViewComponentView.h"
+#include "FocusManager.h"
 #include "Theme.h"
 
 #include "Composition.RootComponentView.g.h"
@@ -25,7 +26,7 @@ struct RootComponentView : RootComponentViewT<RootComponentView, ViewComponentVi
       facebook::react::Tag tag,
       winrt::Microsoft::ReactNative::ReactContext const &reactContext) noexcept;
 
-  winrt::Microsoft::ReactNative::ComponentView &GetFocusedComponent() noexcept;
+  winrt::Microsoft::ReactNative::ComponentView GetFocusedComponent() noexcept;
   void SetFocusedComponent(const winrt::Microsoft::ReactNative::ComponentView &value) noexcept;
   bool TrySetFocusedComponent(const winrt::Microsoft::ReactNative::ComponentView &view) noexcept;
 
@@ -51,6 +52,9 @@ struct RootComponentView : RootComponentViewT<RootComponentView, ViewComponentVi
 
   virtual ~RootComponentView();
 
+  winrt::Microsoft::ReactNative::ComponentView FindFirstFocusableElement() noexcept;
+  winrt::Microsoft::ReactNative::ComponentView FindLastFocusableElement() noexcept;
+
  private:
   // should this be a ReactTaggedView? - It shouldn't actually matter since if the view is going away it should always
   // be clearing its focus But being a reactTaggedView might make it easier to identify cases where that isn't