@shopify/react-native-skia 2.2.21 → 2.3.0

package/apple/SkiaCVPixelBufferUtils.mm

@@ -30,16 +30,12 @@
 #include <TargetConditionals.h>
 #if TARGET_RT_BIG_ENDIAN
 #define FourCC2Str(fourcc)                                                     \
-  (const char[]) {                                                             \
-    *((char *)&fourcc), *(((char *)&fourcc) + 1), *(((char *)&fourcc) + 2),    \
-        *(((char *)&fourcc) + 3), 0                                            \
-  }
+  (const char[]){*((char *)&fourcc), *(((char *)&fourcc) + 1),                 \
+                 *(((char *)&fourcc) + 2), *(((char *)&fourcc) + 3), 0}
 #else
 #define FourCC2Str(fourcc)                                                     \
-  (const char[]) {                                                             \
-    *(((char *)&fourcc) + 3), *(((char *)&fourcc) + 2),                        \
-        *(((char *)&fourcc) + 1), *(((char *)&fourcc) + 0), 0                  \
-  }
+  (const char[]){*(((char *)&fourcc) + 3), *(((char *)&fourcc) + 2),           \
+                 *(((char *)&fourcc) + 1), *(((char *)&fourcc) + 0), 0}
 #endif
 
 // pragma MARK: TextureHolder

package/cpp/api/JsiSkCanvas.h

@@ -34,7 +34,10 @@
 #include "include/core/SkRegion.h"
 #include "include/core/SkSurface.h"
 #include "include/core/SkTypeface.h"
+
+#if !defined(SK_GRAPHITE)
 #include "include/gpu/ganesh/GrDirectContext.h"
+#endif
 
 #pragma clang diagnostic pop
 

package/cpp/api/JsiSkImage.h

@@ -17,6 +17,8 @@
 #if defined(SK_GRAPHITE)
 #include "RNDawnContext.h"
 #include "include/gpu/graphite/Context.h"
+#else
+#include "include/gpu/ganesh/GrDirectContext.h"
 #endif
 
 #pragma clang diagnostic push
@@ -241,7 +243,15 @@ public:
     auto rasterImage = DawnContext::getInstance().MakeRasterImage(getObject());
 #else
     auto grContext = getContext()->getDirectContext();
-    auto rasterImage = getObject()->makeRasterImage(grContext);
+    auto image = getObject();
+    if (!grContext) {
+      throw jsi::JSError(runtime, "No GPU context available");
+    }
+    if (image && !image->isValid(grContext->asRecorder())) {
+      throw jsi::JSError(runtime, "invoked makeNonTextureImage() on an image "
+                                  "that does not belong to this context");
+    }
+    auto rasterImage = image->makeRasterImage(grContext);
 #endif
     auto hostObjectInstance =
         std::make_shared<JsiSkImage>(getContext(), std::move(rasterImage));
@@ -312,4 +322,4 @@ public:
   }
 };
 
-} // namespace RNSkia
+} // namespace RNSkia

package/cpp/api/JsiSkSVG.h

