react-native-windows 0.74.6 → 0.74.7

package/Microsoft.ReactNative/CompositionRootView.idl

@@ -5,6 +5,7 @@ import "IJSValueWriter.idl";
 import "ReactCoreInjection.idl";
 import "ReactNativeHost.idl";
 import "Theme.idl";
+import "IReactViewComponentBuilder.idl";
 #include "NamespaceRedirect.h"
 #include "DocString.h"
 
@@ -61,6 +62,13 @@ namespace Microsoft.ReactNative
   }
   }
 
+  [default_interface]
+  [webhosthidden]
+  [experimental]
+  runtimeclass RootViewSizeChangedEventArgs {
+    Windows.Foundation.Size Size { get; };
+  }
+
   [default_interface]
   [webhosthidden]
   [experimental]
@@ -82,7 +90,7 @@ namespace Microsoft.ReactNative
     DOC_STRING("The RootVisual associated with the @CompositionRootView. It must be set to show any React UI elements.")
     Microsoft.UI.Composition.Visual RootVisual { get; };
 
-    Windows.Foundation.Size Size {get; set; };
+    Windows.Foundation.Size Size { get; };
 
     DOC_STRING("ScaleFactor for this windows (DPI/96)")
     Single ScaleFactor {get; set;};
@@ -90,8 +98,8 @@ namespace Microsoft.ReactNative
     DOC_STRING("Move focus to this @CompositionRootView")
     FocusNavigationResult NavigateFocus(FocusNavigationRequest request);
 
-    Windows.Foundation.Size Measure(Windows.Foundation.Size availableSize);
-    Windows.Foundation.Size Arrange(Windows.Foundation.Size availableSize);
+    Windows.Foundation.Size Measure(LayoutConstraints layoutConstraints, Windows.Foundation.Point viewportOffset);
+    void Arrange(LayoutConstraints layoutConstraints, Windows.Foundation.Point viewportOffset);
 
     Object GetUiaProvider();
 
@@ -104,6 +112,8 @@ namespace Microsoft.ReactNative
 #ifdef USE_WINUI3
     Microsoft.UI.Content.ContentIsland Island { get; };
 #endif
+
+    event Windows.Foundation.EventHandler<RootViewSizeChangedEventArgs> SizeChanged;
   }
 
 } // namespace Microsoft.ReactNative

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

@@ -243,7 +243,7 @@ CompositionEventHandler::CompositionEventHandler(
                     : static_cast<facebook::react::Tag>(
                           winrt::get_self<winrt::Microsoft::ReactNative::implementation::CompositionRootView>(
                               strongRootView)
-                              ->GetTag()),
+                              ->RootTag()),
                 args);
         auto keyboardSource = winrt::make<CompositionInputKeyboardSource>(source);
         onKeyDown(keyboardSource, keyArgs);
@@ -266,7 +266,7 @@ CompositionEventHandler::CompositionEventHandler(
                     : static_cast<facebook::react::Tag>(
                           winrt::get_self<winrt::Microsoft::ReactNative::implementation::CompositionRootView>(
                               strongRootView)
-                              ->GetTag()),
+                              ->RootTag()),
                 args);
         auto keyboardSource = winrt::make<CompositionInputKeyboardSource>(source);
         onKeyUp(keyboardSource, keyArgs);
@@ -290,7 +290,7 @@ CompositionEventHandler::CompositionEventHandler(
                     : static_cast<facebook::react::Tag>(
                           winrt::get_self<winrt::Microsoft::ReactNative::implementation::CompositionRootView>(
                               strongRootView)
-                              ->GetTag()),
+                              ->RootTag()),
                 args);
             auto keyboardSource = winrt::make<CompositionInputKeyboardSource>(source);
             onCharacterReceived(keyboardSource, charArgs);
@@ -323,7 +323,7 @@ CompositionEventHandler::~CompositionEventHandler() {
 facebook::react::SurfaceId CompositionEventHandler::SurfaceId() const noexcept {
   if (auto strongRootView = m_wkRootView.get()) {
     return static_cast<facebook::react::SurfaceId>(
-        winrt::get_self<winrt::Microsoft::ReactNative::implementation::CompositionRootView>(strongRootView)->GetTag());
+        winrt::get_self<winrt::Microsoft::ReactNative::implementation::CompositionRootView>(strongRootView)->RootTag());
   }
   return -1;
 }
@@ -460,7 +460,7 @@ int64_t CompositionEventHandler::SendMessage(HWND hwnd, uint32_t msg, uint64_t w
                              : static_cast<facebook::react::Tag>(
                                    winrt::get_self<winrt::Microsoft::ReactNative::implementation::CompositionRootView>(
                                        strongRootView)
-                                       ->GetTag()),
+                                       ->RootTag()),
             msg,
             wParam,
             lParam);
