react-native-windows 0.74.10 → 0.75.0-preview.1

package/Microsoft.ReactNative/Fabric/FabricUIManagerModule.cpp

@@ -79,20 +79,8 @@ void FabricUIManager::installFabricUIManager() noexcept {
     runtimeExecutor = [runtimeScheduler](std::function<void(facebook::jsi::Runtime & runtime)> &&callback) {
       runtimeScheduler->scheduleWork(std::move(callback));
     };
-    facebook::react::EventBeat::Factory synchronousBeatFactory =
-        [runtimeExecutor, context = m_context, runtimeScheduler](
-            facebook::react::EventBeat::SharedOwnerBox const &ownerBox) {
-          return std::make_unique<SynchronousEventBeat>(ownerBox, context, runtimeExecutor, runtimeScheduler);
-        };
-    toolbox.synchronousEventBeatFactory = synchronousBeatFactory;
   } else {
     runtimeExecutor = SchedulerSettings::GetRuntimeExecutor(m_context.Properties());
-
-    facebook::react::EventBeat::Factory synchronousBeatFactory =
-        [runtimeExecutor, context = m_context](facebook::react::EventBeat::SharedOwnerBox const &ownerBox) {
-          return std::make_unique<AsynchronousEventBeat>(ownerBox, context, runtimeExecutor);
-        };
-    toolbox.synchronousEventBeatFactory = synchronousBeatFactory;
   }
 
   facebook::react::EventBeat::Factory asynchronousBeatFactory =
@@ -324,9 +312,6 @@ void FabricUIManager::initiateTransaction(facebook::react::MountingCoordinator::
 }
 
 void FabricUIManager::schedulerDidFinishTransaction(
-    const facebook::react::MountingCoordinator::Shared &mountingCoordinator) {}
-
-void FabricUIManager::schedulerShouldRenderTransactions(
     const facebook::react::MountingCoordinator::Shared &mountingCoordinator) {
   // Should cache this locally
 
@@ -338,9 +323,17 @@ void FabricUIManager::schedulerShouldRenderTransactions(
   }
 }
 
