react-native-windows 0.81.4 → 0.81.5

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

@@ -6,7 +6,7 @@
 
 #include "ScrollViewComponentView.h"
 
-#include <UI.Xaml.Controls.h>
+#include <Fabric/ComponentView.h>
 #include <Utils/ValueUtils.h>
 
 #pragma warning(push)
@@ -20,6 +20,8 @@
 #include <AutoDraw.h>
 #include <Fabric/DWriteHelpers.h>
 #include <unicode.h>
+#include <functional>
+#include "ContentIslandComponentView.h"
 #include "JSValueReader.h"
 #include "RootComponentView.h"
 
@@ -885,6 +887,13 @@ void ScrollViewComponentView::updateContentVisualSize() noexcept {
 
 void ScrollViewComponentView::prepareForRecycle() noexcept {}
 
+void ScrollViewComponentView::updateChildrenClippingPath(
+    facebook::react::LayoutMetrics const & /*layoutMetrics*/,
+    const facebook::react::ViewProps & /*viewProps*/) noexcept {
+  // No-op: ScrollView mounts children into m_scrollVisual (not Visual()),
+  // and scroll visuals inherently clip their content.
+}
+
 /*
 ScrollViewComponentView::ScrollInteractionTrackerOwner::ScrollInteractionTrackerOwner(
     ScrollViewComponentView *outer)
@@ -1326,6 +1335,10 @@ winrt::Microsoft::ReactNative::Composition::Experimental::IVisual ScrollViewComp
             m_allowNextScrollNoMatterWhat = false;
           }
         }
+
+        // Issue #15557: Notify listeners that scroll position has changed,
+        // so ContentIslandComponentView can update LocalToParentTransformMatrix
+        FireViewChanged();
       });
 
   m_scrollBeginDragRevoker = m_scrollVisual.ScrollBeginDrag(
@@ -1333,6 +1346,9 @@ winrt::Microsoft::ReactNative::Composition::Experimental::IVisual ScrollViewComp
       [this](
           winrt::IInspectable const & /*sender*/,
           winrt::Microsoft::ReactNative::Composition::Experimental::IScrollPositionChangedArgs const &args) {
+        // Issue #15557: Notify listeners that scroll position has changed
+        FireViewChanged();
+
         m_allowNextScrollNoMatterWhat = true; // Ensure next scroll event is recorded, regardless of throttle
         updateStateWithContentOffset();
         auto eventEmitter = GetEventEmitter();
@@ -1479,4 +1495,20 @@ void ScrollViewComponentView::updateShowsVerticalScrollIndicator(bool value) noe
 void ScrollViewComponentView::updateDecelerationRate(float value) noexcept {
   m_scrollVisual.SetDecelerationRate({value, value, value});
 }
+
+// Issue #15557: Notify listeners that scroll position has changed.
+// ContentIslandComponentView subscribes to this to update LocalToParentTransformMatrix.
+void ScrollViewComponentView::FireViewChanged() noexcept {
+  m_viewChangedEvent(*this, nullptr);
+}
+
+// Issue #15557: Event accessors for ViewChanged
+winrt::event_token ScrollViewComponentView::ViewChanged(
+    winrt::Windows::Foundation::EventHandler<winrt::Windows::Foundation::IInspectable> const &handler) noexcept {
+  return m_viewChangedEvent.add(handler);
+}
+
+void ScrollViewComponentView::ViewChanged(winrt::event_token const &token) noexcept {
+  m_viewChangedEvent.remove(token);
+}
 } // namespace winrt::Microsoft::ReactNative::Composition::implementation

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

@@ -118,6 +118,18 @@ struct ScrollInteractionTrackerOwner : public winrt::implements<
   double getVerticalSize() noexcept;
   double getHorizontalSize() noexcept;
 
+  // Issue #15557: Event accessors for ViewChanged (used by ContentIslandComponentView for transform update)
+  winrt::event_token ViewChanged(
+      winrt::Windows::Foundation::EventHandler<winrt::Windows::Foundation::IInspectable> const &handler) noexcept;
+  void ViewChanged(winrt::event_token const &token) noexcept;
+
+ protected:
+  // ScrollView mounts children into m_scrollVisual (not Visual()), and scroll visuals
+  // inherently clip their content, so we skip the children container clipping logic.
+  void updateChildrenClippingPath(
+      facebook::react::LayoutMetrics const &layoutMetrics,
+      const facebook::react::ViewProps &viewProps) noexcept override;
+
  private:
   void updateDecelerationRate(float value) noexcept;
   void updateContentVisualSize() noexcept;
