react-native-windows 0.77.0 → 0.78.0-preview.2

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

@@ -0,0 +1,66 @@
+
+// Copyright (c) Microsoft Corporation.
+// Licensed under the MIT License.
+
+#pragma once
+
+#include "PortalComponentView.h"
+
+#include "Composition.PortalComponentView.g.cpp"
+
+namespace winrt::Microsoft::ReactNative::Composition::implementation {
+
+PortalComponentView::PortalComponentView(
+    const winrt::Microsoft::ReactNative::Composition::Experimental::ICompositionContext &compContext,
+    facebook::react::Tag tag,
+    winrt::Microsoft::ReactNative::ReactContext const &reactContext,
+    winrt::Microsoft::ReactNative::Composition::ReactCompositionViewComponentBuilder *builder)
+    : base_type(tag, reactContext, builder) {
+  m_rootComponentView = winrt::make_self<winrt::Microsoft::ReactNative::Composition::implementation::RootComponentView>(
+      compContext, *this, reactContext);
+}
+
+PortalComponentView::~PortalComponentView() {}
+
+winrt::Microsoft::ReactNative::Composition::RootComponentView PortalComponentView::ContentRoot() const noexcept {
+  return *m_rootComponentView;
+}
+
+void PortalComponentView::MountChildComponentView(
+    const winrt::Microsoft::ReactNative::ComponentView &childComponentView,
+    uint32_t index) noexcept {
+  m_rootComponentView->MountChildComponentView(childComponentView, index);
+}
+
+void PortalComponentView::UnmountChildComponentView(
+    const winrt::Microsoft::ReactNative::ComponentView &childComponentView,
+    uint32_t index) noexcept {
+  m_rootComponentView->UnmountChildComponentView(childComponentView, index);
+}
+
+const winrt::Microsoft::ReactNative::IComponentProps PortalComponentView::userProps(
+    facebook::react::Props::Shared const &props) noexcept {
+  const auto &abiViewProps = *std::static_pointer_cast<const ::Microsoft::ReactNative::AbiViewProps>(props);
+  return abiViewProps.UserProps();
+}
+
+void PortalComponentView::updateProps(
+    facebook::react::Props::Shared const &props,
+    facebook::react::Props::Shared const &oldProps) noexcept {
+  m_rootComponentView->updateProps(props, oldProps);
+  base_type::updateProps(props, oldProps);
+}
+
+void PortalComponentView::updateLayoutMetrics(
+    facebook::react::LayoutMetrics const &layoutMetrics,
+    facebook::react::LayoutMetrics const &oldLayoutMetrics) noexcept {
+  m_rootComponentView->updateLayoutMetrics(layoutMetrics, oldLayoutMetrics);
+  base_type::updateLayoutMetrics(layoutMetrics, oldLayoutMetrics);
+}
+
+void PortalComponentView::FinalizeUpdates(winrt::Microsoft::ReactNative::ComponentViewUpdateMask updateMask) noexcept {
+  m_rootComponentView->FinalizeUpdates(updateMask);
+  base_type::FinalizeUpdates(updateMask);
+}
+
+} // namespace winrt::Microsoft::ReactNative::Composition::implementation

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

@@ -0,0 +1,52 @@
+
+// Copyright (c) Microsoft Corporation.
+// Licensed under the MIT License.
+
+#pragma once
+
+#include <Fabric/ComponentView.h>
+#include <Microsoft.ReactNative.Cxx/ReactContext.h>
+#include "RootComponentView.h"
+
+#include "Composition.PortalComponentView.g.h"
+
+namespace Microsoft::ReactNative {
+struct CompContext;
+} // namespace Microsoft::ReactNative
+
+namespace winrt::Microsoft::ReactNative::Composition::implementation {
+
+struct PortalComponentView
+    : public PortalComponentViewT<PortalComponentView, winrt::Microsoft::ReactNative::implementation::ComponentView> {
+  PortalComponentView(
+      const winrt::Microsoft::ReactNative::Composition::Experimental::ICompositionContext &compContext,
+      facebook::react::Tag tag,
+      winrt::Microsoft::ReactNative::ReactContext const &reactContext,
+      winrt::Microsoft::ReactNative::Composition::ReactCompositionViewComponentBuilder *builder);
+  virtual ~PortalComponentView();
+
+  winrt::Microsoft::ReactNative::Composition::RootComponentView ContentRoot() const noexcept;
+
+  void MountChildComponentView(
+      const winrt::Microsoft::ReactNative::ComponentView &childComponentView,
+      uint32_t index) noexcept override;
+  void UnmountChildComponentView(
+      const winrt::Microsoft::ReactNative::ComponentView &childComponentView,
+      uint32_t index) noexcept override;
+
+  const winrt::Microsoft::ReactNative::IComponentProps userProps(
+      facebook::react::Props::Shared const &props) noexcept override;
+  void updateProps(facebook::react::Props::Shared const &props, facebook::react::Props::Shared const &oldProps) 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;
+
+ private:
+  winrt::com_ptr<winrt::Microsoft::ReactNative::Composition::implementation::RootComponentView> m_rootComponentView;
+};
+
+} // namespace winrt::Microsoft::ReactNative::Composition::implementation

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