@@ -481,7 +481,7 @@ int64_t CompositionEventHandler::SendMessage(HWND hwnd, uint32_t msg, uint64_t w
                              : static_cast<facebook::react::Tag>(
                                    winrt::get_self<winrt::Microsoft::ReactNative::implementation::CompositionRootView>(
                                        strongRootView)
-                                       ->GetTag()),
+                                       ->RootTag()),
             msg,
             wParam,
             lParam);

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

@@ -101,8 +101,9 @@ void CompositionHwndHost::UpdateSize() noexcept {
           static_cast<float>(m_width / ScaleFactor()), static_cast<float>(m_height / ScaleFactor())};
       // Do not relayout when minimized
       if (!IsIconic(m_hwnd)) {
-        m_compRootView.Size(size);
-        m_compRootView.Arrange(size);
+        winrt::Microsoft::ReactNative::LayoutConstraints constraints;
+        constraints.MinimumSize = constraints.MaximumSize = size;
+        m_compRootView.Arrange(constraints, {0, 0});
       }
     }
   }

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

@@ -4,6 +4,7 @@
 #include "CompositionRootView.h"
 #include "CompositionRootView.g.cpp"
 #include "FocusNavigationRequest.g.cpp"
+#include <RootViewSizeChangedEventArgs.g.h>
 
 #include <AutoDraw.h>
 #include <DynamicWriter.h>
@@ -330,26 +331,6 @@ winrt::IInspectable CompositionRootView::GetUiaProvider() noexcept {
   return m_uiaProvider;
 }
 
-std::string CompositionRootView::JSComponentName() const noexcept {
-  return to_string(m_reactViewOptions.ComponentName());
-}
-
-int64_t CompositionRootView::GetActualHeight() const noexcept {
-  return static_cast<int64_t>(m_size.Height);
-}
-
-int64_t CompositionRootView::GetActualWidth() const noexcept {
-  return static_cast<int64_t>(m_size.Width);
-}
-
-int64_t CompositionRootView::GetTag() const noexcept {
-  return m_rootTag;
-}
-
-void CompositionRootView::SetTag(int64_t tag) noexcept {
-  m_rootTag = tag;
-}
-
 void CompositionRootView::SetWindow(uint64_t hwnd) noexcept {
   m_hwnd = reinterpret_cast<HWND>(hwnd);
 }
@@ -445,7 +426,7 @@ void CompositionRootView::UninitRootView() noexcept {
 
     auto uiManager = ::Microsoft::ReactNative::FabricUIManager::FromProperties(
         winrt::Microsoft::ReactNative::ReactPropertyBag(m_context.Properties()));
-    uiManager->stopSurface(static_cast<facebook::react::SurfaceId>(GetTag()));
+    uiManager->stopSurface(static_cast<facebook::react::SurfaceId>(RootTag()));
 
     // This is needed to ensure that the unmount JS logic is completed before the the instance is shutdown during
     // instance destruction. Aligns with similar code in ReactInstanceWin::DetachRootView for paper Future: Instead this
@@ -484,19 +465,82 @@ void CompositionRootView::ShowInstanceLoaded() noexcept {
     auto uiManager = ::Microsoft::ReactNative::FabricUIManager::FromProperties(
         winrt::Microsoft::ReactNative::ReactPropertyBag(m_context.Properties()));
 
-    auto rootTag = ::Microsoft::ReactNative::getNextRootViewTag();
-    SetTag(rootTag);
+    m_rootTag = ::Microsoft::ReactNative::getNextRootViewTag();
     auto initProps = DynamicWriter::ToDynamic(Mso::Copy(m_reactViewOptions.InitialProps()));
     if (initProps.isNull()) {
       initProps = folly::dynamic::object();
     }
     initProps["concurrentRoot"] = true;
-    uiManager->startSurface(*this, rootTag, JSComponentName(), initProps);
+    uiManager->startSurface(
+        *this,
+        static_cast<facebook::react::SurfaceId>(m_rootTag),
+        m_layoutConstraints,
+        to_string(m_reactViewOptions.ComponentName()),
+        initProps);
 
     m_isJSViewAttached = true;
   }
 }
 