@@ -129,6 +141,8 @@ struct ScrollInteractionTrackerOwner : public winrt::implements<
   bool scrollRight(float delta, bool animate) noexcept;
   void updateBackgroundColor(const facebook::react::SharedColor &color) noexcept;
   void updateStateWithContentOffset() noexcept;
+  // Issue #15557: Notify listeners that scroll position has changed
+  void FireViewChanged() noexcept;
   facebook::react::ScrollViewEventEmitter::Metrics getScrollMetrics(
       facebook::react::SharedViewEventEmitter const &eventEmitter,
       winrt::Microsoft::ReactNative::Composition::Experimental::IScrollPositionChangedArgs const &args) noexcept;
@@ -160,6 +174,9 @@ struct ScrollInteractionTrackerOwner : public winrt::implements<
   bool m_allowNextScrollNoMatterWhat{false};
   std::chrono::steady_clock::time_point m_lastScrollEventTime{};
   std::shared_ptr<facebook::react::ScrollViewShadowNode::ConcreteState const> m_state;
+
+  // Issue #15557: Event for notifying listeners when scroll position changes
+  winrt::event<winrt::Windows::Foundation::EventHandler<winrt::Windows::Foundation::IInspectable>> m_viewChangedEvent;
 };
 
 } // namespace winrt::Microsoft::ReactNative::Composition::implementation

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

@@ -186,6 +186,7 @@ struct CompTextHost : public winrt::implements<CompTextHost, ITextHost> {
 
     auto pt = m_outer->getClientOffset();
     m_outer->m_caretVisual.Position({x - pt.x, y - pt.y});
+    m_outer->m_caretPosition = {x, y};
     return true;
   }
 
@@ -696,17 +697,10 @@ void WindowsTextInputComponentView::OnPointerPressed(
   }
 
   if (m_textServices && msg) {
-    if (msg == WM_RBUTTONUP && !windowsTextInputProps().contextMenuHidden) {
-      ShowContextMenu(position);
-      args.Handled(true);
-    } else if (msg == WM_RBUTTONUP && windowsTextInputProps().contextMenuHidden) {
-      args.Handled(true);
-    } else {
-      LRESULT lresult;
-      DrawBlock db(*this);
-      auto hr = m_textServices->TxSendMessage(msg, static_cast<WPARAM>(wParam), static_cast<LPARAM>(lParam), &lresult);
-      args.Handled(hr != S_FALSE);
-    }
+    LRESULT lresult;
+    DrawBlock db(*this);
+    auto hr = m_textServices->TxSendMessage(msg, static_cast<WPARAM>(wParam), static_cast<LPARAM>(lParam), &lresult);
+    args.Handled(hr != S_FALSE);
   }
 
   // Emits the OnPressIn event
@@ -768,10 +762,18 @@ void WindowsTextInputComponentView::OnPointerReleased(
   }
 
   if (m_textServices && msg) {
-    LRESULT lresult;
-    DrawBlock db(*this);
-    auto hr = m_textServices->TxSendMessage(msg, static_cast<WPARAM>(wParam), static_cast<LPARAM>(lParam), &lresult);
-    args.Handled(hr != S_FALSE);
+    // Show context menu on right button release (standard Windows behavior)
+    if (msg == WM_RBUTTONUP && !windowsTextInputProps().contextMenuHidden) {
+      ShowContextMenu(LocalToScreen(position));
+      args.Handled(true);
+    } else if (msg == WM_RBUTTONUP) {
+      // Context menu is hidden - don't mark as handled, let app add custom behavior
+    } else {
+      LRESULT lresult;
+      DrawBlock db(*this);
+      auto hr = m_textServices->TxSendMessage(msg, static_cast<WPARAM>(wParam), static_cast<LPARAM>(lParam), &lresult);
+      args.Handled(hr != S_FALSE);
+    }
   }
 
   // Emits the OnPressOut event
