react-native-windows 0.74.12 → 0.75.0-preview.2

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

@@ -16,7 +16,6 @@
 #include <Utils/ValueUtils.h>
 #include <Views/FrameworkElementTransferProperties.h>
 #include <winrt/Microsoft.ReactNative.Composition.Experimental.h>
-#include <winrt/Microsoft.UI.Input.h>
 #include <winrt/Windows.UI.Composition.h>
 #include "CompositionContextHelper.h"
 #include "CompositionDynamicAutomationProvider.h"
@@ -180,46 +179,11 @@ const facebook::react::LayoutMetrics &ComponentView::layoutMetrics() const noexc
   return m_layoutMetrics;
 }
 
-void ComponentView::FinalizeTransform(
-    facebook::react::LayoutMetrics const &layoutMetrics,
-    const facebook::react::ViewProps &viewProps) noexcept {
-  const auto resolveTransformMatrix = viewProps.resolveTransform(layoutMetrics);
-  winrt::Windows::Foundation::Numerics::float4x4 transformMatrix;
-  transformMatrix.m11 = resolveTransformMatrix.matrix[0];
-  transformMatrix.m12 = resolveTransformMatrix.matrix[1];
-  transformMatrix.m13 = resolveTransformMatrix.matrix[2];
-  transformMatrix.m14 = resolveTransformMatrix.matrix[3];
-  transformMatrix.m21 = resolveTransformMatrix.matrix[4];
-  transformMatrix.m22 = resolveTransformMatrix.matrix[5];
-  transformMatrix.m23 = resolveTransformMatrix.matrix[6];
-  transformMatrix.m24 = resolveTransformMatrix.matrix[7];
-  transformMatrix.m31 = resolveTransformMatrix.matrix[8];
-  transformMatrix.m32 = resolveTransformMatrix.matrix[9];
-  transformMatrix.m33 = resolveTransformMatrix.matrix[10];
-  transformMatrix.m34 = resolveTransformMatrix.matrix[11];
-  transformMatrix.m41 = resolveTransformMatrix.matrix[12];
-  transformMatrix.m42 = resolveTransformMatrix.matrix[13];
-  transformMatrix.m43 = resolveTransformMatrix.matrix[14];
-  transformMatrix.m44 = resolveTransformMatrix.matrix[15];
-
-  auto centerPointPropSet = EnsureCenterPointPropertySet();
-  if (centerPointPropSet) {
-    centerPointPropSet.InsertMatrix4x4(L"transform", transformMatrix);
-  }
-
-  EnsureTransformMatrixFacade();
-  m_FinalizeTransform = false;
-}
-
 void ComponentView::FinalizeUpdates(winrt::Microsoft::ReactNative::ComponentViewUpdateMask updateMask) noexcept {
   if ((m_flags & ComponentViewFeatures::NativeBorder) == ComponentViewFeatures::NativeBorder) {
     finalizeBorderUpdates(m_layoutMetrics, *viewProps());
   }
 
-  if (m_FinalizeTransform) {
-    FinalizeTransform(m_layoutMetrics, *viewProps());
-  }
-
   base_type::FinalizeUpdates(updateMask);
 }
 
