react-native-windows 0.76.11 → 0.76.13

package/Microsoft.ReactNative/Fabric/FabricUIManagerModule.h

@@ -6,13 +6,13 @@
 #include <NativeModules.h>
 #include <React.h>
 #include <react/renderer/scheduler/SchedulerDelegate.h>
-#include <react/renderer/scheduler/SurfaceManager.h>
 #include <winrt/Windows.UI.Composition.h>
 #include "Composition/ComponentViewRegistry.h"
 
 namespace facebook::react {
 class Scheduler;
 class ReactNativeConfig;
+class SurfaceHandler;
 } // namespace facebook::react
 
 namespace Microsoft::ReactNative {
@@ -47,6 +47,8 @@ struct FabricUIManager final : public std::enable_shared_from_this<FabricUIManag
       const facebook::react::LayoutConstraints &layoutConstraints,
       const facebook::react::LayoutContext &layoutContext) const noexcept;
 
+  void setProps(facebook::react::SurfaceId surfaceId, const folly::dynamic &props) const noexcept;
+
   const IComponentViewRegistry &GetViewRegistry() const noexcept;
 
   static winrt::Microsoft::ReactNative::ReactNotificationId<facebook::react::SurfaceId> NotifyMountedId() noexcept;
@@ -62,10 +64,13 @@ struct FabricUIManager final : public std::enable_shared_from_this<FabricUIManag
       facebook::react::SurfaceId surfaceId);
   void didMountComponentsWithRootTag(facebook::react::SurfaceId surfaceId) noexcept;
 
+  void visit(
+      facebook::react::SurfaceId surfaceId,
+      const std::function<void(const facebook::react::SurfaceHandler &surfaceHandler)> &callback) const noexcept;
+
   winrt::Microsoft::ReactNative::ReactContext m_context;
   winrt::Microsoft::ReactNative::Composition::Experimental::ICompositionContext m_compContext;
   std::shared_ptr<facebook::react::Scheduler> m_scheduler;
-  std::shared_ptr<facebook::react::SurfaceManager> m_surfaceManager;
   std::mutex m_schedulerMutex; // Protect m_scheduler
   bool m_transactionInFlight{false};
   bool m_followUpTransactionRequired{false};
@@ -77,6 +82,9 @@ struct FabricUIManager final : public std::enable_shared_from_this<FabricUIManag
 
   std::unordered_map<facebook::react::SurfaceId, SurfaceInfo> m_surfaceRegistry;
 
+  std::unordered_map<facebook::react::SurfaceId, facebook::react::SurfaceHandler> m_handlerRegistry{};
+  mutable std::shared_mutex m_handlerMutex;
+
   // Inherited via SchedulerDelegate
   virtual void schedulerDidFinishTransaction(
       const facebook::react::MountingCoordinator::Shared &mountingCoordinator) override;

package/Microsoft.ReactNative/Fabric/ImageRequestParams.cpp

@@ -0,0 +1,26 @@
+// Copyright (c) Microsoft Corporation.
+// Licensed under the MIT License.
+
+#pragma once
+
+#include <react/renderer/graphics/Float.h>
+
+namespace facebook::react {
+
+class ImageRequestParams {
+ public:
+  ImageRequestParams() = default;
+  explicit ImageRequestParams(Float blurRadius) : blurRadius(blurRadius) {}
+
+  Float blurRadius{};
+
+  bool operator==(const ImageRequestParams &rhs) const {
+    return this->blurRadius == rhs.blurRadius;
+  }
+
+  bool operator!=(const ImageRequestParams &rhs) const {
+    return !(*this == rhs);
+  }
+};
+
+} // namespace facebook::react

package/Microsoft.ReactNative/Fabric/WindowsImageManager.cpp

@@ -78,7 +78,9 @@ wicBitmapSourceFromStream(const winrt::Windows::Storage::Streams::IRandomAccessS
 }
 
 winrt::Windows::Foundation::IAsyncOperation<winrt::Microsoft::ReactNative::Composition::ImageResponse>
