react-native-windows 0.74.2 → 0.74.4

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

@@ -5,8 +5,13 @@
 #include "UriImageManager.h"
 
 #include "Composition.ImageSource.g.h"
-#include "Composition.UriImageManager.g.cpp"
+#include <AutoDraw.h>
 #include <ReactPropertyBag.h>
+#include <d2d1_3.h>
+#include <shcore.h>
+#include <winrt/Microsoft.ReactNative.Composition.Experimental.h>
+#include <winrt/Windows.Security.Cryptography.h>
+#include <winrt/Windows.Storage.Streams.h>
 
 namespace winrt::Microsoft::ReactNative::Composition::implementation {
 
@@ -39,27 +44,170 @@ winrt::Microsoft::ReactNative::Composition::ImageSource MakeImageSource(
   return winrt::make<ImageSource>(source);
 }
 
-static const ReactPropertyId<ReactNonAbiValue<winrt::com_ptr<UriImageManager>>> &UriImageManagerPropertyId() noexcept {
-  static const ReactPropertyId<ReactNonAbiValue<winrt::com_ptr<UriImageManager>>> prop{
+/**
+ * This ImageHandler will handle uri types with svgxaml base64 encoded data
+ *
+ *   <Image
+ *      style={{width: 400, height: 200}}
+ *      source={{uri:
+ *       'data:image/svg+xml;base64,PD94bWwgdmVyc2lvbj0iMS4wIiBlbmNvZGluZz0iVVRGLTgiPz4gPHN2ZyB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciIHZpZXdCb3g9IjAgMCAyOCAyOCIgZmlsbD0ibm9uZSI+PHBhdGggZD0iTTEzLjEyNSAwSDBWMTMuMTI1SDEzLjEyNVYwWiIgZmlsbD0iI0YyNTAyMiI+PC9wYXRoPjxwYXRoIGQ9Ik0yOCAwSDE0Ljg3NVYxMy4xMjVIMjhWMFoiIGZpbGw9IiM3RkJBMDAiPjwvcGF0aD48cGF0aCBkPSJNMTMuMTI1IDE0Ljg3NUgwVjI4SDEzLjEyNVYxNC44NzVaIiBmaWxsPSIjMDBBNEVGIj48L3BhdGg+PHBhdGggZD0iTTI4IDE0Ljg3NUgxNC44NzVWMjhIMjhWMTQuODc1WiIgZmlsbD0iI0ZGQjkwMCI+PC9wYXRoPjwvc3ZnPiA='}}
+ *   />
+ *
+ */
+struct SvgDataImageHandler : winrt::implements<
+                                 SvgDataImageHandler,
+                                 winrt::Microsoft::ReactNative::Composition::Experimental::IUriBrushProvider,
+                                 winrt::Microsoft::ReactNative::Composition::IUriImageProvider> {
+  bool CanLoadImageUri(winrt::Microsoft::ReactNative::IReactContext context, winrt::Windows::Foundation::Uri uri) {
+    return uri.SchemeName() == L"data" && std::wstring_view(uri.Path()).starts_with(L"image/svg+xml;base64,");
+  }
+
+  winrt::Windows::Foundation::IAsyncOperation<winrt::Microsoft::ReactNative::Composition::Experimental::UriBrushFactory>
+  GetSourceAsync(
+      const winrt::Microsoft::ReactNative::IReactContext &context,
+      const winrt::Microsoft::ReactNative::Composition::ImageSource &imageSource) {
+    auto path = winrt::to_string(imageSource.Uri().Path());
+    auto size = imageSource.Size();
+    auto scale = imageSource.Scale();
+
+    size_t start = path.find(',');
+    if (start == std::string::npos || start + 1 > path.length())
+      co_return nullptr;
+
+    try {
+      co_await winrt::resume_background();
+
+      std::string_view base64String(path.c_str() + start + 1, path.length() - start - 1);
+      auto buffer = winrt::Windows::Security::Cryptography::CryptographicBuffer::DecodeFromBase64String(
+          winrt::to_hstring(base64String));
+
+      winrt::Windows::Storage::Streams::InMemoryRandomAccessStream memoryStream;
+      co_await memoryStream.WriteAsync(buffer);
+      memoryStream.Seek(0);
+
+      co_return
+          [memoryStream, size, scale](
+              const winrt::Microsoft::ReactNative::IReactContext &reactContext,
+              const winrt::Microsoft::ReactNative::Composition::Experimental::ICompositionContext &compositionContext)
+              -> winrt::Microsoft::ReactNative::Composition::Experimental::IBrush {
+            auto drawingBrush = compositionContext.CreateDrawingSurfaceBrush(
+                size,
+                winrt::Windows::Graphics::DirectX::DirectXPixelFormat::B8G8R8A8UIntNormalized,
+                winrt::Windows::Graphics::DirectX::DirectXAlphaMode::Premultiplied);
+            POINT pt;
+            ::Microsoft::ReactNative::Composition::AutoDrawDrawingSurface autoDraw(drawingBrush, 1.0, &pt);
+            auto renderTarget = autoDraw.GetRenderTarget();
+
+            winrt::com_ptr<ID2D1DeviceContext5> deviceContext5;
+            winrt::check_hresult(renderTarget->QueryInterface(IID_ID2D1DeviceContext5, deviceContext5.put_void()));
+
+            winrt::com_ptr<IStream> nativeStream;
+
+            winrt::check_hresult(CreateStreamOverRandomAccessStream(
+                memoryStream.as<::IUnknown>().get(), IID_PPV_ARGS(nativeStream.put())));
+
+            winrt::com_ptr<ID2D1SvgDocument> svgDocument;
+            if (FAILED(deviceContext5->CreateSvgDocument(
+                    nativeStream.get(), {size.Width, size.Height}, svgDocument.put()))) {
+              return nullptr;
+            }
+
+            D2D1::Matrix3x2F originalTransform;
+            D2D1::Matrix3x2F translationTransform =
+                D2D1::Matrix3x2F::Translation(static_cast<float>(pt.x), static_cast<float>(pt.y));
+
+            renderTarget->GetTransform(&originalTransform);
+            translationTransform = originalTransform * translationTransform;
+
+            renderTarget->SetTransform(translationTransform);
+
+            deviceContext5->DrawSvgDocument(svgDocument.get());
+
+            renderTarget->SetTransform(originalTransform);
+
+            return drawingBrush;
+          };
+
+    } catch (winrt::hresult_error const &) {
+    }
+
+    co_return nullptr;
+  }
+};
+
+/**
+ * This ImageHandler will handle uri types of base64 encoded data
+ *
+ *   <Image
+ *      style={{width: 400, height: 200}}
+ *      source={{uri:
+ * 'data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAEsAAABLCAQAAACSR7JhAAADtUlEQVR4Ac3YA2Bj6QLH0XPT1Fzbtm29tW3btm3bfLZtv7e2ObZnms7d8Uw098tuetPzrxv8wiISrtVudrG2JXQZ4VOv+qUfmqCGGl1mqLhoA52oZlb0mrjsnhKpgeUNEs91Z0pd1kvihA3ULGVHiQO2narKSHKkEMulm9VgUyE60s1aWoMQUbpZOWE+kaqs4eLEjdIlZTcFZB0ndc1+lhB1lZrIuk5P2aib1NBpZaL+JaOGIt0ls47SKzLC7CqrlGF6RZ09HGoNy1lYl2aRSWL5GuzqWU1KafRdoRp0iOQEiDzgZPnG6DbldcomadViflnl/cL93tOoVbsOLVM2jylvdWjXolWX1hmfZbGR/wjypDjFLSZIRov09BgYmtUqPQPlQrPapecLgTIy0jMgPKtTeob2zWtrGH3xvjUkPCtNg/tm1rjwrMa+mdUkPd3hWbH0jArPGiU9ufCsNNWFZ40wpwn+62/66R2RUtoso1OB34tnLOcy7YB1fUdc9e0q3yru8PGM773vXsuZ5YIZX+5xmHwHGVvlrGPN6ZSiP1smOsMMde40wKv2VmwPPVXNut4sVpUreZiLBHi0qln/VQeI/LTMYXpsJtFiclUN+5HVZazim+Ky+7sAvxWnvjXrJFneVtLWLyPJu9K3cXLWeOlbMTlrIelbMDlrLenrjEQOtIF+fuI9xRp9ZBFp6+b6WT8RrxEpdK64BuvHgDk+vUy+b5hYk6zfyfs051gRoNO1usU12WWRWL73/MMEy9pMi9qIrR4ZpV16Rrvduxazmy1FSvuFXRkqTnE7m2kdb5U8xGjLw/spRr1uTov4uOgQE+0N/DvFrG/Jt7i/FzwxbA9kDanhf2w+t4V97G8lrT7wc08aA2QNUkuTfW/KimT01wdlfK4yEw030VfT0RtZbzjeMprNq8m8tnSTASrTLti64oBNdpmMQm0eEwvfPwRbUBywG5TzjPCsdwk3IeAXjQblLCoXnDVeoAz6SfJNk5TTzytCNZk/POtTSV40NwOFWzw86wNJRpubpXsn60NJFlHeqlYRbslqZm2jnEZ3qcSKgm0kTli3zZVS7y/iivZTweYXJ26Y+RTbV1zh3hYkgyFGSTKPfRVbRqWWVReaxYeSLarYv1Qqsmh1s95S7G+eEWK0f3jYKTbV6bOwepjfhtafsvUsqrQvrGC8YhmnO9cSCk3yuY984F1vesdHYhWJ5FvASlacshUsajFt2mUM9pqzvKGcyNJW0arTKN1GGGzQlH0tXwLDgQTurS8eIQAAAABJRU5ErkJggg=='}}
+ *   />
+ *
+ */
+struct DataImageHandler : winrt::implements<
+                              DataImageHandler,
+                              winrt::Microsoft::ReactNative::Composition::IUriImageStreamProvider,
+                              winrt::Microsoft::ReactNative::Composition::IUriImageProvider> {
+  bool CanLoadImageUri(winrt::Microsoft::ReactNative::IReactContext context, winrt::Windows::Foundation::Uri uri) {
+    return uri.SchemeName() == L"data";
+  }
+
+  winrt::Windows::Foundation::IAsyncOperation<winrt::Windows::Storage::Streams::IRandomAccessStream> GetSourceAsync(
+      const winrt::Microsoft::ReactNative::IReactContext &context,
+      const winrt::Microsoft::ReactNative::Composition::ImageSource &imageSource) {
+    auto path = winrt::to_string(imageSource.Uri().Path());
+
+    size_t start = path.find(',');
+    if (start == std::string::npos || start + 1 > path.length())
+      co_return nullptr;
+
+    try {
+      co_await winrt::resume_background();
+
+      std::string_view base64String(path.c_str() + start + 1, path.length() - start - 1);
+      auto buffer = winrt::Windows::Security::Cryptography::CryptographicBuffer::DecodeFromBase64String(
+          winrt::to_hstring(base64String));
+
+      winrt::Windows::Storage::Streams::InMemoryRandomAccessStream memoryStream;
+      co_await memoryStream.WriteAsync(buffer);
+      memoryStream.Seek(0);
+
+      co_return memoryStream;
+    } catch (winrt::hresult_error const &) {
+      // Base64 decode failed
+    }
+
+    co_return nullptr;
+  }
+};
+
+static const ReactPropertyId<ReactNonAbiValue<std::shared_ptr<UriImageManager>>> &UriImageManagerPropertyId() noexcept {
+  static const ReactPropertyId<ReactNonAbiValue<std::shared_ptr<UriImageManager>>> prop{
       L"ReactNative", L"UriImageManager"};
   return prop;
 }
 
-winrt::com_ptr<UriImageManager> UriImageManager::GetOrCreate(
+UriImageManager::UriImageManager() {
+  m_providers.push_back(winrt::make<SvgDataImageHandler>());
+  m_providers.push_back(winrt::make<DataImageHandler>());
+}
+
+void UriImageManager::Install(
+    const winrt::Microsoft::ReactNative::ReactPropertyBag &properties,
+    const std::shared_ptr<UriImageManager> &manager) noexcept {
+  properties.Set(UriImageManagerPropertyId(), manager);
+}
+
+std::shared_ptr<UriImageManager> UriImageManager::Get(
     const winrt::Microsoft::ReactNative::ReactPropertyBag &properties) noexcept {
-  auto uriImageManager =
-      winrt::Microsoft::ReactNative::ReactPropertyBag(properties).GetOrCreate(UriImageManagerPropertyId(), []() {
-        return winrt::make_self<UriImageManager>();
-      });
-  return uriImageManager.Value();
+  return winrt::Microsoft::ReactNative::ReactPropertyBag(properties).Get(UriImageManagerPropertyId()).Value();
 }
 
-void UriImageManager::AddUriImageProvider(
-    const winrt::Microsoft::ReactNative::IReactPropertyBag &properties,
-    const IUriImageProvider &provider) {
+void UriImageManager::AddUriImageProvider(const IUriImageProvider &provider) {
   if (!provider)
     winrt::throw_hresult(E_INVALIDARG);
-  GetOrCreate(winrt::Microsoft::ReactNative::ReactPropertyBag(properties))->m_providers.push_back(provider);
+  m_providers.push_back(provider);
 }
 
 IUriImageProvider UriImageManager::TryGetUriImageProvider(

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

@@ -2,7 +2,6 @@
 // Licensed under the MIT License.
 
 #pragma once
-#include "Composition.UriImageManager.g.h"
 
 #include <ReactPropertyBag.h>
 #include <Utils/ImageUtils.h>
@@ -11,14 +10,16 @@
 
 namespace winrt::Microsoft::ReactNative::Composition::implementation {
 
-struct UriImageManager : UriImageManagerT<UriImageManager> {
-  UriImageManager() = default;
+struct UriImageManager {
+  UriImageManager();
 
-  static void AddUriImageProvider(
-      const winrt::Microsoft::ReactNative::IReactPropertyBag &properties,
-      const IUriImageProvider &provider);
+  void AddUriImageProvider(const IUriImageProvider &provider);
 
-  static winrt::com_ptr<UriImageManager> GetOrCreate(
+  static void Install(
+      const winrt::Microsoft::ReactNative::ReactPropertyBag &properties,
+      const std::shared_ptr<UriImageManager> &manager) noexcept;
+
+  static std::shared_ptr<UriImageManager> Get(
       const winrt::Microsoft::ReactNative::ReactPropertyBag &properties) noexcept;
 
   IUriImageProvider TryGetUriImageProvider(
@@ -33,7 +34,3 @@ winrt::Microsoft::ReactNative::Composition::ImageSource MakeImageSource(
     const facebook::react::ImageSource &source) noexcept;
 
 } // namespace winrt::Microsoft::ReactNative::Composition::implementation
-
-namespace winrt::Microsoft::ReactNative::Composition::factory_implementation {
-struct UriImageManager : UriImageManagerT<UriImageManager, implementation::UriImageManager> {};
-} // namespace winrt::Microsoft::ReactNative::Composition::factory_implementation

package/Microsoft.ReactNative/Fabric/WindowsImageManager.cpp

@@ -19,8 +19,8 @@ namespace Microsoft::ReactNative {
 
 WindowsImageManager::WindowsImageManager(winrt::Microsoft::ReactNative::ReactContext reactContext)
     : m_reactContext(reactContext) {
-  m_uriImageManager = winrt::Microsoft::ReactNative::Composition::implementation::UriImageManager::GetOrCreate(
-      reactContext.Properties());
+  m_uriImageManager =
+      winrt::Microsoft::ReactNative::Composition::implementation::UriImageManager::Get(reactContext.Properties());
 }
 
 winrt::com_ptr<IWICBitmapSource> wicBitmapSourceFromStream(

package/Microsoft.ReactNative/Fabric/WindowsImageManager.h

@@ -19,7 +19,7 @@ struct WindowsImageManager {
 
  private:
   winrt::Microsoft::ReactNative::ReactContext m_reactContext;
-  winrt::com_ptr<winrt::Microsoft::ReactNative::Composition::implementation::UriImageManager> m_uriImageManager;
+  std::shared_ptr<winrt::Microsoft::ReactNative::Composition::implementation::UriImageManager> m_uriImageManager;
 };
 
 } // namespace Microsoft::ReactNative

package/Microsoft.ReactNative/IReactPackageBuilderFabric.idl

@@ -2,6 +2,7 @@
 // Licensed under the MIT License.
 
 import "IReactViewComponentBuilder.idl";
+import "UriImageManager.idl";
 
 #include "DocString.h"
 
@@ -18,6 +19,10 @@ namespace Microsoft.ReactNative
   {
     DOC_STRING("Registers a custom native view component.")
     void AddViewComponent(String componentName, ReactViewComponentProvider componentProvider);
+
+    DOC_STRING(
+      "Ability to load images using custom Uri protocol handlers. The provider should implement @Composition.IUriImageStreamProvider or @Composition.Experimental.IUriBrushProvider.")
+    void AddUriImageProvider(Microsoft.ReactNative.Composition.IUriImageProvider provider);
   };
 
 } // namespace Microsoft.ReactNative

package/Microsoft.ReactNative/ReactHost/React.h

@@ -32,6 +32,10 @@
 #include <ViewManagerProvider.h>
 #include <winrt/Microsoft.ReactNative.h>
 
+#ifdef USE_FABRIC
+#include <Fabric/Composition/UriImageManager.h>
+#endif
+
 namespace Mso::React {
 
 // Forward declarations
@@ -182,6 +186,9 @@ struct ReactOptions {
   std::shared_ptr<NativeModuleProvider2> ModuleProvider;
   std::shared_ptr<ViewManagerProvider2> ViewManagerProvider;
   std::shared_ptr<winrt::Microsoft::ReactNative::TurboModulesProvider> TurboModuleProvider;
+#ifdef USE_FABRIC
+  std::shared_ptr<winrt::Microsoft::ReactNative::Composition::implementation::UriImageManager> UriImageManager;
+#endif
 
   //! Identity of the SDX. Must uniquely describe the SDX across the installed product.
   std::string Identity;

package/Microsoft.ReactNative/ReactHost/ReactInstanceWin.cpp

@@ -52,6 +52,7 @@
 #include "Unicode.h"
 
 #ifdef USE_FABRIC
+#include <Fabric/Composition/UriImageManager.h>
 #include <Fabric/FabricUIManagerModule.h>
 #include <Fabric/ReactNativeConfigProperties.h>
 #include <Fabric/WindowsComponentDescriptorRegistry.h>
@@ -570,6 +571,8 @@ void ReactInstanceWin::InitializeBridgeless() noexcept {
           });
 
   InitDevMenu();
+  winrt::Microsoft::ReactNative::Composition::implementation::UriImageManager::Install(
+      ReactPropertyBag(m_reactContext->Properties()), m_options.UriImageManager);
 
   m_uiQueue->Post([this, weakThis = Mso::WeakPtr{this}]() noexcept {
     // Objects that must be created on the UI thread
@@ -726,6 +729,10 @@ void ReactInstanceWin::InitializeWithBridge() noexcept {
 #endif
 
   InitDevMenu();
+#ifdef USE_FABRIC
+  winrt::Microsoft::ReactNative::Composition::implementation::UriImageManager::Install(
+      ReactPropertyBag(m_reactContext->Properties()), m_options.UriImageManager);
+#endif
 
   m_uiQueue->Post([this, weakThis = Mso::WeakPtr{this}]() noexcept {
     // Objects that must be created on the UI thread

package/Microsoft.ReactNative/ReactNativeHost.cpp

@@ -16,6 +16,7 @@
 
 #ifdef USE_FABRIC
 #include <Fabric/WindowsComponentDescriptorRegistry.h>
+#include <ReactPackageBuilder.h>
 #include <react/renderer/componentregistry/ComponentDescriptorProviderRegistry.h>
 #endif
 
@@ -93,6 +94,8 @@ IAsyncAction ReactNativeHost::ReloadInstance() noexcept {
   auto turboModulesProvider = std::make_shared<TurboModulesProvider>();
 
 #ifdef USE_FABRIC
+  auto uriImageManager =
+      std::make_shared<winrt::Microsoft::ReactNative::Composition::implementation::UriImageManager>();
   auto componentregistry = std::make_shared<::Microsoft::ReactNative::WindowsComponentDescriptorRegistry>();
   auto componentDescriptorRegistry = std::make_shared<facebook::react::ComponentDescriptorProviderRegistry>();
 
@@ -108,6 +111,7 @@ IAsyncAction ReactNativeHost::ReloadInstance() noexcept {
       turboModulesProvider,
 #ifdef USE_FABRIC
       componentregistry,
+      uriImageManager,
 #endif
       m_instanceSettings.UseWebDebugger());
 
@@ -164,6 +168,10 @@ IAsyncAction ReactNativeHost::ReloadInstance() noexcept {
 #endif
   reactOptions.TurboModuleProvider = turboModulesProvider;
 
+#ifdef USE_FABRIC
+  reactOptions.UriImageManager = uriImageManager;
+#endif
+
   reactOptions.OnInstanceCreated = [](Mso::CntPtr<Mso::React::IReactContext> &&context) {
     auto notifications = context->Notifications();
     ReactInstanceSettings::RaiseInstanceCreated(

package/Microsoft.ReactNative/ReactPackageBuilder.cpp

@@ -22,6 +22,7 @@ ReactPackageBuilder::ReactPackageBuilder(
     std::shared_ptr<TurboModulesProvider> const &turboModulesProvider,
 #ifdef USE_FABRIC
     std::shared_ptr<::Microsoft::ReactNative::WindowsComponentDescriptorRegistry> const &componentRegistry,
+    std::shared_ptr<winrt::Microsoft::ReactNative::Composition::implementation::UriImageManager> const &uriImageManager,
 #endif
     bool isWebDebugging) noexcept
     : m_modulesProvider{modulesProvider},
@@ -31,6 +32,7 @@ ReactPackageBuilder::ReactPackageBuilder(
       m_turboModulesProvider{turboModulesProvider},
 #ifdef USE_FABRIC
       m_componentRegistry{componentRegistry},
+      m_uriImageManager{uriImageManager},
 #endif
 
       m_isWebDebugging{isWebDebugging} {
@@ -63,5 +65,11 @@ void ReactPackageBuilder::AddViewComponent(
     ReactViewComponentProvider const &viewComponentProvider) noexcept {
   m_componentRegistry->Add(componentName, viewComponentProvider);
 }
+
+void ReactPackageBuilder::AddUriImageProvider(
+    const winrt::Microsoft::ReactNative::Composition::IUriImageProvider &provider) noexcept {
+  m_uriImageManager->AddUriImageProvider(provider);
+}
+
 #endif
 } // namespace winrt::Microsoft::ReactNative

package/Microsoft.ReactNative/ReactPackageBuilder.h

@@ -9,7 +9,9 @@
 #endif
 #include "winrt/Microsoft.ReactNative.h"
 #ifdef USE_FABRIC
+#include <Fabric/Composition/UriImageManager.h>
 #include <Fabric/WindowsComponentDescriptorRegistry.h>
+#include "winrt/Microsoft.ReactNative.Composition.h"
 #endif
 
 namespace winrt::Microsoft::ReactNative {
@@ -30,6 +32,8 @@ struct ReactPackageBuilder : winrt::implements<
       std::shared_ptr<TurboModulesProvider> const &turboModulesProvider,
 #ifdef USE_FABRIC
       std::shared_ptr<::Microsoft::ReactNative::WindowsComponentDescriptorRegistry> const &componentRegistry,
+      std::shared_ptr<winrt::Microsoft::ReactNative::Composition::implementation::UriImageManager> const
+          &uriImageManager,
 #endif
       bool isWebDebugging) noexcept;
 
@@ -43,6 +47,7 @@ struct ReactPackageBuilder : winrt::implements<
 #ifdef USE_FABRIC
   // IReactPackageBuilderFabric
   void AddViewComponent(winrt::hstring componentName, ReactViewComponentProvider const &viewComponentProvider) noexcept;
+  void AddUriImageProvider(const winrt::Microsoft::ReactNative::Composition::IUriImageProvider &provider) noexcept;
 #endif // USE_FABRIC
 
  private:
@@ -54,6 +59,7 @@ struct ReactPackageBuilder : winrt::implements<
 
 #ifdef USE_FABRIC
   std::shared_ptr<::Microsoft::ReactNative::WindowsComponentDescriptorRegistry> m_componentRegistry;
+  std::shared_ptr<winrt::Microsoft::ReactNative::Composition::implementation::UriImageManager> m_uriImageManager;
 #endif
 
   const bool m_isWebDebugging;

package/Microsoft.ReactNative/UriImageManager.idl

@@ -72,14 +72,4 @@ namespace Microsoft.ReactNative.Composition
     Windows.Foundation.IAsyncOperation<UriBrushFactory> GetSourceAsync(Microsoft.ReactNative.IReactContext context, Microsoft.ReactNative.Composition.ImageSource imageSource);
   }
   }
-
-  [default_interface]
-  [webhosthidden]
-  [experimental]
-  DOC_STRING(
-    "Ability to load images using custom Uri protocol handlers.  The provider should implement @IUriImageStreamProvider or @Experimental.IUriBrushProvider")
-  runtimeclass UriImageManager
-  {
-    static void AddUriImageProvider(Microsoft.ReactNative.IReactPropertyBag properties, IUriImageProvider provider);
-  }
 } // namespace Microsoft.ReactNative.Composition

package/Microsoft.ReactNative.Cxx/AutoDraw.h

@@ -1,6 +1,7 @@
 // Copyright (c) Microsoft Corporation.
 // Licensed under the MIT License.
 
+#include <winrt/Microsoft.ReactNative.Composition.Experimental.h>
 #include <winrt/Microsoft.ReactNative.Composition.h>
 
 #include <CompositionSwitcher.Experimental.interop.h>

package/PropertySheets/Generated/PackageVersion.g.props

@@ -10,11 +10,11 @@
 -->
 <Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <PropertyGroup>
-    <ReactNativeWindowsVersion>0.74.2</ReactNativeWindowsVersion>
+    <ReactNativeWindowsVersion>0.74.4</ReactNativeWindowsVersion>
     <ReactNativeWindowsMajor>0</ReactNativeWindowsMajor>
     <ReactNativeWindowsMinor>74</ReactNativeWindowsMinor>
-    <ReactNativeWindowsPatch>2</ReactNativeWindowsPatch>
+    <ReactNativeWindowsPatch>4</ReactNativeWindowsPatch>
     <ReactNativeWindowsCanary>false</ReactNativeWindowsCanary>
-    <ReactNativeWindowsCommitId>b422f06e2b5ac1bd5fb7cffbc9f247024452120a</ReactNativeWindowsCommitId>
+    <ReactNativeWindowsCommitId>785c8734e6b203a669bd504846488c89ed5352aa</ReactNativeWindowsCommitId>
   </PropertyGroup>
 </Project>

package/PropertySheets/JSEngine.props

@@ -6,7 +6,7 @@
     <!-- Enabling this will (1) Include hermes glues in the Microsoft.ReactNative binaries AND (2) Make hermes the default engine -->
     <UseHermes Condition="'$(UseHermes)' == ''">true</UseHermes>
     <!-- This will be true if (1) the client want to use hermes by setting UseHermes to true OR (2) We are building for UWP where dynamic switching is enabled -->
-    <HermesVersion Condition="'$(HermesVersion)' == ''">0.1.18</HermesVersion>
+    <HermesVersion Condition="'$(HermesVersion)' == ''">0.1.21</HermesVersion>
     <HermesPackage Condition="'$(HermesPackage)' == '' And Exists('$(PkgMicrosoft_JavaScript_Hermes)')">$(PkgMicrosoft_JavaScript_Hermes)</HermesPackage>
     <HermesPackage Condition="'$(HermesPackage)' == ''">$(NuGetPackageRoot)\Microsoft.JavaScript.Hermes\$(HermesVersion)</HermesPackage>
     <EnableHermesInspectorInReleaseFlavor Condition="'$(EnableHermesInspectorInReleaseFlavor)' == ''">false</EnableHermesInspectorInReleaseFlavor>

package/Shared/HermesRuntimeHolder.cpp

@@ -291,6 +291,10 @@ void NAPI_CDECL removeInspectorPage(int32_t pageId) noexcept {
 
 } // namespace
 
+//==============================================================================
+// HermesRuntimeHolder implementation
+//==============================================================================
+
 HermesRuntimeHolder::HermesRuntimeHolder(
     std::shared_ptr<facebook::react::DevSettings> devSettings,
     std::shared_ptr<facebook::react::MessageQueueThread> jsQueue,
@@ -393,6 +397,10 @@ void HermesRuntimeHolder::removeFromProfiling() const noexcept {
   CRASH_ON_ERROR(getHermesApi().hermes_sampling_profiler_dump_to_file(fileName.c_str()));
 }
 
+//==============================================================================
+// HermesJSRuntime implementation
+//==============================================================================
+
 HermesJSRuntime::HermesJSRuntime(std::shared_ptr<Microsoft::JSI::RuntimeHolderLazyInit> hermesRuntimeHolder)
     : m_holder(std::move(hermesRuntimeHolder)) {}
 

package/Shared/Shared.vcxitems

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

package/package.json

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

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

@@ -1,16 +0,0 @@
-// Copyright (c) Microsoft Corporation.
-// Licensed under the MIT License.
-
-#include "pch.h"
-
-#include "UriImageManager.h"
-
-#include "Composition.UriImageManager.g.cpp"
-
-namespace winrt::Microsoft::ReactNative::Composition::implementation {
-
-void UriImageManager::AddUriImageProvider(
-    const winrt::Microsoft::ReactNative::IReactPropertyBag &,
-    const IUriImageProvider &) {}
-
-} // namespace winrt::Microsoft::ReactNative::Composition::implementation