+facebook::react::AttributedStringBox CreateLoadingAttributedString() noexcept {
+  auto attributedString = facebook::react::AttributedString{};
+  auto fragment = facebook::react::AttributedString::Fragment{};
+  fragment.string = "Loading";
+  fragment.textAttributes.fontSize = loadingBarFontSize;
+  attributedString.appendFragment(fragment);
+  return facebook::react::AttributedStringBox{attributedString};
+}
+
+facebook::react::Size MeasureLoading(const facebook::react::LayoutConstraints &layoutConstraints, float scaleFactor) {
+  auto attributedStringBox = CreateLoadingAttributedString();
+  winrt::com_ptr<::IDWriteTextLayout> textLayout;
+  facebook::react::TextLayoutManager::GetTextLayout(
+      attributedStringBox, {} /*paragraphAttributes*/, layoutConstraints, textLayout);
+
+  DWRITE_TEXT_METRICS tm;
+  textLayout->GetMetrics(&tm);
+
+  return layoutConstraints.clamp(
+      {loadingActivityHorizontalOffset * scaleFactor + tm.width, loadingBarHeight * scaleFactor});
+}
+
+winrt::event_token CompositionRootView::SizeChanged(
+    winrt::Windows::Foundation::EventHandler<winrt::Microsoft::ReactNative::RootViewSizeChangedEventArgs> const
+        &handler) noexcept {
+  return m_sizeChangedEvent.add(handler);
+}
+
+void CompositionRootView::SizeChanged(winrt::event_token const &token) noexcept {
+  m_sizeChangedEvent.remove(token);
+}
+
+struct RootViewSizeChangedEventArgs : RootViewSizeChangedEventArgsT<RootViewSizeChangedEventArgs> {
+  RootViewSizeChangedEventArgs(winrt::Windows::Foundation::Size size) : m_size(size) {}
+  winrt::Windows::Foundation::Size Size() const noexcept {
+    return m_size;
+  }
+
+ private:
+  const winrt::Windows::Foundation::Size m_size;
+};
+
+void CompositionRootView::NotifySizeChanged() noexcept {
+  auto oldSize = m_size;
+  facebook::react::Size size;
+  auto rootComponentView = GetComponentView();
+  if (rootComponentView) {
+    size = rootComponentView->layoutMetrics().frame.size;
+  } else if (m_loadingVisual) {
+    size = MeasureLoading(m_layoutConstraints, m_scaleFactor);
+  }
+
+  m_size = {size.width, size.height};
+  UpdateRootVisualSize();
+  if (oldSize != m_size) {
+    m_sizeChangedEvent(*this, winrt::make<RootViewSizeChangedEventArgs>(m_size));
+  }
+}
+
 void CompositionRootView::ShowInstanceError() noexcept {
   ClearLoadingUI();
 }
@@ -506,6 +550,9 @@ Composition::Experimental::IDrawingSurfaceBrush CompositionRootView::CreateLoadi
       winrt::Microsoft::ReactNative::Composition::implementation::CompositionUIService::GetCompositionContext(
           m_context.Properties().Handle());
 
