react-native-windows 0.74.25 → 0.74.27

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,
@@ -28,7 +35,8 @@ struct ComponentView : public ComponentViewT<
       const winrt::Microsoft::ReactNative::Composition::Experimental::ICompositionContext &compContext,
       facebook::react::Tag tag,
       winrt::Microsoft::ReactNative::ReactContext const &reactContext,
-      ComponentViewFeatures flags);
+      ComponentViewFeatures flags,
+      winrt::Microsoft::ReactNative::Composition::ReactCompositionViewComponentBuilder *builder);
   virtual ~ComponentView();
 
   virtual winrt::Microsoft::ReactNative::Composition::Experimental::IVisual Visual() const noexcept {
@@ -99,6 +107,8 @@ struct ComponentView : public ComponentViewT<
   void Toggle() noexcept override;
   virtual winrt::Microsoft::ReactNative::implementation::ClipState getClipState() noexcept;
 
+  virtual std::pair<facebook::react::Cursor, HCURSOR> cursor() const noexcept;
+
   const facebook::react::LayoutMetrics &layoutMetrics() const noexcept;
 
   virtual std::string DefaultControlType() const noexcept;
@@ -125,13 +135,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 +147,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 +185,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;
@@ -201,7 +209,8 @@ struct ViewComponentView : public ViewComponentViewT<
       const winrt::Microsoft::ReactNative::Composition::Experimental::ICompositionContext &compContext,
       facebook::react::Tag tag,
       winrt::Microsoft::ReactNative::ReactContext const &reactContext,
-      ComponentViewFeatures flags);
+      ComponentViewFeatures flags,
+      winrt::Microsoft::ReactNative::Composition::ReactCompositionViewComponentBuilder *builder = nullptr);
 
   virtual winrt::Microsoft::ReactNative::Composition::Experimental::IVisual createVisual() noexcept;
 
@@ -219,7 +228,6 @@ struct ViewComponentView : public ViewComponentViewT<
   bool m_hasNonVisualChildren{false};
   facebook::react::SharedViewProps m_props;
   winrt::Microsoft::ReactNative::Composition::Experimental::IVisual m_visual{nullptr};
-  winrt::Microsoft::ReactNative::Composition::CreateVisualDelegate m_createVisualHandler{nullptr};
   winrt::Microsoft::ReactNative::Composition::Experimental::CreateInternalVisualDelegate m_createInternalVisualHandler{
       nullptr};
 };

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