-WindowsImageManager::GetImageRandomAccessStreamAsync(ReactImageSource source) const {
+WindowsImageManager::GetImageRandomAccessStreamAsync(
+    ReactImageSource source,
+    std::function<void(uint64_t loaded, uint64_t total)> progressCallback) const {
   co_await winrt::resume_background();
 
   winrt::Windows::Foundation::Uri uri(winrt::to_hstring(source.uri));
@@ -123,6 +125,12 @@ WindowsImageManager::GetImageRandomAccessStreamAsync(ReactImageSource source) co
     }
   }
 
+  if (!source.body.empty()) {
+    auto bodyContent = winrt::Windows::Web::Http::HttpStringContent(
+        winrt::to_hstring(source.body), winrt::Windows::Storage::Streams::UnicodeEncoding::Utf8, L"application/json");
+    request.Content(bodyContent);
+  }
+
   winrt::Windows::Web::Http::HttpResponseMessage response(co_await m_httpClient.SendRequestAsync(request));
 
   if (!response.IsSuccessStatusCode()) {
@@ -130,8 +138,29 @@ WindowsImageManager::GetImageRandomAccessStreamAsync(ReactImageSource source) co
         response.ReasonPhrase(), response.StatusCode(), response.Headers());
   }
 
+  auto inputStream = co_await response.Content().ReadAsInputStreamAsync();
+  auto contentLengthRef = response.Content().Headers().ContentLength();
+  uint64_t total = contentLengthRef ? contentLengthRef.GetUInt64() : 0;
+  uint64_t loaded = 0;
+
   winrt::Windows::Storage::Streams::InMemoryRandomAccessStream memoryStream;
-  co_await response.Content().WriteToStreamAsync(memoryStream);
+  winrt::Windows::Storage::Streams::DataReader reader(inputStream);
+  constexpr uint32_t bufferSize = 16 * 1024;
+
+  while (true) {
+    uint32_t loadedBuffer = co_await reader.LoadAsync(bufferSize);
+    if (loadedBuffer == 0)
+      break;
+
+    auto buffer = reader.ReadBuffer(loadedBuffer);
+    co_await memoryStream.WriteAsync(buffer);
+    loaded += loadedBuffer;
+
+    if (progressCallback) {
+      progressCallback(loaded, total);
+    }
+  }
+
   memoryStream.Seek(0);
 
   co_return winrt::Microsoft::ReactNative::Composition::StreamImageResponse(memoryStream.CloneStream());
@@ -160,7 +189,13 @@ facebook::react::ImageRequest WindowsImageManager::requestImage(
     source.width = imageSource.size.width;
     source.sourceType = ImageSourceType::Download;
 
-    imageResponseTask = GetImageRandomAccessStreamAsync(source);
+    auto progressCallback = [weakObserverCoordinator](int64_t loaded, int64_t total) {
+      if (auto observerCoordinator = weakObserverCoordinator.lock()) {
+        float progress = total > 0 ? static_cast<float>(loaded) / static_cast<float>(total) : 1.0f;
+        observerCoordinator->nativeImageResponseProgress(progress, loaded, total);
+      }
+    };
+    imageResponseTask = GetImageRandomAccessStreamAsync(source, progressCallback);
   }
 
   imageResponseTask.Completed([weakObserverCoordinator](auto asyncOp, auto status) {
@@ -195,11 +230,6 @@ facebook::react::ImageRequest WindowsImageManager::requestImage(
         observerCoordinator->nativeImageResponseFailed(facebook::react::ImageLoadError(errorInfo));
         break;
       }
-      case winrt::Windows::Foundation::AsyncStatus::Started: {
-        // TODO progress? - Can we register for progress off the download task?
-        // observerCoordinator->nativeImageResponseProgress(0.0/*progress*/, 0/*completed*/, 0/*total*/);
-        break;
-      }
     }
   });
   return imageRequest;

