react-native-windows 0.76.11 → 0.76.12

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

@@ -35,33 +35,23 @@ 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);
+    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_bridge.Close();
-    }
-
-    if (m_window) {
-      m_window.Destroy();
-      m_window = nullptr;
-    }
-
-#ifdef USE_EXPERIMENTAL_WINUI3
-    if (m_popUp) {
       m_popUp.Close();
       m_popUp = nullptr;
     }
-#endif
   }
 
   void InitializePortalViewComponent(
@@ -80,16 +70,37 @@ struct ModalHostView : public winrt::implements<ModalHostView, winrt::Windows::F
       const winrt::com_ptr<::Microsoft::ReactNativeSpecs::ModalHostViewProps> &oldProps) noexcept override {
     if (!oldProps || newProps->visible != oldProps->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();
       }
     }
     ::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 +129,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 +142,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
       return;
     }
 
@@ -159,57 +158,31 @@ struct ModalHostView : public winrt::implements<ModalHostView, winrt::Windows::F
     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
   };
 
   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 +195,9 @@ 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
 
     // dispatch onDismiss event
     if (auto eventEmitter = EventEmitter()) {
@@ -245,21 +211,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,15 +226,16 @@ 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()
+            .Parent()
+            .as<winrt::Microsoft::ReactNative::Composition::ComponentView>()
+            .Root()
+            .ReactNativeIsland()
+            .Island());
     m_popUp.Connect(contentIsland);
 
     // set the top-level windows as the new hwnd
@@ -284,6 +243,9 @@ struct ModalHostView : public winrt::implements<ModalHostView, winrt::Windows::F
         view.ReactContext().Properties(),
         reinterpret_cast<uint64_t>(winrt::Microsoft::UI::GetWindowFromWindowId(m_popUp.WindowId())));
 
+    // 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(
@@ -293,39 +255,7 @@ struct ModalHostView : public winrt::implements<ModalHostView, winrt::Windows::F
             TrySetFocus(strongView.Parent());
           }
         });
-
-#else
-    auto presenter = winrt::Microsoft::UI::Windowing::OverlappedPresenter::CreateForDialog();
-    presenter.SetBorderAndTitleBar(true, false);
-    presenter.IsModal(true);
-
-    m_window = winrt::Microsoft::UI::Windowing::AppWindow::Create(
-        presenter, winrt::Microsoft::UI::GetWindowIdFromWindow(m_parentHwnd));
-
-    // 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();
-
-    auto navHost = winrt::Microsoft::UI::Input::InputFocusNavigationHost::GetForSiteBridge(m_bridge);
-    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());
-          }
-        });
-    m_bridge.Connect(contentIsland);
-
-#endif
-
-    m_bridge.ResizePolicy(winrt::Microsoft::UI::Content::ContentSizePolicy::ResizeContentToParentWindow);
+        */
 
     m_islandStateChangedToken =
         contentIsland.StateChanged([weakThis = get_weak()](
@@ -343,12 +273,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();
@@ -381,21 +310,17 @@ 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};
 };
 
 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);

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

@@ -195,6 +195,8 @@ void ReactNativeIsland::ReactViewHost(winrt::Microsoft::ReactNative::IReactViewH
     return;
   }
 