+  if (m_size.Height == 0 || m_size.Width == 0)
+    return nullptr;
+
   winrt::Windows::Foundation::Size surfaceSize = {
       m_size.Width * m_scaleFactor, std::min(m_size.Height, loadingBarHeight) * m_scaleFactor};
   auto drawingSurface = compContext.CreateDrawingSurfaceBrush(
@@ -523,12 +570,7 @@ Composition::Experimental::IDrawingSurfaceBrush CompositionRootView::CreateLoadi
       constraints.maximumSize.width = std::max(0.0f, m_size.Width - loadingTextHorizontalOffset);
       constraints.maximumSize.height = std::max(0.0f, m_size.Height - loadingBarHeight);
 
-      auto attributedString = facebook::react::AttributedString{};
-      auto fragment = facebook::react::AttributedString::Fragment{};
-      fragment.string = "Loading";
-      fragment.textAttributes.fontSize = loadingBarFontSize;
-      attributedString.appendFragment(fragment);
-      auto attributedStringBox = facebook::react::AttributedStringBox{attributedString};
+      auto attributedStringBox = CreateLoadingAttributedString();
 
       auto textAttributes = facebook::react::TextAttributes{};
       textAttributes.foregroundColor = facebook::react::whiteColor();
@@ -569,10 +611,7 @@ void CompositionRootView::ShowInstanceLoading() noexcept {
       winrt::Microsoft::ReactNative::Composition::implementation::CompositionUIService::GetCompositionContext(
           m_context.Properties().Handle());
 
-  auto drawingSurface = CreateLoadingVisualBrush();
-
   m_loadingVisual = compContext.CreateSpriteVisual();
-  m_loadingVisual.Brush(drawingSurface);
 
   auto foregroundBrush = compContext.CreateColorBrush({255, 255, 255, 255});
 
@@ -580,14 +619,28 @@ void CompositionRootView::ShowInstanceLoading() noexcept {
   m_loadingActivityVisual.Brush(foregroundBrush);
   m_loadingVisual.InsertAt(m_loadingActivityVisual, 0);
 
+  NotifySizeChanged();
   UpdateLoadingVisualSize();
 
   InternalRootVisual().InsertAt(m_loadingVisual, m_hasRenderedVisual ? 1 : 0);
 }
 
+void ApplyConstraints(
+    const winrt::Microsoft::ReactNative::LayoutConstraints &layoutConstraintsIn,
+    facebook::react::LayoutConstraints &layoutConstraintsOut) noexcept {
+  layoutConstraintsOut.minimumSize = {layoutConstraintsIn.MinimumSize.Width, layoutConstraintsIn.MinimumSize.Height};
+  layoutConstraintsOut.maximumSize = {layoutConstraintsIn.MaximumSize.Width, layoutConstraintsIn.MaximumSize.Height};
+  layoutConstraintsOut.layoutDirection =
+      static_cast<facebook::react::LayoutDirection>(layoutConstraintsIn.LayoutDirection);
+}
+
 winrt::Windows::Foundation::Size CompositionRootView::Measure(
-    winrt::Windows::Foundation::Size const &availableSize) const {
-  winrt::Windows::Foundation::Size size{0.0f, 0.0f};
+    const winrt::Microsoft::ReactNative::LayoutConstraints &layoutConstraints,
+    const winrt::Windows::Foundation::Point &viewportOffset) const noexcept {
+  facebook::react::Size size{0, 0};
+
+  facebook::react::LayoutConstraints constraints;
+  ApplyConstraints(layoutConstraints, constraints);
 
   if (m_isInitialized && m_rootTag != -1) {
     if (auto fabricuiManager = ::Microsoft::ReactNative::FabricUIManager::FromProperties(
@@ -596,55 +649,39 @@ winrt::Windows::Foundation::Size CompositionRootView::Measure(
       // TODO scaling factor
       context.pointScaleFactor = static_cast<facebook::react::Float>(m_scaleFactor);
       context.fontSizeMultiplier = static_cast<facebook::react::Float>(m_scaleFactor);
+      context.viewportOffset = {viewportOffset.X, viewportOffset.Y};
 
-      facebook::react::LayoutConstraints constraints;
-      // TODO should support MinHeight/MinWidth
-      constraints.minimumSize.height = static_cast<facebook::react::Float>(0.0f);
-      constraints.minimumSize.width = static_cast<facebook::react::Float>(0.0f);
-
-      // TODO should support MaxHeight/MaxWidth props?
-      constraints.minimumSize.height = constraints.maximumSize.height =
-          static_cast<facebook::react::Float>(availableSize.Height);
-      constraints.minimumSize.width = constraints.maximumSize.width =
-          static_cast<facebook::react::Float>(availableSize.Width);
-      // TODO get RTL
-      constraints.layoutDirection = facebook::react::LayoutDirection::LeftToRight;
-
-      auto yogaSize =
-          fabricuiManager->measureSurface(static_cast<facebook::react::SurfaceId>(m_rootTag), constraints, context);
-      return {std::min(yogaSize.width, availableSize.Width), std::min(yogaSize.height, availableSize.Height)};
+      size = fabricuiManager->measureSurface(static_cast<facebook::react::SurfaceId>(m_rootTag), constraints, context);
     }
+  } else if (m_loadingVisual) {
+    size = MeasureLoading(constraints, m_scaleFactor);
   }
 
-  return size;
+  auto clampedSize = constraints.clamp(size);
+  return {clampedSize.width, clampedSize.height};
 }
 
-winrt::Windows::Foundation::Size CompositionRootView::Arrange(winrt::Windows::Foundation::Size finalSize) const {
+void CompositionRootView::Arrange(
+    const winrt::Microsoft::ReactNative::LayoutConstraints &layoutConstraints,
+    const winrt::Windows::Foundation::Point &viewportOffset) noexcept {
+  ApplyConstraints(layoutConstraints, m_layoutConstraints);
+
   if (m_isInitialized && m_rootTag != -1) {
     if (auto fabricuiManager = ::Microsoft::ReactNative::FabricUIManager::FromProperties(
             winrt::Microsoft::ReactNative::ReactPropertyBag(m_context.Properties()))) {
       facebook::react::LayoutContext context;
       context.pointScaleFactor = static_cast<facebook::react::Float>(m_scaleFactor);
       context.fontSizeMultiplier = static_cast<facebook::react::Float>(m_scaleFactor);
-
-      facebook::react::LayoutConstraints constraints;
-      // TODO should support MinHeight/MinWidth
-      constraints.minimumSize.height = static_cast<facebook::react::Float>(0.0f);
-      constraints.minimumSize.width = static_cast<facebook::react::Float>(0.0f);
-
-      // TODO should support MaxHeight/MaxWidth props?
-      constraints.minimumSize.height = constraints.maximumSize.height =
-          static_cast<facebook::react::Float>(finalSize.Height);
-      constraints.minimumSize.width = constraints.maximumSize.width =
-          static_cast<facebook::react::Float>(finalSize.Width);
-      // TODO get RTL
-      constraints.layoutDirection = facebook::react::LayoutDirection::LeftToRight;
+      context.viewportOffset = {viewportOffset.X, viewportOffset.Y};
 
       fabricuiManager->constraintSurfaceLayout(
-          static_cast<facebook::react::SurfaceId>(m_rootTag), constraints, context);
+          static_cast<facebook::react::SurfaceId>(m_rootTag), m_layoutConstraints, context);
     }
+  } else if (m_loadingVisual) {
+    // TODO: Resize to align loading
+    auto s = m_layoutConstraints.clamp(MeasureLoading(m_layoutConstraints, m_scaleFactor));
+    NotifySizeChanged();
   }
-  return finalSize;
 }
 
 #ifdef USE_WINUI3

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

@@ -7,11 +7,11 @@
 #include <FocusNavigationResult.g.h>
 
 #include <ReactContext.h>
+#include <react/renderer/core/LayoutConstraints.h>
 #include <winrt/Microsoft.ReactNative.Composition.Experimental.h>
 #include <winrt/Microsoft.ReactNative.h>
 #include "CompositionEventHandler.h"
 #include "ReactHost/React.h"
-#include "Views/ICompositionRootView.h"
 
 namespace winrt::Microsoft::ReactNative::implementation {
 
@@ -42,8 +42,7 @@ struct FocusNavigationResult : FocusNavigationResultT<FocusNavigationResult> {
 };
 
 struct CompositionRootView
-    : CompositionRootViewT<CompositionRootView, Composition::Experimental::IInternalCompositionRootView>,
-      ::Microsoft::ReactNative::ICompositionRootView {
+    : CompositionRootViewT<CompositionRootView, Composition::Experimental::IInternalCompositionRootView> {
   CompositionRootView() noexcept;
   ~CompositionRootView() noexcept;
 
@@ -70,6 +69,12 @@ struct CompositionRootView
   float ScaleFactor() noexcept;
   void ScaleFactor(float value) noexcept;
 
+  winrt::event_token SizeChanged(
+      winrt::Windows::Foundation::EventHandler<winrt::Microsoft::ReactNative::RootViewSizeChangedEventArgs> const
+          &handler) noexcept;
+  void SizeChanged(winrt::event_token const &token) noexcept;
+  void NotifySizeChanged() noexcept;
+
   void AddRenderedVisual(const winrt::Microsoft::ReactNative::Composition::Experimental::IVisual &visual) noexcept;
   void RemoveRenderedVisual(const winrt::Microsoft::ReactNative::Composition::Experimental::IVisual &visual) noexcept;
   bool TrySetFocus() noexcept;
@@ -80,8 +85,12 @@ struct CompositionRootView
   winrt::Microsoft::ReactNative::Composition::Theme Theme() noexcept;
   void Theme(const winrt::Microsoft::ReactNative::Composition::Theme &value) noexcept;
 
-  winrt::Windows::Foundation::Size Measure(winrt::Windows::Foundation::Size const &availableSize) const;
-  winrt::Windows::Foundation::Size Arrange(winrt::Windows::Foundation::Size finalSize) const;
+  winrt::Windows::Foundation::Size Measure(
+      const winrt::Microsoft::ReactNative::LayoutConstraints &layoutConstraints,
+      const winrt::Windows::Foundation::Point &viewportOffset) const noexcept;
+  void Arrange(
+      const winrt::Microsoft::ReactNative::LayoutConstraints &layoutConstraints,
+      const winrt::Windows::Foundation::Point &viewportOffset) noexcept;
 
   winrt::Microsoft::ReactNative::FocusNavigationResult NavigateFocus(
       const winrt::Microsoft::ReactNative::FocusNavigationRequest &request) noexcept;
@@ -103,13 +112,6 @@ struct CompositionRootView
       const winrt::Microsoft::ReactNative::Composition::Input::Pointer &pointer,
       facebook::react::Tag tag) noexcept;
 
- public: // IReactRootView
-  std::string JSComponentName() const noexcept override;
-  int64_t GetActualHeight() const noexcept override;
-  int64_t GetActualWidth() const noexcept override;
-  int64_t GetTag() const noexcept override;
-  void SetTag(int64_t tag) noexcept override;
-
  public: // IReactViewInstance UI-thread implementation
   void InitRootView(
       winrt::Microsoft::ReactNative::IReactContext &&context,
@@ -134,7 +136,7 @@ struct CompositionRootView
   winrt::IInspectable m_uiaProvider{nullptr};
   int64_t m_rootTag{-1};
   float m_scaleFactor{1.0};
-  winrt::Windows::Foundation::Size m_size;
+  winrt::Windows::Foundation::Size m_size{0, 0};
   winrt::Microsoft::ReactNative::ReactContext m_context;
   winrt::Microsoft::ReactNative::IReactViewHost m_reactViewHost;
   winrt::Microsoft::ReactNative::ReactViewOptions m_reactViewOptions;
@@ -145,6 +147,9 @@ struct CompositionRootView
   winrt::Microsoft::ReactNative::Composition::ICustomResourceLoader m_resources{nullptr};
   winrt::Microsoft::ReactNative::Composition::Theme m_theme{nullptr};
   winrt::Microsoft::ReactNative::Composition::Theme::ThemeChanged_revoker m_themeChangedRevoker;
+  facebook::react::LayoutConstraints m_layoutConstraints;
+  winrt::event<winrt::Windows::Foundation::EventHandler<winrt::Microsoft::ReactNative::RootViewSizeChangedEventArgs>>
+      m_sizeChangedEvent;
 
   void UpdateRootViewInternal() noexcept;
   void ClearLoadingUI() noexcept;

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

@@ -175,6 +175,10 @@ void ComponentView::updateLayoutMetrics(
   base_type::updateLayoutMetrics(layoutMetrics, oldLayoutMetrics);
 }
 
+const facebook::react::LayoutMetrics &ComponentView::layoutMetrics() const noexcept {
+  return m_layoutMetrics;
+}
+
 void ComponentView::FinalizeUpdates(winrt::Microsoft::ReactNative::ComponentViewUpdateMask updateMask) noexcept {
   if ((m_flags & ComponentViewFeatures::NativeBorder) == ComponentViewFeatures::NativeBorder) {
     finalizeBorderUpdates(m_layoutMetrics, *viewProps());

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

@@ -120,6 +120,8 @@ struct ComponentView
   bool getAcccessiblityIsReadOnly() noexcept override;
   virtual winrt::Microsoft::ReactNative::implementation::ClipState getClipState() noexcept;
 
+  const facebook::react::LayoutMetrics &layoutMetrics() const noexcept;
+
   virtual std::string DefaultControlType() const noexcept;
   virtual std::string DefaultAccessibleName() const noexcept;
   virtual std::string DefaultHelpText() const noexcept;

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

@@ -45,6 +45,20 @@ RootComponentView *RootComponentView::rootComponentView() noexcept {
   return this;
 }
 
+void RootComponentView::updateLayoutMetrics(
+    facebook::react::LayoutMetrics const &layoutMetrics,
+    facebook::react::LayoutMetrics const &oldLayoutMetrics) noexcept {
+  base_type::updateLayoutMetrics(layoutMetrics, oldLayoutMetrics);
+
+  if (oldLayoutMetrics.frame != layoutMetrics.frame ||
+      oldLayoutMetrics.pointScaleFactor != layoutMetrics.pointScaleFactor) {
+    if (auto rootView = m_wkRootView.get()) {
+      winrt::get_self<winrt::Microsoft::ReactNative::implementation::CompositionRootView>(rootView)
+          ->NotifySizeChanged();
+    }
+  }
+}
+
 winrt::Microsoft::ReactNative::ComponentView RootComponentView::GetFocusedComponent() noexcept {
   return m_focusedComponent;
 }

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

@@ -43,6 +43,10 @@ struct RootComponentView : RootComponentViewT<RootComponentView, ViewComponentVi
   HRESULT GetFragmentRoot(IRawElementProviderFragmentRoot **pRetVal) noexcept;
   winrt::Microsoft::ReactNative::implementation::ClipState getClipState() noexcept override;
 
+  void updateLayoutMetrics(
+      facebook::react::LayoutMetrics const &layoutMetrics,
+      facebook::react::LayoutMetrics const &oldLayoutMetrics) noexcept override;
+
   winrt::IInspectable UiaProviderFromPoint(const POINT &ptPixels) noexcept;
 
   RootComponentView(

package/Microsoft.ReactNative/Fabric/FabricUIManagerModule.cpp

@@ -12,7 +12,6 @@
 #include <Fabric/FabricUIManagerModule.h>
 #include <Fabric/ReactNativeConfigProperties.h>
 #include <Fabric/WindowsComponentDescriptorRegistry.h>
-#include <ICompositionRootView.h>
 #include <IReactContext.h>
 #include <IReactRootView.h>
 #include <JSI/jsi.h>
@@ -144,6 +143,7 @@ const IComponentViewRegistry &FabricUIManager::GetViewRegistry() const noexcept
 void FabricUIManager::startSurface(
     const winrt::Microsoft::ReactNative::CompositionRootView &rootView,
     facebook::react::SurfaceId surfaceId,
+    const facebook::react::LayoutConstraints &layoutConstraints,
     const std::string &moduleName,
     const folly::dynamic &initialProps) noexcept {
   m_surfaceRegistry.insert({surfaceId, {rootView}});
@@ -158,22 +158,16 @@ void FabricUIManager::startSurface(
     root->start(rootView);
   });
 
-  facebook::react::LayoutContext context;
-  facebook::react::LayoutConstraints constraints;
-  context.pointScaleFactor = rootView.ScaleFactor();
-  context.fontSizeMultiplier = rootView.ScaleFactor();
-  constraints.minimumSize.height = rootView.Size().Height;
-  constraints.minimumSize.width = rootView.Size().Width;
-  constraints.maximumSize.height = rootView.Size().Height;
-  constraints.maximumSize.width = rootView.Size().Width;
-  constraints.layoutDirection = facebook::react::LayoutDirection::LeftToRight;
+  facebook::react::LayoutContext layoutContext;
+  layoutContext.pointScaleFactor = rootView.ScaleFactor();
+  layoutContext.fontSizeMultiplier = rootView.ScaleFactor();
 
   m_surfaceManager->startSurface(
       surfaceId,
       moduleName,
       initialProps,
-      constraints, // layout constraints
-      context // layout context
+      layoutConstraints,
+      layoutContext // layout context
   );
 }
 

package/Microsoft.ReactNative/Fabric/FabricUIManagerModule.h

@@ -31,6 +31,7 @@ struct FabricUIManager final : public std::enable_shared_from_this<FabricUIManag
   void startSurface(
       const winrt::Microsoft::ReactNative::CompositionRootView &rootView,
       facebook::react::SurfaceId surfaceId,
+      const facebook::react::LayoutConstraints &layoutConstraints,
       const std::string &moduleName,
       const folly::dynamic &initialProps) noexcept;
 

package/PropertySheets/Generated/PackageVersion.g.props

@@ -10,11 +10,11 @@
 -->
 <Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <PropertyGroup>
-    <ReactNativeWindowsVersion>0.74.6</ReactNativeWindowsVersion>
+    <ReactNativeWindowsVersion>0.74.7</ReactNativeWindowsVersion>
     <ReactNativeWindowsMajor>0</ReactNativeWindowsMajor>
     <ReactNativeWindowsMinor>74</ReactNativeWindowsMinor>
-    <ReactNativeWindowsPatch>6</ReactNativeWindowsPatch>
+    <ReactNativeWindowsPatch>7</ReactNativeWindowsPatch>
     <ReactNativeWindowsCanary>false</ReactNativeWindowsCanary>
-    <ReactNativeWindowsCommitId>c93d7314ed1689c74689990641fbf3c1a54aa8cc</ReactNativeWindowsCommitId>
+    <ReactNativeWindowsCommitId>92b63ecf09a8f2c61a3c972e76bfdb535707d87b</ReactNativeWindowsCommitId>
   </PropertyGroup>
 </Project>

package/Shared/Shared.vcxitems

@@ -69,11 +69,6 @@
       <DependentUpon>$(ReactNativeWindowsDir)Microsoft.ReactNative\CompositionRootView.idl</DependentUpon>
       <SubType>Code</SubType>
     </ClCompile>
-    <ClCompile Include="$(MSBuildThisFileDirectory)..\Microsoft.ReactNative\Fabric\Composition\CompositionRootView_emptyimpl.cpp">
-      <ExcludedFromBuild Condition="'$(UseFabric)' == 'true' OR '$(IncludeFabricInterface)' != 'true'">true</ExcludedFromBuild>
-      <DependentUpon>$(ReactNativeWindowsDir)Microsoft.ReactNative\CompositionRootView.idl</DependentUpon>
-      <SubType>Code</SubType>
-    </ClCompile>
     <ClCompile Include="$(MSBuildThisFileDirectory)..\Microsoft.ReactNative\Fabric\Composition\CompositionUIService.cpp">
       <ExcludedFromBuild Condition="'$(UseFabric)' != 'true'">true</ExcludedFromBuild>
       <DependentUpon>$(ReactNativeWindowsDir)Microsoft.ReactNative\CompositionUIService.idl</DependentUpon>

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "react-native-windows",
-  "version": "0.74.6",
+  "version": "0.74.7",
   "license": "MIT",
   "repository": {
     "type": "git",

package/templates/cpp-app/windows/MyApp/MyApp.cpp

@@ -34,8 +34,9 @@ void UpdateRootViewSizeToAppWindow(
   // Do not relayout when minimized
   if (window.Presenter().as<winrt::Microsoft::UI::Windowing::OverlappedPresenter>().State() !=
       winrt::Microsoft::UI::Windowing::OverlappedPresenterState::Minimized) {
-    rootView.Arrange(size);
-    rootView.Size(size);
+    winrt::Microsoft::ReactNative::LayoutConstraints constraints;
+    constraints.MaximumSize = constraints.MinimumSize = size;
+    rootView.Arrange(constraints, {0,0});
   }
 }
 

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

@@ -1,149 +0,0 @@
-// Copyright (c) Microsoft Corporation.
-// Licensed under the MIT License.
-#include "pch.h"
-
-#include "CompositionRootView.h"
-
-#include "CompositionRootView.g.cpp"
-#include "FocusNavigationRequest.g.cpp"
-
-namespace winrt::Microsoft::ReactNative::implementation {
-
-//! This class ensures that we access ReactRootView from UI thread.
-struct CompositionReactViewInstance
-    : public winrt::implements<CompositionReactViewInstance, winrt::Microsoft::ReactNative::IReactViewInstance> {
-  CompositionReactViewInstance(
-      winrt::weak_ref<winrt::Microsoft::ReactNative::implementation::CompositionRootView> &&) noexcept {}
-
-  void InitRootView(
-      winrt::Microsoft::ReactNative::IReactContext,
-      winrt::Microsoft::ReactNative::ReactViewOptions) noexcept {}
-
-  void UpdateRootView() noexcept {}
-  void UninitRootView() noexcept {}
-};
-
-//===========================================================================
-// ReactViewInstance inline implementation
-//===========================================================================
-
-CompositionRootView::CompositionRootView() noexcept {}
-CompositionRootView::~CompositionRootView() noexcept {}
-
-CompositionRootView::CompositionRootView(const winrt::Microsoft::UI::Composition::Compositor &compositor) noexcept {}
-
-ReactNative::IReactViewHost CompositionRootView::ReactViewHost() noexcept {
-  return nullptr;
-}
-
-void CompositionRootView::ReactViewHost(winrt::Microsoft::ReactNative::IReactViewHost const &) noexcept {}
-
-winrt::Microsoft::UI::Composition::Visual CompositionRootView::RootVisual() noexcept {
-  return nullptr;
-}
-
-winrt::Microsoft::ReactNative::Composition::Experimental::IVisual CompositionRootView::InternalRootVisual() noexcept {
-  return nullptr;
-}
-
-void CompositionRootView::InternalRootVisual(
-    const winrt::Microsoft::ReactNative::Composition::Experimental::IVisual &) noexcept {}
-
-winrt::Microsoft::UI::Content::ContentIsland CompositionRootView::Island() noexcept {
-  return nullptr;
-}
-
-winrt::Windows::Foundation::Size CompositionRootView::Size() noexcept {
-  return {};
-}
-
-void CompositionRootView::Size(winrt::Windows::Foundation::Size) noexcept {}
-
-float CompositionRootView::ScaleFactor() noexcept {
-  return 0;
-}
-
-void CompositionRootView::ScaleFactor(float) noexcept {}
-
-winrt::Microsoft::ReactNative::Composition::Theme CompositionRootView::Theme() noexcept {
-  return nullptr;
-}
-void CompositionRootView::Theme(const winrt::Microsoft::ReactNative::Composition::Theme &) noexcept {}
-
-winrt::Microsoft::ReactNative::Composition::ICustomResourceLoader CompositionRootView::Resources() noexcept {
-  return nullptr;
-}
-void CompositionRootView::Resources(
-    const winrt::Microsoft::ReactNative::Composition::ICustomResourceLoader &) noexcept {}
-
-winrt::IInspectable CompositionRootView::GetUiaProvider() noexcept {
-  return nullptr;
-}
-
-std::string CompositionRootView::JSComponentName() const noexcept {
-  return {};
-}
-
-int64_t CompositionRootView::GetActualHeight() const noexcept {
-  return 0;
-}
-
-int64_t CompositionRootView::GetActualWidth() const noexcept {
-  return 0;
-}
-
-int64_t CompositionRootView::GetTag() const noexcept {
-  return 0;
-}
-
-int64_t CompositionRootView::RootTag() const noexcept {
-  return 0;
-}
-
-void CompositionRootView::SetTag(int64_t) noexcept {}
-
-void CompositionRootView::SetWindow(uint64_t) noexcept {}
-
-int64_t CompositionRootView::SendMessage(uint32_t, uint64_t, int64_t) noexcept {
-  return 0;
-}
-
-void CompositionRootView::InitRootView(
-    winrt::Microsoft::ReactNative::IReactContext &&,
-    winrt::Microsoft::ReactNative::ReactViewOptions &&) noexcept {}
-
-void CompositionRootView::UpdateRootView() noexcept {}
-
-void CompositionRootView::UpdateRootViewInternal() noexcept {}
-
-void CompositionRootView::UninitRootView() noexcept {}
-
-void CompositionRootView::ClearLoadingUI() noexcept {}
-
-void CompositionRootView::EnsureLoadingUI() noexcept {}
-
-void CompositionRootView::ShowInstanceLoaded() noexcept {}
-
-void CompositionRootView::ShowInstanceError() noexcept {}
-
-void CompositionRootView::ShowInstanceLoading() noexcept {}
-
-winrt::Windows::Foundation::Size CompositionRootView::Measure(winrt::Windows::Foundation::Size const &) const {
-  return {};
-}
-
-winrt::Windows::Foundation::Size CompositionRootView::Arrange(winrt::Windows::Foundation::Size) const {
-  return {};
-}
-
-winrt::Microsoft::ReactNative::Composition::implementation::RootComponentView *
-CompositionRootView::GetComponentView() noexcept {
-  return nullptr;
-}
-
-winrt::Microsoft::ReactNative::FocusNavigationResult CompositionRootView::NavigateFocus(
-    const winrt::Microsoft::ReactNative::FocusNavigationRequest &) noexcept {
-  return nullptr;
-}
-
-} // namespace winrt::Microsoft::ReactNative::implementation

package/Microsoft.ReactNative/Views/ICompositionRootView.h

@@ -1,18 +0,0 @@
-// Copyright (c) Microsoft Corporation.
-// Licensed under the MIT License.
-
-#pragma once
-
-#include <Fabric/Composition/CompositionHelpers.h>
-#include <IReactRootView.h>
-#include <React.h>
-#include <folly/dynamic.h>
-#include <winrt/Windows.UI.Composition.h>
-
-namespace Microsoft::ReactNative {
-
-struct ICompositionRootView : public facebook::react::IReactRootView {
-  virtual float ScaleFactor() noexcept = 0;
-};
-
-} // namespace Microsoft::ReactNative