@@ -638,8 +602,6 @@ void SetBorderLayerPropertiesCommon(
     facebook::react::BorderStyle borderStyle) {
   layer.Offset({anchorOffset.x, anchorOffset.y, 0}, {anchorPoint.x, anchorPoint.y, 0});
   layer.RelativeSizeWithOffset(size, relativeSizeAdjustment);
-  layer.as<::Microsoft::ReactNative::Composition::Experimental::IVisualInterop>()->SetClippingPath(nullptr);
-
   if ((textureRect.right - textureRect.left) <= 0 || (textureRect.bottom - textureRect.top) <= 0)
     return;
 
@@ -741,8 +703,7 @@ void SetBorderLayerProperties(
     // if (VisualVersion::IsUseWinCompClippingRegionEnabled())
     {
       layer.Offset({anchorOffset.x, anchorOffset.y, 0}, {anchorPoint.x, anchorPoint.y, 0});
-      layer.RelativeSizeWithOffset(
-          {textureRect.right - textureRect.left, textureRect.bottom - textureRect.top}, {0.0f, 0.0f});
+      layer.Size({textureRect.right - textureRect.left, textureRect.bottom - textureRect.top});
 
       layer.Brush(theme->Brush(*borderColor));
 
@@ -1281,7 +1242,30 @@ void ComponentView::updateTransformProps(
 
   // Transform - TODO doesn't handle multiple of the same kind of transform -- Doesn't handle hittesting updates
   if (oldViewProps.transform != newViewProps.transform) {
-    m_FinalizeTransform = true;
+    winrt::Windows::Foundation::Numerics::float4x4 transformMatrix;
+    transformMatrix.m11 = newViewProps.transform.matrix[0];
+    transformMatrix.m12 = newViewProps.transform.matrix[1];
+    transformMatrix.m13 = newViewProps.transform.matrix[2];
+    transformMatrix.m14 = newViewProps.transform.matrix[3];
+    transformMatrix.m21 = newViewProps.transform.matrix[4];
+    transformMatrix.m22 = newViewProps.transform.matrix[5];
+    transformMatrix.m23 = newViewProps.transform.matrix[6];
+    transformMatrix.m24 = newViewProps.transform.matrix[7];
+    transformMatrix.m31 = newViewProps.transform.matrix[8];
+    transformMatrix.m32 = newViewProps.transform.matrix[9];
+    transformMatrix.m33 = newViewProps.transform.matrix[10];
+    transformMatrix.m34 = newViewProps.transform.matrix[11];
+    transformMatrix.m41 = newViewProps.transform.matrix[12];
+    transformMatrix.m42 = newViewProps.transform.matrix[13];
+    transformMatrix.m43 = newViewProps.transform.matrix[14];
+    transformMatrix.m44 = newViewProps.transform.matrix[15];
+
+    auto centerPointPropSet = EnsureCenterPointPropertySet();
+    if (centerPointPropSet) {
+      centerPointPropSet.InsertMatrix4x4(L"transform", transformMatrix);
+    }
+
+    EnsureTransformMatrixFacade();
   }
 }
 
@@ -1630,10 +1614,7 @@ inline winrt::Windows::System::VirtualKey GetLeftOrRightModifiedKey(
     const winrt::Microsoft::ReactNative::Composition::Input::KeyboardSource &source,
     winrt::Windows::System::VirtualKey leftKey,
     winrt::Windows::System::VirtualKey rightKey) {
-  return ((source.GetKeyState(leftKey) & winrt::Microsoft::UI::Input::VirtualKeyStates::Down) ==
-          winrt::Microsoft::UI::Input::VirtualKeyStates::Down)
-      ? leftKey
-      : rightKey;
+  return (source.GetKeyState(leftKey) == winrt::Windows::UI::Core::CoreVirtualKeyStates::Down) ? leftKey : rightKey;
 }
 
 std::string CodeFromVirtualKey(
@@ -1666,20 +1647,16 @@ void ViewComponentView::OnKeyDown(
     const winrt::Microsoft::ReactNative::Composition::Input::KeyboardSource &source,
     const winrt::Microsoft::ReactNative::Composition::Input::KeyRoutedEventArgs &args) noexcept {
   auto eventCode = CodeFromVirtualKey(source, args.Key());
-  bool fShift =
-      (source.GetKeyState(winrt::Windows::System::VirtualKey::Shift) &
-       winrt::Microsoft::UI::Input::VirtualKeyStates::Down) == winrt::Microsoft::UI::Input::VirtualKeyStates::Down;
-  bool fAlt =
-      (source.GetKeyState(winrt::Windows::System::VirtualKey::Menu) &
-       winrt::Microsoft::UI::Input::VirtualKeyStates::Down) == winrt::Microsoft::UI::Input::VirtualKeyStates::Down;
-  bool fCtrl =
-      (source.GetKeyState(winrt::Windows::System::VirtualKey::Control) &
-       winrt::Microsoft::UI::Input::VirtualKeyStates::Down) == winrt::Microsoft::UI::Input::VirtualKeyStates::Down;
-  bool fMeta =
-      ((source.GetKeyState(winrt::Windows::System::VirtualKey::LeftWindows) &
-        winrt::Microsoft::UI::Input::VirtualKeyStates::Down) == winrt::Microsoft::UI::Input::VirtualKeyStates::Down) ||
-      ((source.GetKeyState(winrt::Windows::System::VirtualKey::RightWindows) &
-        winrt::Microsoft::UI::Input::VirtualKeyStates::Down) == winrt::Microsoft::UI::Input::VirtualKeyStates::Down);
+  bool fShift = source.GetKeyState(winrt::Windows::System::VirtualKey::Shift) !=
+      winrt::Windows::UI::Core::CoreVirtualKeyStates::None;
+  bool fAlt = source.GetKeyState(winrt::Windows::System::VirtualKey::Menu) !=
+      winrt::Windows::UI::Core::CoreVirtualKeyStates::None;
+  bool fCtrl = source.GetKeyState(winrt::Windows::System::VirtualKey::Control) !=
+      winrt::Windows::UI::Core::CoreVirtualKeyStates::None;
+  bool fMeta = (source.GetKeyState(winrt::Windows::System::VirtualKey::LeftWindows) !=
+                winrt::Windows::UI::Core::CoreVirtualKeyStates::None) ||
+      (source.GetKeyState(winrt::Windows::System::VirtualKey::RightWindows) !=
+       winrt::Windows::UI::Core::CoreVirtualKeyStates::None);
 
   if (args.OriginalSource() == Tag() && !args.Handled()) {
     facebook::react::KeyEvent event;
@@ -1688,12 +1665,7 @@ void ViewComponentView::OnKeyDown(
     event.altKey = fAlt;
     event.metaKey = fMeta;
 
-    event.key = ::Microsoft::ReactNative::FromVirtualKey(
-        args.Key(),
-        event.shiftKey,
-        !!((source.GetKeyState(winrt::Windows::System::VirtualKey::CapitalLock) &
-            winrt::Microsoft::UI::Input::VirtualKeyStates::Locked) ==
-           winrt::Microsoft::UI::Input::VirtualKeyStates::Locked));
+    event.key = ::Microsoft::ReactNative::FromVirtualKey(args.Key(), event.shiftKey, !!(GetKeyState(VK_CAPITAL) & 1));
     event.code = eventCode;
     m_eventEmitter->onKeyDown(event);
   }
@@ -1714,20 +1686,16 @@ void ViewComponentView::OnKeyUp(
     const winrt::Microsoft::ReactNative::Composition::Input::KeyboardSource &source,
     const winrt::Microsoft::ReactNative::Composition::Input::KeyRoutedEventArgs &args) noexcept {
   auto eventCode = CodeFromVirtualKey(source, args.Key());
-  bool fShift =
-      (source.GetKeyState(winrt::Windows::System::VirtualKey::Shift) &
-       winrt::Microsoft::UI::Input::VirtualKeyStates::Down) == winrt::Microsoft::UI::Input::VirtualKeyStates::Down;
-  bool fAlt =
-      (source.GetKeyState(winrt::Windows::System::VirtualKey::Menu) &
-       winrt::Microsoft::UI::Input::VirtualKeyStates::Down) == winrt::Microsoft::UI::Input::VirtualKeyStates::Down;
-  bool fCtrl =
-      (source.GetKeyState(winrt::Windows::System::VirtualKey::Control) &
-       winrt::Microsoft::UI::Input::VirtualKeyStates::Down) == winrt::Microsoft::UI::Input::VirtualKeyStates::Down;
-  bool fMeta =
-      ((source.GetKeyState(winrt::Windows::System::VirtualKey::LeftWindows) &
-        winrt::Microsoft::UI::Input::VirtualKeyStates::Down) == winrt::Microsoft::UI::Input::VirtualKeyStates::Down) ||
-      ((source.GetKeyState(winrt::Windows::System::VirtualKey::RightWindows) &
-        winrt::Microsoft::UI::Input::VirtualKeyStates::Down) == winrt::Microsoft::UI::Input::VirtualKeyStates::Down);
+  bool fShift = source.GetKeyState(winrt::Windows::System::VirtualKey::Shift) !=
+      winrt::Windows::UI::Core::CoreVirtualKeyStates::None;
+  bool fAlt = source.GetKeyState(winrt::Windows::System::VirtualKey::Menu) !=
+      winrt::Windows::UI::Core::CoreVirtualKeyStates::None;
+  bool fCtrl = source.GetKeyState(winrt::Windows::System::VirtualKey::Control) !=
+      winrt::Windows::UI::Core::CoreVirtualKeyStates::None;
+  bool fMeta = (source.GetKeyState(winrt::Windows::System::VirtualKey::LeftWindows) !=
+                winrt::Windows::UI::Core::CoreVirtualKeyStates::None) ||
+      (source.GetKeyState(winrt::Windows::System::VirtualKey::RightWindows) !=
+       winrt::Windows::UI::Core::CoreVirtualKeyStates::None);
 
   if (args.OriginalSource() == Tag()) {
     facebook::react::KeyEvent event;
@@ -1736,12 +1704,7 @@ void ViewComponentView::OnKeyUp(
     event.altKey = fAlt;
     event.metaKey = fMeta;
 
-    event.key = ::Microsoft::ReactNative::FromVirtualKey(
-        args.Key(),
-        event.shiftKey,
-        !!((source.GetKeyState(winrt::Windows::System::VirtualKey::CapitalLock) &
-            winrt::Microsoft::UI::Input::VirtualKeyStates::Down) ==
-           winrt::Microsoft::UI::Input::VirtualKeyStates::Down));
+    event.key = ::Microsoft::ReactNative::FromVirtualKey(args.Key(), event.shiftKey, !!(GetKeyState(VK_CAPITAL) & 1));
     event.code = eventCode;
     m_eventEmitter->onKeyUp(event);
   }

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

@@ -168,11 +168,7 @@ struct ComponentView
   std::array<winrt::Microsoft::ReactNative::Composition::Experimental::ISpriteVisual, SpecialBorderLayerCount>
   FindSpecialBorderLayers() const noexcept;
   void UpdateCenterPropertySet() noexcept;
-  void FinalizeTransform(
-      facebook::react::LayoutMetrics const &layoutMetrics,
-      const facebook::react::ViewProps &viewProps) noexcept;
 
-  bool m_FinalizeTransform{false};
   ComponentViewFeatures m_flags;
   void showFocusVisual(bool show) noexcept;
   winrt::Microsoft::ReactNative::Composition::Experimental::IFocusVisual m_focusVisual{nullptr};

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

@@ -30,30 +30,25 @@ extern "C" HRESULT WINAPI WICCreateImagingFactory_Proxy(UINT SDKVersion, IWICIma
 
 namespace winrt::Microsoft::ReactNative::Composition::implementation {
 
-ImageComponentView::WindowsImageResponseObserver::WindowsImageResponseObserver(
-    winrt::weak_ref<winrt::Microsoft::ReactNative::Composition::implementation::ImageComponentView> wkImage)
-    : m_wkImage(std::move(wkImage)) {}
+ImageComponentView::WindowsImageResponseObserver::WindowsImageResponseObserver(ImageComponentView &image) {
+  m_image.copy_from(&image);
+}
 
-void ImageComponentView::WindowsImageResponseObserver::didReceiveProgress(float progress) const {
+void ImageComponentView::WindowsImageResponseObserver::didReceiveProgress(float progress, int64_t loaded, int64_t total)
+    const {
   // TODO progress?
 }
 
 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_image->m_reactContext.UIDispatcher().Post(
+      [imageResponseImage, image = m_image]() { image->didReceiveImage(imageResponseImage); });
 }
 
-void ImageComponentView::WindowsImageResponseObserver::didReceiveFailure() const {
-  if (auto imgComponentView{m_wkImage.get()}) {
-    imgComponentView->didReceiveFailureFromObserver();
-  }
+void ImageComponentView::WindowsImageResponseObserver::didReceiveFailure(
+    facebook::react::ImageLoadError const &error) const {
+  m_image->didReceiveFailureFromObserver(error);
 }
 
 facebook::react::SharedViewProps ImageComponentView::defaultProps() noexcept {
@@ -99,7 +94,7 @@ void ImageComponentView::didReceiveImage(const std::shared_ptr<ImageResponseImag
 
   auto imageEventEmitter = std::static_pointer_cast<facebook::react::ImageEventEmitter const>(m_eventEmitter);
   if (imageEventEmitter) {
-    imageEventEmitter->onLoad();
+    imageEventEmitter->onLoad(m_state->getData().getImageSource());
     imageEventEmitter->onLoadEnd();
   }
 
@@ -114,10 +109,12 @@ void ImageComponentView::didReceiveImage(const std::shared_ptr<ImageResponseImag
   ensureDrawingSurface();
 }
 
-void ImageComponentView::didReceiveFailureFromObserver() noexcept {
+void ImageComponentView::didReceiveFailureFromObserver(const facebook::react::ImageLoadError &error) noexcept {
   auto imageEventEmitter = std::static_pointer_cast<facebook::react::ImageEventEmitter const>(m_eventEmitter);
   if (imageEventEmitter) {
-    imageEventEmitter->onError();
+    std::shared_ptr<facebook::react::ImageErrorInfo> errorInfo =
+        std::static_pointer_cast<facebook::react::ImageErrorInfo>(error.getError());
+    imageEventEmitter->onError(*errorInfo);
     imageEventEmitter->onLoadEnd();
   }
 }
@@ -149,7 +146,14 @@ 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());
+    // Should ViewComponents enable_shared_from_this? then we don't need this dance to get a shared_ptr
+    std::shared_ptr<::Microsoft::ReactNative::FabricUIManager> fabricuiManager =
+        ::Microsoft::ReactNative::FabricUIManager::FromProperties(m_reactContext.Properties());
+    auto componentViewDescriptor = fabricuiManager->GetViewRegistry().componentViewDescriptorWithTag(m_tag);
+
+    m_imageResponseObserver = std::make_shared<WindowsImageResponseObserver>(
+        *componentViewDescriptor.view
+             .as<winrt::Microsoft::ReactNative::Composition::implementation::ImageComponentView>());
   }
 
   setStateAndResubscribeImageResponseObserver(newImageState);
@@ -178,10 +182,6 @@ void ImageComponentView::setStateAndResubscribeImageResponseObserver(
   }
 }
 
-void ImageComponentView::prepareForRecycle() noexcept {
-  setStateAndResubscribeImageResponseObserver(nullptr);
-}
-
 winrt::Microsoft::ReactNative::ImageProps ImageComponentView::ImageProps() noexcept {
   // We do not currently support custom ImageComponentView's
   // If we did we would need to create a AbiImageProps and possibly return them here

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

@@ -47,7 +47,6 @@ struct ImageComponentView : ImageComponentViewT<ImageComponentView, ViewComponen
       override;
   void updateState(facebook::react::State::Shared const &state, facebook::react::State::Shared const &oldState) noexcept
       override;
-  void prepareForRecycle() noexcept override;
   void OnRenderingDeviceLost() noexcept override;
   void onThemeChanged() noexcept override;
 
@@ -70,14 +69,13 @@ struct ImageComponentView : ImageComponentViewT<ImageComponentView, ViewComponen
  private:
   struct WindowsImageResponseObserver : facebook::react::ImageResponseObserver {
    public:
-    WindowsImageResponseObserver(
-        winrt::weak_ref<winrt::Microsoft::ReactNative::Composition::implementation::ImageComponentView> wkImage);
-    void didReceiveProgress(float progress) const override;
-    void didReceiveImage(facebook::react::ImageResponse const &imageResponse) const override;
-    void didReceiveFailure() const override;
+    WindowsImageResponseObserver(ImageComponentView &image);
+    void didReceiveProgress(float progress, int64_t loaded, int64_t total) const override;
+    void didReceiveImage(const facebook::react::ImageResponse &imageResponse) const override;
+    void didReceiveFailure(const facebook::react::ImageLoadError &error) const override;
 
    private:
-    winrt::weak_ref<winrt::Microsoft::ReactNative::Composition::implementation::ImageComponentView> m_wkImage;
+    winrt::com_ptr<ImageComponentView> m_image;
   };
 
   void ensureDrawingSurface() noexcept;
@@ -86,7 +84,7 @@ struct ImageComponentView : ImageComponentViewT<ImageComponentView, ViewComponen
   void ImageLoadStart() noexcept;
   void ImageLoaded() noexcept;
   void didReceiveImage(const std::shared_ptr<ImageResponseImage> &wicbmp) noexcept;
-  void didReceiveFailureFromObserver() noexcept;
+  void didReceiveFailureFromObserver(const facebook::react::ImageLoadError &error) noexcept;
   void setStateAndResubscribeImageResponseObserver(
       facebook::react::ImageShadowNode::ConcreteState::Shared const &state) noexcept;
   bool themeEffectsImage() const noexcept;

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

@@ -83,16 +83,6 @@ void ParagraphComponentView::updateState(
   m_textLayout = nullptr;
 }
 
-void ParagraphComponentView::updateLayoutMetrics(
-    facebook::react::LayoutMetrics const &layoutMetrics,
-    facebook::react::LayoutMetrics const &oldLayoutMetrics) noexcept {
-  Super::updateLayoutMetrics(layoutMetrics, oldLayoutMetrics);
-
-  if (layoutMetrics.pointScaleFactor != oldLayoutMetrics.pointScaleFactor) {
-    m_textLayout = nullptr;
-  }
-}
-
 void ParagraphComponentView::FinalizeUpdates(
     winrt::Microsoft::ReactNative::ComponentViewUpdateMask updateMask) noexcept {
   ensureVisual();

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

@@ -34,9 +34,6 @@ struct ParagraphComponentView : ParagraphComponentViewT<ParagraphComponentView,
   void updateProps(facebook::react::Props::Shared const &props, facebook::react::Props::Shared const &oldProps) noexcept
       override;
   void updateEventEmitter(facebook::react::EventEmitter::Shared const &eventEmitter) noexcept override;
-  void updateLayoutMetrics(
-      facebook::react::LayoutMetrics const &layoutMetrics,
-      facebook::react::LayoutMetrics const &oldLayoutMetrics) noexcept override;
   void updateState(facebook::react::State::Shared const &state, facebook::react::State::Shared const &oldState) noexcept
       override;
   void FinalizeUpdates(winrt::Microsoft::ReactNative::ComponentViewUpdateMask updateMask) noexcept override;

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

@@ -125,15 +125,6 @@ inline Mso::Future<void> CompositionReactViewInstance::PostInUIQueue(TAction &&a
   return promise.AsFuture();
 }
 
-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);
-}
-
 ReactNativeIsland::ReactNativeIsland() noexcept {}
 
 #ifdef USE_WINUI3
@@ -145,7 +136,6 @@ ReactNativeIsland::~ReactNativeIsland() noexcept {
 #ifdef USE_WINUI3
   if (m_island && m_island.IsConnected()) {
     m_island.AutomationProviderRequested(m_islandAutomationProviderRequestedToken);
-    m_island.StateChanged(m_islandStateChangedToken);
   }
 #endif
 
@@ -261,7 +251,6 @@ void ReactNativeIsland::ScaleFactor(float value) noexcept {
       rootView.Scale({invScale, invScale, invScale});
     }
     UpdateRootVisualSize();
-    Arrange(m_layoutConstraints, m_viewportOffset);
   }
 }
 
@@ -426,6 +415,13 @@ void ReactNativeIsland::UpdateRootViewInternal() noexcept {
   }
 }
 
+struct AutoMRE {
+  ~AutoMRE() {
+    mre.Set();
+  }
+  Mso::ManualResetEvent mre;
+};
+
 void ReactNativeIsland::UninitRootView() noexcept {
   if (!m_isInitialized) {
     return;
@@ -442,8 +438,10 @@ void ReactNativeIsland::UninitRootView() noexcept {
     // 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
     // method should return a Promise, which should be resolved when the JS logic is complete.
+    // The task will auto set the event on destruction to ensure that the event is set if the JS Queue has already been
+    // shutdown
     Mso::ManualResetEvent mre;
-    m_context.JSDispatcher().Post([&]() { mre.Set(); });
+    m_context.JSDispatcher().Post([autoMRE = std::make_unique<AutoMRE>(AutoMRE{mre})]() {});
     mre.Wait();
 
     // Paper version gives the JS thread time to finish executing - Is this needed?
@@ -482,14 +480,10 @@ void ReactNativeIsland::ShowInstanceLoaded() noexcept {
       initProps = folly::dynamic::object();
     }
     initProps["concurrentRoot"] = true;
-
-    facebook::react::LayoutConstraints fbLayoutConstraints;
-    ApplyConstraints(m_layoutConstraints, fbLayoutConstraints);
-
     uiManager->startSurface(
         *this,
         static_cast<facebook::react::SurfaceId>(m_rootTag),
-        fbLayoutConstraints,
+        m_layoutConstraints,
         to_string(m_reactViewOptions.ComponentName()),
         initProps);
 
@@ -506,21 +500,16 @@ facebook::react::AttributedStringBox CreateLoadingAttributedString() noexcept {
   return facebook::react::AttributedStringBox{attributedString};
 }
 
-facebook::react::Size MeasureLoading(
-    const winrt::Microsoft::ReactNative::LayoutConstraints &layoutConstraints,
-    float scaleFactor) {
-  facebook::react::LayoutConstraints fbLayoutConstraints;
-  ApplyConstraints(layoutConstraints, fbLayoutConstraints);
-
+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*/, fbLayoutConstraints, textLayout);
+      attributedStringBox, {} /*paragraphAttributes*/, layoutConstraints, textLayout);
 
   DWRITE_TEXT_METRICS tm;
-  textLayout->GetMetrics(&tm);
+  winrt::check_hresult(textLayout->GetMetrics(&tm));
 
-  return fbLayoutConstraints.clamp(
+  return layoutConstraints.clamp(
       {loadingActivityHorizontalOffset * scaleFactor + tm.width, loadingBarHeight * scaleFactor});
 }
 
@@ -535,7 +524,7 @@ void ReactNativeIsland::SizeChanged(winrt::event_token const &token) noexcept {
 }
 
 struct RootViewSizeChangedEventArgs : RootViewSizeChangedEventArgsT<RootViewSizeChangedEventArgs> {
-  RootViewSizeChangedEventArgs(winrt::Windows::Foundation::Size size) : m_size(size) {}
+  RootViewSizeChangedEventArgs(const winrt::Windows::Foundation::Size &size) : m_size(size) {}
   winrt::Windows::Foundation::Size Size() const noexcept {
     return m_size;
   }
@@ -645,6 +634,15 @@ void ReactNativeIsland::ShowInstanceLoading() noexcept {
   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 ReactNativeIsland::Measure(
     const winrt::Microsoft::ReactNative::LayoutConstraints &layoutConstraints,
     const winrt::Windows::Foundation::Point &viewportOffset) const noexcept {
@@ -665,7 +663,7 @@ winrt::Windows::Foundation::Size ReactNativeIsland::Measure(
       size = fabricuiManager->measureSurface(static_cast<facebook::react::SurfaceId>(m_rootTag), constraints, context);
     }
   } else if (m_loadingVisual) {
-    size = MeasureLoading(layoutConstraints, m_scaleFactor);
+    size = MeasureLoading(constraints, m_scaleFactor);
   }
 
   auto clampedSize = constraints.clamp(size);
@@ -675,10 +673,7 @@ winrt::Windows::Foundation::Size ReactNativeIsland::Measure(
 void ReactNativeIsland::Arrange(
     const winrt::Microsoft::ReactNative::LayoutConstraints &layoutConstraints,
     const winrt::Windows::Foundation::Point &viewportOffset) noexcept {
-  m_layoutConstraints = layoutConstraints;
-  m_viewportOffset = viewportOffset;
-  facebook::react::LayoutConstraints fbLayoutConstraints;
-  ApplyConstraints(layoutConstraints, fbLayoutConstraints);
+  ApplyConstraints(layoutConstraints, m_layoutConstraints);
 
   if (m_isInitialized && m_rootTag != -1) {
     if (auto fabricuiManager = ::Microsoft::ReactNative::FabricUIManager::FromProperties(
@@ -689,11 +684,11 @@ void ReactNativeIsland::Arrange(
       context.viewportOffset = {viewportOffset.X, viewportOffset.Y};
 
       fabricuiManager->constraintSurfaceLayout(
-          static_cast<facebook::react::SurfaceId>(m_rootTag), fbLayoutConstraints, context);
+          static_cast<facebook::react::SurfaceId>(m_rootTag), m_layoutConstraints, context);
     }
   } else if (m_loadingVisual) {
     // TODO: Resize to align loading
-    auto s = fbLayoutConstraints.clamp(MeasureLoading(layoutConstraints, m_scaleFactor));
+    auto s = m_layoutConstraints.clamp(MeasureLoading(m_layoutConstraints, m_scaleFactor));
     NotifySizeChanged();
   }
 }
@@ -743,17 +738,6 @@ winrt::Microsoft::UI::Content::ContentIsland ReactNativeIsland::Island() {
         pThis->m_island = nullptr;
       }
     });
-
-    m_islandStateChangedToken =
-        m_island.StateChanged([weakThis = get_weak()](
-                                  winrt::Microsoft::UI::Content::ContentIsland const &island,
-                                  winrt::Microsoft::UI::Content::ContentIslandStateChangedEventArgs const &args) {
-          if (auto pThis = weakThis.get()) {
-            if (args.DidRasterizationScaleChange()) {
-              pThis->ScaleFactor(island.RasterizationScale());
-            }
-          }
-        });
   }
   return m_island;
 }

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

@@ -125,7 +125,6 @@ struct ReactNativeIsland
   winrt::Microsoft::UI::Content::ContentIsland m_island{nullptr};
   winrt::event_token m_islandFrameworkClosedToken;
   winrt::event_token m_islandAutomationProviderRequestedToken;
-  winrt::event_token m_islandStateChangedToken;
 #endif
 
   HWND m_hwnd{0};
@@ -148,8 +147,7 @@ struct ReactNativeIsland
   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;
-  winrt::Microsoft::ReactNative::LayoutConstraints m_layoutConstraints;
-  winrt::Windows::Foundation::Point m_viewportOffset{0, 0};
+  facebook::react::LayoutConstraints m_layoutConstraints;
   winrt::event<winrt::Windows::Foundation::EventHandler<winrt::Microsoft::ReactNative::RootViewSizeChangedEventArgs>>
       m_sizeChangedEvent;