+  m_props = nullptr;
+
   if (m_reactViewHost) {
     UninitRootView();
     m_reactViewHost.DetachViewInstance();
@@ -374,7 +376,14 @@ winrt::IInspectable ReactNativeIsland::GetUiaProvider() noexcept {
   if (m_uiaProvider == nullptr) {
     m_uiaProvider =
         winrt::make<winrt::Microsoft::ReactNative::implementation::CompositionRootAutomationProvider>(*this);
-    if (m_hwnd && !m_island) {
+    if (m_island) {
+      auto pRootProvider =
+          static_cast<winrt::Microsoft::ReactNative::implementation::CompositionRootAutomationProvider *>(
+              m_uiaProvider.as<IRawElementProviderSimple>().get());
+      if (pRootProvider != nullptr) {
+        pRootProvider->SetIsland(m_island);
+      }
+    } else if (m_hwnd) {
       auto pRootProvider =
           static_cast<winrt::Microsoft::ReactNative::implementation::CompositionRootAutomationProvider *>(
               m_uiaProvider.as<IRawElementProviderSimple>().get());
@@ -577,7 +586,9 @@ void ReactNativeIsland::ShowInstanceLoaded() noexcept {
         winrt::Microsoft::ReactNative::ReactPropertyBag(m_context.Properties()));
 
     m_rootTag = ::Microsoft::ReactNative::getNextRootViewTag();
-    auto initProps = DynamicWriter::ToDynamic(Mso::Copy(m_reactViewOptions.InitialProps()));
+
+    auto initProps =
+        m_props.isNull() ? m_props : DynamicWriter::ToDynamic(Mso::Copy(m_reactViewOptions.InitialProps()));
     if (initProps.isNull()) {
       initProps = folly::dynamic::object();
     }
@@ -900,16 +911,6 @@ winrt::Microsoft::UI::Content::ContentIsland ReactNativeIsland::Island() {
             if (args.DidLayoutDirectionChange()) {
               pThis->Arrange(pThis->m_layoutConstraints, pThis->m_viewportOffset);
             }
-#ifndef USE_EXPERIMENTAL_WINUI3 // Use this in place of Connected/Disconnected events for now. -- Its not quite what we
-                                // want, but it will do for now.
-            if (args.DidSiteVisibleChange()) {
-              if (island.IsSiteVisible()) {
-                pThis->OnMounted();
-              } else {
-                pThis->OnUnmounted();
-              }
-            }
-#endif
           }
         });
 #ifdef USE_EXPERIMENTAL_WINUI3
@@ -965,6 +966,24 @@ void ReactNativeIsland::OnUnmounted() noexcept {
   }
 }
 
+void ReactNativeIsland::SetProperties(winrt::Microsoft::ReactNative::JSValueArgWriter props) noexcept {
+  auto initProps = DynamicWriter::ToDynamic(props);
+  if (initProps.isNull()) {
+    initProps = folly::dynamic::object();
+  }
+
+  if (m_isJSViewAttached) {
+    if (auto fabricuiManager = ::Microsoft::ReactNative::FabricUIManager::FromProperties(
+            winrt::Microsoft::ReactNative::ReactPropertyBag(m_context.Properties()))) {
+      initProps["concurrentRoot"] = true;
+      fabricuiManager->setProps(static_cast<facebook::react::SurfaceId>(m_rootTag), initProps);
+      return;
+    }
+  }
+
+  m_props = initProps;
+}
+
 winrt::com_ptr<winrt::Microsoft::ReactNative::Composition::implementation::RootComponentView>
 ReactNativeIsland::GetComponentView() noexcept {
   if (auto portal = m_portal.get()) {

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

@@ -76,6 +76,8 @@ struct ReactNativeIsland
   float ScaleFactor() noexcept;
   void ScaleFactor(float value) noexcept;
 
+  void SetProperties(winrt::Microsoft::ReactNative::JSValueArgWriter props) noexcept;
+
   float FontSizeMultiplier() const noexcept;
 
   winrt::event_token SizeChanged(
@@ -154,11 +156,14 @@ struct ReactNativeIsland
   bool m_isJSViewAttached{false};
   bool m_hasRenderedVisual{false};
   bool m_showingLoadingUI{false};
-  bool m_mounted{false};
+  bool m_mounted{true};
   winrt::weak_ref<winrt::Microsoft::ReactNative::Composition::PortalComponentView> m_portal{nullptr};
   IReactDispatcher m_uiDispatcher{nullptr};
   winrt::IInspectable m_uiaProvider{nullptr};
 
+  // If SetProps is called before the surface is loaded, store it locally to use on start
+  folly::dynamic m_props;
+
   // 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};

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

@@ -76,6 +76,7 @@ void RootComponentView::updateLayoutMetrics(
 winrt::Microsoft::ReactNative::ComponentView RootComponentView::GetFocusedComponent() noexcept {
   return m_focusedComponent;
 }
+
 void RootComponentView::SetFocusedComponent(
     const winrt::Microsoft::ReactNative::ComponentView &value,
     winrt::Microsoft::ReactNative::FocusNavigationDirection direction) noexcept {
@@ -92,11 +93,10 @@ void RootComponentView::SetFocusedComponent(
     if (auto rootView = m_wkRootView.get()) {
       winrt::get_self<winrt::Microsoft::ReactNative::implementation::ReactNativeIsland>(rootView)->TrySetFocus();
     }
+    m_focusedComponent = value;
     auto args = winrt::make<winrt::Microsoft::ReactNative::implementation::GotFocusEventArgs>(value, direction);
     winrt::get_self<winrt::Microsoft::ReactNative::implementation::ComponentView>(value)->onGotFocus(args);
   }
-
-  m_focusedComponent = value;
 }
 
 bool RootComponentView::NavigateFocus(const winrt::Microsoft::ReactNative::FocusNavigationRequest &request) noexcept {