react-native-windows 0.78.5 → 0.78.7

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

@@ -31,24 +31,29 @@ extern "C" HRESULT WINAPI WICCreateImagingFactory_Proxy(UINT SDKVersion, IWICIma
 namespace winrt::Microsoft::ReactNative::Composition::implementation {
 
 ImageComponentView::WindowsImageResponseObserver::WindowsImageResponseObserver(
+    winrt::Microsoft::ReactNative::ReactContext const &reactContext,
     winrt::weak_ref<winrt::Microsoft::ReactNative::Composition::implementation::ImageComponentView> wkImage)
-    : m_wkImage(std::move(wkImage)) {}
+    : m_reactContext(reactContext), m_wkImage(std::move(wkImage)) {}
 
 void ImageComponentView::WindowsImageResponseObserver::didReceiveProgress(float progress, int64_t loaded, int64_t total)
     const {
-  // TODO progress?
+  int loadedInt = static_cast<int>(loaded);
+  int totalInt = static_cast<int>(total);
+  m_reactContext.UIDispatcher().Post([progress, wkImage = m_wkImage, loadedInt, totalInt]() {
+    if (auto image = wkImage.get()) {
+      image->didReceiveProgress(progress, loadedInt, totalInt);
+    }
+  });
 }
 
 void ImageComponentView::WindowsImageResponseObserver::didReceiveImage(
     facebook::react::ImageResponse const &imageResponse) const {
-  if (auto imgComponentView{m_wkImage.get()}) {
-    auto imageResponseImage = std::static_pointer_cast<ImageResponseImage>(imageResponse.getImage());
-    imgComponentView->m_reactContext.UIDispatcher().Post([imageResponseImage, wkImage = m_wkImage]() {
-      if (auto image{wkImage.get()}) {
-        image->didReceiveImage(imageResponseImage);
-      }
-    });
-  }
+  auto imageResponseImage = std::static_pointer_cast<ImageResponseImage>(imageResponse.getImage());
+  m_reactContext.UIDispatcher().Post([imageResponseImage, wkImage = m_wkImage]() {
+    if (auto image{wkImage.get()}) {
+      image->didReceiveImage(imageResponseImage);
+    }
+  });
 }
 
 void ImageComponentView::WindowsImageResponseObserver::didReceiveFailure(
@@ -95,6 +100,21 @@ void ImageComponentView::ImageLoadStart() noexcept {
   }
 }
 
+void ImageComponentView::ImageLoaded() noexcept {
+  auto imageEventEmitter = std::static_pointer_cast<facebook::react::ImageEventEmitter const>(m_eventEmitter);
+  if (imageEventEmitter) {
+    imageEventEmitter->onLoadEnd();
+  }
+}
+
+void ImageComponentView::didReceiveProgress(float progress, int loaded, int total) noexcept {
+  auto imageEventEmitter = std::static_pointer_cast<facebook::react::ImageEventEmitter const>(m_eventEmitter);
+  if (imageEventEmitter) {
+    imageEventEmitter->onProgress(progress, loaded, total);
+  }
+  ensureDrawingSurface();
+}
+
 void ImageComponentView::didReceiveImage(const std::shared_ptr<ImageResponseImage> &imageResponseImage) noexcept {
   // TODO check for recycled?
 
@@ -152,7 +172,7 @@ void ImageComponentView::updateState(
   auto newImageState = std::static_pointer_cast<facebook::react::ImageShadowNode::ConcreteState const>(state);
 
   if (!m_imageResponseObserver) {
-    m_imageResponseObserver = std::make_shared<WindowsImageResponseObserver>(get_weak());
+    m_imageResponseObserver = std::make_shared<WindowsImageResponseObserver>(this->m_reactContext, get_weak());
   }
 
   setStateAndResubscribeImageResponseObserver(newImageState);
@@ -281,6 +301,9 @@ void ImageComponentView::ensureDrawingSurface() noexcept {
                 : winrt::Microsoft::ReactNative::Composition::Experimental::CompositionStretch::Uniform);
         break;
       }
+      case facebook::react::ImageResizeMode::None:
+        m_drawingSurface.Stretch(winrt::Microsoft::ReactNative::Composition::Experimental::CompositionStretch::None);
+        break;
       default:
         assert(false);
     }

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

@@ -71,6 +71,7 @@ struct ImageComponentView : ImageComponentViewT<ImageComponentView, ViewComponen
   struct WindowsImageResponseObserver : facebook::react::ImageResponseObserver {
    public:
     WindowsImageResponseObserver(
+        winrt::Microsoft::ReactNative::ReactContext const &reactContext,
         winrt::weak_ref<winrt::Microsoft::ReactNative::Composition::implementation::ImageComponentView> wkImage);
     void didReceiveProgress(float progress, int64_t loaded, int64_t total) const override;
     void didReceiveImage(const facebook::react::ImageResponse &imageResponse) const override;
@@ -78,6 +79,7 @@ struct ImageComponentView : ImageComponentViewT<ImageComponentView, ViewComponen
 
    private:
     winrt::weak_ref<winrt::Microsoft::ReactNative::Composition::implementation::ImageComponentView> m_wkImage;
+    winrt::Microsoft::ReactNative::ReactContext m_reactContext;
   };
 
   void ensureDrawingSurface() noexcept;
@@ -85,6 +87,7 @@ struct ImageComponentView : ImageComponentViewT<ImageComponentView, ViewComponen
 
   void ImageLoadStart() noexcept;
   void ImageLoaded() noexcept;
+  void didReceiveProgress(float progress, int loaded, int total) noexcept;
   void didReceiveImage(const std::shared_ptr<ImageResponseImage> &wicbmp) noexcept;
   void didReceiveFailureFromObserver(const facebook::react::ImageLoadError &error) noexcept;
   void setStateAndResubscribeImageResponseObserver(

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

@@ -35,33 +35,29 @@ struct ModalHostState
 struct ModalHostView : public winrt::implements<ModalHostView, winrt::Windows::Foundation::IInspectable>,
                        ::Microsoft::ReactNativeSpecs::BaseModalHostView<ModalHostView> {
   ~ModalHostView() {
-    if (m_window && m_window.IsVisible()) {
-      CloseWindow();
-    }
-
     if (m_reactNativeIsland) {
       m_reactNativeIsland.Island().Close();
     }
 
-    if (m_bridge) {
-      if (m_departFocusToken && !m_bridge.IsClosed()) {
-        auto navHost = winrt::Microsoft::UI::Input::InputFocusNavigationHost::GetForSiteBridge(m_bridge);
-        navHost.DepartFocusRequested(m_departFocusToken);
-      }
-      m_bridge.Close();
+    // Add AppWindow closing token cleanup
+    if (m_appWindow && m_appWindowClosingToken) {
+      m_appWindow.Closing(m_appWindowClosingToken);
+      m_appWindowClosingToken.value = 0;
     }
 
-    if (m_window) {
-      m_window.Destroy();
-      m_window = nullptr;
-    }
-
-#ifdef USE_EXPERIMENTAL_WINUI3
     if (m_popUp) {
+      if (m_departFocusToken && !m_popUp.IsClosed()) {
+        // WASDK BUG: InputFocusNavigationHost::GetForSiteBridge fails on a DesktopPopupSiteBridge
+        // https://github.com/microsoft/react-native-windows/issues/14604
+        /*
+        auto navHost =
+        winrt::Microsoft::UI::Input::InputFocusNavigationHost::GetForSiteBridge(m_popUp.as<winrt::Microsoft::UI::Content::IContentSiteBridge>());
+        navHost.DepartFocusRequested(m_departFocusToken);
+        */
+      }
       m_popUp.Close();
       m_popUp = nullptr;
     }
-#endif
   }
 
   void InitializePortalViewComponent(
@@ -78,18 +74,54 @@ struct ModalHostView : public winrt::implements<ModalHostView, winrt::Windows::F
       const winrt::Microsoft::ReactNative::ComponentView &view,
       const winrt::com_ptr<::Microsoft::ReactNativeSpecs::ModalHostViewProps> &newProps,
       const winrt::com_ptr<::Microsoft::ReactNativeSpecs::ModalHostViewProps> &oldProps) noexcept override {
-    if (!oldProps || newProps->visible != oldProps->visible) {
+    // Store the props locally
+    m_localProps = newProps;
+
+    const auto &oldViewProps = *oldProps;
+    const auto &newViewProps = *newProps;
+
+    if (!oldProps || newViewProps.visible != oldViewProps.visible) {
       if (newProps->visible.value_or(true)) {
+        m_visible = true;
         // We do not immediately show the window, since we want to resize/position
         // the window based on the layout metrics before we show it
-        m_showQueued = true;
+        QueueShow(view);
       } else {
+        m_visible = false;
         CloseWindow();
       }
     }
+
+    // Update Title if changed and AppWindow exists
+    if (m_appWindow && (!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);
+    }
+
     ::Microsoft::ReactNativeSpecs::BaseModalHostView<ModalHostView>::UpdateProps(view, newProps, oldProps);
   }
 
+  void QueueShow(const winrt::Microsoft::ReactNative::ComponentView &view) noexcept {
+    if (m_showQueued)
+      return;
+    m_showQueued = true;
+
+    m_reactContext.UIDispatcher().Post([wkThis = get_weak(), wkView = winrt::weak_ref(view)]() {
+      if (auto strongThis = wkThis.get()) {
+        strongThis->m_showQueued = false;
+
+        if (!strongThis->m_visible) {
+          return;
+        }
+        if (auto v = wkView.get()) {
+          strongThis->ShowOnUIThread(v);
+        }
+      }
+    });
+  }
+
   void UpdateState(
       const winrt::Microsoft::ReactNative::ComponentView & /*view*/,
       const winrt::Microsoft::ReactNative::IComponentState &newState) noexcept override {
@@ -118,19 +150,11 @@ struct ModalHostView : public winrt::implements<ModalHostView, winrt::Windows::F
     m_childLayoutMetricsToken.value = 0;
   }
 
-  void FinalizeUpdate(
-      const winrt::Microsoft::ReactNative::ComponentView &view,
-      winrt::Microsoft::ReactNative::ComponentViewUpdateMask /*mask*/) noexcept override {
-    if (m_showQueued) {
-      ShowOnUIThread(view);
-    }
-  }
-
  private:
   void OnMounted(const winrt::Microsoft::ReactNative::ComponentView &view) noexcept {
     m_mounted = true;
-    if (m_showQueued) {
-      ShowOnUIThread(view);
+    if (m_visible) {
+      QueueShow(view);
     }
   }
 
@@ -139,11 +163,7 @@ struct ModalHostView : public winrt::implements<ModalHostView, winrt::Windows::F
   }
 
   void AdjustWindowSize(const winrt::Microsoft::ReactNative::LayoutMetrics &layoutMetrics) noexcept {
-#ifdef USE_EXPERIMENTAL_WINUI3
-    if (!m_popUp) {
-#else
-    if (!m_window) {
-#endif
+    if (!m_appWindow) {
       return;
     }
 
@@ -151,65 +171,45 @@ struct ModalHostView : public winrt::implements<ModalHostView, winrt::Windows::F
       return;
     }
 
-    // get Modal's position based on parent
+    // Calculate physical pixels from DIPs
+    int32_t clientWidthPx = static_cast<int32_t>(layoutMetrics.Frame.Width * layoutMetrics.PointScaleFactor);
+    int32_t clientHeightPx = static_cast<int32_t>(layoutMetrics.Frame.Height * layoutMetrics.PointScaleFactor);
+
+    // Ensure minimum size for the window
+    clientWidthPx = std::max(100, clientWidthPx);
+    clientHeightPx = std::max(100, clientHeightPx);
+
+    // Size the client area directly
+    m_appWindow.ResizeClient({clientWidthPx, clientHeightPx});
+
+    // Center the window on its parent
     RECT parentRC;
     GetWindowRect(m_parentHwnd, &parentRC);
-    int32_t xCor = static_cast<int32_t>(
-        (parentRC.left + parentRC.right - layoutMetrics.Frame.Width * layoutMetrics.PointScaleFactor) / 2);
-    int32_t yCor = static_cast<int32_t>(
-        (parentRC.top + parentRC.bottom - layoutMetrics.Frame.Height * layoutMetrics.PointScaleFactor) / 2);
-
-#ifdef USE_EXPERIMENTAL_WINUI3
-    winrt::Windows::Graphics::RectInt32 rect2{
-        (int)xCor,
-        (int)yCor,
-        static_cast<int32_t>(layoutMetrics.Frame.Width * (layoutMetrics.PointScaleFactor)),
-        static_cast<int32_t>(layoutMetrics.Frame.Height * (layoutMetrics.PointScaleFactor))};
-    m_popUp.MoveAndResize(rect2);
-#else
-    // Fix for https://github.com/microsoft/microsoft-ui-xaml/issues/9529
-    auto titleBarHeight = m_window.TitleBar().Height();
-
-    // Adjust window position and size
-    m_window.ResizeClient(
-        {static_cast<int32_t>(layoutMetrics.Frame.Width * (layoutMetrics.PointScaleFactor)),
-         static_cast<int32_t>(layoutMetrics.Frame.Height * (layoutMetrics.PointScaleFactor)) - titleBarHeight});
-    m_window.Move({xCor, yCor});
-#endif
+    auto outerSize = m_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});
   };
 
   void ShowOnUIThread(const winrt::Microsoft::ReactNative::ComponentView &view) {
     if (!m_mounted)
       return;
 
-    m_showQueued = false;
     EnsureModalCreated(view);
 
-#ifdef USE_EXPERIMENTAL_WINUI3
     if (m_popUp) {
-      m_bridge.Enable();
       m_popUp.Show();
 
+      // WASDK BUG: InputFocusNavigationHost::GetForSiteBridge fails on a DesktopPopupSiteBridge
+      // https://github.com/microsoft/react-native-windows/issues/14604
+      /*
       auto navHost = winrt::Microsoft::UI::Input::InputFocusNavigationHost::GetForSiteBridge(
           m_popUp.as<winrt::Microsoft::UI::Content::IContentSiteBridge>());
       auto result = navHost.NavigateFocus(winrt::Microsoft::UI::Input::FocusNavigationRequest::Create(
           winrt::Microsoft::UI::Input::FocusNavigationReason::First));
-
-      // dispatch onShow event
-      if (auto eventEmitter = EventEmitter()) {
-        ::Microsoft::ReactNativeSpecs::ModalHostViewEventEmitter::OnShow eventArgs;
-        eventEmitter->onShow(eventArgs);
-      }
-    }
-#endif
-
-    if (m_window && !m_window.IsVisible()) {
-      m_bridge.Enable();
-      m_window.Show(true);
-
-      auto navHost = winrt::Microsoft::UI::Input::InputFocusNavigationHost::GetForSiteBridge(m_bridge);
-      auto result = navHost.NavigateFocus(winrt::Microsoft::UI::Input::FocusNavigationRequest::Create(
-          winrt::Microsoft::UI::Input::FocusNavigationReason::First));
+      */
 
       // dispatch onShow event
       if (auto eventEmitter = EventEmitter()) {
@@ -222,16 +222,15 @@ struct ModalHostView : public winrt::implements<ModalHostView, winrt::Windows::F
   void CloseWindow() noexcept {
     // enable input to parent before closing the modal window, so focus can return back to the parent window
     EnableWindow(m_parentHwnd, true);
-
-    if (m_window) {
-      m_window.Hide();
-    }
-
-#ifdef USE_EXPERIMENTAL_WINUI3
     if (m_popUp) {
       m_popUp.Hide();
     }
-#endif
+
+    // Unregister closing event handler
+    if (m_appWindow && m_appWindowClosingToken) {
+      m_appWindow.Closing(m_appWindowClosingToken);
+      m_appWindowClosingToken.value = 0;
+    }
 
     // dispatch onDismiss event
     if (auto eventEmitter = EventEmitter()) {
@@ -245,21 +244,13 @@ struct ModalHostView : public winrt::implements<ModalHostView, winrt::Windows::F
           m_reactContext.Properties().Handle(), m_prevWindowID);
       m_prevWindowID = 0;
     }
-
-    m_bridge.Disable();
   }
 
   // creates a new modal window
   void EnsureModalCreated(const winrt::Microsoft::ReactNative::ComponentView &view) {
-    if (m_window) {
-      return;
-    }
-
-#ifdef USE_EXPERIMENTAL_WINUI3
     if (m_popUp) {
       return;
     }
-#endif
     // get the root hwnd
     m_prevWindowID =
         winrt::Microsoft::ReactNative::ReactCoreInjection::GetTopLevelWindowId(view.ReactContext().Properties());
@@ -268,52 +259,63 @@ 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>();
-
-#ifdef USE_EXPERIMENTAL_WINUI3
-    m_bridge = winrt::Microsoft::UI::Content::DesktopChildSiteBridge::Create(
-        view.Parent().as<winrt::Microsoft::ReactNative::Composition::ComponentView>().Compositor(),
-        winrt::Microsoft::UI::GetWindowIdFromWindow(m_parentHwnd));
     m_reactNativeIsland = winrt::Microsoft::ReactNative::ReactNativeIsland::CreatePortal(portal);
     auto contentIsland = m_reactNativeIsland.Island();
 
-    m_popUp = m_bridge.TryCreatePopupSiteBridge();
+    m_popUp = winrt::Microsoft::UI::Content::DesktopPopupSiteBridge::Create(
+        portal.Parent()
+            .as<winrt::Microsoft::ReactNative::Composition::ComponentView>()
+            .Root()
+            .ReactNativeIsland()
+            .Island());
     m_popUp.Connect(contentIsland);
 
-    // set the top-level windows as the new hwnd
-    winrt::Microsoft::ReactNative::ReactCoreInjection::SetTopLevelWindowId(
-        view.ReactContext().Properties(),
-        reinterpret_cast<uint64_t>(winrt::Microsoft::UI::GetWindowFromWindowId(m_popUp.WindowId())));
+    // 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();
 
-    auto navHost = winrt::Microsoft::UI::Input::InputFocusNavigationHost::GetForSiteBridge(
-        m_popUp.as<winrt::Microsoft::UI::Content::IContentSiteBridge>());
-    m_departFocusToken = navHost.DepartFocusRequested(
-        [wkView = winrt::make_weak(view)](
-            const auto &sender, const winrt::Microsoft::UI::Input::FocusNavigationRequestEventArgs &args) {
-          if (auto strongView = wkView.get()) {
-            TrySetFocus(strongView.Parent());
-          }
-        });
+      // Configure presenter for modal behavior
+      overlappedPresenter.IsModal(true);
+      overlappedPresenter.SetBorderAndTitleBar(true, true);
 
-#else
-    auto presenter = winrt::Microsoft::UI::Windowing::OverlappedPresenter::CreateForDialog();
-    presenter.SetBorderAndTitleBar(true, false);
-    presenter.IsModal(true);
+      // Apply the presenter to the window
+      m_appWindow.SetPresenter(overlappedPresenter);
 
-    m_window = winrt::Microsoft::UI::Windowing::AppWindow::Create(
-        presenter, winrt::Microsoft::UI::GetWindowIdFromWindow(m_parentHwnd));
+      // 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
+      }
+
+      // 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);
+              }
+            }
+          });
+    }
 
     // set the top-level windows as the new hwnd
     winrt::Microsoft::ReactNative::ReactCoreInjection::SetTopLevelWindowId(
         view.ReactContext().Properties(),
-        reinterpret_cast<uint64_t>(winrt::Microsoft::UI::GetWindowFromWindowId(m_window.Id())));
-
-    // create a react native island - code taken from CompositionHwndHost
-    m_bridge = winrt::Microsoft::UI::Content::DesktopChildSiteBridge::Create(
-        view.Parent().as<winrt::Microsoft::ReactNative::Composition::ComponentView>().Compositor(), m_window.Id());
-    m_reactNativeIsland = winrt::Microsoft::ReactNative::ReactNativeIsland::CreatePortal(portal);
-    auto contentIsland = m_reactNativeIsland.Island();
+        reinterpret_cast<uint64_t>(winrt::Microsoft::UI::GetWindowFromWindowId(m_popUp.WindowId())));
 
-    auto navHost = winrt::Microsoft::UI::Input::InputFocusNavigationHost::GetForSiteBridge(m_bridge);
+    // WASDK BUG: InputFocusNavigationHost::GetForSiteBridge fails on a DesktopPopupSiteBridge
+    // https://github.com/microsoft/react-native-windows/issues/14604
+    /*
+    auto navHost = winrt::Microsoft::UI::Input::InputFocusNavigationHost::GetForSiteBridge(
+        m_popUp.as<winrt::Microsoft::UI::Content::IContentSiteBridge>());
     m_departFocusToken = navHost.DepartFocusRequested(
         [wkView = winrt::make_weak(view)](
             const auto &sender, const winrt::Microsoft::UI::Input::FocusNavigationRequestEventArgs &args) {
@@ -321,9 +323,7 @@ struct ModalHostView : public winrt::implements<ModalHostView, winrt::Windows::F
             TrySetFocus(strongView.Parent());
           }
         });
-    m_bridge.Connect(contentIsland);
-#endif
-    m_bridge.ResizePolicy(winrt::Microsoft::UI::Content::ContentSizePolicy::ResizeContentToParentWindow);
+        */
 
     m_islandStateChangedToken =
         contentIsland.StateChanged([weakThis = get_weak()](
@@ -341,12 +341,11 @@ struct ModalHostView : public winrt::implements<ModalHostView, winrt::Windows::F
     if (portal.ContentRoot().Children().Size()) {
       AdjustWindowSize(portal.ContentRoot().Children().GetAt(0).LayoutMetrics());
     }
-    m_bridge.Show();
   }
 
   void UpdateConstraints() noexcept {
     auto displayArea = winrt::Microsoft::UI::Windowing::DisplayArea::GetFromDisplayId(
-        m_bridge.SiteView().EnvironmentView().DisplayId());
+        m_popUp.SiteView().EnvironmentView().DisplayId());
     auto workArea = displayArea.WorkArea();
 
     float scale = m_reactNativeIsland.Island().RasterizationScale();
@@ -379,21 +378,20 @@ struct ModalHostView : public winrt::implements<ModalHostView, winrt::Windows::F
 
   ReactContext m_reactContext{nullptr};
   HWND m_parentHwnd{nullptr};
-  winrt::Microsoft::UI::Windowing::AppWindow m_window{nullptr};
   uint64_t m_prevWindowID;
-  bool m_showTitleBar{false};
   bool m_showQueued{false};
+  bool m_visible{false};
   bool m_mounted{false};
   winrt::event_token m_islandStateChangedToken;
   winrt::Microsoft::UI::Input::InputFocusNavigationHost::DepartFocusRequested_revoker m_departFocusRevoker;
   winrt::event_token m_departFocusToken;
   winrt::event_token m_childLayoutMetricsToken;
   winrt::Microsoft::ReactNative::IComponentState m_state{nullptr};
-  winrt::Microsoft::UI::Content::DesktopChildSiteBridge m_bridge{nullptr};
   winrt::Microsoft::ReactNative::ReactNativeIsland m_reactNativeIsland{nullptr};
-#ifdef USE_EXPERIMENTAL_WINUI3
-  winrt::Microsoft::UI::Content::PopupWindowSiteBridge m_popUp{nullptr};
-#endif
+  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};
 };
 
 void RegisterWindowsModalHostNativeComponent(

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

@@ -1,4 +1,3 @@
-
 // Copyright (c) Microsoft Corporation.
 // Licensed under the MIT License.
 
@@ -32,14 +31,12 @@ ParagraphComponentView::ParagraphComponentView(
 void ParagraphComponentView::MountChildComponentView(
     const winrt::Microsoft::ReactNative::ComponentView &childComponentView,
     uint32_t index) noexcept {
-  assert(false);
   base_type::MountChildComponentView(childComponentView, index);
 }
 
 void ParagraphComponentView::UnmountChildComponentView(
     const winrt::Microsoft::ReactNative::ComponentView &childComponentView,
     uint32_t index) noexcept {
-  assert(false);
   base_type::UnmountChildComponentView(childComponentView, index);
 }
 
@@ -64,6 +61,10 @@ void ParagraphComponentView::updateProps(
     updateTextAlignment(newViewProps.textAttributes.alignment);
   }
 
+  if (oldViewProps.paragraphAttributes.adjustsFontSizeToFit != newViewProps.paragraphAttributes.adjustsFontSizeToFit) {
+    m_requireRedraw = true;
+  }
+
   Super::updateProps(props, oldProps);
 }
 
@@ -73,7 +74,7 @@ void ParagraphComponentView::updateState(
   const auto &newState = *std::static_pointer_cast<facebook::react::ParagraphShadowNode::ConcreteState const>(state);
 
   m_attributedStringBox = facebook::react::AttributedStringBox(newState.getData().attributedString);
-  m_paragraphAttributes = {}; // TODO
+  m_paragraphAttributes = facebook::react::ParagraphAttributes(newState.getData().paragraphAttributes);
 
   m_textLayout = nullptr;
 }
@@ -168,7 +169,9 @@ void ParagraphComponentView::updateVisualBrush() noexcept {
     constraints.maximumSize.height =
         m_layoutMetrics.frame.size.height - m_layoutMetrics.contentInsets.top - m_layoutMetrics.contentInsets.bottom;
 
-    facebook::react::TextLayoutManager::GetTextLayout(m_attributedStringBox, {} /*TODO*/, constraints, m_textLayout);
+    facebook::react::TextLayoutManager::GetTextLayout(
+        m_attributedStringBox, m_paragraphAttributes, constraints, m_textLayout);
+
     requireNewBrush = true;
   }
 
@@ -199,6 +202,7 @@ void ParagraphComponentView::updateVisualBrush() noexcept {
     // The surfaceBrush's size is based on the size the text takes up, which maybe smaller than the total visual
     // So we need to align the brush within the visual to match the text alignment.
     float horizAlignment{0.f};
+
     /*
     const auto &props = paragraphProps()
     if (props.textAttributes.alignment) {
@@ -227,7 +231,6 @@ void ParagraphComponentView::updateVisualBrush() noexcept {
     // TODO Using brush alignment to align the text makes it blurry...
     if (m_drawingSurface) {
       m_drawingSurface.HorizontalAlignmentRatio(horizAlignment);
-      m_drawingSurface.VerticalAlignmentRatio(0.f);
       m_drawingSurface.Stretch(winrt::Microsoft::ReactNative::Composition::Experimental::CompositionStretch::None);
     }
     Visual().as<Experimental::ISpriteVisual>().Brush(m_drawingSurface);