@@ -22,8 +22,15 @@ namespace winrt::Microsoft::ReactNative::Composition::implementation {
 ContentIslandComponentView::ContentIslandComponentView(
     const winrt::Microsoft::ReactNative::Composition::Experimental::ICompositionContext &compContext,
     facebook::react::Tag tag,
-    winrt::Microsoft::ReactNative::ReactContext const &reactContext)
-    : base_type(ViewComponentView::defaultProps(), compContext, tag, reactContext, ComponentViewFeatures::Default) {
+    winrt::Microsoft::ReactNative::ReactContext const &reactContext,
+    ReactCompositionViewComponentBuilder *builder)
+    : base_type(
+          ViewComponentView::defaultProps(),
+          compContext,
+          tag,
+          reactContext,
+          ComponentViewFeatures::Default,
+          builder) {
   m_mountedToken = Mounted([](const winrt::IInspectable &, const winrt::Microsoft::ReactNative::ComponentView &view) {
     view.as<ContentIslandComponentView>()->OnMounted();
   });

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

@@ -40,7 +40,8 @@ struct ContentIslandComponentView : ContentIslandComponentViewT<ContentIslandCom
   ContentIslandComponentView(
       const winrt::Microsoft::ReactNative::Composition::Experimental::ICompositionContext &compContext,
       facebook::react::Tag tag,
-      winrt::Microsoft::ReactNative::ReactContext const &reactContext);
+      winrt::Microsoft::ReactNative::ReactContext const &reactContext,
+      ReactCompositionViewComponentBuilder *builder);
   ~ContentIslandComponentView() noexcept;
 
  private:

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

@@ -24,6 +24,7 @@
 #include "IReactContext.h"
 #include "ReactHost/ReactInstanceWin.h"
 #include "ReactNativeHost.h"
+#include "WindowsModalHostViewShadowNode.h"
 
 namespace winrt::Microsoft::ReactNative::Composition::implementation {
 WindowsModalHostComponentView::WindowsModalHostComponentView(
@@ -33,6 +34,23 @@ WindowsModalHostComponentView::WindowsModalHostComponentView(
     : Super(compContext, tag, reactContext) {}
 
 WindowsModalHostComponentView::~WindowsModalHostComponentView() {
+  // dispatch onDismiss event
+  auto emitter = std::static_pointer_cast<const facebook::react::ModalHostViewEventEmitter>(m_eventEmitter);
+  facebook::react::ModalHostViewEventEmitter::OnDismiss onDismissArgs;
+  emitter->onDismiss(onDismissArgs);
+
+  // reset the topWindowID
+  if (m_prevWindowID) {
+    auto host =
+        winrt::Microsoft::ReactNative::implementation::ReactNativeHost::GetReactNativeHost(m_reactContext.Properties());
+    winrt::Microsoft::ReactNative::ReactCoreInjection::SetTopLevelWindowId(
+        host.InstanceSettings().Properties(), m_prevWindowID);
+    m_prevWindowID = 0;
+  }
+
+  // enable input to parent
+  EnableWindow(m_parentHwnd, true);
+
   // Check if the window handle (m_hwnd) exists and destroy it if necessary
   if (m_hwnd) {
     // Close/Destroy the modal window
@@ -77,17 +95,19 @@ void WindowsModalHostComponentView::EnsureModalCreated() {
   m_prevWindowID =
       winrt::Microsoft::ReactNative::ReactCoreInjection::GetTopLevelWindowId(m_reactContext.Properties().Handle());
 
-  auto roothwnd = GetHwndForParenting();
+  m_parentHwnd = GetHwndForParenting();
+
+  auto windowsStyle = m_showTitleBar ? WS_OVERLAPPEDWINDOW : WS_POPUP;
 
   m_hwnd = CreateWindow(
       c_modalWindowClassName,
       L"React-Native Modal",
-      WS_OVERLAPPEDWINDOW,
+      windowsStyle,
       CW_USEDEFAULT,
       CW_USEDEFAULT,
       MODAL_MIN_WIDTH,
       MODAL_MIN_HEIGHT,
-      roothwnd, // parent
+      m_parentHwnd, // parent
       nullptr,
       hInstance,
       spunk.get());
@@ -126,7 +146,7 @@ void WindowsModalHostComponentView::EnsureModalCreated() {
   constraints.LayoutDirection = winrt::Microsoft::ReactNative::LayoutDirection::Undefined;
 
   RECT rc;
-  GetClientRect(roothwnd, &rc);
+  GetClientRect(m_parentHwnd, &rc);
   // Maximum size is set to size of parent hwnd
   constraints.MaximumSize = {(rc.right - rc.left) * ScaleFactor(m_hwnd), (rc.bottom - rc.top) / ScaleFactor(m_hwnd)};
   constraints.MinimumSize = {MODAL_MIN_WIDTH * ScaleFactor(m_hwnd), MODAL_MIN_HEIGHT * ScaleFactor(m_hwnd)};
@@ -141,6 +161,14 @@ void WindowsModalHostComponentView::ShowOnUIThread() {
     ShowWindow(m_hwnd, SW_NORMAL);
     BringWindowToTop(m_hwnd);
     SetFocus(m_hwnd);
+
+    // disable input to parent
+    EnableWindow(m_parentHwnd, false);
+
+    // dispatch onShow event
+    auto emitter = std::static_pointer_cast<const facebook::react::ModalHostViewEventEmitter>(m_eventEmitter);
+    facebook::react::ModalHostViewEventEmitter::OnShow onShowArgs;
+    emitter->onShow(onShowArgs);
   }
 }
 
@@ -149,12 +177,21 @@ void WindowsModalHostComponentView::HideOnUIThread() noexcept {
     SendMessage(m_hwnd, WM_CLOSE, 0, 0);
   }
 
+  // dispatch onDismiss event
+  auto emitter = std::static_pointer_cast<const facebook::react::ModalHostViewEventEmitter>(m_eventEmitter);
+  facebook::react::ModalHostViewEventEmitter::OnDismiss onDismissArgs;
+  emitter->onDismiss(onDismissArgs);
+
+  // enable input to parent
+  EnableWindow(m_parentHwnd, true);
+
   // reset the topWindowID
   if (m_prevWindowID) {
     auto host =
         winrt::Microsoft::ReactNative::implementation::ReactNativeHost::GetReactNativeHost(m_reactContext.Properties());
     winrt::Microsoft::ReactNative::ReactCoreInjection::SetTopLevelWindowId(
         host.InstanceSettings().Properties(), m_prevWindowID);
+    m_prevWindowID = 0;
   }
 }
 
@@ -266,22 +303,32 @@ void WindowsModalHostComponentView::AdjustWindowSize() noexcept {
   if (m_layoutMetrics.overflowInset.right == 0 && m_layoutMetrics.overflowInset.bottom == 0) {
     return;
   }
+
   // Modal's size is based on it's children, use the overflow to calculate the width/height
   float xPos = (-m_layoutMetrics.overflowInset.right * (m_layoutMetrics.pointScaleFactor));
   float yPos = (-m_layoutMetrics.overflowInset.bottom * (m_layoutMetrics.pointScaleFactor));
   RECT rc;
   GetClientRect(m_hwnd, &rc);
   RECT rect = {0, 0, (int)xPos, (int)yPos};
-  AdjustWindowRect(&rect, WS_OVERLAPPEDWINDOW, FALSE); // Adjust for title bar and borders
-  MoveWindow(m_hwnd, 0, 0, (int)(rect.right - rect.left), (int)(rect.bottom - rect.top), true);
+
+  if (m_showTitleBar) {
+    AdjustWindowRect(&rect, WS_OVERLAPPEDWINDOW, FALSE); // Adjust for title bar and borders
+  }
 
   // set the layoutMetrics
-  m_layoutMetrics.frame.size = {
-      (float)rect.right - rect.left + m_layoutMetrics.frame.origin.x,
-      (float)rect.bottom - rect.top + m_layoutMetrics.frame.origin.y};
+  m_layoutMetrics.frame.size = {(float)rect.right - rect.left, (float)rect.bottom - rect.top};
   m_layoutMetrics.overflowInset.right = 0;
   m_layoutMetrics.overflowInset.bottom = 0;
 
+  // get Modal's position based on parent
+  RECT parentRC;
+  GetWindowRect(m_parentHwnd, &parentRC);
+  float xCor = (parentRC.left + parentRC.right - m_layoutMetrics.frame.size.width) / 2; // midpointx - width / 2
+  float yCor = (parentRC.top + parentRC.bottom - m_layoutMetrics.frame.size.height) / 2; // midpointy - height / 2
+
+  // Adjust window position and size
+  MoveWindow(m_hwnd, (int)xCor, (int)yCor, (int)(rect.right - rect.left), (int)(rect.bottom - rect.top), true);
+
   // Let RNWIsland know that Modal's size has changed
   winrt::get_self<winrt::Microsoft::ReactNative::implementation::ReactNativeIsland>(m_reactNativeIsland)
       ->NotifySizeChanged();
@@ -294,6 +341,9 @@ void WindowsModalHostComponentView::updateProps(
       *std::static_pointer_cast<const facebook::react::ModalHostViewProps>(oldProps ? oldProps : viewProps());
   const auto &newModalProps = *std::static_pointer_cast<const facebook::react::ModalHostViewProps>(props);
   newModalProps.visible ? m_isVisible = true : m_isVisible = false;
+  if (!m_isVisible) {
+    HideOnUIThread();
+  }
   base_type::updateProps(props, oldProps);
 }
 

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

@@ -60,9 +60,11 @@ struct WindowsModalHostComponentView
   static void RegisterWndClass() noexcept;
 
  private:
+  HWND m_parentHwnd{nullptr};
   HWND m_hwnd{nullptr};
   uint64_t m_prevWindowID;
   bool m_isVisible{false};
+  bool m_showTitleBar{false};
   winrt::Microsoft::ReactNative::ReactNativeIsland m_reactNativeIsland;
 };
 

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

@@ -6,6 +6,7 @@
 #include <Fabric/Composition/CompositionViewComponentView.h>
 #include <Fabric/Composition/ContentIslandComponentView.h>
 #include <strsafe.h>
+#include "CompositionContextHelper.h"
 #include "DynamicWriter.h"
 #include "ReactHost/MsoUtils.h"
 
@@ -52,24 +53,6 @@ LayoutHandler ReactCompositionViewComponentBuilder::LayoutHandler() const noexce
 void ReactCompositionViewComponentBuilder::InitializeComponentView(
     const winrt::Microsoft::ReactNative::ComponentView &view) noexcept {
   auto self = winrt::get_self<winrt::Microsoft::ReactNative::implementation::ComponentView>(view);
-  self->MarkAsCustomComponent();
-  if (m_customCommandHandler)
-    self->CustomCommandHandler(m_customCommandHandler);
-  if (m_finalizeUpdateHandler)
-    self->FinalizeUpdateHandler(m_finalizeUpdateHandler);
-  if (m_updatePropsHandler)
-    self->UpdatePropsHandler(m_updatePropsHandler);
-  if (m_updateStateHandler)
-    self->UpdateStateHandler(m_updateStateHandler);
-  if (m_updateEventEmitterHandler)
-    self->UpdateEventEmitterHandler(m_updateEventEmitterHandler);
-  if (m_mountChildComponentViewHandler)
-    self->MountChildComponentViewHandler(m_mountChildComponentViewHandler);
-  if (m_unmountChildComponentViewHandler)
-    self->UnmountChildComponentViewHandler(m_unmountChildComponentViewHandler);
-  if (m_createVisualHandler)
-    view.as<winrt::Microsoft::ReactNative::Composition::implementation::ViewComponentView>()->CreateVisualHandler(
-        m_createVisualHandler);
 }
 
 void ReactCompositionViewComponentBuilder::SetComponentViewInitializer(
@@ -78,8 +61,9 @@ void ReactCompositionViewComponentBuilder::SetComponentViewInitializer(
                        const IReactContext &reactContext,
                        int32_t tag,
                        const Experimental::ICompositionContext &context,
-                       ComponentViewFeatures) {
-    auto view = winrt::make<winrt::Microsoft::ReactNative::implementation::ComponentView>(tag, reactContext);
+                       ComponentViewFeatures,
+                       ReactCompositionViewComponentBuilder &builder) {
+    auto view = winrt::make<winrt::Microsoft::ReactNative::implementation::ComponentView>(tag, reactContext, &builder);
     initializer(view);
     return view;
   };
@@ -94,9 +78,10 @@ void ReactCompositionViewComponentBuilder::SetViewComponentViewInitializer(
                        const IReactContext &reactContext,
                        int32_t tag,
                        const Experimental::ICompositionContext &context,
-                       ComponentViewFeatures features) {
+                       ComponentViewFeatures features,
+                       ReactCompositionViewComponentBuilder &builder) {
     auto view = winrt::make<implementation::ViewComponentView>(
-        implementation::ViewComponentView::defaultProps(), context, tag, reactContext, features);
+        implementation::ViewComponentView::defaultProps(), context, tag, reactContext, features, &builder);
     initializer(view);
     return view;
   };
@@ -108,14 +93,15 @@ void ReactCompositionViewComponentBuilder::SetViewComponentViewInitializer(
 
 void ReactCompositionViewComponentBuilder::SetContentIslandComponentViewInitializer(
     const ComponentIslandComponentViewInitializer &initializer) noexcept {
-  m_fnCreateView =
-      [initializer](
-          const IReactContext &reactContext,
-          int32_t tag,
-          const Experimental::ICompositionContext &context,
-          ComponentViewFeatures) -> winrt::Microsoft::ReactNative::Composition::ContentIslandComponentView {
+  m_fnCreateView = [initializer](
+                       const IReactContext &reactContext,
+                       int32_t tag,
+                       const Experimental::ICompositionContext &context,
+                       ComponentViewFeatures /*features*/,
+                       ReactCompositionViewComponentBuilder &builder)
+      -> winrt::Microsoft::ReactNative::Composition::ContentIslandComponentView {
     auto view = winrt::make<winrt::Microsoft::ReactNative::Composition::implementation::ContentIslandComponentView>(
-        context, tag, reactContext);
+        context, tag, reactContext, &builder);
     initializer(view);
     return view;
   };
@@ -166,46 +152,108 @@ void ReactCompositionViewComponentBuilder::SetCustomCommandHandler(HandleCommand
   m_customCommandHandler = impl;
 }
 
+const HandleCommandDelegate &ReactCompositionViewComponentBuilder::CustomCommandHandler() const noexcept {
+  return m_customCommandHandler;
+}
+
 void ReactCompositionViewComponentBuilder::SetFinalizeUpdateHandler(UpdateFinalizerDelegate impl) noexcept {
   m_finalizeUpdateHandler = impl;
 }
 
+const UpdateFinalizerDelegate &ReactCompositionViewComponentBuilder::FinalizeUpdateHandler() const noexcept {
+  return m_finalizeUpdateHandler;
+}
+
 void ReactCompositionViewComponentBuilder::SetUpdatePropsHandler(UpdatePropsDelegate impl) noexcept {
   m_updatePropsHandler = impl;
 }
 
+const winrt::Microsoft::ReactNative::UpdatePropsDelegate &ReactCompositionViewComponentBuilder::UpdatePropsHandler()
+    const noexcept {
+  return m_updatePropsHandler;
+}
+
 void ReactCompositionViewComponentBuilder::SetUpdateStateHandler(UpdateStateDelegate impl) noexcept {
   m_updateStateHandler = impl;
 }
 
+const winrt::Microsoft::ReactNative::UpdateStateDelegate &ReactCompositionViewComponentBuilder::UpdateStateHandler()
+    const noexcept {
+  return m_updateStateHandler;
+}
+
 void ReactCompositionViewComponentBuilder::SetUpdateEventEmitterHandler(UpdateEventEmitterDelegate impl) noexcept {
   m_updateEventEmitterHandler = impl;
 }
 
+const UpdateEventEmitterDelegate &ReactCompositionViewComponentBuilder::UpdateEventEmitterHandler() const noexcept {
+  return m_updateEventEmitterHandler;
+}
+
 void ReactCompositionViewComponentBuilder::SetMountChildComponentViewHandler(
     MountChildComponentViewDelegate impl) noexcept {
   m_mountChildComponentViewHandler = impl;
 }
 
+const MountChildComponentViewDelegate &ReactCompositionViewComponentBuilder::MountChildComponentViewHandler()
+    const noexcept {
+  return m_mountChildComponentViewHandler;
+}
+
 void ReactCompositionViewComponentBuilder::SetUnmountChildComponentViewHandler(
     UnmountChildComponentViewDelegate impl) noexcept {
   m_unmountChildComponentViewHandler = impl;
 }
 
+const UnmountChildComponentViewDelegate &ReactCompositionViewComponentBuilder::UnmountChildComponentViewHandler()
+    const noexcept {
+  return m_unmountChildComponentViewHandler;
+}
+
 void ReactCompositionViewComponentBuilder::SetCreateVisualHandler(CreateVisualDelegate impl) noexcept {
   m_createVisualHandler = impl;
 }
 
+const CreateVisualDelegate &ReactCompositionViewComponentBuilder::CreateVisualHandler() const noexcept {
+  return m_createVisualHandler;
+}
+
 void ReactCompositionViewComponentBuilder::SetViewFeatures(ComponentViewFeatures viewFeatures) noexcept {
   m_features = viewFeatures;
 }
 
+void ReactCompositionViewComponentBuilder::SetVisualToMountChildrenIntoHandler(
+    VisualToMountChildrenIntoDelegate impl) noexcept {
+  m_visualToMountChildrenIntoHandler = [impl](const winrt::Microsoft::ReactNative::ComponentView &view) {
+    return winrt::Microsoft::ReactNative::Composition::Experimental::implementation::MicrosoftCompositionContextHelper::
+        CreateVisual(impl(view));
+  };
+}
+
+void ReactCompositionViewComponentBuilder::SetIVisualToMountChildrenIntoHandler(
+    winrt::Microsoft::ReactNative::Composition::Experimental::IVisualToMountChildrenIntoDelegate impl) noexcept {
+  m_visualToMountChildrenIntoHandler = impl;
+}
+
+const winrt::Microsoft::ReactNative::Composition::Experimental::IVisualToMountChildrenIntoDelegate &
+ReactCompositionViewComponentBuilder::VisualToMountChildrenIntoHandler() const noexcept {
+  return m_visualToMountChildrenIntoHandler;
+}
+
+void ReactCompositionViewComponentBuilder::SetUpdateLayoutMetricsHandler(UpdateLayoutMetricsDelegate impl) noexcept {
+  m_updateLayoutMetricsHandler = impl;
+}
+
+const UpdateLayoutMetricsDelegate &ReactCompositionViewComponentBuilder::UpdateLayoutMetricsHandler() const noexcept {
+  return m_updateLayoutMetricsHandler;
+}
+
 winrt::Microsoft::ReactNative::ComponentView ReactCompositionViewComponentBuilder::CreateView(
     const IReactContext &reactContext,
     int32_t tag,
     const Experimental::ICompositionContext &context) noexcept {
   assert(m_fnCreateView);
-  auto view = m_fnCreateView(reactContext, tag, context, m_features);
+  auto view = m_fnCreateView(reactContext, tag, context, m_features, *this);
   InitializeComponentView(view);
   return view;
 }

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

@@ -44,6 +44,10 @@ struct ReactCompositionViewComponentBuilder : winrt::implements<
   void SetContentIslandComponentViewInitializer(const ComponentIslandComponentViewInitializer &initializer) noexcept;
   void SetCreateVisualHandler(CreateVisualDelegate impl) noexcept;
   void SetViewFeatures(ComponentViewFeatures viewFeatures) noexcept;
+  void SetVisualToMountChildrenIntoHandler(VisualToMountChildrenIntoDelegate impl) noexcept;
+  void SetIVisualToMountChildrenIntoHandler(
+      winrt::Microsoft::ReactNative::Composition::Experimental::IVisualToMountChildrenIntoDelegate impl) noexcept;
+  void SetUpdateLayoutMetricsHandler(UpdateLayoutMetricsDelegate impl) noexcept;
 
  public:
   IComponentProps CreateProps(ViewProps props, const IComponentProps &cloneFrom) noexcept;
@@ -60,6 +64,18 @@ struct ReactCompositionViewComponentBuilder : winrt::implements<
       facebook::react::Tag tag,
       const Experimental::ICompositionContext &context) noexcept;
 
+  const UpdateFinalizerDelegate &FinalizeUpdateHandler() const noexcept;
+  const HandleCommandDelegate &CustomCommandHandler() const noexcept;
+  const winrt::Microsoft::ReactNative::UpdatePropsDelegate &UpdatePropsHandler() const noexcept;
+  const winrt::Microsoft::ReactNative::UpdateStateDelegate &UpdateStateHandler() const noexcept;
+  const UpdateEventEmitterDelegate &UpdateEventEmitterHandler() const noexcept;
+  const MountChildComponentViewDelegate &MountChildComponentViewHandler() const noexcept;
+  const UnmountChildComponentViewDelegate &UnmountChildComponentViewHandler() const noexcept;
+  const UpdateLayoutMetricsDelegate &UpdateLayoutMetricsHandler() const noexcept;
+  const CreateVisualDelegate &CreateVisualHandler() const noexcept;
+  const winrt::Microsoft::ReactNative::Composition::Experimental::IVisualToMountChildrenIntoDelegate &
+  VisualToMountChildrenIntoHandler() const noexcept;
+
  private:
   void InitializeComponentView(const winrt::Microsoft::ReactNative::ComponentView &view) noexcept;
 
@@ -74,7 +90,8 @@ struct ReactCompositionViewComponentBuilder : winrt::implements<
       const IReactContext &reactContext,
       int32_t tag,
       const Experimental::ICompositionContext &context,
-      ComponentViewFeatures features)>
+      ComponentViewFeatures features,
+      ReactCompositionViewComponentBuilder &builder)>
       m_fnCreateView;
   std::function<facebook::react::ComponentDescriptorConstructor *()> m_descriptorConstructorFactory;
   winrt::Microsoft::ReactNative::HandleCommandDelegate m_customCommandHandler;
@@ -86,6 +103,9 @@ struct ReactCompositionViewComponentBuilder : winrt::implements<
   winrt::Microsoft::ReactNative::UnmountChildComponentViewDelegate m_unmountChildComponentViewHandler;
 
   winrt::Microsoft::ReactNative::Composition::CreateVisualDelegate m_createVisualHandler;
+  winrt::Microsoft::ReactNative::Composition::Experimental::IVisualToMountChildrenIntoDelegate
+      m_visualToMountChildrenIntoHandler;
+  UpdateLayoutMetricsDelegate m_updateLayoutMetricsHandler;
 };
 
 } // namespace winrt::Microsoft::ReactNative::Composition

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;
   }
@@ -232,7 +236,7 @@ struct CompTextHost : public winrt::implements<CompTextHost, ITextHost> {
 
   //@cmember Establish a new cursor shape
   void TxSetCursor(HCURSOR hcur, BOOL fText) override {
-    assert(false);
+    m_outer->m_hcursor = hcur;
   }
 
   //@cmember Converts screen coordinates of a specified point to the client coordinates
@@ -728,6 +732,9 @@ void WindowsTextInputComponentView::OnPointerMoved(
     auto hr = m_textServices->TxSendMessage(msg, static_cast<WPARAM>(wParam), static_cast<LPARAM>(lParam), &lresult);
     args.Handled(hr != S_FALSE);
   }
+
+  m_textServices->OnTxSetCursor(
+      DVASPECT_CONTENT, -1, nullptr, nullptr, nullptr, nullptr, nullptr, ptContainer.x, ptContainer.y);
 }
 
 void WindowsTextInputComponentView::OnKeyDown(
@@ -915,6 +922,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 +934,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;
@@ -1473,6 +1482,10 @@ WindowsTextInputComponentView::createVisual() noexcept {
   return visual;
 }
 
+std::pair<facebook::react::Cursor, HCURSOR> WindowsTextInputComponentView::cursor() const noexcept {
+  return {viewProps()->cursor, m_hcursor};
+}
+
 void WindowsTextInputComponentView::onThemeChanged() noexcept {
   const auto &props = windowsTextInputProps();
   updateCursorColor(props.cursorColor, props.textAttributes.foregroundColor);

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

@@ -78,6 +78,8 @@ struct WindowsTextInputComponentView
 
   winrt::Microsoft::ReactNative::Composition::Experimental::IVisual createVisual() noexcept;
 
+  std::pair<facebook::react::Cursor, HCURSOR> cursor() const noexcept override;
+
  private:
   struct DrawBlock {
     DrawBlock(WindowsTextInputComponentView &view);
@@ -128,10 +130,12 @@ 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};
   DWORD m_propBits{0};
+  HCURSOR m_hcursor{nullptr};
   std::vector<facebook::react::CompWindowsTextInputSubmitKeyEventsStruct> m_submitKeyEvents;
 };
 

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(