@@ -5,6 +5,7 @@
 #include "ReactCompositionViewComponentBuilder.h"
 #include <Fabric/Composition/CompositionViewComponentView.h>
 #include <Fabric/Composition/ContentIslandComponentView.h>
+#include <Fabric/Composition/PortalComponentView.h>
 #include <strsafe.h>
 #include "CompositionContextHelper.h"
 #include "DynamicWriter.h"
@@ -111,6 +112,26 @@ void ReactCompositionViewComponentBuilder::SetContentIslandComponentViewInitiali
   };
 }
 
+void ReactCompositionViewComponentBuilder::SetPortalComponentViewInitializer(
+    const PortalComponentViewInitializer &initializer) noexcept {
+  m_fnCreateView = [initializer](
+                       const IReactContext &reactContext,
+                       int32_t tag,
+                       const Experimental::ICompositionContext &context,
+                       ComponentViewFeatures /*features*/,
+                       ReactCompositionViewComponentBuilder &builder)
+      -> winrt::Microsoft::ReactNative::Composition::PortalComponentView {
+    auto view = winrt::make<winrt::Microsoft::ReactNative::Composition::implementation::PortalComponentView>(
+        context, tag, reactContext, &builder);
+    initializer(view);
+    return view;
+  };
+  m_descriptorConstructorFactory = []() {
+    return &facebook::react::concreteComponentDescriptorConstructor<
+        ::Microsoft::ReactNative::AbiViewComponentDescriptor>;
+  };
+}
+
 // (Object handle, Microsoft.ReactNative.IComponentState state) => void
 // void ReactCompositionViewComponentBuilder::SetStateUpdater(StateUpdater impl) noexcept {
 //  m_stateUpdater = impl;

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

