react-native-windows 0.81.3 → 0.81.5

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

@@ -32,6 +32,8 @@ struct ContentIslandComponentView : ContentIslandComponentViewT<ContentIslandCom
       uint32_t index) noexcept override;
   void Connect(const winrt::Microsoft::UI::Content::ContentIsland &contentIsland) noexcept;
 
+  winrt::Microsoft::UI::Content::ChildSiteLink ChildSiteLink() noexcept;
+
   void updateLayoutMetrics(
       facebook::react::LayoutMetrics const &layoutMetrics,
       facebook::react::LayoutMetrics const &oldLayoutMetrics) noexcept;
@@ -58,15 +60,28 @@ struct ContentIslandComponentView : ContentIslandComponentViewT<ContentIslandCom
   void OnMounted() noexcept;
   void OnUnmounted() noexcept;
   void ParentLayoutChanged() noexcept;
+  void ConnectInternal() noexcept;
+  winrt::Microsoft::UI::Content::ContentIsland ParentContentIsland() noexcept;
 
   bool m_layoutChangePosted{false};
+  winrt::Microsoft::UI::Content::ContentIsland m_parentContentIsland{nullptr};
   winrt::Microsoft::UI::Content::ContentIsland m_islandToConnect{nullptr};
+  std::optional<winrt::Microsoft::UI::Input::FocusNavigationReason> m_pendingNavigateFocus;
+
   winrt::event_token m_mountedToken;
   winrt::event_token m_unmountedToken;
   std::vector<winrt::Microsoft::ReactNative::ComponentView::LayoutMetricsChanged_revoker> m_layoutMetricChangedRevokers;
   winrt::Microsoft::UI::Content::ChildSiteLink m_childSiteLink{nullptr};
   winrt::Microsoft::UI::Input::InputFocusNavigationHost m_navigationHost{nullptr};
   winrt::event_token m_navigationHostDepartFocusRequestedToken{};
+  std::optional<winrt::Microsoft::UI::Input::FocusNavigationReason> m_pendingFocus;
+
+  // Issue #15557: Store ViewChanged subscriptions to parent ScrollViews for transform updates
+  struct ViewChangedSubscription {
+    winrt::weak_ref<winrt::Microsoft::ReactNative::Composition::ScrollViewComponentView> scrollView;
+    winrt::event_token token;
+  };
+  std::vector<ViewChangedSubscription> m_viewChangedSubscriptions;
 
   // Automation
   void ConfigureChildSiteLinkAutomation() noexcept;

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

