react-native-windows 0.74.5 → 0.74.7

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

@@ -7,11 +7,11 @@
 #include <FocusNavigationResult.g.h>
 
 #include <ReactContext.h>
+#include <react/renderer/core/LayoutConstraints.h>
 #include <winrt/Microsoft.ReactNative.Composition.Experimental.h>
 #include <winrt/Microsoft.ReactNative.h>
 #include "CompositionEventHandler.h"
 #include "ReactHost/React.h"
-#include "Views/ICompositionRootView.h"
 
 namespace winrt::Microsoft::ReactNative::implementation {
 
@@ -42,8 +42,7 @@ struct FocusNavigationResult : FocusNavigationResultT<FocusNavigationResult> {
 };
 
 struct CompositionRootView
-    : CompositionRootViewT<CompositionRootView, Composition::Experimental::IInternalCompositionRootView>,
-      ::Microsoft::ReactNative::ICompositionRootView {
+    : CompositionRootViewT<CompositionRootView, Composition::Experimental::IInternalCompositionRootView> {
   CompositionRootView() noexcept;
   ~CompositionRootView() noexcept;
 
@@ -70,6 +69,12 @@ struct CompositionRootView
   float ScaleFactor() noexcept;
   void ScaleFactor(float value) noexcept;
 
+  winrt::event_token SizeChanged(
+      winrt::Windows::Foundation::EventHandler<winrt::Microsoft::ReactNative::RootViewSizeChangedEventArgs> const
+          &handler) noexcept;
+  void SizeChanged(winrt::event_token const &token) noexcept;
+  void NotifySizeChanged() noexcept;
+
   void AddRenderedVisual(const winrt::Microsoft::ReactNative::Composition::Experimental::IVisual &visual) noexcept;
   void RemoveRenderedVisual(const winrt::Microsoft::ReactNative::Composition::Experimental::IVisual &visual) noexcept;
   bool TrySetFocus() noexcept;
@@ -80,8 +85,12 @@ struct CompositionRootView
   winrt::Microsoft::ReactNative::Composition::Theme Theme() noexcept;
   void Theme(const winrt::Microsoft::ReactNative::Composition::Theme &value) noexcept;
 
-  winrt::Windows::Foundation::Size Measure(winrt::Windows::Foundation::Size const &availableSize) const;
-  winrt::Windows::Foundation::Size Arrange(winrt::Windows::Foundation::Size finalSize) const;
+  winrt::Windows::Foundation::Size Measure(
+      const winrt::Microsoft::ReactNative::LayoutConstraints &layoutConstraints,
+      const winrt::Windows::Foundation::Point &viewportOffset) const noexcept;
+  void Arrange(
+      const winrt::Microsoft::ReactNative::LayoutConstraints &layoutConstraints,
+      const winrt::Windows::Foundation::Point &viewportOffset) noexcept;
 
   winrt::Microsoft::ReactNative::FocusNavigationResult NavigateFocus(
       const winrt::Microsoft::ReactNative::FocusNavigationRequest &request) noexcept;
@@ -103,13 +112,6 @@ struct CompositionRootView
       const winrt::Microsoft::ReactNative::Composition::Input::Pointer &pointer,
       facebook::react::Tag tag) noexcept;
 
- public: // IReactRootView
-  std::string JSComponentName() const noexcept override;
-  int64_t GetActualHeight() const noexcept override;
-  int64_t GetActualWidth() const noexcept override;
-  int64_t GetTag() const noexcept override;
-  void SetTag(int64_t tag) noexcept override;
-
  public: // IReactViewInstance UI-thread implementation
   void InitRootView(
       winrt::Microsoft::ReactNative::IReactContext &&context,
@@ -121,6 +123,8 @@ struct CompositionRootView
 #ifdef USE_WINUI3
   winrt::Microsoft::UI::Composition::Compositor m_compositor{nullptr};
   winrt::Microsoft::UI::Content::ContentIsland m_island{nullptr};
+  winrt::event_token m_islandFrameworkClosedToken;
+  winrt::event_token m_islandAutomationProviderRequestedToken;
 #endif
 
   HWND m_hwnd{0};
@@ -132,7 +136,7 @@ struct CompositionRootView
   winrt::IInspectable m_uiaProvider{nullptr};
   int64_t m_rootTag{-1};
   float m_scaleFactor{1.0};
-  winrt::Windows::Foundation::Size m_size;
+  winrt::Windows::Foundation::Size m_size{0, 0};
   winrt::Microsoft::ReactNative::ReactContext m_context;
   winrt::Microsoft::ReactNative::IReactViewHost m_reactViewHost;
   winrt::Microsoft::ReactNative::ReactViewOptions m_reactViewOptions;
@@ -143,6 +147,9 @@ struct CompositionRootView
   winrt::Microsoft::ReactNative::Composition::ICustomResourceLoader m_resources{nullptr};
   winrt::Microsoft::ReactNative::Composition::Theme m_theme{nullptr};
   winrt::Microsoft::ReactNative::Composition::Theme::ThemeChanged_revoker m_themeChangedRevoker;
+  facebook::react::LayoutConstraints m_layoutConstraints;
+  winrt::event<winrt::Windows::Foundation::EventHandler<winrt::Microsoft::ReactNative::RootViewSizeChangedEventArgs>>
+      m_sizeChangedEvent;
 
   void UpdateRootViewInternal() noexcept;
   void ClearLoadingUI() noexcept;

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

@@ -121,6 +121,10 @@ winrt::Microsoft::ReactNative::Composition::Theme ComponentView::Theme() const n
   return theme()->get_strong().as<winrt::Microsoft::ReactNative::Composition::Theme>();
 }
 
+winrt::Microsoft::ReactNative::Composition::RootComponentView ComponentView::Root() noexcept {
+  return *rootComponentView();
+}
+
 winrt::Microsoft::UI::Composition::Compositor ComponentView::Compositor() const noexcept {
   return winrt::Microsoft::ReactNative::Composition::Experimental::MicrosoftCompositionContextHelper::InnerCompositor(
       m_compContext);
@@ -171,6 +175,10 @@ void ComponentView::updateLayoutMetrics(
   base_type::updateLayoutMetrics(layoutMetrics, oldLayoutMetrics);
 }
 
+const facebook::react::LayoutMetrics &ComponentView::layoutMetrics() const noexcept {
+  return m_layoutMetrics;
+}
+
 void ComponentView::FinalizeUpdates(winrt::Microsoft::ReactNative::ComponentViewUpdateMask updateMask) noexcept {
   if ((m_flags & ComponentViewFeatures::NativeBorder) == ComponentViewFeatures::NativeBorder) {
     finalizeBorderUpdates(m_layoutMetrics, *viewProps());
@@ -179,32 +187,38 @@ void ComponentView::FinalizeUpdates(winrt::Microsoft::ReactNative::ComponentView
   base_type::FinalizeUpdates(updateMask);
 }
 
-void ComponentView::onFocusLost() noexcept {
-  m_eventEmitter->onBlur();
-  showFocusVisual(false);
-  if (m_uiaProvider) {
-    winrt::Microsoft::ReactNative::implementation::UpdateUiaProperty(
-        m_uiaProvider, UIA_HasKeyboardFocusPropertyId, true, false);
+void ComponentView::onLostFocus(
+    const winrt::Microsoft::ReactNative::Composition::Input::RoutedEventArgs &args) noexcept {
+  if (args.OriginalSource() == Tag()) {
+    m_eventEmitter->onBlur();
+    showFocusVisual(false);
+    if (m_uiaProvider) {
+      winrt::Microsoft::ReactNative::implementation::UpdateUiaProperty(
+          m_uiaProvider, UIA_HasKeyboardFocusPropertyId, true, false);
+    }
   }
-  base_type::onFocusLost();
+  base_type::onLostFocus(args);
 }
 
-void ComponentView::onFocusGained() noexcept {
-  m_eventEmitter->onFocus();
-  if (m_enableFocusVisual) {
-    showFocusVisual(true);
-  }
-  if (m_uiaProvider) {
-    auto spProviderSimple = m_uiaProvider.try_as<IRawElementProviderSimple>();
-    if (spProviderSimple != nullptr) {
-      winrt::Microsoft::ReactNative::implementation::UpdateUiaProperty(
-          m_uiaProvider, UIA_HasKeyboardFocusPropertyId, false, true);
-      UiaRaiseAutomationEvent(spProviderSimple.get(), UIA_AutomationFocusChangedEventId);
+void ComponentView::onGotFocus(
+    const winrt::Microsoft::ReactNative::Composition::Input::RoutedEventArgs &args) noexcept {
+  if (args.OriginalSource() == Tag()) {
+    m_eventEmitter->onFocus();
+    if (m_enableFocusVisual) {
+      showFocusVisual(true);
+    }
+    if (m_uiaProvider) {
+      auto spProviderSimple = m_uiaProvider.try_as<IRawElementProviderSimple>();
+      if (spProviderSimple != nullptr) {
+        winrt::Microsoft::ReactNative::implementation::UpdateUiaProperty(
+            m_uiaProvider, UIA_HasKeyboardFocusPropertyId, false, true);
+        UiaRaiseAutomationEvent(spProviderSimple.get(), UIA_AutomationFocusChangedEventId);
+      }
     }
-  }
 
-  StartBringIntoView({});
-  base_type::onFocusGained();
+    StartBringIntoView({});
+  }
+  base_type::onGotFocus(args);
 }
 
 void ComponentView::StartBringIntoView(
@@ -234,13 +248,13 @@ void ComponentView::HandleCommand(
     const winrt::Microsoft::ReactNative::IJSValueReader &args) noexcept {
   if (commandName == L"focus") {
     if (auto root = rootComponentView()) {
-      root->SetFocusedComponent(*get_strong());
+      root->TrySetFocusedComponent(*get_strong());
     }
     return;
   }
   if (commandName == L"blur") {
     if (auto root = rootComponentView()) {
-      root->SetFocusedComponent(nullptr); // Todo store this component as previously focused element
+      root->TrySetFocusedComponent(nullptr); // Todo store this component as previously focused element
     }
     return;
   }

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

@@ -69,11 +69,14 @@ struct ComponentView
     assert(false);
     return emptyProps;
   };
+
+  winrt::Microsoft::ReactNative::Composition::RootComponentView Root() noexcept;
+
   void Theme(const winrt::Microsoft::ReactNative::Composition::Theme &theme) noexcept;
   winrt::Microsoft::ReactNative::Composition::Theme Theme() const noexcept;
   void onThemeChanged() noexcept override;
-  void onFocusLost() noexcept override;
-  void onFocusGained() noexcept override;
+  void onLostFocus(const winrt::Microsoft::ReactNative::Composition::Input::RoutedEventArgs &args) noexcept override;
+  void onGotFocus(const winrt::Microsoft::ReactNative::Composition::Input::RoutedEventArgs &args) noexcept override;
   bool CapturePointer(const winrt::Microsoft::ReactNative::Composition::Input::Pointer &pointer) noexcept;
   void ReleasePointerCapture(const winrt::Microsoft::ReactNative::Composition::Input::Pointer &pointer) noexcept;
 
@@ -117,6 +120,8 @@ struct ComponentView
   bool getAcccessiblityIsReadOnly() noexcept override;
   virtual winrt::Microsoft::ReactNative::implementation::ClipState getClipState() noexcept;
 
+  const facebook::react::LayoutMetrics &layoutMetrics() const noexcept;
+
   virtual std::string DefaultControlType() const noexcept;
   virtual std::string DefaultAccessibleName() const noexcept;
   virtual std::string DefaultHelpText() const noexcept;
@@ -189,6 +194,7 @@ struct ViewComponentView : public ViewComponentViewT<ViewComponentView, Componen
       facebook::react::LayoutMetrics const &layoutMetrics,
       facebook::react::LayoutMetrics const &oldLayoutMetrics) noexcept override;
   void prepareForRecycle() noexcept override;
+  bool TryFocus() noexcept;
   bool focusable() const noexcept override;
   void OnKeyDown(
       const winrt::Microsoft::ReactNative::Composition::Input::KeyboardSource &source,

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

@@ -0,0 +1,152 @@
+// Copyright (c) Microsoft Corporation.
+// Licensed under the MIT License.
+
+#include "pch.h"
+#include "FocusManager.h"
+#include "Composition.FocusManager.g.cpp"
+#include <Fabric/FabricUIManagerModule.h>
+
+namespace winrt::Microsoft::ReactNative::implementation {
+
+LostFocusEventArgs::LostFocusEventArgs(const winrt::Microsoft::ReactNative::ComponentView &originalSource)
+    : m_originalSource(originalSource ? originalSource.Tag() : -1) {}
+int32_t LostFocusEventArgs::OriginalSource() noexcept {
+  return m_originalSource;
+}
+
+GotFocusEventArgs::GotFocusEventArgs(const winrt::Microsoft::ReactNative::ComponentView &originalSource)
+    : m_originalSource(originalSource ? originalSource.Tag() : -1) {}
+int32_t GotFocusEventArgs::OriginalSource() noexcept {
+  return m_originalSource;
+}
+
+LosingFocusEventArgs::LosingFocusEventArgs(
+    const winrt::Microsoft::ReactNative::ComponentView &originalSource,
+    const winrt::Microsoft::ReactNative::ComponentView &oldFocusedComponent,
+    const winrt::Microsoft::ReactNative::ComponentView &newFocusedComponent)
+    : m_originalSource(originalSource ? originalSource.Tag() : -1),
+      m_old(oldFocusedComponent),
+      m_new(newFocusedComponent) {}
+
+int32_t LosingFocusEventArgs::OriginalSource() noexcept {
+  return m_originalSource;
+}
+winrt::Microsoft::ReactNative::ComponentView LosingFocusEventArgs::NewFocusedComponent() noexcept {
+  return m_new;
+}
+winrt::Microsoft::ReactNative::ComponentView LosingFocusEventArgs::OldFocusedComponent() noexcept {
+  return m_old;
+}
+
+void LosingFocusEventArgs::TryCancel() noexcept {
+  m_new = m_old;
+}
+
+void LosingFocusEventArgs::TrySetNewFocusedComponent(
+    const winrt::Microsoft::ReactNative::ComponentView &newFocusedComponent) noexcept {
+  auto selfView = winrt::get_self<winrt::Microsoft::ReactNative::implementation::ComponentView>(newFocusedComponent);
+  if (selfView->focusable()) {
+    m_new = newFocusedComponent;
+  } else {
+    auto target =
+        winrt::Microsoft::ReactNative::Composition::FocusManager::FindFirstFocusableElement(newFocusedComponent);
+    if (!target)
+      return;
+    m_new = target;
+  }
+}
+
+GettingFocusEventArgs::GettingFocusEventArgs(
+    const winrt::Microsoft::ReactNative::ComponentView &originalSource,
+    const winrt::Microsoft::ReactNative::ComponentView &oldFocusedComponent,
+    const winrt::Microsoft::ReactNative::ComponentView &newFocusedComponent)
+    : m_originalSource(originalSource ? originalSource.Tag() : -1),
+      m_old(oldFocusedComponent),
+      m_new(newFocusedComponent) {}
+
+int32_t GettingFocusEventArgs::OriginalSource() noexcept {
+  return m_originalSource;
+}
+winrt::Microsoft::ReactNative::ComponentView GettingFocusEventArgs::NewFocusedComponent() noexcept {
+  return m_new;
+}
+winrt::Microsoft::ReactNative::ComponentView GettingFocusEventArgs::OldFocusedComponent() noexcept {
+  return m_old;
+}
+
+void GettingFocusEventArgs::TryCancel() noexcept {
+  m_new = m_old;
+}
+
+void GettingFocusEventArgs::TrySetNewFocusedComponent(
+    const winrt::Microsoft::ReactNative::ComponentView &newFocusedComponent) noexcept {
+  auto selfView = winrt::get_self<winrt::Microsoft::ReactNative::implementation::ComponentView>(newFocusedComponent);
+  if (selfView->focusable()) {
+    m_new = newFocusedComponent;
+  } else {
+    auto target =
+        winrt::Microsoft::ReactNative::Composition::FocusManager::FindFirstFocusableElement(newFocusedComponent);
+    if (!target)
+      return;
+    m_new = target;
+  }
+}
+
+} // namespace winrt::Microsoft::ReactNative::implementation
+
+namespace winrt::Microsoft::ReactNative::Composition::implementation {
+
+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;
+}
+
+winrt::Microsoft::ReactNative::ComponentView FocusManager::FindFirstFocusableElement(
+    const winrt::Microsoft::ReactNative::ComponentView &searchScope) noexcept {
+  auto selfSearchScope = winrt::get_self<winrt::Microsoft::ReactNative::implementation::ComponentView>(searchScope);
+  auto view = NavigateFocusHelper(*selfSearchScope, winrt::Microsoft::ReactNative::FocusNavigationReason::First);
+  if (view) {
+    winrt::Microsoft::ReactNative::ComponentView component{nullptr};
+    winrt::check_hresult(view->QueryInterface(
+        winrt::guid_of<winrt::Microsoft::ReactNative::ComponentView>(), winrt::put_abi(component)));
+    return *view;
+  }
+  return nullptr;
+}
+
+winrt::Microsoft::ReactNative::ComponentView FocusManager::FindLastFocusableElement(
+    const winrt::Microsoft::ReactNative::ComponentView &searchScope) noexcept {
+  auto selfSearchScope = winrt::get_self<winrt::Microsoft::ReactNative::implementation::ComponentView>(searchScope);
+  auto view = NavigateFocusHelper(*selfSearchScope, winrt::Microsoft::ReactNative::FocusNavigationReason::Last);
+  if (view) {
+    winrt::Microsoft::ReactNative::ComponentView component{nullptr};
+    winrt::check_hresult(view->QueryInterface(
+        winrt::guid_of<winrt::Microsoft::ReactNative::ComponentView>(), winrt::put_abi(component)));
+    return *view;
+  }
+  return nullptr;
+}
+
+} // namespace winrt::Microsoft::ReactNative::Composition::implementation

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

@@ -0,0 +1,85 @@
+// Copyright (c) Microsoft Corporation.
+// Licensed under the MIT License.
+
+#pragma once
+#include "Composition.FocusManager.g.h"
+#include "GettingFocusEventArgs.g.h"
+#include "LosingFocusEventArgs.g.h"
+#include <winrt/Microsoft.ReactNative.Composition.Experimental.h>
+#include <winrt/Microsoft.ReactNative.Composition.Input.h>
+
+namespace winrt::Microsoft::ReactNative::implementation {
+
+struct LostFocusEventArgs
+    : winrt::implements<LostFocusEventArgs, winrt::Microsoft::ReactNative::Composition::Input::RoutedEventArgs> {
+  LostFocusEventArgs(const winrt::Microsoft::ReactNative::ComponentView &originalSource);
+  int32_t OriginalSource() noexcept;
+
+ private:
+  const int32_t m_originalSource;
+};
+
+struct GotFocusEventArgs
+    : winrt::implements<GotFocusEventArgs, winrt::Microsoft::ReactNative::Composition::Input::RoutedEventArgs> {
+  GotFocusEventArgs(const winrt::Microsoft::ReactNative::ComponentView &originalSource);
+  int32_t OriginalSource() noexcept;
+
+ private:
+  const int32_t m_originalSource;
+};
+
+struct LosingFocusEventArgs
+    : winrt::Microsoft::ReactNative::implementation::LosingFocusEventArgsT<LosingFocusEventArgs> {
+  LosingFocusEventArgs(
+      const winrt::Microsoft::ReactNative::ComponentView &originalSource,
+      const winrt::Microsoft::ReactNative::ComponentView &oldFocusedComponent,
+      const winrt::Microsoft::ReactNative::ComponentView &newFocusedComponent);
+  int32_t OriginalSource() noexcept;
+  winrt::Microsoft::ReactNative::ComponentView NewFocusedComponent() noexcept;
+  winrt::Microsoft::ReactNative::ComponentView OldFocusedComponent() noexcept;
+
+  void TryCancel() noexcept;
+  void TrySetNewFocusedComponent(const winrt::Microsoft::ReactNative::ComponentView &newFocusedComponent) noexcept;
+
+ private:
+  const int32_t m_originalSource;
+  winrt::Microsoft::ReactNative::ComponentView m_old{nullptr};
+  winrt::Microsoft::ReactNative::ComponentView m_new{nullptr};
+};
+
+struct GettingFocusEventArgs
+    : winrt::Microsoft::ReactNative::implementation::GettingFocusEventArgsT<GettingFocusEventArgs> {
+  GettingFocusEventArgs(
+      const winrt::Microsoft::ReactNative::ComponentView &originalSource,
+      const winrt::Microsoft::ReactNative::ComponentView &oldFocusedComponent,
+      const winrt::Microsoft::ReactNative::ComponentView &newFocusedComponent);
+  int32_t OriginalSource() noexcept;
+  winrt::Microsoft::ReactNative::ComponentView NewFocusedComponent() noexcept;
+  winrt::Microsoft::ReactNative::ComponentView OldFocusedComponent() noexcept;
+
+  void TryCancel() noexcept;
+  void TrySetNewFocusedComponent(const winrt::Microsoft::ReactNative::ComponentView &newFocusedComponent) noexcept;
+
+ private:
+  const int32_t m_originalSource;
+  winrt::Microsoft::ReactNative::ComponentView m_old{nullptr};
+  winrt::Microsoft::ReactNative::ComponentView m_new{nullptr};
+};
+} // namespace winrt::Microsoft::ReactNative::implementation
+
+namespace winrt::Microsoft::ReactNative::Composition::implementation {
+
+struct FocusManager : FocusManagerT<FocusManager> {
+  FocusManager() = default;
+
+  static winrt::Microsoft::ReactNative::ComponentView FindFirstFocusableElement(
+      const winrt::Microsoft::ReactNative::ComponentView &searchScope) noexcept;
+  static winrt::Microsoft::ReactNative::ComponentView FindLastFocusableElement(
+      const winrt::Microsoft::ReactNative::ComponentView &searchScope) noexcept;
+};
+
+} // namespace winrt::Microsoft::ReactNative::Composition::implementation
+
+namespace winrt::Microsoft::ReactNative::Composition::factory_implementation {
+struct FocusManager : FocusManagerT<FocusManager, implementation::FocusManager> {};
+} // namespace winrt::Microsoft::ReactNative::Composition::factory_implementation

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

@@ -45,7 +45,21 @@ RootComponentView *RootComponentView::rootComponentView() noexcept {
   return this;
 }
 
-winrt::Microsoft::ReactNative::ComponentView &RootComponentView::GetFocusedComponent() noexcept {
+void RootComponentView::updateLayoutMetrics(
+    facebook::react::LayoutMetrics const &layoutMetrics,
+    facebook::react::LayoutMetrics const &oldLayoutMetrics) noexcept {
+  base_type::updateLayoutMetrics(layoutMetrics, oldLayoutMetrics);
+
+  if (oldLayoutMetrics.frame != layoutMetrics.frame ||
+      oldLayoutMetrics.pointScaleFactor != layoutMetrics.pointScaleFactor) {
+    if (auto rootView = m_wkRootView.get()) {
+      winrt::get_self<winrt::Microsoft::ReactNative::implementation::CompositionRootView>(rootView)
+          ->NotifySizeChanged();
+    }
+  }
+}
+
+winrt::Microsoft::ReactNative::ComponentView RootComponentView::GetFocusedComponent() noexcept {
   return m_focusedComponent;
 }
 void RootComponentView::SetFocusedComponent(const winrt::Microsoft::ReactNative::ComponentView &value) noexcept {
@@ -53,69 +67,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);
+  }
+
+  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 false;
+
+  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;
 
@@ -42,6 +43,10 @@ struct RootComponentView : RootComponentViewT<RootComponentView, ViewComponentVi
   HRESULT GetFragmentRoot(IRawElementProviderFragmentRoot **pRetVal) noexcept;
   winrt::Microsoft::ReactNative::implementation::ClipState getClipState() noexcept override;
 
+  void updateLayoutMetrics(
+      facebook::react::LayoutMetrics const &layoutMetrics,
+      facebook::react::LayoutMetrics const &oldLayoutMetrics) noexcept override;
+
   winrt::IInspectable UiaProviderFromPoint(const POINT &ptPixels) noexcept;
 
   RootComponentView(
@@ -51,6 +56,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

package/Microsoft.ReactNative/Fabric/Composition/TextInput/WindowsTextInputComponentView.cpp

@@ -224,7 +224,7 @@ struct CompTextHost : public winrt::implements<CompTextHost, ITextHost> {
     winrt::Microsoft::ReactNative::ComponentView view{nullptr};
     winrt::check_hresult(
         m_outer->QueryInterface(winrt::guid_of<winrt::Microsoft::ReactNative::ComponentView>(), winrt::put_abi(view)));
-    m_outer->rootComponentView()->SetFocusedComponent(view);
+    m_outer->rootComponentView()->TrySetFocusedComponent(view);
     // assert(false);
     // TODO focus
   }
@@ -929,8 +929,9 @@ void WindowsTextInputComponentView::UnmountChildComponentView(
   base_type::UnmountChildComponentView(childComponentView, index);
 }
 
-void WindowsTextInputComponentView::onFocusLost() noexcept {
-  Super::onFocusLost();
+void WindowsTextInputComponentView::onLostFocus(
+    const winrt::Microsoft::ReactNative::Composition::Input::RoutedEventArgs &args) noexcept {
+  Super::onLostFocus(args);
   if (m_textServices) {
     LRESULT lresult;
     DrawBlock db(*this);
@@ -939,8 +940,9 @@ void WindowsTextInputComponentView::onFocusLost() noexcept {
   m_caretVisual.IsVisible(false);
 }
 
-void WindowsTextInputComponentView::onFocusGained() noexcept {
-  Super::onFocusGained();
+void WindowsTextInputComponentView::onGotFocus(
+    const winrt::Microsoft::ReactNative::Composition::Input::RoutedEventArgs &args) noexcept {
+  Super::onGotFocus(args);
   if (m_textServices) {
     LRESULT lresult;
     DrawBlock db(*this);