@@ -1225,8 +1227,11 @@ void WindowsTextInputComponentView::updateState(
   if (m_mostRecentEventCount == m_state->getData().mostRecentEventCount) {
     m_comingFromState = true;
     auto &fragments = m_state->getData().attributedStringBox.getValue().getFragments();
-    UpdateText(fragments.size() ? fragments[0].string : "");
-
+    {
+      // DrawBlock defers DrawText() until after UpdateText completes
+      DrawBlock db(*this);
+      UpdateText(fragments.size() ? fragments[0].string : "");
+    }
     m_comingFromState = false;
   }
 }
@@ -1375,7 +1380,7 @@ void WindowsTextInputComponentView::EmitOnScrollEvent() noexcept {
 }
 
 void WindowsTextInputComponentView::OnSelectionChanged(LONG start, LONG end) noexcept {
-  if (m_eventEmitter && !m_comingFromState /* && !m_comingFromJS ?? */) {
+  if (m_eventEmitter && !m_comingFromState && !m_comingFromJS) {
     auto emitter = std::static_pointer_cast<const facebook::react::WindowsTextInputEventEmitter>(m_eventEmitter);
     facebook::react::WindowsTextInputEventEmitter::OnSelectionChange onSelectionChangeArgs;
     onSelectionChangeArgs.selection.start = start;
@@ -1676,7 +1681,8 @@ void WindowsTextInputComponentView::DrawText() noexcept {
   }
 
   bool isZeroSized =
-      m_layoutMetrics.frame.size.width <= (m_layoutMetrics.contentInsets.left + m_layoutMetrics.contentInsets.right);
+      m_layoutMetrics.frame.size.width <= (m_layoutMetrics.contentInsets.left + m_layoutMetrics.contentInsets.right) ||
+      m_layoutMetrics.frame.size.height <= (m_layoutMetrics.contentInsets.top + m_layoutMetrics.contentInsets.bottom);
   if (!m_drawingSurface || isZeroSized)
     return;
 
@@ -1870,6 +1876,21 @@ void WindowsTextInputComponentView::updateSpellCheck(bool enable) noexcept {
       m_textServices->TxSendMessage(EM_SETLANGOPTIONS, IMF_SPELLCHECKING, enable ? newLangOptions : 0, &lresult));
 }
 
+void WindowsTextInputComponentView::OnContextMenuKey(
+    const winrt::Microsoft::ReactNative::Composition::Input::ContextMenuKeyEventArgs &args) noexcept {
+  // Handle context menu key event (SHIFT+F10 or Context Menu key)
+  if (!windowsTextInputProps().contextMenuHidden) {
+    // m_caretPosition is stored from TxSetCaretPos in RichEdit client rect space (physical pixels).
+    // LocalToScreen expects logical (DIP) coordinates, so divide by pointScaleFactor.
+    auto screenPt = LocalToScreen(winrt::Windows::Foundation::Point{
+        static_cast<float>(m_caretPosition.x) / m_layoutMetrics.pointScaleFactor,
+        static_cast<float>(m_caretPosition.y) / m_layoutMetrics.pointScaleFactor});
+    ShowContextMenu(screenPt);
+    args.Handled(true);
+  }
+  // If contextMenuHidden, don't mark as handled - let app handle it
+}
+
 void WindowsTextInputComponentView::ShowContextMenu(const winrt::Windows::Foundation::Point &position) noexcept {
   HMENU menu = CreatePopupMenu();
   if (!menu)
@@ -1889,13 +1910,16 @@ void WindowsTextInputComponentView::ShowContextMenu(const winrt::Windows::Founda
   AppendMenuW(menu, MF_STRING | (canPaste ? 0 : MF_GRAYED), 3, L"Paste");
   AppendMenuW(menu, MF_STRING | (!isEmpty && !isReadOnly ? 0 : MF_GRAYED), 4, L"Select All");
 
-  POINT cursorPos;
-  GetCursorPos(&cursorPos);
-
   HWND hwnd = GetActiveWindow();
 
   int cmd = TrackPopupMenu(
-      menu, TPM_LEFTALIGN | TPM_TOPALIGN | TPM_RETURNCMD | TPM_NONOTIFY, cursorPos.x, cursorPos.y, 0, hwnd, NULL);
+      menu,
+      TPM_LEFTALIGN | TPM_TOPALIGN | TPM_RETURNCMD | TPM_NONOTIFY,
+      static_cast<int>(position.X),
+      static_cast<int>(position.Y),
+      0,
+      hwnd,
+      NULL);
 
   if (cmd == 1) { // Cut
     m_textServices->TxSendMessage(WM_CUT, 0, 0, &res);

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

@@ -67,6 +67,8 @@ struct WindowsTextInputComponentView
   void OnKeyUp(const winrt::Microsoft::ReactNative::Composition::Input::KeyRoutedEventArgs &args) noexcept override;
   void OnCharacterReceived(const winrt::Microsoft::ReactNative::Composition::Input::CharacterReceivedRoutedEventArgs
                                &args) noexcept override;
+  void OnContextMenuKey(
+      const winrt::Microsoft::ReactNative::Composition::Input::ContextMenuKeyEventArgs &args) noexcept override;
   void onMounted() noexcept override;
 
   std::optional<std::string> getAccessiblityValue() noexcept override;
@@ -146,6 +148,7 @@ struct WindowsTextInputComponentView
   DWORD m_propBitsMask{0};
   DWORD m_propBits{0};
   HCURSOR m_hcursor{nullptr};
+  POINT m_caretPosition{0, 0};
   std::chrono::steady_clock::time_point m_lastClickTime{};
   std::vector<facebook::react::CompWindowsTextInputSubmitKeyEventsStruct> m_submitKeyEvents;
 };

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

@@ -5,6 +5,7 @@
 
 #include <react/featureflags/ReactNativeFeatureFlags.h>
 #include <react/renderer/attributedstring/AttributedStringBox.h>
+#include <react/renderer/attributedstring/PlaceholderAttributedString.h>
 #include <react/renderer/attributedstring/TextAttributes.h>
 #include <react/renderer/components/text/BaseTextShadowNode.h>
 #include <react/renderer/core/LayoutConstraints.h>
@@ -185,6 +186,7 @@ AttributedString WindowsTextInputShadowNode::getPlaceholderAttributedString(cons
   const auto &props = getConcreteProps();
 
   AttributedString attributedString;
+  attributedString.setBaseTextAttributes(props.textAttributes);
   //[windows
   if (!props.placeholder.empty()) {
     auto textAttributes = TextAttributes::defaultTextAttributes();
@@ -203,7 +205,7 @@ AttributedString WindowsTextInputShadowNode::getPlaceholderAttributedString(cons
   }
   // windows]
 
-  return attributedString;
+  return ensurePlaceholderIfEmpty_DO_NOT_USE(attributedString);
 }
 
 #pragma mark - LayoutableShadowNode

package/Microsoft.ReactNative/Modules/LogBoxModule.cpp

@@ -12,6 +12,7 @@
 #ifdef USE_FABRIC
 #include <Fabric/Composition/CompositionContextHelper.h>
 #include <Fabric/Composition/CompositionUIService.h>
+#include <winrt/Microsoft.UI.Windowing.h>
 #include <winrt/Windows.UI.Composition.h>
 #else
 #include <UI.Xaml.Controls.Primitives.h>
@@ -22,16 +23,14 @@ namespace Microsoft::ReactNative {
 
 LogBox::~LogBox() {
 #ifdef USE_FABRIC
-  if (m_hwnd) {
-    m_context.UIDispatcher().Post([hwnd = m_hwnd]() { DestroyWindow(hwnd); });
-    m_hwnd = nullptr;
+  if (m_rnWindow) {
+    m_context.UIDispatcher().Post([rnWindow = m_rnWindow]() { rnWindow.Close(); });
+    m_rnWindow = nullptr;
   }
 #endif
 }
 
 #ifdef USE_FABRIC
-constexpr PCWSTR c_logBoxWindowClassName = L"MS_REACTNATIVE_LOGBOX";
-constexpr auto CompHostProperty = L"CompHost";
 const int LOGBOX_DEFAULT_WIDTH = 700;
 const int LOGBOX_DEFAULT_HEIGHT = 1000;
 #endif // USE_FABRIC
@@ -55,69 +54,6 @@ void LogBox::Hide() noexcept {
   });
 }
 
-#ifdef USE_FABRIC
-LRESULT CALLBACK LogBoxWndProc(HWND hwnd, UINT message, WPARAM wparam, LPARAM lparam) noexcept {
-  auto data = reinterpret_cast<::IUnknown *>(GetProp(hwnd, CompHostProperty));
-  winrt::com_ptr<winrt::IUnknown> spunk;
-  React::CompositionHwndHost host{nullptr};
-
-  if (data) {
-    winrt::check_hresult(data->QueryInterface(winrt::guid_of<React::CompositionHwndHost>(), winrt::put_abi(host)));
-    auto result = static_cast<LRESULT>(host.TranslateMessage(message, wparam, lparam));
-    if (result)
-      return result;
-  }
-
-  switch (message) {
-    case WM_NCCREATE: {
-      auto cs = reinterpret_cast<CREATESTRUCT *>(lparam);
-      auto windowData = static_cast<::IUnknown *>(cs->lpCreateParams);
-      SetProp(hwnd, CompHostProperty, reinterpret_cast<::IUnknown *>(windowData));
-      break;
-    }
-    case WM_CREATE: {
-      host.Initialize((uint64_t)hwnd);
-      break;
-    }
-    case WM_CLOSE: {
-      // Just hide the window instead of destroying it
-      ::ShowWindow(hwnd, SW_HIDE);
-      return 0;
-    }
-    case WM_DESTROY: {
-      data->Release();
-      SetProp(hwnd, CompHostProperty, nullptr);
-    }
-  }
-
-  return DefWindowProc(hwnd, message, wparam, lparam);
-}
-
-void LogBox::RegisterWndClass() noexcept {
-  static bool registered = false;
-  if (registered)
-    return;
-
-  HINSTANCE hInstance = GetModuleHandle(NULL);
-
-  WNDCLASSEXW wcex = {};
-  wcex.cbSize = sizeof(WNDCLASSEX);
-  wcex.style = CS_HREDRAW | CS_VREDRAW;
-  wcex.lpfnWndProc = &LogBoxWndProc;
-  wcex.cbClsExtra = DLGWINDOWEXTRA;
-  wcex.cbWndExtra = sizeof(winrt::impl::abi<winrt::Microsoft::ReactNative::ICompositionHwndHost>::type *);
-  wcex.hInstance = hInstance;
-  wcex.hCursor = LoadCursor(nullptr, IDC_ARROW);
-  wcex.hbrBackground = (HBRUSH)(COLOR_WINDOW + 1);
-  wcex.lpszClassName = c_logBoxWindowClassName;
-  ATOM classId = RegisterClassEx(&wcex);
-  WINRT_VERIFY(classId);
-  winrt::check_win32(!classId);
-
-  registered = true;
-}
-#endif // USE_FABRIC
-
 void LogBox::ShowOnUIThread() noexcept {
   auto host = React::implementation::ReactNativeHost::GetReactNativeHost(m_context.Properties());
   if (!host)
@@ -173,45 +109,34 @@ void LogBox::ShowOnUIThread() noexcept {
   }
 #else
   else {
-    RegisterWndClass();
-
-    if (!m_hwnd) {
+    if (!m_rnWindow) {
+      m_rnWindow = winrt::Microsoft::ReactNative::ReactNativeWindow::CreateFromCompositor(
+          winrt::Microsoft::ReactNative::Composition::CompositionUIService::GetCompositor(
+              host.InstanceSettings().Properties()));
       auto CompositionHwndHost = React::CompositionHwndHost();
       winrt::Microsoft::ReactNative::ReactViewOptions viewOptions;
       viewOptions.ComponentName(L"LogBox");
-      CompositionHwndHost.ReactViewHost(
+      m_rnWindow.AppWindow().Title(L"LogBox");
+      m_rnWindow.AppWindow().Closing([](winrt::Microsoft::UI::Windowing::AppWindow const & /*appWindow*/,
+                                        winrt::Microsoft::UI::Windowing::AppWindowClosingEventArgs const &args) {
+        // Prevent default close behavior - as JS will never try to show the logbox again if it isn't hidden through JS
+        args.Cancel(true);
+      });
+      m_rnWindow.ReactNativeIsland().ReactViewHost(
           winrt::Microsoft::ReactNative::ReactCoreInjection::MakeViewHost(host, viewOptions));
-      HINSTANCE hInstance = GetModuleHandle(NULL);
-      winrt::impl::abi<winrt::Microsoft::ReactNative::ICompositionHwndHost>::type *pHost{nullptr};
-      winrt::com_ptr<::IUnknown> spunk;
-      CompositionHwndHost.as(spunk);
-      spunk->AddRef(); // Will be stored in windowData
-
-      m_hwnd = CreateWindow(
-          c_logBoxWindowClassName,
-          L"React-Native LogBox",
-          WS_OVERLAPPEDWINDOW,
-          CW_USEDEFAULT,
-          CW_USEDEFAULT,
-          LOGBOX_DEFAULT_WIDTH,
-          LOGBOX_DEFAULT_HEIGHT,
-          nullptr,
-          nullptr,
-          hInstance,
-          spunk.get());
+      m_rnWindow.AppWindow().ResizeClient({LOGBOX_DEFAULT_WIDTH, LOGBOX_DEFAULT_HEIGHT});
     }
 
-    ShowWindow(m_hwnd, SW_NORMAL);
-    BringWindowToTop(m_hwnd);
-    SetFocus(m_hwnd);
+    m_rnWindow.AppWindow().Show(true);
+    m_rnWindow.AppWindow().MoveInZOrderAtTop();
   }
 #endif // USE_FABRIC
 }
 
 void LogBox::HideOnUIThread() noexcept {
 #ifdef USE_FABRIC
-  if (m_hwnd) {
-    ::ShowWindow(m_hwnd, SW_HIDE);
+  if (m_rnWindow) {
+    m_rnWindow.AppWindow().Hide();
   }
 #else // USE_FABRIC
   if (m_popup) {

package/Microsoft.ReactNative/Modules/LogBoxModule.h

@@ -31,7 +31,7 @@ struct LogBox : public std::enable_shared_from_this<LogBox> {
 
   winrt::Microsoft::ReactNative::ReactContext m_context;
 #ifdef USE_FABRIC
-  HWND m_hwnd{nullptr};
+  winrt::Microsoft::ReactNative::ReactNativeWindow m_rnWindow{nullptr};
 #else
   xaml::Controls::Primitives::Popup m_popup{nullptr};
   winrt::Microsoft::ReactNative::ReactRootView m_logBoxContent{nullptr};

package/Microsoft.ReactNative/ReactNativeAppBuilder.cpp

@@ -20,19 +20,6 @@ ReactNativeAppBuilder::ReactNativeAppBuilder() {
 
 ReactNativeAppBuilder::~ReactNativeAppBuilder() {}
 
-winrt::Microsoft::ReactNative::ReactNativeAppBuilder ReactNativeAppBuilder::SetDispatcherQueueController(
-    winrt::Microsoft::UI::Dispatching::DispatcherQueueController const &dispatcherQueueController) {
-  m_reactNativeWin32App.as<implementation::ReactNativeWin32App>().get()->DispatcherQueueController(
-      dispatcherQueueController);
-  return *this;
-}
-
-winrt::Microsoft::ReactNative::ReactNativeAppBuilder ReactNativeAppBuilder::SetCompositor(
-    winrt::Microsoft::UI::Composition::Compositor const &compositor) {
-  m_reactNativeWin32App.as<implementation::ReactNativeWin32App>().get()->Compositor(compositor);
-  return *this;
-}
-
 winrt::Microsoft::ReactNative::ReactNativeAppBuilder ReactNativeAppBuilder::SetAppWindow(
     winrt::Microsoft::UI::Windowing::AppWindow const &appWindow) {
   m_reactNativeWin32App.as<implementation::ReactNativeWin32App>().get()->AppWindow(appWindow);
@@ -41,34 +28,6 @@ winrt::Microsoft::ReactNative::ReactNativeAppBuilder ReactNativeAppBuilder::SetA
 }
 
 winrt::Microsoft::ReactNative::ReactNativeWin32App ReactNativeAppBuilder::Build() {
-  // Create the DispatcherQueueController if the app developer doesn't provide one
-  if (m_reactNativeWin32App.as<implementation::ReactNativeWin32App>().get()->DispatcherQueueController() == nullptr) {
-    assert(m_reactNativeWin32App.as<implementation::ReactNativeWin32App>().get()->Compositor() == nullptr);
-
-    // Create a DispatcherQueue for this thread. This is needed for Composition, Content, and Input APIs.
-    auto dispatcherQueueController =
-        winrt::Microsoft::UI::Dispatching::DispatcherQueueController::CreateOnCurrentThread();
-
-    m_reactNativeWin32App.as<implementation::ReactNativeWin32App>().get()->DispatcherQueueController(
-        dispatcherQueueController);
-  }
-
-  // Create the Compositor if the app developer doesn't provide one
-  if (m_reactNativeWin32App.as<implementation::ReactNativeWin32App>().get()->Compositor() == nullptr) {
-    // Create the compositor on behalf of the App Developer.
-    auto compositor = winrt::Microsoft::UI::Composition::Compositor();
-    m_reactNativeWin32App.as<implementation::ReactNativeWin32App>().get()->Compositor(compositor);
-  }
-
-  // Create the AppWindow if the app developer doesn't provide one
-  if (m_reactNativeWin32App.AppWindow() == nullptr) {
-    auto appWindow = winrt::Microsoft::UI::Windowing::AppWindow::Create();
-    appWindow.Title(L"ReactNativeWin32App");
-    appWindow.Resize({1000, 1000});
-
-    m_reactNativeWin32App.as<implementation::ReactNativeWin32App>().get()->AppWindow(appWindow);
-  }
-
   return m_reactNativeWin32App;
 }
 

package/Microsoft.ReactNative/ReactNativeAppBuilder.idl

@@ -18,12 +18,6 @@ namespace Microsoft.ReactNative {
 
         ReactViewOptions ReactViewOptions {get;};
 
-        // TODO: Hide these APIs for now until we're sure we need to expose them and can do so safely
-        // Microsoft.UI.Composition.Compositor Compositor {get;};
-        // Microsoft.UI.Content.DesktopChildSiteBridge DesktopChildSiteBridge {get;};
-        // Microsoft.UI.Dispatching DispatcherQueueController {get;};
-        // ReactNativeIsland ReactNativeIsland {get;};
-
         // Methods
         void Start();
      }
@@ -38,11 +32,6 @@ namespace Microsoft.ReactNative {
 
         ReactNativeAppBuilder SetAppWindow(Microsoft.UI.Windowing.AppWindow appWindow);
 
-        // TODO: Hide these APIs for now until we're sure we need to expose them and can do so safely
-        // Compositor depends on the DispatcherQueue created by DispatcherQueueController
-        // ReactNativeAppBuilder SetCompositor(Microsoft.UI.Composition.Compositor compositor);
-        // ReactNativeAppBuilder SetDispatcherQueueController(Microsoft.UI.Dispatching DispatcherQueueController);
-
         ReactNativeWin32App Build();
     }
 }

package/Microsoft.ReactNative/ReactNativeIsland.idl

@@ -80,9 +80,6 @@ namespace Microsoft.ReactNative
   DOC_STRING("A windows composition component that hosts React Native UI elements.")
   runtimeclass ReactNativeIsland
   {
-    DOC_STRING("Creates a new instance of @ReactNativeIsland. Can be implemented with a ReactViewHost or a ComponentView with reactContext")
-    ReactNativeIsland();
-
 #ifdef USE_WINUI3
     ReactNativeIsland(Microsoft.UI.Composition.Compositor compositor);
 
@@ -100,6 +97,8 @@ namespace Microsoft.ReactNative
 
     Windows.Foundation.Size Size { get; };
 
+    Microsoft.UI.Composition.Compositor Compositor { get; };
+
     DOC_STRING("ScaleFactor for this windows (DPI/96)")
     Single ScaleFactor {get; set;};