-void FabricUIManager::schedulerDidRequestPreliminaryViewAllocation(
-    facebook::react::SurfaceId surfaceId,
-    const facebook::react::ShadowNode &shadowView) {
+void FabricUIManager::schedulerShouldRenderTransactions(
+    const facebook::react::MountingCoordinator::Shared &mountingCoordinator) {
+  if (m_context.UIDispatcher().HasThreadAccess()) {
+    initiateTransaction(mountingCoordinator);
+  } else {
+    m_context.UIDispatcher().Post(
+        [mountingCoordinator, self = shared_from_this()]() { self->initiateTransaction(mountingCoordinator); });
+  }
+}
+
+void FabricUIManager::schedulerDidRequestPreliminaryViewAllocation(const facebook::react::ShadowNode &shadowView) {
   // iOS does not do this optimization, but Android does.  It maybe that android's allocations are more expensive due to
   // the Java boundary.
   // TODO: We should do some perf tests to see if this is worth doing.

package/Microsoft.ReactNative/Fabric/FabricUIManagerModule.h

@@ -79,13 +79,11 @@ struct FabricUIManager final : public std::enable_shared_from_this<FabricUIManag
   std::unordered_map<facebook::react::SurfaceId, SurfaceInfo> m_surfaceRegistry;
 
   // Inherited via SchedulerDelegate
-  virtual void schedulerShouldRenderTransactions(
-      const facebook::react::MountingCoordinator::Shared &mountingCoordinator) override;
   virtual void schedulerDidFinishTransaction(
       const facebook::react::MountingCoordinator::Shared &mountingCoordinator) override;
-  virtual void schedulerDidRequestPreliminaryViewAllocation(
-      facebook::react::SurfaceId surfaceId,
-      const facebook::react::ShadowNode &shadowView) override;
+  virtual void schedulerShouldRenderTransactions(
+      const facebook::react::MountingCoordinator::Shared &mountingCoordinator) override;
+  virtual void schedulerDidRequestPreliminaryViewAllocation(const facebook::react::ShadowNode &shadowView) override;
   virtual void schedulerDidDispatchCommand(
       facebook::react::ShadowView const &shadowView,
       std::string const &commandName,

package/Microsoft.ReactNative/Fabric/WindowsImageManager.cpp

@@ -43,8 +43,11 @@ WindowsImageManager::WindowsImageManager(winrt::Microsoft::ReactNative::ReactCon
   }
 }
 
-std::tuple<winrt::com_ptr<IWICBitmapSource>, winrt::com_ptr<IWICImagingFactory>, std::string> wicBitmapSourceFromStream(
-    const winrt::Windows::Storage::Streams::IRandomAccessStream &stream) noexcept {
+std::tuple<
+    winrt::com_ptr<IWICBitmapSource>,
+    winrt::com_ptr<IWICImagingFactory>,
+    std::shared_ptr<facebook::react::ImageErrorInfo>>
+wicBitmapSourceFromStream(const winrt::Windows::Storage::Streams::IRandomAccessStream &stream) noexcept {
   try {
     winrt::com_ptr<IWICImagingFactory> imagingFactory;
     winrt::check_hresult(WICCreateImagingFactory_Proxy(WINCODEC_SDK_VERSION, imagingFactory.put()));
@@ -58,14 +61,19 @@ std::tuple<winrt::com_ptr<IWICBitmapSource>, winrt::com_ptr<IWICImagingFactory>,
         istream.get(), nullptr, WICDecodeMetadataCacheOnDemand, bitmapDecoder.put()));
 
     if (!bitmapDecoder) {
-      return {nullptr, nullptr, "Failed to decode the image."};
+      auto errorInfo = std::make_shared<facebook::react::ImageErrorInfo>();
+      errorInfo->error = "Failed to decode the image.";
+      return {nullptr, nullptr, errorInfo};
     }
 
     winrt::com_ptr<IWICBitmapFrameDecode> decodedFrame;
     winrt::check_hresult(bitmapDecoder->GetFrame(0, decodedFrame.put()));
-    return {decodedFrame, imagingFactory, {}};
+    return {decodedFrame, imagingFactory, nullptr};
   } catch (winrt::hresult_error const &ex) {
-    return {nullptr, nullptr, ::Microsoft::ReactNative::FormatHResultError(winrt::hresult_error(ex))};
+    auto errorInfo = std::make_shared<facebook::react::ImageErrorInfo>();
+    errorInfo = std::make_shared<facebook::react::ImageErrorInfo>();
+    errorInfo->error = ::Microsoft::ReactNative::FormatHResultError(winrt::hresult_error(ex));
+    return {nullptr, nullptr, errorInfo};
   }
 }
 
@@ -166,16 +174,20 @@ facebook::react::ImageRequest WindowsImageManager::requestImage(
           observerCoordinator->nativeImageResponseComplete(
               facebook::react::ImageResponse(imageResultOrError.image, nullptr /*metadata*/));
         } else {
-          observerCoordinator->nativeImageResponseFailed();
+          observerCoordinator->nativeImageResponseFailed(facebook::react::ImageLoadError(imageResultOrError.errorInfo));
         }
         break;
       }
       case winrt::Windows::Foundation::AsyncStatus::Canceled: {
-        observerCoordinator->nativeImageResponseFailed();
+        auto errorInfo = std::make_shared<facebook::react::ImageErrorInfo>();
+        errorInfo->error = FormatHResultError(winrt::hresult_error(asyncOp.ErrorCode()));
+        observerCoordinator->nativeImageResponseFailed(facebook::react::ImageLoadError(errorInfo));
         break;
       }
       case winrt::Windows::Foundation::AsyncStatus::Error: {
-        observerCoordinator->nativeImageResponseFailed();
+        auto errorInfo = std::make_shared<facebook::react::ImageErrorInfo>();
+        errorInfo->error = FormatHResultError(winrt::hresult_error(asyncOp.ErrorCode()));
+        observerCoordinator->nativeImageResponseFailed(facebook::react::ImageLoadError(errorInfo));
         break;
       }
       case winrt::Windows::Foundation::AsyncStatus::Started: {
@@ -197,8 +209,7 @@ ImageResponseOrImageErrorInfo StreamImageResponse::ResolveImage() {
   try {
     auto result = ::Microsoft::ReactNative::wicBitmapSourceFromStream(m_stream);
 
-    auto &errorInfo = std::get<std::string>(result);
-    if (!errorInfo.empty()) {
+    if (auto errorInfo = std::get<std::shared_ptr<facebook::react::ImageErrorInfo>>(result)) {
       imageOrError.errorInfo = errorInfo;
       return imageOrError;
     }
@@ -222,7 +233,8 @@ ImageResponseOrImageErrorInfo StreamImageResponse::ResolveImage() {
     winrt::check_hresult(imagingFactory->CreateBitmapFromSource(
         converter.get(), WICBitmapCacheOnLoad, imageOrError.image->m_wicbmp.put()));
   } catch (winrt::hresult_error const &ex) {
-    imageOrError.errorInfo = ::Microsoft::ReactNative::FormatHResultError(winrt::hresult_error(ex));
+    imageOrError.errorInfo = std::make_shared<facebook::react::ImageErrorInfo>();
+    imageOrError.errorInfo->error = ::Microsoft::ReactNative::FormatHResultError(winrt::hresult_error(ex));
   }
   return imageOrError;
 }

package/Microsoft.ReactNative/Fabric/WindowsImageManager.h

@@ -30,7 +30,10 @@ struct WindowsImageManager {
   std::shared_ptr<winrt::Microsoft::ReactNative::Composition::implementation::UriImageManager> m_uriImageManager;
 };
 
-std::tuple<winrt::com_ptr<IWICBitmapSource>, winrt::com_ptr<IWICImagingFactory>, std::string> wicBitmapSourceFromStream(
-    const winrt::Windows::Storage::Streams::IRandomAccessStream &stream) noexcept;
+std::tuple<
+    winrt::com_ptr<IWICBitmapSource>,
+    winrt::com_ptr<IWICImagingFactory>,
+    std::shared_ptr<facebook::react::ImageErrorInfo>>
+wicBitmapSourceFromStream(const winrt::Windows::Storage::Streams::IRandomAccessStream &stream) noexcept;
 
 } // namespace Microsoft::ReactNative

package/Microsoft.ReactNative/Fabric/platform/react/renderer/components/view/HostPlatformViewEventEmitter.cpp

@@ -39,19 +39,11 @@ void HostPlatformViewEventEmitter::onBlur() const {
 #pragma mark - Mouse Events
 
 void HostPlatformViewEventEmitter::onMouseEnter(PointerEvent const &pointerEvent) const {
-  dispatchEvent(
-      "mouseEnter",
-      std::make_shared<PointerEvent>(pointerEvent),
-      EventPriority::AsynchronousBatched,
-      RawEvent::Category::ContinuousStart);
+  dispatchEvent("mouseEnter", std::make_shared<PointerEvent>(pointerEvent), RawEvent::Category::ContinuousStart);
 }
 
 void HostPlatformViewEventEmitter::onMouseLeave(PointerEvent const &pointerEvent) const {
-  dispatchEvent(
-      "mouseLeave",
-      std::make_shared<PointerEvent>(pointerEvent),
-      EventPriority::AsynchronousBatched,
-      RawEvent::Category::ContinuousStart);
+  dispatchEvent("mouseLeave", std::make_shared<PointerEvent>(pointerEvent), RawEvent::Category::ContinuousStart);
 }
 
 } // namespace facebook::react

package/Microsoft.ReactNative/Fabric/platform/react/renderer/textlayoutmanager/TextLayoutManager.cpp

@@ -17,14 +17,11 @@
 namespace facebook::react {
 
 void TextLayoutManager::GetTextLayout(
-    AttributedStringBox attributedStringBox,
-    ParagraphAttributes paragraphAttributes,
-    LayoutConstraints layoutConstraints,
+    const AttributedString &attributedString,
+    const ParagraphAttributes &paragraphAttributes,
+    Size size,
     winrt::com_ptr<IDWriteTextLayout> &spTextLayout) noexcept {
-  if (attributedStringBox.getValue().isEmpty())
-    return;
-
-  auto fragments = attributedStringBox.getValue().getFragments();
+  auto fragments = attributedString.getFragments();
   auto outerFragment = fragments[0];
 
   DWRITE_FONT_STYLE style = DWRITE_FONT_STYLE_NORMAL;
@@ -86,14 +83,14 @@ void TextLayoutManager::GetTextLayout(
   }
   winrt::check_hresult(spTextFormat->SetTextAlignment(alignment));
 
-  auto str = GetTransformedText(attributedStringBox);
+  auto str = GetTransformedText(attributedString);
 
   winrt::check_hresult(Microsoft::ReactNative::DWriteFactory()->CreateTextLayout(
       str.c_str(), // The string to be laid out and formatted.
       static_cast<UINT32>(str.size()), // The length of the string.
       spTextFormat.get(), // The text format to apply to the string (contains font information, etc).
-      layoutConstraints.maximumSize.width, // The width of the layout box.
-      layoutConstraints.maximumSize.height, // The height of the layout box.
+      size.width, // The width of the layout box.
+      size.height, // The height of the layout box.
       spTextLayout.put() // The IDWriteTextLayout interface pointer.
       ));
 
@@ -129,12 +126,22 @@ void TextLayoutManager::GetTextLayout(
   }
 }
 
+void TextLayoutManager::GetTextLayout(
+    const AttributedStringBox &attributedStringBox,
+    const ParagraphAttributes &paragraphAttributes,
+    LayoutConstraints layoutConstraints,
+    winrt::com_ptr<IDWriteTextLayout> &spTextLayout) noexcept {
+  if (attributedStringBox.getValue().isEmpty())
+    return;
+
+  GetTextLayout(attributedStringBox.getValue(), paragraphAttributes, layoutConstraints.maximumSize, spTextLayout);
+}
+
 TextMeasurement TextLayoutManager::measure(
-    AttributedStringBox attributedStringBox,
-    ParagraphAttributes paragraphAttributes,
+    const AttributedStringBox &attributedStringBox,
+    const ParagraphAttributes &paragraphAttributes,
     const TextLayoutContext &layoutContext,
-    LayoutConstraints layoutConstraints,
-    std::shared_ptr<void> /* hostTextStorage */) const {
+    LayoutConstraints layoutConstraints) const {
   TextMeasurement measurement{};
   auto &attributedString = attributedStringBox.getValue();
   measurement = m_measureCache.get(
@@ -185,31 +192,12 @@ TextMeasurement TextLayoutManager::measure(
  */
 TextMeasurement TextLayoutManager::measureCachedSpannableById(
     int64_t cacheId,
-    ParagraphAttributes const &paragraphAttributes,
+    const ParagraphAttributes &paragraphAttributes,
     LayoutConstraints layoutConstraints) const {
   assert(false);
   return {};
 }
 
-LinesMeasurements TextLayoutManager::measureLines(
-    AttributedString attributedString,
-    ParagraphAttributes paragraphAttributes,
-    Size size) const {
-  assert(false);
-  return {};
-}
-
-std::shared_ptr<void> TextLayoutManager::getHostTextStorage(
-    AttributedString attributedString,
-    ParagraphAttributes paragraphAttributes,
-    LayoutConstraints layoutConstraints) const {
-  return nullptr;
-}
-
-void *TextLayoutManager::getNativeTextLayoutManager() const {
-  return (void *)this;
-}
-
 Microsoft::ReactNative::TextTransform ConvertTextTransform(std::optional<TextTransform> const &transform) {
   if (transform) {
     switch (transform.value()) {
@@ -229,9 +217,92 @@ Microsoft::ReactNative::TextTransform ConvertTextTransform(std::optional<TextTra
   return Microsoft::ReactNative::TextTransform::Undefined;
 }
 
-winrt::hstring TextLayoutManager::GetTransformedText(AttributedStringBox const &attributedStringBox) {
+LinesMeasurements TextLayoutManager::measureLines(
+    const AttributedString &attributedString,
+    const ParagraphAttributes &paragraphAttributes,
+    Size size) const {
+  LinesMeasurements lineMeasurements{};
+
+  winrt::com_ptr<IDWriteTextLayout> spTextLayout;
+
+  GetTextLayout(attributedString, paragraphAttributes, size, spTextLayout);
+
+  if (spTextLayout) {
+    std::vector<DWRITE_LINE_METRICS> lineMetrics;
+    uint32_t actualLineCount;
+    spTextLayout->GetLineMetrics(nullptr, 0, &actualLineCount);
+    lineMetrics.resize(static_cast<size_t>(actualLineCount));
+    winrt::check_hresult(spTextLayout->GetLineMetrics(lineMetrics.data(), actualLineCount, &actualLineCount));
+    uint32_t startRange = 0;
+    const auto count = (paragraphAttributes.maximumNumberOfLines > 0)
+        ? std::min(static_cast<uint32_t>(paragraphAttributes.maximumNumberOfLines), actualLineCount)
+        : actualLineCount;
+    for (uint32_t i = 0; i < count; ++i) {
+      UINT32 actualHitTestCount = 0;
+      spTextLayout->HitTestTextRange(
+          startRange,
+          lineMetrics[i].length,
+          0, // x
+          0, // y
+          NULL,
+          0, // metrics count
+          &actualHitTestCount);
+
+      // Allocate enough room to return all hit-test metrics.
+      std::vector<DWRITE_HIT_TEST_METRICS> hitTestMetrics(actualHitTestCount);
+      spTextLayout->HitTestTextRange(
+          startRange,
+          lineMetrics[i].length,
+          0, // x
+          0, // y
+          &hitTestMetrics[0],
+          static_cast<UINT32>(hitTestMetrics.size()),
+          &actualHitTestCount);
+
+      float width = 0;
+      for (auto tm : hitTestMetrics) {
+        width += tm.width;
+      }
+
+      std::string str;
+      for (const auto &fragment : attributedString.getFragments()) {
+        str = str +
+            winrt::to_string(Microsoft::ReactNative::TransformableText::TransformText(
+                winrt::hstring{Microsoft::Common::Unicode::Utf8ToUtf16(fragment.string)},
+                ConvertTextTransform(fragment.textAttributes.textTransform)));
+      }
+
+      lineMeasurements.emplace_back(LineMeasurement(
+          str.substr(startRange, lineMetrics[i].length),
+          {{hitTestMetrics[0].left, hitTestMetrics[0].top}, // origin
+           {width, lineMetrics[i].height}},
+          0.0f, // TODO descender
+          0.0f, // TODO: capHeight
+          0.0f, // TODO ascender
+          0.0f // TODO: xHeight
+          ));
+
+      startRange += lineMetrics[i].length;
+    }
+  }
+
+  return lineMeasurements;
+}
+
+std::shared_ptr<void> TextLayoutManager::getHostTextStorage(
+    const AttributedString &attributedString,
+    const ParagraphAttributes &paragraphAttributes,
+    LayoutConstraints layoutConstraints) const {
+  return nullptr;
+}
+
+void *TextLayoutManager::getNativeTextLayoutManager() const {
+  return (void *)this;
+}
+
+winrt::hstring TextLayoutManager::GetTransformedText(const AttributedString &attributedString) {
   winrt::hstring result{};
-  for (const auto &fragment : attributedStringBox.getValue().getFragments()) {
+  for (const auto &fragment : attributedString.getFragments()) {
     result = result +
         Microsoft::ReactNative::TransformableText::TransformText(
                  winrt::hstring{Microsoft::Common::Unicode::Utf8ToUtf16(fragment.string)},

package/Microsoft.ReactNative/Fabric/platform/react/renderer/textlayoutmanager/TextLayoutManager.h

@@ -35,22 +35,23 @@ class TextLayoutManager {
    * Measures `attributedStringBox` using native text rendering infrastructure.
    */
   TextMeasurement measure(
-      AttributedStringBox attributedStringBox,
-      ParagraphAttributes paragraphAttributes,
+      const AttributedStringBox &attributedStringBox,
+      const ParagraphAttributes &paragraphAttributes,
       const TextLayoutContext &layoutContext,
-      LayoutConstraints layoutConstraints,
-      std::shared_ptr<void> /* hostTextStorage */) const;
+      LayoutConstraints layoutConstraints) const;
 
   /*
    * Measures lines of `attributedString` using native text rendering
    * infrastructure.
    */
-  LinesMeasurements measureLines(AttributedString attributedString, ParagraphAttributes paragraphAttributes, Size size)
-      const;
+  LinesMeasurements measureLines(
+      const AttributedString &attributedString,
+      const ParagraphAttributes &paragraphAttributes,
+      Size size) const;
 
   std::shared_ptr<void> getHostTextStorage(
-      AttributedString attributedString,
-      ParagraphAttributes paragraphAttributes,
+      const AttributedString &attributedString,
+      const ParagraphAttributes &paragraphAttributes,
       LayoutConstraints layoutConstraints) const;
 
   /**
@@ -59,7 +60,7 @@ class TextLayoutManager {
    */
   TextMeasurement measureCachedSpannableById(
       int64_t cacheId,
-      ParagraphAttributes const &paragraphAttributes,
+      const ParagraphAttributes &paragraphAttributes,
       LayoutConstraints layoutConstraints) const;
 
   /*
@@ -69,15 +70,20 @@ class TextLayoutManager {
   void *getNativeTextLayoutManager() const;
 
   static void GetTextLayout(
-      AttributedStringBox attributedStringBox,
-      ParagraphAttributes paragraphAttributes,
+      const AttributedStringBox &attributedStringBox,
+      const ParagraphAttributes &paragraphAttributes,
       LayoutConstraints layoutConstraints,
       winrt::com_ptr<IDWriteTextLayout> &spTextLayout) noexcept;
 
 #pragma endregion
 
  private:
-  static winrt::hstring GetTransformedText(AttributedStringBox const &attributedStringBox);
+  static winrt::hstring GetTransformedText(const AttributedString &attributedString);
+  static void GetTextLayout(
+      const AttributedString &attributedString,
+      const ParagraphAttributes &paragraphAttributes,
+      Size size,
+      winrt::com_ptr<IDWriteTextLayout> &spTextLayout) noexcept;
 
   ContextContainer::Shared m_contextContainer;
 #pragma warning(push)

package/Microsoft.ReactNative/Modules/DevSettingsModule.cpp

@@ -50,6 +50,10 @@ void DevSettings::toggleElementInspector() noexcept {
       "RCTDeviceEventEmitter", "emit", folly::dynamic::array("toggleElementInspector", nullptr));
 }
 
+void DevSettings::openDebugger() noexcept {
+  assert(false);
+}
+
 void DevSettings::addMenuItem(std::string title) noexcept {
   assert(false);
 }

package/Microsoft.ReactNative/Modules/DevSettingsModule.h

@@ -24,6 +24,7 @@ struct DevSettings {
   REACT_METHOD(setIsDebuggingRemotely) void setIsDebuggingRemotely(bool isDebuggingRemotelyEnabled) noexcept;
   REACT_METHOD(setProfilingEnabled) void setProfilingEnabled(bool isProfilingEnabled) noexcept;
   REACT_METHOD(toggleElementInspector) void toggleElementInspector() noexcept;
+  REACT_METHOD(openDebugger) void openDebugger() noexcept;
   REACT_METHOD(addMenuItem) void addMenuItem(std::string title) noexcept;
   REACT_METHOD(setIsShakeToShowDevMenuEnabled) void setIsShakeToShowDevMenuEnabled(bool enabled) noexcept;
 

package/Microsoft.ReactNative/Modules/ImageViewManagerModule.cpp

@@ -78,8 +78,7 @@ winrt::fire_and_forget GetImageSizeAsync(
 #ifdef USE_FABRIC
     } else {
       auto result = wicBitmapSourceFromStream(memoryStream);
-      auto &errorInfo = std::get<std::string>(result);
-      if (errorInfo.empty()) {
+      if (!std::get<std::shared_ptr<facebook::react::ImageErrorInfo>>(result)) {
         auto imagingFactory = std::get<winrt::com_ptr<IWICImagingFactory>>(result);
         auto wicBmpSource = std::get<winrt::com_ptr<IWICBitmapSource>>(result);
         UINT width, height;

package/Microsoft.ReactNative/Modules/NativeUIManager.cpp

@@ -234,15 +234,18 @@ void NativeUIManager::AddRootView(ShadowNode &shadowNode, facebook::react::IReac
   Microsoft::ReactNative::SetTag(element, rootTag);
 
   // Add listener to size change so we can redo the layout when that happens
-  m_sizeChangedVector.push_back(view.as<xaml::FrameworkElement>().SizeChanged(
-      winrt::auto_revoke, [this, rootTag](auto &&, xaml::SizeChangedEventArgs const &args) {
-        ApplyLayout(rootTag, args.NewSize().Width, args.NewSize().Height);
-      }));
+  m_sizeChangedMap.insert(
+      {rootTag,
+       view.as<xaml::FrameworkElement>().SizeChanged(
+           winrt::auto_revoke, [this, rootTag](auto &&, xaml::SizeChangedEventArgs const &args) {
+             ApplyLayout(rootTag, args.NewSize().Width, args.NewSize().Height);
+           })});
 }
 
 void NativeUIManager::removeRootView(Microsoft::ReactNative::ShadowNode &shadow) {
   SystraceSection s("NativeUIManager::removeRootView");
   m_tagsToXamlReactControl.erase(shadow.m_tag);
+  m_sizeChangedMap.erase(shadow.m_tag);
   RemoveView(shadow, true);
 }
 

package/Microsoft.ReactNative/Modules/NativeUIManager.h

@@ -118,7 +118,7 @@ class NativeUIManager final : public INativeUIManager {
 
   std::unordered_map<int64_t, YogaNodePtr> m_tagsToYogaNodes;
   std::unordered_map<int64_t, std::unique_ptr<YogaContext>> m_tagsToYogaContext;
-  std::vector<xaml::FrameworkElement::SizeChanged_revoker> m_sizeChangedVector;
+  std::unordered_map<int64_t, xaml::FrameworkElement::SizeChanged_revoker> m_sizeChangedMap;
   std::vector<std::function<void()>> m_batchCompletedCallbacks;
   std::vector<int64_t> m_extraLayoutNodes;
 

package/Microsoft.ReactNative/Modules/PlatformConstantsWinModule.cpp

@@ -10,8 +10,8 @@
 
 namespace Microsoft::ReactNative {
 
-ReactNativeSpecs::PlatformConstantsWinSpec_PlatformConstantsWindows PlatformConstants::GetConstants() noexcept {
-  ReactNativeSpecs::PlatformConstantsWinSpec_PlatformConstantsWindows constants;
+ReactNativeSpecs::PlatformConstantsWindowsSpec_PlatformConstantsWindows PlatformConstants::GetConstants() noexcept {
+  ReactNativeSpecs::PlatformConstantsWindowsSpec_PlatformConstantsWindows constants;
 
   // We don't currently treat Native code differently in a test environment
   constants.isTesting = false;

package/Microsoft.ReactNative/Modules/PlatformConstantsWinModule.h

@@ -2,17 +2,17 @@
 // Licensed under the MIT License.
 #pragma once
 
-#include "codegen/NativePlatformConstantsWinSpec.g.h"
+#include "codegen/NativePlatformConstantsWindowsSpec.g.h"
 #include <NativeModules.h>
 
 namespace Microsoft::ReactNative {
 
 REACT_MODULE(PlatformConstants)
 struct PlatformConstants {
-  using ModuleSpec = ReactNativeSpecs::PlatformConstantsWinSpec;
+  using ModuleSpec = ReactNativeSpecs::PlatformConstantsWindowsSpec;
 
   REACT_GET_CONSTANTS(GetConstants)
-  ReactNativeSpecs::PlatformConstantsWinSpec_PlatformConstantsWindows GetConstants() noexcept;
+  ReactNativeSpecs::PlatformConstantsWindowsSpec_PlatformConstantsWindows GetConstants() noexcept;
 };
 
 } // namespace Microsoft::ReactNative

package/Microsoft.ReactNative/ReactHost/ReactInstanceWin.cpp

@@ -608,8 +608,8 @@ void ReactInstanceWin::InitializeBridgeless() noexcept {
               auto timerManager = std::make_shared<facebook::react::TimerManager>(std::move(timerRegistry));
               timerRegistryRaw->setTimerManager(timerManager);
 
-              auto jsErrorHandlingFunc = [this](facebook::react::MapBuffer errorMap) noexcept {
-                OnJSError(std::move(errorMap));
+              auto jsErrorHandlingFunc = [this](const facebook::react::JsErrorHandler::ParsedError &error) noexcept {
+                OnJSError(std::move(error));
               };
 
               if (devSettings->useDirectDebugger) {
@@ -1239,24 +1239,18 @@ void ReactInstanceWin::OnError(const Mso::ErrorCode &errorCode) noexcept {
 }
 
 #ifdef USE_FABRIC
-void ReactInstanceWin::OnJSError(facebook::react::MapBuffer errorMap) noexcept {
+void ReactInstanceWin::OnJSError(const facebook::react::JsErrorHandler::ParsedError &error) noexcept {
   ErrorInfo errorInfo;
-  errorInfo.Message = errorMap.getString(facebook::react::JSErrorHandlerKey::kErrorMessage);
+  errorInfo.Message = error.message;
   auto errorCode = Mso::React::ReactErrorProvider().MakeErrorCode(Mso::React::ReactError{errorInfo.Message.c_str()});
 
-  std::vector<facebook::react::MapBuffer> frames =
-      errorMap.getMapBufferList(facebook::react::JSErrorHandlerKey::kAllStackFrames);
-  for (const facebook::react::MapBuffer &mapBuffer : frames) {
-    errorInfo.Callstack.push_back(
-        {mapBuffer.getString(facebook::react::JSErrorHandlerKey::kFrameFileName),
-         mapBuffer.getString(facebook::react::JSErrorHandlerKey::kFrameMethodName),
-         mapBuffer.getInt(facebook::react::JSErrorHandlerKey::kFrameLineNumber),
-         mapBuffer.getInt(facebook::react::JSErrorHandlerKey::kFrameColumnNumber)});
+  for (const facebook::react::JsErrorHandler::ParsedError::StackFrame &frame : error.frames) {
+    errorInfo.Callstack.push_back({frame.fileName, frame.methodName, frame.lineNumber, frame.columnNumber});
   }
-  errorInfo.Id = errorMap.getInt(facebook::react::JSErrorHandlerKey::kExceptionId);
-  errorInfo.Id = errorMap.getInt(facebook::react::JSErrorHandlerKey::kExceptionId);
 
-  bool isFatal = errorMap.getBool(facebook::react::JSErrorHandlerKey::kIsFatal);
+  errorInfo.Id = error.exceptionId;
+
+  bool isFatal = error.isFatal;
 
   m_state = ReactInstanceState::HasError;
   AbandonJSCallQueue();
@@ -1325,7 +1319,7 @@ void ReactInstanceWin::DrainJSCallQueue() noexcept {
 
 #ifdef USE_FABRIC
     if (m_bridgelessReactInstance) {
-      m_bridgelessReactInstance->callFunctionOnModule(entry.ModuleName, entry.MethodName, entry.Args);
+      m_bridgelessReactInstance->callFunctionOnModule(entry.ModuleName, entry.MethodName, std::move(entry.Args));
     } else
 #endif
         if (auto instance = m_instance.LoadWithLock()) {
@@ -1364,7 +1358,7 @@ void ReactInstanceWin::CallJsFunction(
   if (shouldCall) {
 #ifdef USE_FABRIC
     if (m_bridgelessReactInstance) {
-      m_bridgelessReactInstance->callFunctionOnModule(moduleName, method, params);
+      m_bridgelessReactInstance->callFunctionOnModule(moduleName, method, std::move(params));
     } else
 #endif
         if (auto instance = m_instance.LoadWithLock()) {

package/Microsoft.ReactNative/ReactHost/ReactInstanceWin.h

@@ -141,7 +141,7 @@ class ReactInstanceWin final : public Mso::ActiveObject<IReactInstanceInternal>
   void OnError(const Mso::ErrorCode &errorcode) noexcept;
   void OnErrorWithMessage(const std::string &errorMessage) noexcept;
 #ifdef USE_FABRIC
-  void OnJSError(facebook::react::MapBuffer errorMap) noexcept;
+  void OnJSError(const facebook::react::JsErrorHandler::ParsedError &error) noexcept;
 #endif
   void OnLiveReload() noexcept;
   void OnWaitingForDebugger() noexcept;

package/Microsoft.ReactNative/Timer.idl

@@ -2,9 +2,7 @@
 // Licensed under the MIT License.
 
 #include "DocString.h"
-import "IJSValueReader.idl";
-import "IJSValueWriter.idl";
-import "Theme.idl";
+import "IReactPropertyBag.idl";
 
 namespace Microsoft.ReactNative {
 

package/Microsoft.ReactNative/Utils/BatchingEventEmitter.cpp

@@ -147,7 +147,7 @@ void BatchingEventEmitter::OnFrameUI() noexcept {
   });
 
   // Don't leave the callback continuously registered as it can waste power.
-  // See https://docs.microsoft.com/en-us/uwp/api/windows.ui.xaml.media.compositiontarget.rendering?view=winrt-19041
+  // See https://docs.microsoft.com/en-us/uwp/api/windows.ui.xaml.media.compositiontarget.rendering?view=winrt-22621
   m_renderingRevoker.revoke();
 }
 

package/Microsoft.ReactNative/Utils/LocalBundleReader.cpp

@@ -59,11 +59,10 @@ std::future<std::string> LocalBundleReader::LoadBundleAsync(const std::wstring b
   winrt::Windows::Storage::StorageFile file{nullptr};
 
   // Supports "ms-appx://" or "ms-appdata://"
-  // TODO: Replace call to private string function with C++ 20 `starts_with`
-  if (bundleUri._Starts_with(L"ms-app")) {
+  if (bundleUri.starts_with(L"ms-app")) {
     winrt::Windows::Foundation::Uri uri(bundleUri);
     file = co_await winrt::Windows::Storage::StorageFile::GetFileFromApplicationUriAsync(uri);
-  } else if (bundleUri._Starts_with(L"resource://")) {
+  } else if (bundleUri.starts_with(L"resource://")) {
     winrt::Windows::Foundation::Uri uri(bundleUri);
     co_return GetBundleFromEmbeddedResource(uri);
   } else {