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

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

@@ -65,14 +65,13 @@ struct ScrollBarComponent {
 
     updateShy(true);
     onScaleChanged();
-    UpdateColorForScrollBarRegions();
+    OnThemeChanged();
   }
 
-  void UpdateColorForScrollBarRegions() noexcept {
+  void OnThemeChanged() noexcept {
     updateHighlight(ScrollbarHitRegion::ArrowFirst);
     updateHighlight(ScrollbarHitRegion::ArrowLast);
     updateHighlight(ScrollbarHitRegion::Thumb);
-
     m_trackVisual.Brush(
         winrt::get_self<winrt::Microsoft::ReactNative::Composition::implementation::Theme>(m_outer.Theme())
             ->InternalPlatformBrush(L"ScrollBarTrackFill"));
@@ -727,14 +726,6 @@ void ScrollViewComponentView::updateProps(
 
   // update BaseComponentView props
   base_type::updateProps(props, oldProps);
-
-  // Update the color only after updating the m_props in BaseComponentView
-  // to avoid scrollbarcomponents reading outdated scrollEnabled value.
-  if (!oldProps || oldViewProps.scrollEnabled != newViewProps.scrollEnabled) {
-    m_scrollVisual.ScrollEnabled(newViewProps.scrollEnabled);
-    m_horizontalScrollbarComponent->UpdateColorForScrollBarRegions();
-    m_verticalScrollbarComponent->UpdateColorForScrollBarRegions();
-  }
 }
 
 void ScrollViewComponentView::updateState(
@@ -834,8 +825,8 @@ void ScrollViewComponentView::OnPointerDown(const winrt::Windows::UI::Input::Poi
 
 void ScrollViewComponentView::onThemeChanged() noexcept {
   updateBackgroundColor(std::static_pointer_cast<const facebook::react::ScrollViewProps>(viewProps())->backgroundColor);
-  m_verticalScrollbarComponent->UpdateColorForScrollBarRegions();
-  m_horizontalScrollbarComponent->UpdateColorForScrollBarRegions();
+  m_verticalScrollbarComponent->OnThemeChanged();
+  m_horizontalScrollbarComponent->OnThemeChanged();
   Super::onThemeChanged();
 }
 
@@ -928,10 +919,6 @@ void ScrollViewComponentView::OnKeyDown(
 }
 
 bool ScrollViewComponentView::scrollToEnd(bool animate) noexcept {
-  if (!std::static_pointer_cast<const facebook::react::ScrollViewProps>(viewProps())->scrollEnabled) {
-    return false;
-  }
-
   if ((((m_contentSize.height - m_layoutMetrics.frame.size.height) * m_layoutMetrics.pointScaleFactor) -
        m_scrollVisual.ScrollPosition().y) < 1.0f) {
     return false;
@@ -944,10 +931,6 @@ bool ScrollViewComponentView::scrollToEnd(bool animate) noexcept {
 }
 
 bool ScrollViewComponentView::scrollToStart(bool animate) noexcept {
-  if (!std::static_pointer_cast<const facebook::react::ScrollViewProps>(viewProps())->scrollEnabled) {
-    return false;
-  }
-
   m_scrollVisual.TryUpdatePosition({0.0f, 0.0f, 0.0f}, animate);
   return true;
 }
@@ -977,10 +960,6 @@ bool ScrollViewComponentView::lineRight(bool animate) noexcept {
 }
 
 bool ScrollViewComponentView::scrollDown(float delta, bool animate) noexcept {
-  if (!std::static_pointer_cast<const facebook::react::ScrollViewProps>(viewProps())->scrollEnabled) {
-    return false;
-  }
-
   if (((m_contentSize.height - m_layoutMetrics.frame.size.height) * m_layoutMetrics.pointScaleFactor) -
           m_scrollVisual.ScrollPosition().y <
       1.0f) {
@@ -992,10 +971,6 @@ bool ScrollViewComponentView::scrollDown(float delta, bool animate) noexcept {
 }
 
 bool ScrollViewComponentView::scrollUp(float delta, bool animate) noexcept {
-  if (!std::static_pointer_cast<const facebook::react::ScrollViewProps>(viewProps())->scrollEnabled) {
-    return false;
-  }
-
   if (m_scrollVisual.ScrollPosition().y <= 0.0f) {
     return false;
   }
@@ -1005,10 +980,6 @@ bool ScrollViewComponentView::scrollUp(float delta, bool animate) noexcept {
 }
 
 bool ScrollViewComponentView::scrollLeft(float delta, bool animate) noexcept {
-  if (!std::static_pointer_cast<const facebook::react::ScrollViewProps>(viewProps())->scrollEnabled) {
-    return false;
-  }
-
   if (m_scrollVisual.ScrollPosition().x <= 0.0f) {
     return false;
   }
@@ -1018,10 +989,6 @@ bool ScrollViewComponentView::scrollLeft(float delta, bool animate) noexcept {
 }
 
 bool ScrollViewComponentView::scrollRight(float delta, bool animate) noexcept {
-  if (!std::static_pointer_cast<const facebook::react::ScrollViewProps>(viewProps())->scrollEnabled) {
-    return false;
-  }
-
   if (((m_contentSize.width - m_layoutMetrics.frame.size.width) * m_layoutMetrics.pointScaleFactor) -
           m_scrollVisual.ScrollPosition().x <
       1.0f) {
@@ -1058,10 +1025,6 @@ void ScrollViewComponentView::HandleCommand(
 }
 
 void ScrollViewComponentView::scrollTo(winrt::Windows::Foundation::Numerics::float3 offset, bool animate) noexcept {
-  if (!std::static_pointer_cast<const facebook::react::ScrollViewProps>(viewProps())->scrollEnabled) {
-    return;
-  }
-
   m_scrollVisual.TryUpdatePosition(offset, animate);
 }
 
@@ -1134,7 +1097,7 @@ void ScrollViewComponentView::StartBringIntoView(
     scrollToHorizontal = options.TargetRect->getMidX() - (viewerWidth * options.HorizontalAlignmentRatio);
   }
 
-  if (needsScroll && std::static_pointer_cast<const facebook::react::ScrollViewProps>(viewProps())->scrollEnabled) {
+  if (needsScroll) {
     m_scrollVisual.TryUpdatePosition(
         {static_cast<float>(scrollToHorizontal), static_cast<float>(scrollToVertical), 0.0f}, options.AnimationDesired);
   }
@@ -1175,7 +1138,7 @@ winrt::Microsoft::ReactNative::Composition::Experimental::IVisual ScrollViewComp
         updateStateWithContentOffset();
         auto eventEmitter = GetEventEmitter();
         if (eventEmitter) {
-          facebook::react::ScrollViewMetrics scrollMetrics;
+          facebook::react::ScrollViewEventEmitter::Metrics scrollMetrics;
           scrollMetrics.containerSize.height = m_layoutMetrics.frame.size.height;
           scrollMetrics.containerSize.width = m_layoutMetrics.frame.size.width;
           scrollMetrics.contentOffset.x = args.Position().x / m_layoutMetrics.pointScaleFactor;

package/Microsoft.ReactNative/Fabric/Composition/TextInput/WindowsTextInputComponentView.cpp

@@ -11,7 +11,6 @@
 #include <Utils/ValueUtils.h>
 #include <tom.h>
 #include <unicode.h>
-#include <winrt/Microsoft.UI.Input.h>
 #include <winrt/Windows.System.h>
 #include <winrt/Windows.UI.h>
 #include "../CompositionHelpers.h"
@@ -755,8 +754,8 @@ void WindowsTextInputComponentView::OnKeyDown(
   // Do not forward tab keys into the TextInput, since we want that to do the tab loop instead.  This aligns with WinUI
   // behavior We do forward Ctrl+Tab to the textinput.
   if (args.Key() != winrt::Windows::System::VirtualKey::Tab ||
-      (source.GetKeyState(winrt::Windows::System::VirtualKey::Control) &
-       winrt::Microsoft::UI::Input::VirtualKeyStates::Down) == winrt::Microsoft::UI::Input::VirtualKeyStates::Down) {
+      source.GetKeyState(winrt::Windows::System::VirtualKey::Control) ==
+          winrt::Windows::UI::Core::CoreVirtualKeyStates::Down) {
     WPARAM wParam = static_cast<WPARAM>(args.Key());
     LPARAM lParam = 0;
     lParam = args.KeyStatus().RepeatCount; // bits 0-15
@@ -785,8 +784,8 @@ void WindowsTextInputComponentView::OnKeyUp(
   // Do not forward tab keys into the TextInput, since we want that to do the tab loop instead.  This aligns with WinUI
   // behavior We do forward Ctrl+Tab to the textinput.
   if (args.Key() != winrt::Windows::System::VirtualKey::Tab ||
-      (source.GetKeyState(winrt::Windows::System::VirtualKey::Control) &
-       winrt::Microsoft::UI::Input::VirtualKeyStates::Down) == winrt::Microsoft::UI::Input::VirtualKeyStates::Down) {
+      source.GetKeyState(winrt::Windows::System::VirtualKey::Control) ==
+          winrt::Windows::UI::Core::CoreVirtualKeyStates::Down) {
     WPARAM wParam = static_cast<WPARAM>(args.Key());
     LPARAM lParam = 1;
     lParam = args.KeyStatus().RepeatCount; // bits 0-15
@@ -824,21 +823,16 @@ bool WindowsTextInputComponentView::ShouldSubmit(
       // If 'submitKeyEvents' are supplied, use them to determine whether to emit onSubmitEditing' for either
       // single-line or multi-line TextInput
       if (args.KeyCode() == '\r') {
-        bool shiftDown = (source.GetKeyState(winrt::Windows::System::VirtualKey::Shift) &
-                          winrt::Microsoft::UI::Input::VirtualKeyStates::Down) ==
-            winrt::Microsoft::UI::Input::VirtualKeyStates::Down;
-        bool ctrlDown = (source.GetKeyState(winrt::Windows::System::VirtualKey::Control) &
-                         winrt::Microsoft::UI::Input::VirtualKeyStates::Down) ==
-            winrt::Microsoft::UI::Input::VirtualKeyStates::Down;
-        bool altDown = (source.GetKeyState(winrt::Windows::System::VirtualKey::Control) &
-                        winrt::Microsoft::UI::Input::VirtualKeyStates::Down) ==
-            winrt::Microsoft::UI::Input::VirtualKeyStates::Down;
-        bool metaDown = (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 shiftDown = source.GetKeyState(winrt::Windows::System::VirtualKey::Shift) ==
+            winrt::Windows::UI::Core::CoreVirtualKeyStates::Down;
+        bool ctrlDown = source.GetKeyState(winrt::Windows::System::VirtualKey::Control) ==
+            winrt::Windows::UI::Core::CoreVirtualKeyStates::Down;
+        bool altDown = source.GetKeyState(winrt::Windows::System::VirtualKey::Control) ==
+            winrt::Windows::UI::Core::CoreVirtualKeyStates::Down;
+        bool metaDown = source.GetKeyState(winrt::Windows::System::VirtualKey::LeftWindows) ==
+                winrt::Windows::UI::Core::CoreVirtualKeyStates::Down ||
+            source.GetKeyState(winrt::Windows::System::VirtualKey::RightWindows) ==
+                winrt::Windows::UI::Core::CoreVirtualKeyStates::Down;
         return (submitKeyEvent.shiftKey && shiftDown) || (submitKeyEvent.ctrlKey && ctrlDown) ||
             (submitKeyEvent.altKey && altDown) || (submitKeyEvent.metaKey && metaDown) ||
             (!submitKeyEvent.shiftKey && !submitKeyEvent.altKey && !submitKeyEvent.metaKey && !submitKeyEvent.altKey &&
@@ -859,8 +853,8 @@ void WindowsTextInputComponentView::OnCharacterReceived(
   // Do not forward tab keys into the TextInput, since we want that to do the tab loop instead.  This aligns with WinUI
   // behavior We do forward Ctrl+Tab to the textinput.
   if ((args.KeyCode() == '\t') &&
-      ((source.GetKeyState(winrt::Windows::System::VirtualKey::Control) &
-        winrt::Microsoft::UI::Input::VirtualKeyStates::Down) != winrt::Microsoft::UI::Input::VirtualKeyStates::Down)) {
+      (source.GetKeyState(winrt::Windows::System::VirtualKey::Control) !=
+       winrt::Windows::UI::Core::CoreVirtualKeyStates::Down)) {
     return;
   }
 
@@ -953,6 +947,10 @@ void WindowsTextInputComponentView::onGotFocus(
     LRESULT lresult;
     DrawBlock db(*this);
     m_textServices->TxSendMessage(WM_SETFOCUS, 0, 0, &lresult);
+
+    if (windowsTextInputProps().clearTextOnFocus) {
+      m_textServices->TxSetText(L"");
+    }
   }
 }
 
@@ -1118,8 +1116,6 @@ void WindowsTextInputComponentView::updateState(
     return;
   }
 
-  auto data = m_state->getData();
-
   if (!oldState) {
     m_mostRecentEventCount = m_state->getData().mostRecentEventCount;
   }
@@ -1128,19 +1124,11 @@ void WindowsTextInputComponentView::updateState(
     m_comingFromState = true;
     // Only handle single/empty fragments right now -- ignore the other fragments
 
-    LRESULT res;
-    CHARRANGE cr;
-    cr.cpMin = cr.cpMax = 0;
-    winrt::check_hresult(m_textServices->TxSendMessage(EM_EXGETSEL, 0, reinterpret_cast<LPARAM>(&cr), &res));
-
     UpdateText(
         m_state->getData().attributedString.getFragments().size()
             ? m_state->getData().attributedString.getFragments()[0].string
             : "");
 
-    winrt::check_hresult(
-        m_textServices->TxSendMessage(EM_SETSEL, static_cast<WPARAM>(cr.cpMin), static_cast<LPARAM>(cr.cpMax), &res));
-
     m_comingFromState = false;
   }
 }
@@ -1159,7 +1147,8 @@ void WindowsTextInputComponentView::UpdateText(const std::string &str) noexcept
   winrt::check_hresult(m_textServices->TxSendMessage(
       EM_SETTEXTEX, reinterpret_cast<WPARAM>(&stt), reinterpret_cast<LPARAM>(str.c_str()), &res));
 
-  winrt::check_hresult(m_textServices->TxSendMessage(EM_EXGETSEL, 0, reinterpret_cast<LPARAM>(&cr), &res));
+  winrt::check_hresult(
+      m_textServices->TxSendMessage(EM_SETSEL, static_cast<WPARAM>(cr.cpMin), static_cast<LPARAM>(cr.cpMax), &res));
 
   // enable colored emojis
   winrt::check_hresult(
@@ -1222,7 +1211,7 @@ void WindowsTextInputComponentView::OnTextUpdated() noexcept {
 }
 
 void WindowsTextInputComponentView::OnSelectionChanged(LONG start, LONG end) noexcept {
-  if (m_eventEmitter /* && !m_comingFromJS ?? */) {
+  if (m_eventEmitter && !m_comingFromState /* && !m_comingFromJS ?? */) {
     auto emitter = std::static_pointer_cast<const facebook::react::WindowsTextInputEventEmitter>(m_eventEmitter);
     facebook::react::WindowsTextInputEventEmitter::OnSelectionChange onSelectionChangeArgs;
     onSelectionChangeArgs.selection.start = start;

package/Microsoft.ReactNative/Fabric/Composition/TextInput/WindowsTextInputShadowNode.cpp

@@ -185,8 +185,7 @@ Size WindowsTextInputShadowNode::measureContent(
           AttributedStringBox{attributedString},
           {}, // TODO getConcreteProps().paragraphAttributes,
           textLayoutContext,
-          layoutConstraints,
-          nullptr)
+          layoutConstraints)
       .size;
 }
 

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

@@ -285,9 +285,15 @@ ImageResponseOrImageErrorInfo ImageResponse::ResolveImage() {
 
 ImageResponseOrImageErrorInfo ImageFailedResponse::ResolveImage() {
   ImageResponseOrImageErrorInfo imageOrError;
-  imageOrError.errorInfo = winrt::to_string(m_errorMessage);
-  if (imageOrError.errorInfo.empty()) {
-    imageOrError.errorInfo = "Failed to load image.";
+  imageOrError.errorInfo = std::make_shared<facebook::react::ImageErrorInfo>();
+  imageOrError.errorInfo->responseCode = static_cast<int>(m_statusCode);
+  imageOrError.errorInfo->error = winrt::to_string(m_errorMessage);
+  if (imageOrError.errorInfo->error.empty()) {
+    imageOrError.errorInfo->error = "Failed to load image.";
+  }
+  for (auto &&[header, value] : m_responseHeaders) {
+    imageOrError.errorInfo->httpResponseHeaders.push_back(
+        std::make_pair<std::string, std::string>(winrt::to_string(header), winrt::to_string(value)));
   }
   return imageOrError;
 }

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

@@ -41,7 +41,7 @@ winrt::Microsoft::ReactNative::Composition::ImageSource MakeImageSource(
 
 struct ImageResponseOrImageErrorInfo {
   std::shared_ptr<winrt::Microsoft::ReactNative::Composition::implementation::ImageResponseImage> image;
-  std::string errorInfo;
+  std::shared_ptr<facebook::react::ImageErrorInfo> errorInfo;
 };
 
 struct ImageResponse : ImageResponseT<ImageResponse /*, IResolveImage*/> {

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 =
@@ -194,17 +182,7 @@ void FabricUIManager::constraintSurfaceLayout(
   m_surfaceManager->constraintSurfaceLayout(surfaceId, layoutConstraints, layoutContext);
 }
 
-winrt::Microsoft::ReactNative::ReactNotificationId<facebook::react::SurfaceId>
-FabricUIManager::NotifyMountedId() noexcept {
-  return {L"ReactNative.Fabric", L"Mounted"};
-}
-
-void FabricUIManager::didMountComponentsWithRootTag(facebook::react::SurfaceId surfaceId) noexcept {
-  m_context.UIDispatcher().Post([context = m_context, self = shared_from_this(), surfaceId]() {
-    self->m_scheduler->reportMount(surfaceId);
-    context.Notifications().SendNotification(NotifyMountedId(), surfaceId);
-  });
-}
+void FabricUIManager::didMountComponentsWithRootTag(facebook::react::SurfaceId surfaceId) noexcept {}
 
 void FabricUIManager::RCTPerformMountInstructions(
     facebook::react::ShadowViewMutationList const &mutations,
@@ -222,25 +200,11 @@ void FabricUIManager::RCTPerformMountInstructions(
       }
 
       case facebook::react::ShadowViewMutation::Delete: {
-// #define DETECT_COMPONENT_OUTLIVE_DELETE_MUTATION
-#ifdef DETECT_COMPONENT_OUTLIVE_DELETE_MUTATION
-        winrt::weak_ref<winrt::Microsoft::ReactNative::ComponentView> wkView;
-#endif
-        {
-          auto &oldChildShadowView = mutation.oldChildShadowView;
-          auto &oldChildViewDescriptor = m_registry.componentViewDescriptorWithTag(oldChildShadowView.tag);
-          // observerCoordinator.unregisterViewComponentDescriptor(oldChildViewDescriptor, surfaceId);
-#ifdef DETECT_COMPONENT_OUTLIVE_DELETE_MUTATION
-          wkView = winrt::make_weak(oldChildViewDescriptor.view);
-#endif
-          m_registry.enqueueComponentViewWithComponentHandle(
-              oldChildShadowView.componentHandle, oldChildShadowView.tag, oldChildViewDescriptor);
-        }
-#ifdef DETECT_COMPONENT_OUTLIVE_DELETE_MUTATION
-        // After handling a delete mutation, nothing should be holding on to the view.  If there is thats an indication
-        // of a leak, or at least something holding on to a view longer than it should
-        assert(!wkView.get());
-#endif
+        auto &oldChildShadowView = mutation.oldChildShadowView;
+        auto &oldChildViewDescriptor = m_registry.componentViewDescriptorWithTag(oldChildShadowView.tag);
+        // observerCoordinator.unregisterViewComponentDescriptor(oldChildViewDescriptor, surfaceId);
+        m_registry.enqueueComponentViewWithComponentHandle(
+            oldChildShadowView.componentHandle, oldChildShadowView.tag, oldChildViewDescriptor);
         break;
       }
 
@@ -348,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
 
@@ -362,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

@@ -52,8 +52,6 @@ struct FabricUIManager final : public std::enable_shared_from_this<FabricUIManag
   winrt::Microsoft::ReactNative::ReactNativeIsland GetReactNativeIsland(
       facebook::react::SurfaceId surfaceId) const noexcept;
 
-  static winrt::Microsoft::ReactNative::ReactNotificationId<facebook::react::SurfaceId> NotifyMountedId() noexcept;
-
  private:
   void installFabricUIManager() noexcept;
   void initiateTransaction(facebook::react::MountingCoordinator::Shared mountingCoordinator);
@@ -81,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};
   }
 }
 
@@ -87,11 +95,6 @@ WindowsImageManager::GetImageRandomAccessStreamAsync(ReactImageSource source) co
     }
 
     winrt::Windows::Storage::StorageFile file(co_await getFileSync);
-
-    if (!file) {
-      co_return winrt::Microsoft::ReactNative::Composition::ImageFailedResponse(L"Failed to get file.");
-    }
-
     co_return winrt::Microsoft::ReactNative::Composition::StreamImageResponse(co_await file.OpenReadAsync());
   }
 
@@ -171,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: {
@@ -202,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;
     }
@@ -227,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