@@ -20,10 +20,13 @@ namespace jsi = facebook::jsi;
 
 class JsiSkSVG : public JsiSkWrappingSkPtrHostObject<SkSVGDOM> {
 public:
-  JsiSkSVG(std::shared_ptr<RNSkPlatformContext> context, sk_sp<SkSVGDOM> svgdom)
+  JsiSkSVG(std::shared_ptr<RNSkPlatformContext> context, sk_sp<SkSVGDOM> svgdom,
+           sk_sp<skresources::ResourceProvider> resourceProvider = nullptr)
       : JsiSkWrappingSkPtrHostObject<SkSVGDOM>(std::move(context),
                                                std::move(svgdom)) {}
 
+  ~JsiSkSVG() = default;
+
   EXPORT_JSI_API_TYPENAME(JsiSkSVG, SVG)
 
   JSI_HOST_FUNCTION(width) {

package/cpp/api/JsiSkSVGFactory.h

@@ -1,6 +1,7 @@
 #pragma once
 
 #include <memory>
+#include <unordered_map>
 #include <utility>
 
 #include <jsi/jsi.h>
@@ -14,6 +15,7 @@
 #pragma clang diagnostic ignored "-Wdocumentation"
 
 #include "include/core/SkStream.h"
+#include "modules/skresources/include/SkResources.h"
 
 #pragma clang diagnostic pop
 
@@ -21,24 +23,141 @@ namespace RNSkia {
 
 namespace jsi = facebook::jsi;
 
+class SVGAssetProvider : public skresources::ResourceProvider {
+public:
+  using AssetMap = std::unordered_map<std::string, sk_sp<SkData>>;
+
+  static sk_sp<SVGAssetProvider>
+  Make(AssetMap assets, skresources::ImageDecodeStrategy strategy =
+                            skresources::ImageDecodeStrategy::kPreDecode) {
+    return sk_sp<SVGAssetProvider>(
+        new SVGAssetProvider(std::move(assets), strategy));
+  }
+
+  // Override loadImageAsset() to handle image loading
+  sk_sp<skresources::ImageAsset>
+  loadImageAsset(const char[] /*path*/, const char name[],
+                 const char[] /*id*/) const override {
+    // Identify resources by name only
+    auto it = fAssets.find(name);
+    if (it != fAssets.end()) {
+      // Create ImageAsset from SkData
+      return skresources::MultiFrameImageAsset::Make(it->second, fStrategy);
+    }
+    return nullptr;
+  }
+
+private:
+  explicit SVGAssetProvider(AssetMap assets,
+                            skresources::ImageDecodeStrategy strategy)
+      : fAssets(std::move(assets)), fStrategy(strategy) {}
+  const AssetMap fAssets;
+  const skresources::ImageDecodeStrategy fStrategy;
+};
+
 class JsiSkSVGFactory : public JsiSkHostObject {
 public:
-  JSI_HOST_FUNCTION(MakeFromData) {
-    auto data = JsiSkData::fromValue(runtime, arguments[0]);
-    auto stream = SkMemoryStream::Make(data);
-    auto svg_dom = SkSVGDOM::Builder().make(*stream);
+  // Helper function to parse asset map from JS object
+  static SVGAssetProvider::AssetMap parseAssetMap(jsi::Runtime &runtime,
+                                                  const jsi::Value &jsValue) {
+    SVGAssetProvider::AssetMap assets;
+
+    if (!jsValue.isObject()) {
+      return assets;
+    }
+
+    auto jsAssetMap = jsValue.asObject(runtime);
+
+    // Convert JS object to C++ AssetMap
+    auto propertyNames = jsAssetMap.getPropertyNames(runtime);
+    size_t propertyCount = propertyNames.size(runtime);
+
+    for (size_t i = 0; i < propertyCount; i++) {
+      auto propertyName =
+          propertyNames.getValueAtIndex(runtime, i).asString(runtime);
+      auto key = propertyName.utf8(runtime);
+      auto jsValue = jsAssetMap.getProperty(runtime, propertyName);
+
+      // Skip null or undefined values
+      if (jsValue.isNull() || jsValue.isUndefined()) {
+        continue;
+      }
+
+      if (jsValue.isObject()) {
+        auto jsObject = jsValue.asObject(runtime);
+        if (jsObject.isHostObject(runtime)) {
+          auto hostObject = jsObject.getHostObject(runtime);
+          auto skData = std::dynamic_pointer_cast<JsiSkData>(hostObject);
+          if (skData) {
+            assets[key] = skData->getObject();
+          }
+        }
+      }
+    }
+
+    return assets;
+  }
+
+private:
+  jsi::Value makeSVGFromStream(jsi::Runtime &runtime,
+                               std::unique_ptr<SkMemoryStream> stream,
+                               sk_sp<SkFontMgr> fontMgr,
+                               SVGAssetProvider::AssetMap assets) {
+    auto builder = SkSVGDOM::Builder();
+
+    if (fontMgr) {
+      builder.setFontManager(fontMgr);
+    }
+
+    auto baseProvider = SVGAssetProvider::Make(
+        std::move(assets), skresources::ImageDecodeStrategy::kPreDecode);
+    auto provider = skresources::DataURIResourceProviderProxy::Make(
+        std::move(baseProvider), skresources::ImageDecodeStrategy::kPreDecode,
+        fontMgr);
+
+    // TODO: this sk_sp subclassing issue needs to be fixed.
+    provider->ref();
+    builder.setResourceProvider(provider);
+
+    auto svg_dom = builder.make(*stream);
     auto svg = std::make_shared<JsiSkSVG>(getContext(), std::move(svg_dom));
     return JSI_CREATE_HOST_OBJECT_WITH_MEMORY_PRESSURE(runtime, svg,
                                                        getContext());
   }
 
+public:
+  JSI_HOST_FUNCTION(MakeFromData) {
+    auto data = JsiSkData::fromValue(runtime, arguments[0]);
+    auto stream = SkMemoryStream::Make(data);
+
+    // Parse fontMgr (second parameter)
+    auto fontMgr = count > 1 && arguments[1].isObject()
+                       ? JsiSkFontMgr::fromValue(runtime, arguments[1])
+                       : nullptr;
+
+    // Parse assets map (third parameter)
+    auto assets = count > 2 ? parseAssetMap(runtime, arguments[2])
+                            : SVGAssetProvider::AssetMap();
+
+    return makeSVGFromStream(runtime, std::move(stream), fontMgr,
+                             std::move(assets));
+  }
+
   JSI_HOST_FUNCTION(MakeFromString) {
     auto svgText = arguments[0].asString(runtime).utf8(runtime);
     auto stream = SkMemoryStream::MakeDirect(svgText.c_str(), svgText.size());
-    auto svg_dom = SkSVGDOM::Builder().make(*stream);
-    auto svg = std::make_shared<JsiSkSVG>(getContext(), std::move(svg_dom));
-    return JSI_CREATE_HOST_OBJECT_WITH_MEMORY_PRESSURE(runtime, svg,
-                                                       getContext());
+
+    // Parse fontMgr (second parameter)
+    auto fontMgr = count > 1 && arguments[1].isObject()
+                       ? JsiSkFontMgr::fromValue(runtime, arguments[1])
+                       : nullptr;
+
+    // Parse assets map (third parameter)
+    auto assets = count > 2 ? parseAssetMap(runtime, arguments[2])
+                            : SVGAssetProvider::AssetMap();
+
+    return makeSVGFromStream(runtime, std::move(stream), fontMgr,
+                             std::move(assets));
   }
 
   size_t getMemoryPressure() const override { return 512; }

package/lib/commonjs/skia/types/SVG/SVGFactory.d.ts

@@ -1,6 +1,7 @@
 import type { SkData } from "../Data";
+import type { SkFontMgr } from "../Font/FontMgr";
 import type { SkSVG } from "./SVG";
 export interface SVGFactory {
-    MakeFromData(data: SkData): SkSVG | null;
-    MakeFromString(str: string): SkSVG | null;
+    MakeFromData(data: SkData, fontMgr?: SkFontMgr | null, assets?: Record<string, SkData | null>): SkSVG | null;
+    MakeFromString(str: string, fontMgr?: SkFontMgr | null, assets?: Record<string, SkData | null>): SkSVG | null;
 }

package/lib/commonjs/skia/types/SVG/SVGFactory.js.map

@@ -1 +1 @@
-{"version":3,"names":[],"sources":["SVGFactory.ts"],"sourcesContent":["import type { SkData } from \"../Data\";\n\nimport type { SkSVG } from \"./SVG\";\n\nexport interface SVGFactory {\n  MakeFromData(data: SkData): SkSVG | null;\n  MakeFromString(str: string): SkSVG | null;\n}\n"],"mappings":"","ignoreList":[]}
+{"version":3,"names":[],"sources":["SVGFactory.ts"],"sourcesContent":["import type { SkData } from \"../Data\";\nimport type { SkFontMgr } from \"../Font/FontMgr\";\n\nimport type { SkSVG } from \"./SVG\";\n\nexport interface SVGFactory {\n  MakeFromData(\n    data: SkData,\n    fontMgr?: SkFontMgr | null,\n    assets?: Record<string, SkData | null>\n  ): SkSVG | null;\n  MakeFromString(\n    str: string,\n    fontMgr?: SkFontMgr | null,\n    assets?: Record<string, SkData | null>\n  ): SkSVG | null;\n}\n"],"mappings":"","ignoreList":[]}

package/lib/module/skia/types/SVG/SVGFactory.d.ts

@@ -1,6 +1,7 @@
 import type { SkData } from "../Data";
+import type { SkFontMgr } from "../Font/FontMgr";
 import type { SkSVG } from "./SVG";
 export interface SVGFactory {
-    MakeFromData(data: SkData): SkSVG | null;
-    MakeFromString(str: string): SkSVG | null;
+    MakeFromData(data: SkData, fontMgr?: SkFontMgr | null, assets?: Record<string, SkData | null>): SkSVG | null;
+    MakeFromString(str: string, fontMgr?: SkFontMgr | null, assets?: Record<string, SkData | null>): SkSVG | null;
 }

package/lib/module/skia/types/SVG/SVGFactory.js.map

@@ -1 +1 @@
-{"version":3,"names":[],"sources":["SVGFactory.ts"],"sourcesContent":["import type { SkData } from \"../Data\";\n\nimport type { SkSVG } from \"./SVG\";\n\nexport interface SVGFactory {\n  MakeFromData(data: SkData): SkSVG | null;\n  MakeFromString(str: string): SkSVG | null;\n}\n"],"mappings":"","ignoreList":[]}
+{"version":3,"names":[],"sources":["SVGFactory.ts"],"sourcesContent":["import type { SkData } from \"../Data\";\nimport type { SkFontMgr } from \"../Font/FontMgr\";\n\nimport type { SkSVG } from \"./SVG\";\n\nexport interface SVGFactory {\n  MakeFromData(\n    data: SkData,\n    fontMgr?: SkFontMgr | null,\n    assets?: Record<string, SkData | null>\n  ): SkSVG | null;\n  MakeFromString(\n    str: string,\n    fontMgr?: SkFontMgr | null,\n    assets?: Record<string, SkData | null>\n  ): SkSVG | null;\n}\n"],"mappings":"","ignoreList":[]}

package/lib/typescript/src/skia/types/SVG/SVGFactory.d.ts

@@ -1,6 +1,7 @@
 import type { SkData } from "../Data";
+import type { SkFontMgr } from "../Font/FontMgr";
 import type { SkSVG } from "./SVG";
 export interface SVGFactory {
-    MakeFromData(data: SkData): SkSVG | null;
-    MakeFromString(str: string): SkSVG | null;
+    MakeFromData(data: SkData, fontMgr?: SkFontMgr | null, assets?: Record<string, SkData | null>): SkSVG | null;
+    MakeFromString(str: string, fontMgr?: SkFontMgr | null, assets?: Record<string, SkData | null>): SkSVG | null;
 }

package/libs/apple/libpathops.xcframework/Info.plist

@@ -8,34 +8,51 @@
 			<key>BinaryPath</key>
 			<string>libpathops.a</string>
 			<key>LibraryIdentifier</key>
-			<string>ios-arm64_arm64e</string>
+			<string>ios-arm64_arm64e_x86_64-simulator</string>
 			<key>LibraryPath</key>
 			<string>libpathops.a</string>
 			<key>SupportedArchitectures</key>
 			<array>
 				<string>arm64</string>
 				<string>arm64e</string>
+				<string>x86_64</string>
 			</array>
 			<key>SupportedPlatform</key>
 			<string>ios</string>
+			<key>SupportedPlatformVariant</key>
+			<string>simulator</string>
 		</dict>
 		<dict>
 			<key>BinaryPath</key>
 			<string>libpathops.a</string>
 			<key>LibraryIdentifier</key>
-			<string>ios-arm64_arm64e_x86_64-simulator</string>
+			<string>ios-arm64_x86_64-maccatalyst</string>
 			<key>LibraryPath</key>
 			<string>libpathops.a</string>
 			<key>SupportedArchitectures</key>
 			<array>
 				<string>arm64</string>
-				<string>arm64e</string>
 				<string>x86_64</string>
 			</array>
 			<key>SupportedPlatform</key>
 			<string>ios</string>
 			<key>SupportedPlatformVariant</key>
-			<string>simulator</string>
+			<string>maccatalyst</string>
+		</dict>
+		<dict>
+			<key>BinaryPath</key>
+			<string>libpathops.a</string>
+			<key>LibraryIdentifier</key>
+			<string>macos-arm64_x86_64</string>
+			<key>LibraryPath</key>
+			<string>libpathops.a</string>
+			<key>SupportedArchitectures</key>
+			<array>
+				<string>arm64</string>
+				<string>x86_64</string>
+			</array>
+			<key>SupportedPlatform</key>
+			<string>macos</string>
 		</dict>
 		<dict>
 			<key>BinaryPath</key>
@@ -59,22 +76,22 @@
 			<key>BinaryPath</key>
 			<string>libpathops.a</string>
 			<key>LibraryIdentifier</key>
-			<string>macos-arm64_x86_64</string>
+			<string>tvos-arm64_arm64e</string>
 			<key>LibraryPath</key>
 			<string>libpathops.a</string>
 			<key>SupportedArchitectures</key>
 			<array>
 				<string>arm64</string>
-				<string>x86_64</string>
+				<string>arm64e</string>
 			</array>
 			<key>SupportedPlatform</key>
-			<string>macos</string>
+			<string>tvos</string>
 		</dict>
 		<dict>
 			<key>BinaryPath</key>
 			<string>libpathops.a</string>
 			<key>LibraryIdentifier</key>
-			<string>tvos-arm64_arm64e</string>
+			<string>ios-arm64_arm64e</string>
 			<key>LibraryPath</key>
 			<string>libpathops.a</string>
 			<key>SupportedArchitectures</key>
@@ -83,7 +100,7 @@
 				<string>arm64e</string>
 			</array>
 			<key>SupportedPlatform</key>
-			<string>tvos</string>
+			<string>ios</string>
 		</dict>
 	</array>
 	<key>CFBundlePackageType</key>

package/libs/apple/libskia.xcframework/Info.plist

@@ -8,7 +8,7 @@
 			<key>BinaryPath</key>
 			<string>libskia.a</string>
 			<key>LibraryIdentifier</key>
-			<string>ios-arm64_arm64e</string>
+			<string>tvos-arm64_arm64e</string>
 			<key>LibraryPath</key>
 			<string>libskia.a</string>
 			<key>SupportedArchitectures</key>
@@ -17,22 +17,25 @@
 				<string>arm64e</string>
 			</array>
 			<key>SupportedPlatform</key>
-			<string>ios</string>
+			<string>tvos</string>
 		</dict>
 		<dict>
 			<key>BinaryPath</key>
 			<string>libskia.a</string>
 			<key>LibraryIdentifier</key>
-			<string>tvos-arm64_arm64e</string>
+			<string>tvos-arm64_arm64e_x86_64-simulator</string>
 			<key>LibraryPath</key>
 			<string>libskia.a</string>
 			<key>SupportedArchitectures</key>
 			<array>
 				<string>arm64</string>
 				<string>arm64e</string>
+				<string>x86_64</string>
 			</array>
 			<key>SupportedPlatform</key>
 			<string>tvos</string>
+			<key>SupportedPlatformVariant</key>
+			<string>simulator</string>
 		</dict>
 		<dict>
 			<key>BinaryPath</key>
@@ -71,19 +74,33 @@
 			<key>BinaryPath</key>
 			<string>libskia.a</string>
 			<key>LibraryIdentifier</key>
-			<string>tvos-arm64_arm64e_x86_64-simulator</string>
+			<string>ios-arm64_x86_64-maccatalyst</string>
 			<key>LibraryPath</key>
 			<string>libskia.a</string>
 			<key>SupportedArchitectures</key>
 			<array>
 				<string>arm64</string>
-				<string>arm64e</string>
 				<string>x86_64</string>
 			</array>
 			<key>SupportedPlatform</key>
-			<string>tvos</string>
+			<string>ios</string>
 			<key>SupportedPlatformVariant</key>
-			<string>simulator</string>
+			<string>maccatalyst</string>
+		</dict>
+		<dict>
+			<key>BinaryPath</key>
+			<string>libskia.a</string>
+			<key>LibraryIdentifier</key>
+			<string>ios-arm64_arm64e</string>
+			<key>LibraryPath</key>
+			<string>libskia.a</string>
+			<key>SupportedArchitectures</key>
+			<array>
+				<string>arm64</string>
+				<string>arm64e</string>
+			</array>
+			<key>SupportedPlatform</key>
+			<string>ios</string>
 		</dict>
 	</array>
 	<key>CFBundlePackageType</key>

package/libs/apple/libskottie.xcframework/Info.plist

@@ -8,82 +8,99 @@
 			<key>BinaryPath</key>
 			<string>libskottie.a</string>
 			<key>LibraryIdentifier</key>
-			<string>tvos-arm64_arm64e</string>
+			<string>ios-arm64_arm64e_x86_64-simulator</string>
 			<key>LibraryPath</key>
 			<string>libskottie.a</string>
 			<key>SupportedArchitectures</key>
 			<array>
 				<string>arm64</string>
 				<string>arm64e</string>
+				<string>x86_64</string>
 			</array>
 			<key>SupportedPlatform</key>
-			<string>tvos</string>
+			<string>ios</string>
+			<key>SupportedPlatformVariant</key>
+			<string>simulator</string>
 		</dict>
 		<dict>
 			<key>BinaryPath</key>
 			<string>libskottie.a</string>
 			<key>LibraryIdentifier</key>
-			<string>tvos-arm64_arm64e_x86_64-simulator</string>
+			<string>ios-arm64_arm64e</string>
 			<key>LibraryPath</key>
 			<string>libskottie.a</string>
 			<key>SupportedArchitectures</key>
 			<array>
 				<string>arm64</string>
 				<string>arm64e</string>
+			</array>
+			<key>SupportedPlatform</key>
+			<string>ios</string>
+		</dict>
+		<dict>
+			<key>BinaryPath</key>
+			<string>libskottie.a</string>
+			<key>LibraryIdentifier</key>
+			<string>ios-arm64_x86_64-maccatalyst</string>
+			<key>LibraryPath</key>
+			<string>libskottie.a</string>
+			<key>SupportedArchitectures</key>
+			<array>
+				<string>arm64</string>
 				<string>x86_64</string>
 			</array>
 			<key>SupportedPlatform</key>
-			<string>tvos</string>
+			<string>ios</string>
 			<key>SupportedPlatformVariant</key>
-			<string>simulator</string>
+			<string>maccatalyst</string>
 		</dict>
 		<dict>
 			<key>BinaryPath</key>
 			<string>libskottie.a</string>
 			<key>LibraryIdentifier</key>
-			<string>macos-arm64_x86_64</string>
+			<string>tvos-arm64_arm64e_x86_64-simulator</string>
 			<key>LibraryPath</key>
 			<string>libskottie.a</string>
 			<key>SupportedArchitectures</key>
 			<array>
 				<string>arm64</string>
+				<string>arm64e</string>
 				<string>x86_64</string>
 			</array>
 			<key>SupportedPlatform</key>
-			<string>macos</string>
+			<string>tvos</string>
+			<key>SupportedPlatformVariant</key>
+			<string>simulator</string>
 		</dict>
 		<dict>
 			<key>BinaryPath</key>
 			<string>libskottie.a</string>
 			<key>LibraryIdentifier</key>
-			<string>ios-arm64_arm64e</string>
+			<string>macos-arm64_x86_64</string>
 			<key>LibraryPath</key>
 			<string>libskottie.a</string>
 			<key>SupportedArchitectures</key>
 			<array>
 				<string>arm64</string>
-				<string>arm64e</string>
+				<string>x86_64</string>
 			</array>
 			<key>SupportedPlatform</key>
-			<string>ios</string>
+			<string>macos</string>
 		</dict>
 		<dict>
 			<key>BinaryPath</key>
 			<string>libskottie.a</string>
 			<key>LibraryIdentifier</key>
-			<string>ios-arm64_arm64e_x86_64-simulator</string>
+			<string>tvos-arm64_arm64e</string>
 			<key>LibraryPath</key>
 			<string>libskottie.a</string>
 			<key>SupportedArchitectures</key>
 			<array>
 				<string>arm64</string>
 				<string>arm64e</string>
-				<string>x86_64</string>
 			</array>
 			<key>SupportedPlatform</key>
-			<string>ios</string>
-			<key>SupportedPlatformVariant</key>
-			<string>simulator</string>
+			<string>tvos</string>
 		</dict>
 	</array>
 	<key>CFBundlePackageType</key>