@@ -37,9 +37,9 @@ struct ModalHostView : public winrt::implements<ModalHostView, winrt::Windows::F
   ~ModalHostView() {
     if (m_popUp) {
       // Unregister closing event handler
-      if (m_appWindow && m_appWindowClosingToken) {
-        m_appWindow.Closing(m_appWindowClosingToken);
-        m_appWindowClosingToken.value = 0;
+      if (m_appWindowClosingToken) {
+        m_rnWindow.AppWindow().Closing(m_appWindowClosingToken);
+        m_appWindowClosingToken = {};
       }
 
       // Reset topWindowID before destroying
@@ -49,21 +49,15 @@ struct ModalHostView : public winrt::implements<ModalHostView, winrt::Windows::F
         m_prevWindowID = 0;
       }
 
-      // Close island
-      if (m_reactNativeIsland) {
-        m_reactNativeIsland.Island().Close();
-        m_reactNativeIsland = nullptr;
-      }
-
       // Hide popup
       if (m_popUp.IsVisible()) {
         m_popUp.Hide();
       }
 
       // Destroy AppWindow this automatically resumes parent window to receive inputs
-      if (m_appWindow) {
-        m_appWindow.Destroy();
-        m_appWindow = nullptr;
+      if (m_rnWindow.AppWindow()) {
+        m_rnWindow.Close();
+        m_rnWindow = nullptr;
       }
 
       // Bring parent window to foreground
@@ -111,11 +105,11 @@ struct ModalHostView : public winrt::implements<ModalHostView, winrt::Windows::F
     }
 
     // Update Title if changed and AppWindow exists
-    if (m_appWindow && (!oldProps || newViewProps.title != oldViewProps.title)) {
+    if (m_rnWindow && (!oldProps || newViewProps.title != oldViewProps.title)) {
       // Use empty string if title is not set
       winrt::hstring titleValue =
           newViewProps.title.has_value() ? winrt::to_hstring(newViewProps.title.value()) : winrt::hstring();
-      m_appWindow.Title(titleValue);
+      m_rnWindow.AppWindow().Title(titleValue);
     }
 
     ::Microsoft::ReactNativeSpecs::BaseModalHostView<ModalHostView>::UpdateProps(view, newProps, oldProps);
@@ -181,7 +175,7 @@ struct ModalHostView : public winrt::implements<ModalHostView, winrt::Windows::F
   }
 
   void AdjustWindowSize(const winrt::Microsoft::ReactNative::LayoutMetrics &layoutMetrics) noexcept {
-    if (!m_appWindow) {
+    if (!m_rnWindow) {
       return;
     }
 
@@ -198,17 +192,17 @@ struct ModalHostView : public winrt::implements<ModalHostView, winrt::Windows::F
     clientHeightPx = std::max(100, clientHeightPx);
 
     // Size the client area directly
-    m_appWindow.ResizeClient({clientWidthPx, clientHeightPx});
+    m_rnWindow.AppWindow().ResizeClient({clientWidthPx, clientHeightPx});
 
     // Center the window on its parent
     RECT parentRC;
     GetWindowRect(m_parentHwnd, &parentRC);
-    auto outerSize = m_appWindow.Size();
+    auto outerSize = m_rnWindow.AppWindow().Size();
 
     int32_t xCor = parentRC.left + (parentRC.right - parentRC.left - outerSize.Width) / 2;
     int32_t yCor = parentRC.top + (parentRC.bottom - parentRC.top - outerSize.Height) / 2;
 
-    m_appWindow.Move({xCor, yCor});
+    m_rnWindow.AppWindow().Move({xCor, yCor});
   };
 
   void ShowOnUIThread(const winrt::Microsoft::ReactNative::ComponentView &view) {
@@ -231,8 +225,7 @@ struct ModalHostView : public winrt::implements<ModalHostView, winrt::Windows::F
 
       // dispatch onShow event
       if (auto eventEmitter = EventEmitter()) {
-        ::Microsoft::ReactNativeSpecs::ModalHostViewEventEmitter::OnShow eventArgs;
-        eventEmitter->onShow(eventArgs);
+        eventEmitter->onShow({});
       }
     }
   }
@@ -261,8 +254,7 @@ struct ModalHostView : public winrt::implements<ModalHostView, winrt::Windows::F
 
     // Dispatch onDismiss event
     if (auto eventEmitter = EventEmitter()) {
-      ::Microsoft::ReactNativeSpecs::ModalHostViewEventEmitter::OnDismiss eventArgs;
-      eventEmitter->onDismiss(eventArgs);
+      eventEmitter->onDismiss({});
     }
   }
 
@@ -279,59 +271,55 @@ struct ModalHostView : public winrt::implements<ModalHostView, winrt::Windows::F
         view.as<::Microsoft::ReactNative::Composition::Experimental::IComponentViewInterop>()->GetHwndForParenting();
 
     auto portal = view.as<winrt::Microsoft::ReactNative::Composition::PortalComponentView>();
-    m_reactNativeIsland = winrt::Microsoft::ReactNative::ReactNativeIsland::CreatePortal(portal);
-    auto contentIsland = m_reactNativeIsland.Island();
-
     m_popUp = winrt::Microsoft::UI::Content::DesktopPopupSiteBridge::Create(
         portal.Parent()
             .as<winrt::Microsoft::ReactNative::Composition::ComponentView>()
             .Root()
             .ReactNativeIsland()
             .Island());
-    m_popUp.Connect(contentIsland);
 
     // Get AppWindow and configure presenter
-    m_appWindow = winrt::Microsoft::UI::Windowing::AppWindow::GetFromWindowId(m_popUp.WindowId());
-    if (m_appWindow) {
-      auto overlappedPresenter = winrt::Microsoft::UI::Windowing::OverlappedPresenter::Create();
-
-      // Configure presenter for modal behavior
-      overlappedPresenter.IsModal(true);
-      overlappedPresenter.SetBorderAndTitleBar(true, true);
-
-      // modal should only have close button
-      overlappedPresenter.IsMinimizable(false);
-      overlappedPresenter.IsMaximizable(false);
-
-      // Apply the presenter to the window
-      m_appWindow.SetPresenter(overlappedPresenter);
-
-      // Hide the title bar icon
-      m_appWindow.TitleBar().IconShowOptions(winrt::Microsoft::UI::Windowing::IconShowOptions::HideIconAndSystemMenu);
-
-      // Set initial title using the stored local props
-      if (m_localProps && m_localProps->title.has_value()) {
-        winrt::hstring titleValue = winrt::to_hstring(m_localProps->title.value());
-        m_appWindow.Title(titleValue);
-      } else {
-        m_appWindow.Title(L""); // Empty title if not provided
-      }
+    m_rnWindow = winrt::Microsoft::ReactNative::ReactNativeWindow::CreateFromContentSiteBridgeAndIsland(
+        m_popUp, winrt::Microsoft::ReactNative::ReactNativeIsland::CreatePortal(portal));
+    m_rnWindow.ResizePolicy(winrt::Microsoft::ReactNative::ContentSizePolicy::None);
+    auto overlappedPresenter = winrt::Microsoft::UI::Windowing::OverlappedPresenter::Create();
+
+    // Configure presenter for modal behavior
+    overlappedPresenter.IsModal(true);
+    overlappedPresenter.SetBorderAndTitleBar(true, true);
+
+    // modal should only have close button
+    overlappedPresenter.IsMinimizable(false);
+    overlappedPresenter.IsMaximizable(false);
+
+    // Apply the presenter to the window
+    m_rnWindow.AppWindow().SetPresenter(overlappedPresenter);
+
+    // Hide the title bar icon
+    m_rnWindow.AppWindow().TitleBar().IconShowOptions(
+        winrt::Microsoft::UI::Windowing::IconShowOptions::HideIconAndSystemMenu);
+
+    // Set initial title using the stored local props
+    if (m_localProps && m_localProps->title.has_value()) {
+      winrt::hstring titleValue = winrt::to_hstring(m_localProps->title.value());
+      m_rnWindow.AppWindow().Title(titleValue);
+    } else {
+      m_rnWindow.AppWindow().Title(L""); // Empty title if not provided
+    }
 
-      // Handle close request ('X' button)
-      m_appWindowClosingToken =
-          m_appWindow.Closing([wkThis = get_weak()](
-                                  const winrt::Microsoft::UI::Windowing::AppWindow & /*sender*/,
-                                  const winrt::Microsoft::UI::Windowing::AppWindowClosingEventArgs &args) {
-            args.Cancel(true); // Prevent default close
-            if (auto strongThis = wkThis.get()) {
-              // Dispatch onRequestClose event
-              if (auto eventEmitter = strongThis->EventEmitter()) {
-                ::Microsoft::ReactNativeSpecs::ModalHostViewEventEmitter::OnRequestClose eventArgs;
-                eventEmitter->onRequestClose(eventArgs);
-              }
+    // Handle close request ('X' button)
+    m_appWindowClosingToken =
+        m_rnWindow.AppWindow().Closing([wkThis = get_weak()](
+                                           const winrt::Microsoft::UI::Windowing::AppWindow & /*sender*/,
+                                           const winrt::Microsoft::UI::Windowing::AppWindowClosingEventArgs &args) {
+          args.Cancel(true); // Prevent default close
+          if (auto strongThis = wkThis.get()) {
+            // Dispatch onRequestClose event
+            if (auto eventEmitter = strongThis->EventEmitter()) {
+              eventEmitter->onRequestClose({});
             }
-          });
-    }
+          }
+        });
 
     // set the top-level windows as the new hwnd
     winrt::Microsoft::ReactNative::ReactCoreInjection::SetTopLevelWindowId(
@@ -352,10 +340,10 @@ struct ModalHostView : public winrt::implements<ModalHostView, winrt::Windows::F
         });
         */
 
-    m_islandStateChangedToken =
-        contentIsland.StateChanged([weakThis = get_weak()](
-                                       winrt::Microsoft::UI::Content::ContentIsland const &island,
-                                       winrt::Microsoft::UI::Content::ContentIslandStateChangedEventArgs const &args) {
+    m_islandStateChangedToken = m_rnWindow.ReactNativeIsland().Island().StateChanged(
+        [weakThis = get_weak()](
+            winrt::Microsoft::UI::Content::ContentIsland const &island,
+            winrt::Microsoft::UI::Content::ContentIslandStateChangedEventArgs const &args) {
           if (auto pThis = weakThis.get()) {
             if (args.DidRasterizationScaleChange() || args.DidLayoutDirectionChange()) {
               pThis->UpdateConstraints();
@@ -375,7 +363,7 @@ struct ModalHostView : public winrt::implements<ModalHostView, winrt::Windows::F
         m_popUp.SiteView().EnvironmentView().DisplayId());
     auto workArea = displayArea.WorkArea();
 
-    float scale = m_reactNativeIsland.Island().RasterizationScale();
+    float scale = m_rnWindow.ReactNativeIsland().Island().RasterizationScale();
 
     winrt::Microsoft::ReactNative::LayoutConstraints constraints;
     constraints.MinimumSize = {0, 0};
@@ -384,7 +372,7 @@ struct ModalHostView : public winrt::implements<ModalHostView, winrt::Windows::F
         static_cast<float>((workArea.Width / scale) * 0.9), static_cast<float>((workArea.Height / scale) * 0.9)};
     constraints.LayoutDirection = winrt::Microsoft::ReactNative::LayoutDirection::Undefined;
 
-    auto layoutDirection = m_reactNativeIsland.Island().LayoutDirection();
+    auto layoutDirection = m_rnWindow.ReactNativeIsland().Island().LayoutDirection();
     if (layoutDirection == winrt::Microsoft::UI::Content::ContentLayoutDirection::LeftToRight)
       constraints.LayoutDirection = winrt::Microsoft::ReactNative::LayoutDirection::LeftToRight;
     else if (layoutDirection == winrt::Microsoft::UI::Content::ContentLayoutDirection::RightToLeft)
@@ -394,7 +382,7 @@ struct ModalHostView : public winrt::implements<ModalHostView, winrt::Windows::F
     // When no constraint is set (maxSize is std::numeric_limits<Float>::infinity()), yoga will layout the content to a
     // desired size If we provide a specific max size, then contents with a flex:1 will expand to fill that size. We
     // might want to provide a windows specific property to control this behavior.
-    m_state.UpdateState(winrt::make<ModalHostState>(constraints, m_reactNativeIsland.Island().RasterizationScale()));
+    m_state.UpdateState(winrt::make<ModalHostState>(constraints, scale));
   }
 
   static void TrySetFocus(const winrt::Microsoft::ReactNative::ComponentView &view) {
@@ -414,9 +402,8 @@ struct ModalHostView : public winrt::implements<ModalHostView, winrt::Windows::F
   winrt::event_token m_departFocusToken;
   winrt::event_token m_childLayoutMetricsToken;
   winrt::Microsoft::ReactNative::IComponentState m_state{nullptr};
-  winrt::Microsoft::ReactNative::ReactNativeIsland m_reactNativeIsland{nullptr};
+  winrt::Microsoft::ReactNative::ReactNativeWindow m_rnWindow{nullptr};
   winrt::Microsoft::UI::Content::DesktopPopupSiteBridge m_popUp{nullptr};
-  winrt::Microsoft::UI::Windowing::AppWindow m_appWindow{nullptr};
   winrt::event_token m_appWindowClosingToken;
   winrt::com_ptr<::Microsoft::ReactNativeSpecs::ModalHostViewProps> m_localProps{nullptr};
 };

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

@@ -167,6 +167,26 @@ void ParagraphComponentView::updateTextAlignment(
   m_textLayout = nullptr;
 }
 
+facebook::react::Tag ParagraphComponentView::hitTest(
+    facebook::react::Point pt,
+    facebook::react::Point &localPt,
+    bool ignorePointerEvents) const noexcept {
+  facebook::react::Point ptLocal{pt.x - m_layoutMetrics.frame.origin.x, pt.y - m_layoutMetrics.frame.origin.y};
+  const auto &props = paragraphProps();
+  const auto &vProps = *viewProps();
+
+  if (props.isSelectable && ptLocal.x >= 0 && ptLocal.x <= m_layoutMetrics.frame.size.width && ptLocal.y >= 0 &&
+      ptLocal.y <= m_layoutMetrics.frame.size.height) {
+    // claims if pointer events are enabled for this component
+    if (ignorePointerEvents || vProps.pointerEvents == facebook::react::PointerEventsMode::Auto ||
+        vProps.pointerEvents == facebook::react::PointerEventsMode::BoxOnly) {
+      localPt = ptLocal;
+      return Tag();
+    }
+  }
+  return Super::hitTest(pt, localPt, ignorePointerEvents);
+}
+
 bool ParagraphComponentView::IsTextSelectableAtPoint(facebook::react::Point pt) noexcept {
   // paragraph-level selectable prop is enabled
   const auto &props = paragraphProps();
@@ -519,6 +539,7 @@ void ParagraphComponentView::ClearSelection() noexcept {
   m_selectionStart = std::nullopt;
   m_selectionEnd = std::nullopt;
   m_isSelecting = false;
+  m_isWordSelecting = false;
   if (hadSelection) {
     // Clears selection highlight
     DrawText();
@@ -534,7 +555,8 @@ void ParagraphComponentView::OnPointerPressed(
     return;
   }
 
-  auto pp = args.GetCurrentPoint(-1);
+  // Use Tag() to get coordinates in component's local space
+  auto pp = args.GetCurrentPoint(static_cast<int32_t>(Tag()));
 
   // Ignores right-click
   if (pp.Properties().PointerUpdateKind() ==
@@ -545,8 +567,8 @@ void ParagraphComponentView::OnPointerPressed(
 
   auto position = pp.Position();
 
-  facebook::react::Point localPt{
-      position.X - m_layoutMetrics.frame.origin.x, position.Y - m_layoutMetrics.frame.origin.y};
+  // GetCurrentPoint(Tag()) returns position relative to component origin
+  facebook::react::Point localPt{position.X, position.Y};
 
   std::optional<int32_t> charPosition = GetTextPositionAtPoint(localPt);
 
@@ -568,7 +590,13 @@ void ParagraphComponentView::OnPointerPressed(
 
     if (isDoubleClick) {
       SelectWordAtPosition(*charPosition);
-      m_isSelecting = false;
+      if (m_selectionStart && m_selectionEnd) {
+        m_isWordSelecting = true;
+        m_wordAnchorStart = *m_selectionStart;
+        m_wordAnchorEnd = *m_selectionEnd;
+        m_isSelecting = true;
+        CapturePointer(args.Pointer());
+      }
     } else {
       // Single-click: start drag selection
       m_selectionStart = charPosition;
@@ -610,17 +638,35 @@ void ParagraphComponentView::OnPointerMoved(
   facebook::react::Point localPt{position.X, position.Y};
   std::optional<int32_t> charPosition = GetClampedTextPosition(localPt);
 
-  if (charPosition && charPosition != m_selectionEnd) {
-    m_selectionEnd = charPosition;
-    DrawText();
-    args.Handled(true);
+  if (charPosition) {
+    if (m_isWordSelecting) {
+      // Extend selection by whole words
+      auto [wordStart, wordEnd] = GetWordBoundariesAtPosition(*charPosition);
+
+      if (*charPosition < m_wordAnchorStart) {
+        m_selectionStart = wordStart;
+        m_selectionEnd = m_wordAnchorEnd;
+      } else if (*charPosition >= m_wordAnchorEnd) {
+        m_selectionStart = m_wordAnchorStart;
+        m_selectionEnd = wordEnd;
+      } else {
+        m_selectionStart = m_wordAnchorStart;
+        m_selectionEnd = m_wordAnchorEnd;
+      }
+      DrawText();
+      args.Handled(true);
+    } else if (charPosition != m_selectionEnd) {
+      m_selectionEnd = charPosition;
+      DrawText();
+      args.Handled(true);
+    }
   }
 }
 
 void ParagraphComponentView::OnPointerReleased(
     const winrt::Microsoft::ReactNative::Composition::Input::PointerRoutedEventArgs &args) noexcept {
   // Check for right-click to show context menu
-  auto pp = args.GetCurrentPoint(-1);
+  auto pp = args.GetCurrentPoint(static_cast<int32_t>(Tag()));
   if (pp.Properties().PointerUpdateKind() ==
       winrt::Microsoft::ReactNative::Composition::Input::PointerUpdateKind::RightButtonReleased) {
     const auto &props = paragraphProps();
@@ -637,6 +683,7 @@ void ParagraphComponentView::OnPointerReleased(
   }
 
   m_isSelecting = false;
+  m_isWordSelecting = false;
 
   ReleasePointerCapture(args.Pointer());
 
@@ -661,6 +708,7 @@ void ParagraphComponentView::OnPointerCaptureLost() noexcept {
   // Pointer capture was lost stop any active selection drag
   if (m_isSelecting) {
     m_isSelecting = false;
+    m_isWordSelecting = false;
 
     if (!m_selectionStart || !m_selectionEnd || *m_selectionStart == *m_selectionEnd) {
       m_selectionStart = std::nullopt;
@@ -711,12 +759,17 @@ void ParagraphComponentView::CopySelectionToClipboard() noexcept {
   winrt::Windows::ApplicationModel::DataTransfer::Clipboard::SetContent(dataPackage);
 }
 
-void ParagraphComponentView::SelectWordAtPosition(int32_t charPosition) noexcept {
+std::pair<int32_t, int32_t> ParagraphComponentView::GetWordBoundariesAtPosition(int32_t charPosition) noexcept {
   const std::wstring utf16Text{facebook::react::WindowsTextLayoutManager::GetTransformedText(m_attributedStringBox)};
   const int32_t textLength = static_cast<int32_t>(utf16Text.length());
 
-  if (utf16Text.empty() || charPosition < 0 || charPosition >= textLength) {
-    return;
+  if (utf16Text.empty() || charPosition < 0) {
+    return {0, 0};
+  }
+
+  charPosition = std::min(charPosition, textLength - 1);
+  if (charPosition < 0) {
+    return {0, 0};
   }
 
   int32_t wordStart = charPosition;
@@ -749,6 +802,12 @@ void ParagraphComponentView::SelectWordAtPosition(int32_t charPosition) noexcept
     }
   }
 
+  return {wordStart, wordEnd};
+}
+
+void ParagraphComponentView::SelectWordAtPosition(int32_t charPosition) noexcept {
+  auto [wordStart, wordEnd] = GetWordBoundariesAtPosition(charPosition);
+
   if (wordEnd > wordStart) {
     SetSelection(wordStart, wordEnd);
     DrawText();

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

@@ -49,6 +49,11 @@ struct ParagraphComponentView : ParagraphComponentViewT<ParagraphComponentView,
   static facebook::react::SharedViewProps defaultProps() noexcept;
   const facebook::react::ParagraphProps &paragraphProps() const noexcept;
 
+  facebook::react::Tag hitTest(
+      facebook::react::Point pt,
+      facebook::react::Point &localPt,
+      bool ignorePointerEvents = false) const noexcept override;
+
   // Returns true when text is selectable
   bool focusable() const noexcept override;
 
@@ -95,6 +100,7 @@ struct ParagraphComponentView : ParagraphComponentViewT<ParagraphComponentView,
 
   // Selects the word at the given character position
   void SelectWordAtPosition(int32_t charPosition) noexcept;
+  std::pair<int32_t, int32_t> GetWordBoundariesAtPosition(int32_t charPosition) noexcept;
 
   // Shows a context menu with Copy/Select All options on right-click
   void ShowContextMenu() noexcept;
@@ -113,6 +119,11 @@ struct ParagraphComponentView : ParagraphComponentViewT<ParagraphComponentView,
   std::optional<int32_t> m_selectionEnd;
   bool m_isSelecting{false};
 
+  // Double click + drag selection
+  bool m_isWordSelecting{false};
+  int32_t m_wordAnchorStart{0};
+  int32_t m_wordAnchorEnd{0};
+
   // Double-click detection
   std::chrono::steady_clock::time_point m_lastClickTime{};
   std::optional<int32_t> m_lastClickPosition;

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

@@ -168,9 +168,6 @@ winrt::Microsoft::ReactNative::ReactNativeIsland ReactNativeIsland::CreatePortal
   return winrt::make<ReactNativeIsland>(portal);
 }
 
-ReactNativeIsland::ReactNativeIsland() noexcept
-    : ReactNativeIsland(winrt::Microsoft::UI::Composition::Compositor{nullptr}) {}
-
 ReactNativeIsland::~ReactNativeIsland() noexcept {
 #ifdef USE_WINUI3
   if (m_island) {
@@ -220,6 +217,10 @@ void ReactNativeIsland::ReactViewHost(winrt::Microsoft::ReactNative::IReactViewH
   }
 }
 
+winrt::Microsoft::UI::Composition::Compositor ReactNativeIsland::Compositor() noexcept {
+  return m_compositor;
+}
+
 winrt::Microsoft::UI::Composition::Visual ReactNativeIsland::RootVisual() noexcept {
   return winrt::Microsoft::ReactNative::Composition::Experimental::MicrosoftCompositionContextHelper::InnerVisual(
       m_rootVisual);

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

@@ -48,7 +48,6 @@ struct FocusNavigationResult : FocusNavigationResultT<FocusNavigationResult> {
 
 struct ReactNativeIsland
     : ReactNativeIslandT<ReactNativeIsland, Composition::Experimental::IInternalCompositionRootView> {
-  ReactNativeIsland() noexcept;
   ~ReactNativeIsland() noexcept;
 
   ReactNativeIsland(const winrt::Microsoft::UI::Composition::Compositor &compositor) noexcept;
@@ -65,6 +64,8 @@ struct ReactNativeIsland
   ReactNative::IReactViewHost ReactViewHost() noexcept;
   void ReactViewHost(ReactNative::IReactViewHost const &value);
 
+  winrt::Microsoft::UI::Composition::Compositor Compositor() noexcept;
+
   winrt::Microsoft::UI::Composition::Visual RootVisual() noexcept;
 
   // property RootVisual