react-native-windows 0.74.25 → 0.74.26

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

@@ -818,6 +818,11 @@ uint8_t BorderPrimitive::numberOfVisuals() const noexcept {
   return m_numBorderVisuals;
 }
 
+void BorderPrimitive::setOuter(
+    winrt::Microsoft::ReactNative::Composition::implementation::ComponentView *outer) noexcept {
+  m_outer = outer;
+}
+
 bool BorderPrimitive::TryUpdateSpecialBorderLayers(
     winrt::Microsoft::ReactNative::Composition::implementation::Theme *theme,
     std::array<winrt::Microsoft::ReactNative::Composition::Experimental::ISpriteVisual, SpecialBorderLayerCount>

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

@@ -29,6 +29,10 @@ struct BorderPrimitive {
 
   void markNeedsUpdate() noexcept;
 
+  // We hoist focus visuals up the tree to allow them to be higher in the z-order.
+  // This means a single BorderPrimitive may change the owning ComponentView as focus moves around
+  void setOuter(winrt::Microsoft::ReactNative::Composition::implementation::ComponentView *outer) noexcept;
+
   void updateProps(
       const facebook::react::ViewProps &oldViewProps,
       const facebook::react::ViewProps &newViewProps) noexcept;

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

@@ -40,7 +40,7 @@ constexpr float FOCUS_VISUAL_WIDTH = 2.0f;
 //   ----- m_visual <-- Background / clip - Can be a custom visual depending on Component type
 //            |
 //            ----- Border Visuals x N (BorderPrimitive attached to m_visual)
-//   ------Focus Visual Container
+//   ------Focus Visual Container (created when hosting focus visuals)
 //           |
 //           |------Inner Focus Visual
 //                     |
@@ -57,9 +57,6 @@ ComponentView::ComponentView(
     : base_type(tag, reactContext), m_compContext(compContext), m_flags(flags) {
   m_outerVisual = compContext.CreateSpriteVisual(); // TODO could be a raw ContainerVisual if we had a
                                                     // CreateContainerVisual in ICompositionContext
-  m_focusVisual = compContext.CreateSpriteVisual(); // TODO could be a raw ContainerVisual if we had a
-                                                    // CreateContainerVisual in ICompositionContext
-  m_outerVisual.InsertAt(m_focusVisual, 0);
 }
 
 ComponentView::~ComponentView() {
@@ -90,13 +87,17 @@ void ComponentView::onThemeChanged() noexcept {
     m_borderPrimitive->onThemeChanged(
         m_layoutMetrics, BorderPrimitive::resolveAndAlignBorderMetrics(m_layoutMetrics, *viewProps()));
   }
-  if (m_focusInnerPrimitive) {
-    auto innerFocusMetrics = focusLayoutMetrics(true /*inner*/);
-    m_focusInnerPrimitive->onThemeChanged(innerFocusMetrics, focusBorderMetrics(true /*inner*/, innerFocusMetrics));
-  }
-  if (m_focusOuterPrimitive) {
-    auto outerFocusMetrics = focusLayoutMetrics(true /*inner*/);
-    m_focusOuterPrimitive->onThemeChanged(outerFocusMetrics, focusBorderMetrics(false /*inner*/, outerFocusMetrics));
+  if (m_componentHostingFocusVisual) {
+    if (m_componentHostingFocusVisual->m_focusPrimitive->m_focusInnerPrimitive) {
+      auto innerFocusMetrics = focusLayoutMetrics(true /*inner*/);
+      m_componentHostingFocusVisual->m_focusPrimitive->m_focusInnerPrimitive->onThemeChanged(
+          innerFocusMetrics, focusBorderMetrics(true /*inner*/, innerFocusMetrics));
+    }
+    if (m_componentHostingFocusVisual->m_focusPrimitive->m_focusOuterPrimitive) {
+      auto outerFocusMetrics = focusLayoutMetrics(true /*inner*/);
+      m_componentHostingFocusVisual->m_focusPrimitive->m_focusOuterPrimitive->onThemeChanged(
+          outerFocusMetrics, focusBorderMetrics(false /*inner*/, outerFocusMetrics));
+    }
   }
 
   if ((m_flags & ComponentViewFeatures::ShadowProps) == ComponentViewFeatures::ShadowProps) {
@@ -160,14 +161,18 @@ void ComponentView::updateProps(
   if (m_borderPrimitive) {
     m_borderPrimitive->updateProps(oldViewProps, newViewProps);
   }
-  if (!newViewProps.enableFocusRing) {
-    showFocusVisual(false);
-  }
-  if (m_focusInnerPrimitive) {
-    m_focusInnerPrimitive->updateProps(oldViewProps, newViewProps);
-  }
-  if (m_focusOuterPrimitive) {
-    m_focusOuterPrimitive->updateProps(oldViewProps, newViewProps);
+
+  if (m_componentHostingFocusVisual) {
+    if (!newViewProps.enableFocusRing) {
+      m_componentHostingFocusVisual->hostFocusVisual(false, get_strong());
+    }
+
+    if (m_componentHostingFocusVisual->m_focusPrimitive->m_focusInnerPrimitive) {
+      m_componentHostingFocusVisual->m_focusPrimitive->m_focusInnerPrimitive->updateProps(oldViewProps, newViewProps);
+    }
+    if (m_componentHostingFocusVisual->m_focusPrimitive->m_focusOuterPrimitive) {
+      m_componentHostingFocusVisual->m_focusPrimitive->m_focusOuterPrimitive->updateProps(oldViewProps, newViewProps);
+    }
   }
   if ((m_flags & ComponentViewFeatures::ShadowProps) == ComponentViewFeatures::ShadowProps) {
     updateShadowProps(oldViewProps, newViewProps);
@@ -200,44 +205,70 @@ void ComponentView::updateLayoutMetrics(
     });
   }
 
-  updateFocusLayoutMetrics(layoutMetrics);
+  base_type::updateLayoutMetrics(layoutMetrics, oldLayoutMetrics);
 
   if (layoutMetrics != oldLayoutMetrics) {
     if (m_borderPrimitive) {
       m_borderPrimitive->markNeedsUpdate();
     }
-    if (m_focusInnerPrimitive) {
-      m_focusInnerPrimitive->markNeedsUpdate();
-    }
-    if (m_focusOuterPrimitive) {
-      m_focusOuterPrimitive->markNeedsUpdate();
+
+    if (m_componentHostingFocusVisual) {
+      m_componentHostingFocusVisual->updateFocusLayoutMetrics();
     }
   }
 
-  base_type::updateLayoutMetrics(layoutMetrics, oldLayoutMetrics);
   UpdateCenterPropertySet();
 }
 
-void ComponentView::updateFocusLayoutMetrics(facebook::react::LayoutMetrics const &layoutMetrics) noexcept {
-  if (m_focusInnerPrimitive) {
-    auto innerFocusMetrics = focusLayoutMetrics(true /*inner*/);
-    m_focusInnerPrimitive->RootVisual().Size(
-        {innerFocusMetrics.frame.size.width * layoutMetrics.pointScaleFactor,
-         innerFocusMetrics.frame.size.height * layoutMetrics.pointScaleFactor});
-    m_focusInnerPrimitive->RootVisual().Offset(
-        {-FOCUS_VISUAL_WIDTH * layoutMetrics.pointScaleFactor,
-         -FOCUS_VISUAL_WIDTH * layoutMetrics.pointScaleFactor,
-         0.0f});
-  }
-  if (m_focusOuterPrimitive) {
-    auto outerFocusMetrics = focusLayoutMetrics(false /*inner*/);
-    m_focusOuterPrimitive->RootVisual().Size(
-        {outerFocusMetrics.frame.size.width * layoutMetrics.pointScaleFactor,
-         outerFocusMetrics.frame.size.height * layoutMetrics.pointScaleFactor});
-    m_focusOuterPrimitive->RootVisual().Offset(
-        {-(FOCUS_VISUAL_WIDTH * 2 * m_layoutMetrics.pointScaleFactor),
-         -(FOCUS_VISUAL_WIDTH * 2 * m_layoutMetrics.pointScaleFactor),
-         0.0f});
+void ComponentView::updateFocusLayoutMetrics() noexcept {
+  facebook::react::RectangleEdges<bool> nudgeEdges;
+  auto scaleFactor = m_focusPrimitive->m_focusVisualComponent->m_layoutMetrics.pointScaleFactor;
+  if (m_focusPrimitive) {
+    if (m_focusPrimitive->m_focusOuterPrimitive) {
+      auto outerFocusMetrics = m_focusPrimitive->m_focusVisualComponent->focusLayoutMetrics(false /*inner*/);
+
+      if (outerFocusMetrics.frame.origin.x < 0) {
+        nudgeEdges.left = true;
+      }
+      if (outerFocusMetrics.frame.origin.y < 0) {
+        nudgeEdges.top = true;
+      }
+      if (outerFocusMetrics.frame.getMaxX() > m_layoutMetrics.frame.getMaxX()) {
+        nudgeEdges.right = true;
+      }
+      if (outerFocusMetrics.frame.getMaxY() > m_layoutMetrics.frame.getMaxY()) {
+        nudgeEdges.bottom = true;
+      }
+
+      m_focusPrimitive->m_focusOuterPrimitive->RootVisual().Size(
+          {outerFocusMetrics.frame.size.width * scaleFactor -
+               (nudgeEdges.left ? (FOCUS_VISUAL_WIDTH * 2 * scaleFactor) : 0) -
+               (nudgeEdges.right ? (FOCUS_VISUAL_WIDTH * 2 * scaleFactor) : 0),
+           outerFocusMetrics.frame.size.height * scaleFactor -
+               (nudgeEdges.top ? (FOCUS_VISUAL_WIDTH * 2 * scaleFactor) : 0) -
+               (nudgeEdges.bottom ? (FOCUS_VISUAL_WIDTH * 2 * scaleFactor) : 0)});
+      m_focusPrimitive->m_focusOuterPrimitive->RootVisual().Offset(
+          {nudgeEdges.left ? 0 : -(FOCUS_VISUAL_WIDTH * 2 * scaleFactor),
+           nudgeEdges.top ? 0 : -(FOCUS_VISUAL_WIDTH * 2 * scaleFactor),
+           0.0f});
+      m_focusPrimitive->m_focusOuterPrimitive->markNeedsUpdate();
+    }
+
+    if (m_focusPrimitive->m_focusInnerPrimitive) {
+      auto innerFocusMetrics = m_focusPrimitive->m_focusVisualComponent->focusLayoutMetrics(true /*inner*/);
+      m_focusPrimitive->m_focusInnerPrimitive->RootVisual().Size(
+          {innerFocusMetrics.frame.size.width * scaleFactor -
+               (nudgeEdges.left ? (FOCUS_VISUAL_WIDTH * scaleFactor) : 0) -
+               (nudgeEdges.right ? (FOCUS_VISUAL_WIDTH * scaleFactor) : 0),
+           innerFocusMetrics.frame.size.height * scaleFactor -
+               (nudgeEdges.top ? (FOCUS_VISUAL_WIDTH * scaleFactor) : 0) -
+               (nudgeEdges.bottom ? (FOCUS_VISUAL_WIDTH * scaleFactor) : 0)});
+      m_focusPrimitive->m_focusInnerPrimitive->RootVisual().Offset(
+          {nudgeEdges.left ? 0 : -FOCUS_VISUAL_WIDTH * scaleFactor,
+           nudgeEdges.top ? 0 : -FOCUS_VISUAL_WIDTH * scaleFactor,
+           0.0f});
+      m_focusPrimitive->m_focusInnerPrimitive->markNeedsUpdate();
+    }
   }
 }
 
@@ -288,13 +319,17 @@ void ComponentView::FinalizeUpdates(winrt::Microsoft::ReactNative::ComponentView
     }
   }
 
-  if (m_focusInnerPrimitive) {
-    auto innerFocusMetrics = focusLayoutMetrics(true /*inner*/);
-    m_focusInnerPrimitive->finalize(innerFocusMetrics, focusBorderMetrics(true /*inner*/, innerFocusMetrics));
-  }
-  if (m_focusOuterPrimitive) {
-    auto outerFocusMetrics = focusLayoutMetrics(false /*inner*/);
-    m_focusOuterPrimitive->finalize(outerFocusMetrics, focusBorderMetrics(false /*inner*/, outerFocusMetrics));
+  if (m_componentHostingFocusVisual) {
+    if (m_componentHostingFocusVisual->m_focusPrimitive->m_focusInnerPrimitive) {
+      auto innerFocusMetrics = focusLayoutMetrics(true /*inner*/);
+      m_componentHostingFocusVisual->m_focusPrimitive->m_focusInnerPrimitive->finalize(
+          innerFocusMetrics, focusBorderMetrics(true /*inner*/, innerFocusMetrics));
+    }
+    if (m_componentHostingFocusVisual->m_focusPrimitive->m_focusOuterPrimitive) {
+      auto outerFocusMetrics = focusLayoutMetrics(false /*inner*/);
+      m_componentHostingFocusVisual->m_focusPrimitive->m_focusOuterPrimitive->finalize(
+          outerFocusMetrics, focusBorderMetrics(false /*inner*/, outerFocusMetrics));
+    }
   }
 
   if (m_FinalizeTransform) {
@@ -308,7 +343,12 @@ void ComponentView::onLostFocus(
     const winrt::Microsoft::ReactNative::Composition::Input::RoutedEventArgs &args) noexcept {
   if (args.OriginalSource() == Tag()) {
     m_eventEmitter->onBlur();
-    showFocusVisual(false);
+
+    if (m_componentHostingFocusVisual) {
+      auto s = get_strong();
+
+      m_componentHostingFocusVisual->hostFocusVisual(false, get_strong());
+    }
     if (m_uiaProvider) {
       winrt::Microsoft::ReactNative::implementation::UpdateUiaProperty(
           m_uiaProvider, UIA_HasKeyboardFocusPropertyId, true, false);
@@ -317,12 +357,47 @@ void ComponentView::onLostFocus(
   base_type::onLostFocus(args);
 }
 
+winrt::Microsoft::ReactNative::Composition::Experimental::IVisual ComponentView::visualToHostFocus() noexcept {
+  return OuterVisual();
+}
+
+// We want to host focus visuals as close to the focused component as possible.  However since the focus visuals extend
+// past the bounds of the component, in cases where additional components are positioned directly next to this one, we'd
+// get zorder issues causing most of the focus rect to be obscured. So we go up the tree until we find a component who's
+// bounds will fix the entire focus rect.
+winrt::com_ptr<ComponentView> ComponentView::focusVisualRoot(const facebook::react::Rect &focusRect) noexcept {
+  auto compVisual =
+      winrt::Microsoft::ReactNative::Composition::Experimental::CompositionContextHelper::InnerVisual(OuterVisual());
+  if (!compVisual) {
+    return get_strong();
+    // When not using lifted composition, force the focus visual to host within its own component, as we do not support
+    // ParentForTransform
+  }
+
+  if (facebook::react::Rect::intersect(focusRect, m_layoutMetrics.frame) == focusRect) {
+    return get_strong();
+  }
+
+  if (!m_parent) {
+    return get_strong();
+  }
+
+  return m_parent.as<ComponentView>()->focusVisualRoot(
+      {{focusRect.origin.x + m_layoutMetrics.frame.origin.x, focusRect.origin.y + m_layoutMetrics.frame.origin.y},
+       focusRect.size});
+}
+
 void ComponentView::onGotFocus(
     const winrt::Microsoft::ReactNative::Composition::Input::RoutedEventArgs &args) noexcept {
   if (args.OriginalSource() == Tag()) {
     m_eventEmitter->onFocus();
     if (viewProps()->enableFocusRing) {
-      showFocusVisual(true);
+      facebook::react::Rect focusRect = m_layoutMetrics.frame;
+      focusRect.origin.x -= (FOCUS_VISUAL_WIDTH * 2);
+      focusRect.origin.y -= (FOCUS_VISUAL_WIDTH * 2);
+      focusRect.size.width += (FOCUS_VISUAL_WIDTH * 2);
+      focusRect.size.height += (FOCUS_VISUAL_WIDTH * 2);
+      focusVisualRoot(focusRect)->hostFocusVisual(true, get_strong());
     }
     if (m_uiaProvider) {
       auto spProviderSimple = m_uiaProvider.try_as<IRawElementProviderSimple>();
@@ -493,39 +568,70 @@ facebook::react::BorderMetrics ComponentView::focusBorderMetrics(
   return metrics;
 }
 
-void ComponentView::showFocusVisual(bool show) noexcept {
-  if ((m_flags & ComponentViewFeatures::FocusVisual) == ComponentViewFeatures::FocusVisual) {
-    if (show && !m_showingFocusVisual) {
-      m_showingFocusVisual = true;
-
-      m_focusVisual.IsVisible(true);
-      assert(viewProps()->enableFocusRing);
-      if (!m_focusInnerPrimitive) {
-        m_focusInnerPrimitive = std::make_shared<BorderPrimitive>(*this);
-        m_focusVisual.InsertAt(m_focusInnerPrimitive->RootVisual(), 0);
+void ComponentView::hostFocusVisual(bool show, winrt::com_ptr<ComponentView> view) noexcept {
+  if ((view->m_flags & ComponentViewFeatures::FocusVisual) == ComponentViewFeatures::FocusVisual) {
+    // Any previous view showing focus visuals should have removed them before another shows it
+    assert(
+        !m_focusPrimitive || !m_focusPrimitive->m_focusVisualComponent ||
+        m_focusPrimitive->m_focusVisualComponent == view);
+    assert(
+        !m_focusPrimitive || !m_focusPrimitive->m_focusVisualComponent ||
+        view->m_componentHostingFocusVisual.get() == this);
+    if (show && !view->m_componentHostingFocusVisual) {
+      view->m_componentHostingFocusVisual = get_strong();
+
+      if (!m_focusPrimitive) {
+        m_focusPrimitive = std::make_unique<FocusPrimitive>();
       }
-      if (!m_focusOuterPrimitive) {
-        m_focusOuterPrimitive = std::make_shared<BorderPrimitive>(*this);
-        m_focusVisual.InsertAt(m_focusOuterPrimitive->RootVisual(), 0);
+      m_focusPrimitive->m_focusVisualComponent = view;
+
+      if (!m_focusPrimitive->m_focusVisual) {
+        m_focusPrimitive->m_focusVisual = m_compContext.CreateSpriteVisual();
+        auto hostingVisual =
+            winrt::Microsoft::ReactNative::Composition::Experimental::CompositionContextHelper::InnerVisual(
+                visualToHostFocus())
+                .as<winrt::Microsoft::UI::Composition::ContainerVisual>();
+        if (hostingVisual) {
+          hostingVisual.Children().InsertAtTop(
+              winrt::Microsoft::ReactNative::Composition::Experimental::CompositionContextHelper::InnerVisual(
+                  m_focusPrimitive->m_focusVisual));
+        } else {
+          assert(
+              view.get() ==
+              this); // When not using lifted comp, focus visuals should always host within their own component
+          OuterVisual().InsertAt(m_focusPrimitive->m_focusVisual, 1);
+        }
       }
-      updateFocusLayoutMetrics(m_layoutMetrics);
-      auto innerFocusMetrics = focusLayoutMetrics(true /*inner*/);
-      m_focusInnerPrimitive->finalize(innerFocusMetrics, focusBorderMetrics(true /*inner*/, innerFocusMetrics));
-      auto outerFocusMetrics = focusLayoutMetrics(false /*inner*/);
-      m_focusOuterPrimitive->finalize(outerFocusMetrics, focusBorderMetrics(false /*inner*/, outerFocusMetrics));
-    } else if (!show && m_showingFocusVisual) {
-      m_showingFocusVisual = false;
-      m_focusVisual.IsVisible(false);
-      if (m_focusInnerPrimitive) {
-        m_focusInnerPrimitive->markNeedsUpdate();
-        auto innerFocusMetrics = focusLayoutMetrics(true /*inner*/);
-        m_focusInnerPrimitive->finalize(innerFocusMetrics, focusBorderMetrics(true /*inner*/, innerFocusMetrics));
+
+      m_focusPrimitive->m_focusVisual.IsVisible(true);
+      assert(view->viewProps()->enableFocusRing);
+      if (!m_focusPrimitive->m_focusInnerPrimitive) {
+        m_focusPrimitive->m_focusInnerPrimitive = std::make_shared<BorderPrimitive>(*this);
+        m_focusPrimitive->m_focusVisual.InsertAt(m_focusPrimitive->m_focusInnerPrimitive->RootVisual(), 0);
+      }
+      if (!m_focusPrimitive->m_focusOuterPrimitive) {
+        m_focusPrimitive->m_focusOuterPrimitive = std::make_shared<BorderPrimitive>(*this);
+        m_focusPrimitive->m_focusVisual.InsertAt(m_focusPrimitive->m_focusOuterPrimitive->RootVisual(), 0);
       }
-      if (m_focusOuterPrimitive) {
-        m_focusOuterPrimitive->markNeedsUpdate();
-        auto outerFocusMetrics = focusLayoutMetrics(false /*inner*/);
-        m_focusOuterPrimitive->finalize(outerFocusMetrics, focusBorderMetrics(false /*inner*/, outerFocusMetrics));
+      if (auto focusVisual =
+              winrt::Microsoft::ReactNative::Composition::Experimental::CompositionContextHelper::InnerVisual(
+                  m_focusPrimitive->m_focusVisual)) {
+        auto outerVisual =
+            winrt::Microsoft::ReactNative::Composition::Experimental::CompositionContextHelper::InnerVisual(
+                view->OuterVisual());
+        focusVisual.ParentForTransform(outerVisual);
       }
+      updateFocusLayoutMetrics();
+      auto innerFocusMetrics = view->focusLayoutMetrics(true /*inner*/);
+      m_focusPrimitive->m_focusInnerPrimitive->finalize(
+          innerFocusMetrics, view->focusBorderMetrics(true /*inner*/, innerFocusMetrics));
+      auto outerFocusMetrics = view->focusLayoutMetrics(false /*inner*/);
+      m_focusPrimitive->m_focusOuterPrimitive->finalize(
+          outerFocusMetrics, view->focusBorderMetrics(false /*inner*/, outerFocusMetrics));
+    } else if (!show && view->m_componentHostingFocusVisual && m_focusPrimitive) {
+      m_focusPrimitive->m_focusVisualComponent = nullptr;
+      m_focusPrimitive->m_focusVisual.IsVisible(false);
+      view->m_componentHostingFocusVisual = nullptr;
     }
   }
 }

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

@@ -20,6 +20,13 @@ struct CompContext;
 
 namespace winrt::Microsoft::ReactNative::Composition::implementation {
 
+struct FocusPrimitive {
+  std::shared_ptr<BorderPrimitive> m_focusInnerPrimitive;
+  std::shared_ptr<BorderPrimitive> m_focusOuterPrimitive;
+  winrt::com_ptr<ComponentView> m_focusVisualComponent{nullptr}; // The owning component of focus visuals being hosted
+  winrt::Microsoft::ReactNative::Composition::Experimental::IVisual m_focusVisual{nullptr};
+};
+
 struct ComponentView : public ComponentViewT<
                            ComponentView,
                            winrt::Microsoft::ReactNative::implementation::ComponentView,
@@ -125,13 +132,10 @@ struct ComponentView : public ComponentViewT<
   facebook::react::SharedViewEventEmitter m_eventEmitter;
 
  private:
-  void updateFocusLayoutMetrics(facebook::react::LayoutMetrics const &layoutMetrics) noexcept;
+  void updateFocusLayoutMetrics() noexcept;
   void updateClippingPath(
       facebook::react::LayoutMetrics const &layoutMetrics,
       const facebook::react::ViewProps &viewProps) noexcept;
-  void finalizeFocusVisual(
-      facebook::react::LayoutMetrics const &layoutMetrics,
-      const facebook::react::ViewProps &viewProps) noexcept;
   void UpdateCenterPropertySet() noexcept;
   void FinalizeTransform(
       facebook::react::LayoutMetrics const &layoutMetrics,
@@ -140,16 +144,18 @@ struct ComponentView : public ComponentViewT<
   facebook::react::BorderMetrics focusBorderMetrics(bool inner, const facebook::react::LayoutMetrics &layoutMetrics)
       const noexcept;
 
+  virtual winrt::Microsoft::ReactNative::Composition::Experimental::IVisual visualToHostFocus() noexcept;
+  virtual winrt::com_ptr<ComponentView> focusVisualRoot(const facebook::react::Rect &focusRect) noexcept;
+
   bool m_hasTransformMatrixFacade : 1 {false};
-  bool m_showingFocusVisual : 1 {false};
   bool m_FinalizeTransform : 1 {false};
   bool m_tooltipTracked : 1 {false};
   ComponentViewFeatures m_flags;
-  void showFocusVisual(bool show) noexcept;
+  void hostFocusVisual(bool show, winrt::com_ptr<ComponentView> view) noexcept;
+  winrt::com_ptr<ComponentView>
+      m_componentHostingFocusVisual; // The component that we are showing our focus visuals within
   std::shared_ptr<BorderPrimitive> m_borderPrimitive;
-  std::shared_ptr<BorderPrimitive> m_focusInnerPrimitive;
-  std::shared_ptr<BorderPrimitive> m_focusOuterPrimitive;
-  winrt::Microsoft::ReactNative::Composition::Experimental::IVisual m_focusVisual{nullptr};
+  std::unique_ptr<FocusPrimitive> m_focusPrimitive{nullptr};
   winrt::Microsoft::ReactNative::Composition::Experimental::IVisual m_outerVisual{nullptr};
   winrt::event<winrt::Windows::Foundation::EventHandler<winrt::IInspectable>> m_themeChangedEvent;
 };
@@ -176,7 +182,6 @@ struct ViewComponentView : public ViewComponentViewT<
       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::KeyRoutedEventArgs &args) noexcept override;
   void OnKeyUp(const winrt::Microsoft::ReactNative::Composition::Input::KeyRoutedEventArgs &args) noexcept override;

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

@@ -1258,4 +1258,14 @@ std::string ScrollViewComponentView::DefaultControlType() const noexcept {
   return "scrollbar";
 }
 
+winrt::com_ptr<ComponentView> ScrollViewComponentView::focusVisualRoot(
+    const facebook::react::Rect &focusRect) noexcept {
+  return get_strong();
+}
+
+winrt::Microsoft::ReactNative::Composition::Experimental::IVisual
+ScrollViewComponentView::visualToHostFocus() noexcept {
+  return m_scrollVisual;
+}
+
 } // namespace winrt::Microsoft::ReactNative::Composition::implementation

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

@@ -110,6 +110,9 @@ struct ScrollInteractionTrackerOwner : public winrt::implements<
   bool lineRight(bool animate) noexcept;
   winrt::Microsoft::ReactNative::Composition::Experimental::IVisual createVisual() noexcept override;
 
+  winrt::Microsoft::ReactNative::Composition::Experimental::IVisual visualToHostFocus() noexcept override;
+  winrt::com_ptr<ComponentView> focusVisualRoot(const facebook::react::Rect &focusRect) noexcept override;
+
  private:
   void updateContentVisualSize() noexcept;
   bool scrollToEnd(bool animate) noexcept;

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

@@ -165,6 +165,10 @@ struct CompTextHost : public winrt::implements<CompTextHost, ITextHost> {
 
   //@cmember Show the caret
   BOOL TxShowCaret(BOOL fShow) override {
+    // Only show the caret if we have focus
+    if (fShow && !m_outer->m_hasFocus) {
+      return false;
+    }
     m_outer->ShowCaret(m_outer->windowsTextInputProps().caretHidden ? false : fShow);
     return true;
   }
@@ -915,6 +919,7 @@ void WindowsTextInputComponentView::UnmountChildComponentView(
 
 void WindowsTextInputComponentView::onLostFocus(
     const winrt::Microsoft::ReactNative::Composition::Input::RoutedEventArgs &args) noexcept {
+  m_hasFocus = false;
   Super::onLostFocus(args);
   if (m_textServices) {
     LRESULT lresult;
@@ -926,6 +931,7 @@ void WindowsTextInputComponentView::onLostFocus(
 
 void WindowsTextInputComponentView::onGotFocus(
     const winrt::Microsoft::ReactNative::Composition::Input::RoutedEventArgs &args) noexcept {
+  m_hasFocus = true;
   Super::onGotFocus(args);
   if (m_textServices) {
     LRESULT lresult;

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

@@ -128,6 +128,7 @@ struct WindowsTextInputComponentView
   int m_cDrawBlock{0};
   bool m_needsRedraw{false};
   bool m_drawing{false};
+  bool m_hasFocus{false};
   bool m_clearTextOnSubmit{false};
   bool m_multiline{false};
   DWORD m_propBitsMask{0};

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

@@ -26,7 +26,7 @@ UnimplementedNativeViewComponentView::UnimplementedNativeViewComponentView(
               ~(ComponentViewFeatures::Background | ComponentViewFeatures::ShadowProps |
                 ComponentViewFeatures::NativeBorder)) {
   m_labelVisual = compContext.CreateSpriteVisual();
-  OuterVisual().InsertAt(m_labelVisual, 1);
+  OuterVisual().InsertAt(m_labelVisual, 0);
 }
 
 winrt::Microsoft::ReactNative::ComponentView UnimplementedNativeViewComponentView::Create(

package/PropertySheets/Generated/PackageVersion.g.props

@@ -10,11 +10,11 @@
 -->
 <Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <PropertyGroup>
-    <ReactNativeWindowsVersion>0.74.25</ReactNativeWindowsVersion>
+    <ReactNativeWindowsVersion>0.74.26</ReactNativeWindowsVersion>
     <ReactNativeWindowsMajor>0</ReactNativeWindowsMajor>
     <ReactNativeWindowsMinor>74</ReactNativeWindowsMinor>
-    <ReactNativeWindowsPatch>25</ReactNativeWindowsPatch>
+    <ReactNativeWindowsPatch>26</ReactNativeWindowsPatch>
     <ReactNativeWindowsCanary>false</ReactNativeWindowsCanary>
-    <ReactNativeWindowsCommitId>15286b6547fe52ab5ae6d98e442a52ca1627d0e9</ReactNativeWindowsCommitId>
+    <ReactNativeWindowsCommitId>242effb4b70c5c442b0568203fb2de1818b9f8a3</ReactNativeWindowsCommitId>
   </PropertyGroup>
 </Project>

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "react-native-windows",
-  "version": "0.74.25",
+  "version": "0.74.26",
   "license": "MIT",
   "repository": {
     "type": "git",