package/Microsoft.ReactNative/Fabric/WindowsImageManager.h

@@ -22,7 +22,9 @@ struct WindowsImageManager {
 
  private:
   winrt::Windows::Foundation::IAsyncOperation<winrt::Microsoft::ReactNative::Composition::ImageResponse>
-  GetImageRandomAccessStreamAsync(ReactImageSource source) const;
+  GetImageRandomAccessStreamAsync(
+      ReactImageSource source,
+      std::function<void(uint64_t loaded, uint64_t total)> progressCallback) const;
 
   winrt::Windows::Web::Http::HttpClient m_httpClient;
   winrt::Microsoft::ReactNative::ReactContext m_reactContext;

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

@@ -16,11 +16,60 @@
 
 namespace facebook::react {
 
+// Creates an empty InlineObject since RN handles actually rendering the Inline object, this just reserves space for it.
+class AttachmentInlineObject : public winrt::implements<AttachmentInlineObject, IDWriteInlineObject> {
+ public:
+  AttachmentInlineObject(float width, float height) : m_width(width), m_height(height) {}
+
+  // IDWriteInlineObject methods
+  STDMETHOD(Draw)
+  (_In_opt_ void *clientDrawingContext,
+   _In_ IDWriteTextRenderer *renderer,
+   FLOAT originX,
+   FLOAT originY,
+   BOOL isSideways,
+   BOOL isRightToLeft,
+   _In_opt_ IUnknown *clientDrawingEffect) override {
+    // We don't need to draw anything here since the actual rendering is handled by React Native
+    return S_OK;
+  }
+
+  STDMETHOD(GetMetrics)(_Out_ DWRITE_INLINE_OBJECT_METRICS *metrics) override {
+    metrics->width = m_width;
+    metrics->height = m_height;
+    metrics->baseline =
+        m_height; // If the baseline is at the bottom, then baseline = height
+                  // (https://learn.microsoft.com/en-us/windows/win32/api/dwrite/ns-dwrite-dwrite_inline_object_metrics)
+    metrics->supportsSideways = true;
+    return S_OK;
+  }
+
+  STDMETHOD(GetOverhangMetrics)(_Out_ DWRITE_OVERHANG_METRICS *overhangs) override {
+    overhangs->left = 0;
+    overhangs->top = 0;
+    overhangs->right = 0;
+    overhangs->bottom = 0;
+    return S_OK;
+  }
+
+  STDMETHOD(GetBreakConditions)
+  (_Out_ DWRITE_BREAK_CONDITION *breakConditionBefore, _Out_ DWRITE_BREAK_CONDITION *breakConditionAfter) override {
+    *breakConditionBefore = DWRITE_BREAK_CONDITION_NEUTRAL;
+    *breakConditionAfter = DWRITE_BREAK_CONDITION_NEUTRAL;
+    return S_OK;
+  }
+
+ private:
+  float m_width;
+  float m_height;
+};
+
 void TextLayoutManager::GetTextLayout(
     const AttributedStringBox &attributedStringBox,
     const ParagraphAttributes &paragraphAttributes,
     Size size,
-    winrt::com_ptr<IDWriteTextLayout> &spTextLayout) noexcept {
+    winrt::com_ptr<IDWriteTextLayout> &spTextLayout,
+    TextMeasurement::Attachments &attachments) noexcept {
   const auto &attributedString = attributedStringBox.getValue();
   auto fragments = attributedString.getFragments();
   auto outerFragment = fragments[0];
@@ -62,6 +111,7 @@ void TextLayoutManager::GetTextLayout(
         outerFragment.textAttributes.lineHeight * 0.8f));
   }
 
+  // Set text alignment
   DWRITE_TEXT_ALIGNMENT alignment = DWRITE_TEXT_ALIGNMENT_LEADING;
   if (outerFragment.textAttributes.alignment) {
     switch (*outerFragment.textAttributes.alignment) {
@@ -87,6 +137,7 @@ void TextLayoutManager::GetTextLayout(
   }
   winrt::check_hresult(spTextFormat->SetTextAlignment(alignment));
 
+  // Get text with Object Replacement Characters for attachments
   auto str = GetTransformedText(attributedStringBox);
 
   winrt::check_hresult(Microsoft::ReactNative::DWriteFactory()->CreateTextLayout(
@@ -98,39 +149,75 @@ void TextLayoutManager::GetTextLayout(
       spTextLayout.put() // The IDWriteTextLayout interface pointer.
       ));
 
+  // Calculate positions for attachments and set inline objects
   unsigned int position = 0;
-  unsigned int length = 0;
   for (const auto &fragment : fragments) {
-    length = static_cast<UINT32>(fragment.string.length());
-    DWRITE_TEXT_RANGE range = {position, length};
-    TextAttributes attributes = fragment.textAttributes;
-    DWRITE_FONT_STYLE fragmentStyle = DWRITE_FONT_STYLE_NORMAL;
-    if (attributes.fontStyle == facebook::react::FontStyle::Italic)
-      fragmentStyle = DWRITE_FONT_STYLE_ITALIC;
-    else if (attributes.fontStyle == facebook::react::FontStyle::Oblique)
-      fragmentStyle = DWRITE_FONT_STYLE_OBLIQUE;
-
-    winrt::check_hresult(spTextLayout->SetFontFamilyName(
-        attributes.fontFamily.empty() ? L"Segoe UI"
-                                      : Microsoft::Common::Unicode::Utf8ToUtf16(attributes.fontFamily).c_str(),
-        range));
-    winrt::check_hresult(spTextLayout->SetFontWeight(
-        static_cast<DWRITE_FONT_WEIGHT>(
-            attributes.fontWeight.value_or(static_cast<facebook::react::FontWeight>(DWRITE_FONT_WEIGHT_REGULAR))),
-        range));
-    winrt::check_hresult(spTextLayout->SetFontStyle(fragmentStyle, range));
-    winrt::check_hresult(spTextLayout->SetFontSize(
-        (attributes.allowFontScaling.value_or(true) && !std::isnan(attributes.fontSizeMultiplier))
-            ? (attributes.fontSizeMultiplier * attributes.fontSize)
-            : attributes.fontSize,
-        range));
-
-    if (!isnan(attributes.letterSpacing)) {
-      winrt::check_hresult(
-          spTextLayout.as<IDWriteTextLayout1>()->SetCharacterSpacing(0, attributes.letterSpacing, 0, range));
-    }
+    if (fragment.isAttachment()) {
+      float width = fragment.parentShadowView.layoutMetrics.frame.size.width;
+      float height = fragment.parentShadowView.layoutMetrics.frame.size.height;
+
+      // Get current height to check if attachment needs to be clipped
+      DWRITE_TEXT_METRICS dtm{};
+      winrt::check_hresult(spTextLayout->GetMetrics(&dtm));
+
+      // Check if the attachment should be clipped
+      // TODO #14443: clipping works on the first-levels view, but any nested view won't be clipped
+      bool isClipped = height > dtm.height;
+      if (isClipped) {
+        height = dtm.height;
+      }
 
-    position += length;
+      // Create an inline object (this just reserves space in RichEdit for ReactNative to render the actual attachment)
+      auto inlineObject = winrt::make<AttachmentInlineObject>(width, height);
+      winrt::check_hresult(spTextLayout->SetInlineObject(inlineObject.get(), {position, 1}));
+
+      // Get the position of the Object Replacement Character
+      DWRITE_HIT_TEST_METRICS hitTestMetrics;
+      float x, y;
+      winrt::check_hresult(spTextLayout->HitTestTextPosition(position, false, &x, &y, &hitTestMetrics));
+
+      // Store the attachment position for RN to render later
+      TextMeasurement::Attachment attachment;
+      attachment.frame = {
+          x, // left
+          y, // top
+          width, // width
+          height // height
+      };
+      attachment.isClipped = isClipped;
+      attachments.push_back(attachment);
+      position += 1;
+    } else {
+      unsigned int length = static_cast<UINT32>(fragment.string.length());
+      DWRITE_TEXT_RANGE range = {position, length};
+      TextAttributes attributes = fragment.textAttributes;
+      DWRITE_FONT_STYLE fragmentStyle = DWRITE_FONT_STYLE_NORMAL;
+      if (attributes.fontStyle == facebook::react::FontStyle::Italic)
+        fragmentStyle = DWRITE_FONT_STYLE_ITALIC;
+      else if (attributes.fontStyle == facebook::react::FontStyle::Oblique)
+        fragmentStyle = DWRITE_FONT_STYLE_OBLIQUE;
+
+      winrt::check_hresult(spTextLayout->SetFontFamilyName(
+          attributes.fontFamily.empty() ? L"Segoe UI"
+                                        : Microsoft::Common::Unicode::Utf8ToUtf16(attributes.fontFamily).c_str(),
+          range));
+      winrt::check_hresult(spTextLayout->SetFontWeight(
+          static_cast<DWRITE_FONT_WEIGHT>(
+              attributes.fontWeight.value_or(static_cast<facebook::react::FontWeight>(DWRITE_FONT_WEIGHT_REGULAR))),
+          range));
+      winrt::check_hresult(spTextLayout->SetFontStyle(fragmentStyle, range));
+      winrt::check_hresult(spTextLayout->SetFontSize(
+          (attributes.allowFontScaling.value_or(true) && !std::isnan(attributes.fontSizeMultiplier))
+              ? (attributes.fontSizeMultiplier * attributes.fontSize)
+              : attributes.fontSize,
+          range));
+
+      if (!isnan(attributes.letterSpacing)) {
+        winrt::check_hresult(
+            spTextLayout.as<IDWriteTextLayout1>()->SetCharacterSpacing(0, attributes.letterSpacing, 0, range));
+      }
+      position += length;
+    }
   }
 }
 
@@ -142,9 +229,69 @@ void TextLayoutManager::GetTextLayout(
   if (attributedStringBox.getValue().isEmpty())
     return;
 
-  GetTextLayout(attributedStringBox, paragraphAttributes, layoutConstraints.maximumSize, spTextLayout);
+  TextMeasurement::Attachments attachments;
+  if (paragraphAttributes.adjustsFontSizeToFit) {
+    GetTextLayoutByAdjustingFontSizeToFit(
+        attributedStringBox, paragraphAttributes, layoutConstraints, spTextLayout, attachments);
+  } else {
+    GetTextLayout(attributedStringBox, paragraphAttributes, layoutConstraints.maximumSize, spTextLayout, attachments);
+  }
+}
+
+void TextLayoutManager::GetTextLayoutByAdjustingFontSizeToFit(
+    AttributedStringBox attributedStringBox,
+    const ParagraphAttributes &paragraphAttributes,
+    LayoutConstraints layoutConstraints,
+    winrt::com_ptr<IDWriteTextLayout> &spTextLayout,
+    TextMeasurement::Attachments &attachments) noexcept {
+  /* This function constructs a text layout from the given parameters.
+  If the generated text layout doesn't fit within the given layout constraints,
+  it will reduce the font size and construct a new text layout. This process will
+  be repeated until the text layout meets the constraints.*/
+
+  DWRITE_TEXT_METRICS metrics;
+
+  // Better Approach should be implemented , this uses O(n)
+  do {
+    if (spTextLayout) // Font Size reduction
+    {
+      constexpr auto fontReduceFactor = 1.0f;
+
+      auto attributedStringToResize = attributedStringBox.getValue();
+
+      auto fragmentsCopyToResize = attributedStringToResize.getFragments();
+
+      attributedStringToResize.getFragments().clear();
+
+      for (auto fragment : fragmentsCopyToResize) {
+        fragment.textAttributes.fontSize -= fontReduceFactor;
+
+        attributedStringToResize.appendFragment(std::move(fragment));
+      }
+      attributedStringBox = facebook::react::AttributedStringBox(attributedStringToResize);
+    }
+
+    GetTextLayout(attributedStringBox, paragraphAttributes, layoutConstraints.maximumSize, spTextLayout, attachments);
+
+    if (spTextLayout) {
+      const auto defaultMinFontSize = 2.0f;
+
+      // TODO : changes for minimumFontScale prop can be added.
+
+      if (spTextLayout->GetFontSize() <= defaultMinFontSize) {
+        break; // reached minimum font size , so no more size reducing
+      }
+      winrt::check_hresult(spTextLayout->GetMetrics(&metrics));
+    } else {
+      return;
+    }
+
+  } while ((paragraphAttributes.maximumNumberOfLines != 0 &&
+            paragraphAttributes.maximumNumberOfLines < static_cast<int>(metrics.lineCount)) ||
+           metrics.height > metrics.layoutHeight || metrics.width > metrics.layoutWidth);
 }
 
+// measure entire text (inluding attachments)
 TextMeasurement TextLayoutManager::measure(
     const AttributedStringBox &attributedStringBox,
     const ParagraphAttributes &paragraphAttributes,
@@ -152,6 +299,7 @@ TextMeasurement TextLayoutManager::measure(
     LayoutConstraints layoutConstraints) const {
   TextMeasurement measurement{};
   auto &attributedString = attributedStringBox.getValue();
+
   measurement = m_measureCache.get(
       {attributedString, paragraphAttributes, layoutConstraints}, [&](TextMeasureCacheKey const &key) {
         auto telemetry = TransactionTelemetry::threadLocalTelemetry();
@@ -161,7 +309,9 @@ TextMeasurement TextLayoutManager::measure(
 
         winrt::com_ptr<IDWriteTextLayout> spTextLayout;
 
-        GetTextLayout(attributedStringBox, paragraphAttributes, layoutConstraints, spTextLayout);
+        TextMeasurement::Attachments attachments;
+        GetTextLayout(
+            attributedStringBox, paragraphAttributes, layoutConstraints.maximumSize, spTextLayout, attachments);
 
         if (spTextLayout) {
           auto maxHeight = std::numeric_limits<float>().max();
@@ -182,6 +332,7 @@ TextMeasurement TextLayoutManager::measure(
           DWRITE_TEXT_METRICS dtm{};
           winrt::check_hresult(spTextLayout->GetMetrics(&dtm));
           measurement.size = {dtm.width, std::min(dtm.height, maxHeight)};
+          measurement.attachments = attachments;
         }
 
         if (telemetry) {
@@ -190,7 +341,6 @@ TextMeasurement TextLayoutManager::measure(
 
         return measurement;
       });
-
   return measurement;
 }
 
@@ -232,8 +382,8 @@ LinesMeasurements TextLayoutManager::measureLines(
   LinesMeasurements lineMeasurements{};
 
   winrt::com_ptr<IDWriteTextLayout> spTextLayout;
-
-  GetTextLayout(attributedStringBox, paragraphAttributes, size, spTextLayout);
+  TextMeasurement::Attachments attachments;
+  GetTextLayout(attributedStringBox, paragraphAttributes, size, spTextLayout, attachments);
 
   if (spTextLayout) {
     std::vector<DWRITE_LINE_METRICS> lineMetrics;
@@ -313,17 +463,32 @@ Float TextLayoutManager::baseline(
     AttributedStringBox attributedStringBox,
     ParagraphAttributes paragraphAttributes,
     Size size) const {
-  return 0;
+  winrt::com_ptr<IDWriteTextLayout> spTextLayout;
+  TextMeasurement::Attachments attachments;
+  GetTextLayout(attributedStringBox, paragraphAttributes, size, spTextLayout, attachments);
+  if (!spTextLayout) {
+    return 0;
+  }
+
+  DWRITE_TEXT_METRICS metrics;
+  winrt::check_hresult(spTextLayout->GetMetrics(&metrics));
+  return metrics.height *
+      0.8f; // https://learn.microsoft.com/en-us/windows/win32/api/dwrite/nf-dwrite-idwritetextformat-getlinespacing
 }
 
 winrt::hstring TextLayoutManager::GetTransformedText(const AttributedStringBox &attributedStringBox) {
   winrt::hstring result{};
   const auto &attributedString = attributedStringBox.getValue();
+
   for (const auto &fragment : attributedString.getFragments()) {
-    result = result +
-        Microsoft::ReactNative::TransformableText::TransformText(
-                 winrt::hstring{Microsoft::Common::Unicode::Utf8ToUtf16(fragment.string)},
-                 ConvertTextTransform(fragment.textAttributes.textTransform));
+    if (fragment.isAttachment()) {
+      result = result + L"\uFFFC"; // Unicode Object Replacement Character, will be replaced with an inline object
+    } else {
+      result = result +
+          Microsoft::ReactNative::TransformableText::TransformText(
+                   winrt::hstring{Microsoft::Common::Unicode::Utf8ToUtf16(fragment.string)},
+                   ConvertTextTransform(fragment.textAttributes.textTransform));
+    }
   }
   return result;
 }

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

@@ -75,12 +75,26 @@ class TextLayoutManager {
    */
   void *getNativeTextLayoutManager() const;
 
+  static void GetTextLayout(
+      const AttributedStringBox &attributedStringBox,
+      const ParagraphAttributes &paragraphAttributes,
+      Size size,
+      winrt::com_ptr<IDWriteTextLayout> &spTextLayout,
+      TextMeasurement::Attachments &attachments) noexcept;
+
   static void GetTextLayout(
       const AttributedStringBox &attributedStringBox,
       const ParagraphAttributes &paragraphAttributes,
       LayoutConstraints layoutConstraints,
       winrt::com_ptr<IDWriteTextLayout> &spTextLayout) noexcept;
 
+  static void GetTextLayoutByAdjustingFontSizeToFit(
+      AttributedStringBox attributedStringBox,
+      const ParagraphAttributes &paragraphAttributes,
+      LayoutConstraints layoutConstraints,
+      winrt::com_ptr<IDWriteTextLayout> &spTextLayout,
+      TextMeasurement::Attachments &attachments) noexcept;
+
 #pragma endregion
 
  private:

package/Microsoft.ReactNative/Modules/Animated/AnimationDriver.cpp

@@ -50,7 +50,6 @@ void AnimationDriver::StartAnimation() {
     animatedValue->PropertySet().StartAnimation(ValueAnimatedNode::s_valueName, animation);
     animatedValue->AddActiveAnimation(m_id);
   }
-  scopedBatch.End();
 
   m_scopedBatchCompletedToken = scopedBatch.Completed(
       [weakSelf = weak_from_this(), weakManager = m_manager, id = m_id, tag = m_animatedValueTag](auto sender, auto) {
@@ -74,6 +73,8 @@ void AnimationDriver::StartAnimation() {
         }
       });
 
+  scopedBatch.End();
+
   m_animation = animation;
   m_scopedBatch = scopedBatch;
 }

package/Microsoft.ReactNative/ReactNativeIsland.idl

@@ -119,6 +119,9 @@ namespace Microsoft.ReactNative
     Microsoft.ReactNative.Composition.Theme Theme { get; };
     Int64 RootTag { get; };
 
+    DOC_STRING("Initial props should be set on ReactViewHost. This is used to update props after the initial props are set")
+    void SetProperties(JSValueArgWriter props);
+
 #ifdef USE_WINUI3
     Microsoft.UI.Content.ContentIsland Island { get; };
 #endif

package/Microsoft.ReactNative/Utils/ImageUtils.h

@@ -15,6 +15,7 @@ struct ReactImageSource {
   std::string uri;
   std::string method;
   std::vector<std::pair<std::string, std::string>> headers;
+  std::string body;
   double width = 0;
   double height = 0;
   double scale = 1.0;

package/PropertySheets/Generated/PackageVersion.g.props

@@ -10,11 +10,11 @@
 -->
 <Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <PropertyGroup>
-    <ReactNativeWindowsVersion>0.76.11</ReactNativeWindowsVersion>
+    <ReactNativeWindowsVersion>0.76.13</ReactNativeWindowsVersion>
     <ReactNativeWindowsMajor>0</ReactNativeWindowsMajor>
     <ReactNativeWindowsMinor>76</ReactNativeWindowsMinor>
-    <ReactNativeWindowsPatch>11</ReactNativeWindowsPatch>
+    <ReactNativeWindowsPatch>13</ReactNativeWindowsPatch>
     <ReactNativeWindowsCanary>false</ReactNativeWindowsCanary>
-    <ReactNativeWindowsCommitId>0717f9f9efed2a5278cdb3a0fbdef459f0b3507c</ReactNativeWindowsCommitId>
+    <ReactNativeWindowsCommitId>838423173a985d81b925df7c668072db0324a555</ReactNativeWindowsCommitId>
   </PropertyGroup>
 </Project>

package/PropertySheets/NuGet.LockFile.props

@@ -8,7 +8,7 @@
        -->
 
   <PropertyGroup>
-    <RestoreLockedMode Condition="'$(RestoreLockedMode)'=='' OR '$(BuildingInRnwRepo)'=='true'">true</RestoreLockedMode>
+    <RestoreLockedMode Condition="'$(RestoreLockedMode)'=='' OR '$(BuildingInRnwRepo)'=='true'">false</RestoreLockedMode>
     <NuGetLockFileName>packages</NuGetLockFileName>
     <NuGetLockFileName Condition="'$(UseFabric)'=='true'">$(NuGetLockFileName).fabric</NuGetLockFileName>
     <NuGetLockFileName Condition="'$(UseExperimentalWinUI3)'=='true'">$(NuGetLockFileName).experimentalwinui3</NuGetLockFileName>

package/PropertySheets/WebView2.props

@@ -2,6 +2,6 @@
 <Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <PropertyGroup Label="WebView2 versioning">
       <!-- WinAppSDK 1.6+ has a dependency on Microsoft.Web.WebView2, there are a few places we need to pull in this package explicitly. -->
-      <WebView2PackageVersion>1.0.2792.45</WebView2PackageVersion>
+      <WebView2PackageVersion Condition="'$(WebView2PackageVersion)'=='' Or $([MSBuild]::VersionLessThan('$(WebView2PackageVersion)', '1.0.2903.40'))">1.0.2903.40</WebView2PackageVersion>
   </PropertyGroup>
 </Project>

package/PropertySheets/WinUI.props

@@ -9,7 +9,7 @@
     <WinUI3ExperimentalVersion Condition="'$(WinUI3ExperimentalVersion)'==''">1.7.250109001-experimental2</WinUI3ExperimentalVersion>
     <!-- This value is also used by the CLI, see /packages/@react-native-windows/cli/.../autolinkWindows.ts -->
     <WinUI3Version Condition="'$(WinUI3Version)'=='' AND '$(UseExperimentalWinUI3)'=='true'">$(WinUI3ExperimentalVersion)</WinUI3Version>
-    <WinUI3Version Condition="'$(WinUI3Version)'==''">1.6.240923002</WinUI3Version>
+    <WinUI3Version Condition="'$(WinUI3Version)'==''">1.7.250401001</WinUI3Version>
   </PropertyGroup>
 
   <PropertyGroup Label="WinUI2x versioning">