@@ -12,10 +12,12 @@
 
 namespace winrt::Microsoft::ReactNative::Composition {
 
-struct ReactCompositionViewComponentBuilder : winrt::implements<
-                                                  ReactCompositionViewComponentBuilder,
-                                                  IReactViewComponentBuilder,
-                                                  Composition::IReactCompositionViewComponentBuilder> {
+struct ReactCompositionViewComponentBuilder
+    : winrt::implements<
+          ReactCompositionViewComponentBuilder,
+          IReactViewComponentBuilder,
+          Composition::IReactCompositionViewComponentBuilder,
+          Composition::Experimental::IReactCompositionViewComponentInternalBuilder> {
   ReactCompositionViewComponentBuilder() noexcept;
 
  public: // IReactViewComponentBuilder
@@ -42,6 +44,7 @@ struct ReactCompositionViewComponentBuilder : winrt::implements<
  public: // Composition::IReactCompositionViewComponentBuilder
   void SetViewComponentViewInitializer(const ViewComponentViewInitializer &initializer) noexcept;
   void SetContentIslandComponentViewInitializer(const ComponentIslandComponentViewInitializer &initializer) noexcept;
+  void SetPortalComponentViewInitializer(const PortalComponentViewInitializer &initializer) noexcept;
   void SetCreateVisualHandler(CreateVisualDelegate impl) noexcept;
   void SetViewFeatures(ComponentViewFeatures viewFeatures) noexcept;
   void SetVisualToMountChildrenIntoHandler(VisualToMountChildrenIntoDelegate impl) noexcept;

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

@@ -127,21 +127,39 @@ ReactNativeIsland::ReactNativeIsland(const winrt::Microsoft::UI::Composition::Co
   InitTextScaleMultiplier();
 }
 
-// Constructor to initialize ReactNativeIsland with context and componentView
 ReactNativeIsland::ReactNativeIsland(
-    const winrt::Microsoft::UI::Composition::Compositor &compositor,
-    winrt::Microsoft::ReactNative::IReactContext context,
-    winrt::Microsoft::ReactNative::ComponentView componentView) noexcept
-    : m_compositor(compositor),
-      m_context(context),
+    const winrt::Microsoft::ReactNative::Composition::PortalComponentView &portal) noexcept
+    : m_compositor(portal.ContentRoot().Compositor()),
+      m_context(portal.ReactContext()),
       m_layoutConstraints({{0, 0}, {0, 0}, winrt::Microsoft::ReactNative::LayoutDirection::Undefined}),
       m_isFragment(true) {
-  m_rootTag = componentView.Tag();
+  m_portal = winrt::make_weak(portal);
+
+  auto trueRoot =
+      winrt::get_self<winrt::Microsoft::ReactNative::Composition::implementation::PortalComponentView>(portal)
+          ->rootComponentView();
+  while (auto p = trueRoot->Portal()) {
+    trueRoot = winrt::get_self<winrt::Microsoft::ReactNative::Composition::implementation::PortalComponentView>(p)
+                   ->rootComponentView();
+  };
+  m_rootTag = trueRoot->Tag();
+
   InitTextScaleMultiplier();
-  AddFragmentCompositionEventHandler(context, componentView);
+  AddFragmentCompositionEventHandler(m_context.Handle(), portal.ContentRoot());
+  auto selfPortal = winrt::get_self<winrt::Microsoft::ReactNative::Composition::implementation::RootComponentView>(
+      portal.ContentRoot());
+  selfPortal->ReactNativeIsland(*this);
+  NotifySizeChanged();
+  selfPortal->start(*this);
+}
+
+winrt::Microsoft::ReactNative::ReactNativeIsland ReactNativeIsland::CreatePortal(
+    const winrt::Microsoft::ReactNative::Composition::PortalComponentView &portal) noexcept {
+  return winrt::make<ReactNativeIsland>(portal);
 }
 
-ReactNativeIsland::ReactNativeIsland() noexcept : ReactNativeIsland(nullptr) {}
+ReactNativeIsland::ReactNativeIsland() noexcept
+    : ReactNativeIsland(winrt::Microsoft::UI::Composition::Compositor{nullptr}) {}
 
 ReactNativeIsland::~ReactNativeIsland() noexcept {
 #ifdef USE_WINUI3
@@ -159,14 +177,20 @@ ReactNativeIsland::~ReactNativeIsland() noexcept {
     assert(m_uiDispatcher.HasThreadAccess());
     UninitRootView();
   }
+
+  if (m_island) {
+    m_island.Close();
+  }
 }
 
 ReactNative::IReactViewHost ReactNativeIsland::ReactViewHost() noexcept {
   return m_reactViewHost;
 }
 
-void ReactNativeIsland::ReactViewHost(winrt::Microsoft::ReactNative::IReactViewHost const &value) noexcept {
-  assert(!m_isFragment); // make sure this isn't a FragmentIsalnd
+void ReactNativeIsland::ReactViewHost(winrt::Microsoft::ReactNative::IReactViewHost const &value) {
+  if (m_isFragment)
+    winrt::throw_hresult(E_ACCESSDENIED);
+
   if (m_reactViewHost == value) {
     return;
   }
@@ -217,6 +241,8 @@ void ReactNativeIsland::AddRenderedVisual(
 
 void ReactNativeIsland::RemoveRenderedVisual(
     const winrt::Microsoft::ReactNative::Composition::Experimental::IVisual &visual) noexcept {
+  if (m_isFragment)
+    return;
   assert(m_hasRenderedVisual);
   InternalRootVisual().Remove(visual);
   m_hasRenderedVisual = false;
@@ -442,7 +468,7 @@ void ReactNativeIsland::InitRootView(
 
   m_context = winrt::Microsoft::ReactNative::ReactContext(std::move(context));
   m_reactViewOptions = std::move(viewOptions);
-  m_CompositionEventHandler = std::make_shared<::Microsoft::ReactNative::CompositionEventHandler>(m_context, *this, -1);
+  m_CompositionEventHandler = std::make_shared<::Microsoft::ReactNative::CompositionEventHandler>(m_context, *this);
   m_CompositionEventHandler->Initialize();
 
   UpdateRootViewInternal();
@@ -457,15 +483,13 @@ void ReactNativeIsland::AddFragmentCompositionEventHandler(
                        .Get(winrt::Microsoft::ReactNative::ReactDispatcherHelper::UIDispatcherProperty())
                        .try_as<IReactDispatcher>();
   VerifyElseCrash(m_uiDispatcher.HasThreadAccess());
-  VerifyElseCrash(m_rootTag != -1);
   auto uiManager = ::Microsoft::ReactNative::FabricUIManager::FromProperties(
       winrt::Microsoft::ReactNative::ReactPropertyBag(context.Properties()));
 
   if (!m_CompositionEventHandler) {
     // Create CompositionEventHandler if not already created
     m_context = winrt::Microsoft::ReactNative::ReactContext(context);
-    m_CompositionEventHandler =
-        std::make_shared<::Microsoft::ReactNative::CompositionEventHandler>(m_context, *this, componentView.Tag());
+    m_CompositionEventHandler = std::make_shared<::Microsoft::ReactNative::CompositionEventHandler>(m_context, *this);
     m_CompositionEventHandler->Initialize();
     m_isInitialized = true;
   }
@@ -545,6 +569,7 @@ void ReactNativeIsland::ClearLoadingUI() noexcept {
 void ReactNativeIsland::EnsureLoadingUI() noexcept {}
 
 void ReactNativeIsland::ShowInstanceLoaded() noexcept {
+  VerifyElseCrash(!m_isFragment);
   if (m_rootVisual) {
     ClearLoadingUI();
 
@@ -740,6 +765,9 @@ void ReactNativeIsland::InitTextScaleMultiplier() noexcept {
 winrt::Windows::Foundation::Size ReactNativeIsland::Measure(
     const winrt::Microsoft::ReactNative::LayoutConstraints &layoutConstraints,
     const winrt::Windows::Foundation::Point &viewportOffset) const {
+  if (m_isFragment)
+    winrt::throw_hresult(E_ILLEGAL_METHOD_CALL);
+
   facebook::react::Size size{0, 0};
 
   if (layoutConstraints.LayoutDirection != winrt::Microsoft::ReactNative::LayoutDirection::LeftToRight &&
@@ -781,7 +809,7 @@ void ReactNativeIsland::Arrange(
   facebook::react::LayoutConstraints fbLayoutConstraints;
   ApplyConstraints(layoutConstraints, fbLayoutConstraints);
 
-  if (m_isInitialized && m_rootTag != -1) {
+  if (m_isInitialized && m_rootTag != -1 && !m_isFragment) {
     if (auto fabricuiManager = ::Microsoft::ReactNative::FabricUIManager::FromProperties(
             winrt::Microsoft::ReactNative::ReactPropertyBag(m_context.Properties()))) {
       facebook::react::LayoutContext context;
@@ -820,6 +848,23 @@ winrt::Microsoft::UI::Content::ContentIsland ReactNativeIsland::Island() {
             rootVisual));
     m_island = winrt::Microsoft::UI::Content::ContentIsland::Create(rootVisual);
 
+    auto focusController = winrt::Microsoft::UI::Input::InputFocusController::GetForIsland(m_island);
+    focusController.NavigateFocusRequested(
+        [weakThis = get_weak()](
+            const auto &sender, const winrt::Microsoft::UI::Input::FocusNavigationRequestEventArgs &args) {
+          if (auto pThis = weakThis.get()) {
+            if (auto rootView = pThis->GetComponentView()) {
+              args.Result(
+                  rootView->NavigateFocus(winrt::Microsoft::ReactNative::FocusNavigationRequest(
+                      winrt::Microsoft::ReactNative::FocusNavigationReason::First))
+                      ? winrt::Microsoft::UI::Input::FocusNavigationResult::Moved
+                      : winrt::Microsoft::UI::Input::FocusNavigationResult::NotMoved);
+            } else {
+              args.Result(winrt::Microsoft::UI::Input::FocusNavigationResult::NoFocusableElements);
+            }
+          }
+        });
+
     // ContentIsland does not support weak_ref, so we cannot use auto_revoke for these events
     m_islandAutomationProviderRequestedToken = m_island.AutomationProviderRequested(
         [weakThis = get_weak()](
@@ -903,13 +948,29 @@ void ReactNativeIsland::OnUnmounted() noexcept {
   if (!m_mounted)
     return;
   m_mounted = false;
+
+  if (m_island && m_island.IsConnected()) {
+    auto focusController = winrt::Microsoft::UI::Input::InputFocusController::GetForIsland(m_island);
+    auto request = winrt::Microsoft::UI::Input::FocusNavigationRequest::Create(
+        winrt::Microsoft::UI::Input::FocusNavigationReason::Programmatic);
+    if (focusController.HasFocus()) {
+      focusController.DepartFocus(request);
+    }
+  }
+
   if (auto componentView = GetComponentView()) {
     componentView->onUnmounted();
   }
 }
 
-winrt::Microsoft::ReactNative::Composition::implementation::RootComponentView *
+winrt::com_ptr<winrt::Microsoft::ReactNative::Composition::implementation::RootComponentView>
 ReactNativeIsland::GetComponentView() noexcept {
+  if (auto portal = m_portal.get()) {
+    return winrt::get_self<winrt::Microsoft::ReactNative::Composition::implementation::PortalComponentView>(portal)
+        ->ContentRoot()
+        .as<winrt::Microsoft::ReactNative::Composition::implementation::RootComponentView>();
+  }
+
   if (!m_context || m_context.Handle().LoadingState() != winrt::Microsoft::ReactNative::LoadingState::Loaded ||
       m_rootTag == -1)
     return nullptr;
@@ -919,8 +980,7 @@ ReactNativeIsland::GetComponentView() noexcept {
     auto rootComponentViewDescriptor = fabricuiManager->GetViewRegistry().componentViewDescriptorWithTag(
         static_cast<facebook::react::SurfaceId>(m_rootTag));
     return rootComponentViewDescriptor.view
-        .as<winrt::Microsoft::ReactNative::Composition::implementation::RootComponentView>()
-        .get();
+        .as<winrt::Microsoft::ReactNative::Composition::implementation::RootComponentView>();
   }
   return nullptr;
 }

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

@@ -12,6 +12,7 @@
 #include <winrt/Microsoft.ReactNative.h>
 #include <winrt/Windows.UI.ViewManagement.h>
 #include "CompositionEventHandler.h"
+#include "PortalComponentView.h"
 #include "ReactHost/React.h"
 
 namespace winrt::Microsoft::ReactNative::implementation {
@@ -48,15 +49,15 @@ struct ReactNativeIsland
   ~ReactNativeIsland() noexcept;
 
   ReactNativeIsland(const winrt::Microsoft::UI::Composition::Compositor &compositor) noexcept;
-  ReactNativeIsland(
-      const winrt::Microsoft::UI::Composition::Compositor &compositor,
-      winrt::Microsoft::ReactNative::IReactContext context,
-      winrt::Microsoft::ReactNative::ComponentView componentView) noexcept;
+  ReactNativeIsland(const winrt::Microsoft::ReactNative::Composition::PortalComponentView &portal) noexcept;
+
+  static winrt::Microsoft::ReactNative::ReactNativeIsland CreatePortal(
+      const winrt::Microsoft::ReactNative::Composition::PortalComponentView &portal) noexcept;
   winrt::Microsoft::UI::Content::ContentIsland Island();
 
   // property ReactViewHost
   ReactNative::IReactViewHost ReactViewHost() noexcept;
-  void ReactViewHost(ReactNative::IReactViewHost const &value) noexcept;
+  void ReactViewHost(ReactNative::IReactViewHost const &value);
 
   winrt::Microsoft::UI::Composition::Visual RootVisual() noexcept;
 
@@ -104,7 +105,8 @@ struct ReactNativeIsland
   winrt::Microsoft::ReactNative::FocusNavigationResult NavigateFocus(
       const winrt::Microsoft::ReactNative::FocusNavigationRequest &request) noexcept;
 
-  winrt::Microsoft::ReactNative::Composition::implementation::RootComponentView *GetComponentView() noexcept;
+  winrt::com_ptr<winrt::Microsoft::ReactNative::Composition::implementation::RootComponentView>
+  GetComponentView() noexcept;
 
   int64_t RootTag() const noexcept;
 
@@ -153,8 +155,12 @@ struct ReactNativeIsland
   bool m_hasRenderedVisual{false};
   bool m_showingLoadingUI{false};
   bool m_mounted{false};
+  winrt::weak_ref<winrt::Microsoft::ReactNative::Composition::PortalComponentView> m_portal{nullptr};
   IReactDispatcher m_uiDispatcher{nullptr};
   winrt::IInspectable m_uiaProvider{nullptr};
+
+  // This is the surfaceId that this island belongs to.
+  // In the case of portal content root, this will be the surfaceId that contains the portal.
   int64_t m_rootTag{-1};
   float m_scaleFactor{1.0};
   float m_textScaleMultiplier{1.0};

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

@@ -17,7 +17,8 @@ namespace winrt::Microsoft::ReactNative::Composition::implementation {
 RootComponentView::RootComponentView(
     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)
     : base_type(
           {}, // default viewProps
           compContext,
@@ -25,20 +26,34 @@ RootComponentView::RootComponentView(
           reactContext,
           ComponentViewFeatures::Default &
               ~(ComponentViewFeatures::Background | ComponentViewFeatures::ShadowProps |
-                ComponentViewFeatures::NativeBorder | ComponentViewFeatures::FocusVisual)) {}
+                ComponentViewFeatures::NativeBorder | ComponentViewFeatures::FocusVisual),
+          builder) {}
+
+RootComponentView::RootComponentView(
+    const winrt::Microsoft::ReactNative::Composition::Experimental::ICompositionContext &compContext,
+    const winrt::Microsoft::ReactNative::Composition::PortalComponentView &portal,
+    winrt::Microsoft::ReactNative::ReactContext const &reactContext)
+    : base_type(
+          {}, // default viewProps
+          compContext,
+          -1,
+          reactContext,
+          ComponentViewFeatures::Default &
+              ~(ComponentViewFeatures::Background | ComponentViewFeatures::ShadowProps |
+                ComponentViewFeatures::NativeBorder | ComponentViewFeatures::FocusVisual),
+          nullptr // builder,
+          ),
+      m_wkPortal(portal) {}
 
 RootComponentView::~RootComponentView() {
-  if (auto rootView = m_wkRootView.get()) {
-    winrt::get_self<winrt::Microsoft::ReactNative::implementation::ReactNativeIsland>(rootView)->RemoveRenderedVisual(
-        OuterVisual());
-  }
+  stop();
 }
 
 winrt::Microsoft::ReactNative::ComponentView RootComponentView::Create(
     const winrt::Microsoft::ReactNative::Composition::Experimental::ICompositionContext &compContext,
     facebook::react::Tag tag,
     winrt::Microsoft::ReactNative::ReactContext const &reactContext) noexcept {
-  return winrt::make<RootComponentView>(compContext, tag, reactContext);
+  return winrt::make<RootComponentView>(compContext, tag, reactContext, nullptr);
 }
 
 RootComponentView *RootComponentView::rootComponentView() const noexcept {
@@ -84,13 +99,13 @@ void RootComponentView::SetFocusedComponent(const winrt::Microsoft::ReactNative:
 
 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;
+    if (m_focusedComponent)
+      return true;
   }
 
-  auto view = (request.Reason() == winrt::Microsoft::ReactNative::FocusNavigationReason::First)
-      ? FocusManager::FindFirstFocusableElement(*this)
-      : FocusManager::FindLastFocusableElement(*this);
+  auto view = (request.Reason() == winrt::Microsoft::ReactNative::FocusNavigationReason::Last)
+      ? FocusManager::FindLastFocusableElement(*this)
+      : FocusManager::FindFirstFocusableElement(*this);
   if (view) {
     TrySetFocusedComponent(
         view,
@@ -116,8 +131,10 @@ bool RootComponentView::TrySetFocusedComponent(
     selfView = winrt::get_self<winrt::Microsoft::ReactNative::implementation::ComponentView>(target);
   }
 
-  if (selfView && selfView->rootComponentView() != this)
+  if (selfView && selfView->rootComponentView() != this) {
+    assert(false);
     return false;
+  }
 
   auto losingFocusArgs = winrt::make<winrt::Microsoft::ReactNative::implementation::LosingFocusEventArgs>(
       target, direction, m_focusedComponent, target);
@@ -197,7 +214,7 @@ HRESULT RootComponentView::GetFragmentRoot(IRawElementProviderFragmentRoot **pRe
   if (uiManager == nullptr)
     return UIA_E_ELEMENTNOTAVAILABLE;
 
-  auto rootView{uiManager->GetReactNativeIsland(Tag())};
+  auto rootView = m_wkRootView.get();
   if (!rootView) {
     return UIA_E_ELEMENTNOTAVAILABLE;
   }
@@ -214,10 +231,43 @@ uint32_t RootComponentView::overlayIndex() noexcept {
   return 1;
 }
 
-void RootComponentView::start(const winrt::Microsoft::ReactNative::ReactNativeIsland &rootView) noexcept {
-  winrt::get_self<winrt::Microsoft::ReactNative::implementation::ReactNativeIsland>(rootView)->AddRenderedVisual(
+void RootComponentView::start(const winrt::Microsoft::ReactNative::ReactNativeIsland &island) noexcept {
+  theme(winrt::get_self<winrt::Microsoft::ReactNative::Composition::implementation::Theme>(island.Theme()));
+
+  winrt::get_self<winrt::Microsoft::ReactNative::implementation::ReactNativeIsland>(island)->AddRenderedVisual(
       OuterVisual());
-  m_wkRootView = rootView;
+  m_visualAddedToIsland = true;
+  ReactNativeIsland(island);
+}
+
+void RootComponentView::stop() noexcept {
+  SetFocusedComponent(nullptr);
+  if (m_visualAddedToIsland) {
+    if (auto rootView = m_wkRootView.get()) {
+      winrt::get_self<winrt::Microsoft::ReactNative::implementation::ReactNativeIsland>(rootView)->RemoveRenderedVisual(
+          OuterVisual());
+    }
+    m_visualAddedToIsland = false;
+  }
+  // Disconnect from the Island.  In case of an instance reload, the island may now
+  // be attached to a new RootComponentView, so we should stop interacting with it.
+  ReactNativeIsland(nullptr);
+}
+
+void RootComponentView::ReactNativeIsland(const winrt::Microsoft::ReactNative::ReactNativeIsland &island) noexcept {
+  m_wkRootView = island;
+}
+
+winrt::Microsoft::ReactNative::ReactNativeIsland RootComponentView::ReactNativeIsland() noexcept {
+  return m_wkRootView.get();
+}
+
+winrt::Microsoft::ReactNative::Composition::PortalComponentView RootComponentView::Portal() const noexcept {
+  return m_wkPortal.get();
+}
+
+facebook::react::Point RootComponentView::getClientOffset() const noexcept {
+  return {};
 }
 
 winrt::IInspectable RootComponentView::UiaProviderFromPoint(const POINT &ptPixels) noexcept {
@@ -226,6 +276,10 @@ winrt::IInspectable RootComponentView::UiaProviderFromPoint(const POINT &ptPixel
       static_cast<facebook::react::Float>(ptPixels.y) / m_layoutMetrics.pointScaleFactor};
 
   facebook::react::Point localPt;
+
+  // In the case of a sub rootview, we may have a non-zero origin.  hitTest takes a pt in the parent coords, so we need
+  // to apply the current origin
+  ptDips += m_layoutMetrics.frame.origin;
   auto tag = hitTest(ptDips, localPt, true);
 
   auto uiManager = ::Microsoft::ReactNative::FabricUIManager::FromProperties(m_reactContext.Properties());

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

@@ -46,6 +46,12 @@ struct RootComponentView : RootComponentViewT<RootComponentView, ViewComponentVi
   // Index that visuals can be inserted into OuterVisual for debugging UI
   uint32_t overlayIndex() noexcept;
   void start(const winrt::Microsoft::ReactNative::ReactNativeIsland &rootView) noexcept;
+  void stop() noexcept;
+
+  void ReactNativeIsland(const winrt::Microsoft::ReactNative::ReactNativeIsland &rootView) noexcept;
+  winrt::Microsoft::ReactNative::ReactNativeIsland ReactNativeIsland() noexcept;
+
+  facebook::react::Point getClientOffset() const noexcept override;
 
   HRESULT GetFragmentRoot(IRawElementProviderFragmentRoot **pRetVal) noexcept;
   winrt::Microsoft::ReactNative::implementation::ClipState getClipState() noexcept override;
@@ -60,8 +66,16 @@ struct RootComponentView : RootComponentViewT<RootComponentView, ViewComponentVi
   RootComponentView(
       const winrt::Microsoft::ReactNative::Composition::Experimental::ICompositionContext &compContext,
       facebook::react::Tag tag,
+      winrt::Microsoft::ReactNative::ReactContext const &reactContext,
+      ReactCompositionViewComponentBuilder *builder);
+
+  RootComponentView(
+      const winrt::Microsoft::ReactNative::Composition::Experimental::ICompositionContext &compContext,
+      const winrt::Microsoft::ReactNative::Composition::PortalComponentView &portal,
       winrt::Microsoft::ReactNative::ReactContext const &reactContext);
 
+  winrt::Microsoft::ReactNative::Composition::PortalComponentView Portal() const noexcept;
+
   virtual ~RootComponentView();
 
   winrt::Microsoft::ReactNative::ComponentView FindFirstFocusableElement() noexcept;
@@ -75,6 +89,8 @@ struct RootComponentView : RootComponentViewT<RootComponentView, ViewComponentVi
   // happening.
   winrt::Microsoft::ReactNative::ComponentView m_focusedComponent{nullptr};
   winrt::weak_ref<winrt::Microsoft::ReactNative::ReactNativeIsland> m_wkRootView{nullptr};
+  winrt::weak_ref<winrt::Microsoft::ReactNative::Composition::PortalComponentView> m_wkPortal{nullptr};
+  bool m_visualAddedToIsland{false};
 };
 
 } // namespace winrt::Microsoft::ReactNative::Composition::implementation

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

@@ -20,11 +20,8 @@ namespace facebook::react {
 class WindowsTextInputComponentDescriptor final : public ConcreteComponentDescriptor<WindowsTextInputShadowNode> {
  public:
   WindowsTextInputComponentDescriptor(const ComponentDescriptorParameters &parameters)
-      : ConcreteComponentDescriptor<WindowsTextInputShadowNode>(parameters) {
-    // Every single `WindowsTextInputShadowNode` will have a reference to
-    // a shared `TextLayoutManager`.
-    m_textLayoutManager = std::make_shared<TextLayoutManager>(contextContainer_);
-  }
+      : ConcreteComponentDescriptor<WindowsTextInputShadowNode>(parameters),
+        textLayoutManager_(std::make_shared<TextLayoutManager>(contextContainer_)) {}
 
   /*
 virtual State::Shared createInitialState(
@@ -71,11 +68,9 @@ virtual State::Shared createInitialState(
   void adopt(ShadowNode &shadowNode) const override {
     auto &textInputShadowNode = static_cast<WindowsTextInputShadowNode &>(shadowNode);
 
-    // `ParagraphShadowNode` uses `TextLayoutManager` to measure text content
+    // `TextInputShadowNode` uses `TextLayoutManager` to measure text content
     // and communicate text rendering metrics to mounting layer.
-    textInputShadowNode.setTextLayoutManager(m_textLayoutManager);
-
-    textInputShadowNode.setContextContainer(const_cast<ContextContainer *>(getContextContainer().get()));
+    textInputShadowNode.setTextLayoutManager(textLayoutManager_);
 
     /*
             int surfaceId = textInputShadowNode.getSurfaceId();
@@ -161,7 +156,7 @@ virtual State::Shared createInitialState(
   // TODO T68526882: Unify with Binding::UIManagerJavaDescriptor
   constexpr static auto UIManagerJavaDescriptor = "com/facebook/react/fabric/FabricUIManager";
 
-  SharedTextLayoutManager m_textLayoutManager;
+  const std::shared_ptr<TextLayoutManager> textLayoutManager_;
   mutable std::unordered_map<int, ThemePadding> surfaceIdToThemePaddingMap_;
 };