@shopify/react-native-skia 2.7.0 → 2.9.0

package/android/build.gradle

@@ -74,12 +74,18 @@ static def resolveNodePackage(packageName, baseDir) {
   return proc.text.trim()
 }
 
-// Graphite is detected via a marker file created by install-skia-graphite, which
-// downloads its binaries directly into libs/. For the default (Ganesh) build the
-// binaries live in the react-native-skia-android npm package and are read in place.
+// Graphite is detected via a marker file (created by install-skia-graphite for
+// in-repo development, or shipped in the npm tarball for next-channel releases).
+// The prebuilt binaries live in the react-native-skia-android npm package for the
+// default (Ganesh) build and in react-native-skia-graphite-android for Graphite.
+// In-repo Graphite development downloads them directly into libs/android instead,
+// which takes precedence over the npm package when present.
 def useGraphite = file("${projectDir}/../libs/.graphite").exists()
+def localGraphiteLibs = file("${projectDir}/../libs/android")
 def skiaLibsPath = useGraphite
-    ? "${projectDir}/../libs/android"
+    ? (localGraphiteLibs.exists()
+        ? "${projectDir}/../libs/android"
+        : "${resolveNodePackage('react-native-skia-graphite-android', projectDir)}/libs")
     : "${resolveNodePackage('react-native-skia-android', projectDir)}/libs"
 
 logger.warn("react-native-skia: SK_GRAPHITE: ${useGraphite}")

package/android/cpp/rnskia-android/OpenGLContext.h

@@ -42,6 +42,11 @@ private:
     _glConfig = _glDisplay->chooseConfig();
     _glContext = _glDisplay->makeContext(_glConfig, nullptr);
     _glSurface = _glDisplay->makePixelBufferSurface(_glConfig, 1, 1);
+    if (_glContext == nullptr || _glSurface == nullptr) {
+      RNSkLogger::logToConsole(
+          "Couldn't create the shared OpenGL context or surface");
+      return;
+    }
     _glContext->makeCurrent(_glSurface.get());
   }
 };
@@ -60,6 +65,10 @@ public:
 
   sk_sp<SkSurface> MakeOffscreen(int width, int height,
                                  bool useP3ColorSpace = false) {
+    if (_directContext == nullptr) {
+      return nullptr;
+    }
+
     auto colorType = kRGBA_8888_SkColorType;
 
     SkSurfaceProps props(0, kUnknown_SkPixelGeometry);
@@ -110,6 +119,9 @@ public:
   sk_sp<SkImage> MakeImageFromBuffer(void *buffer,
                                      bool requireKnownFormat = false) {
 #if __ANDROID_API__ >= 26
+    if (_directContext == nullptr) {
+      return nullptr;
+    }
     const AHardwareBuffer *hardwareBuffer =
         static_cast<AHardwareBuffer *>(buffer);
     DeleteImageProc deleteImageProc = nullptr;
@@ -181,6 +193,11 @@ public:
   // TODO: remove width, height
   std::unique_ptr<WindowContext> MakeWindow(ANativeWindow *window,
                                             bool highBitDepth = false) {
+    if (_directContext == nullptr) {
+      RNSkLogger::logToConsole(
+          "The OpenGL context is invalid, the surface will not be rendered");
+      return nullptr;
+    }
     auto display = OpenGLSharedContext::getInstance().getDisplay();
     if (highBitDepth) {
       // A 10-bit window surface would require the shared EGL context to be
@@ -196,7 +213,11 @@ public:
   }
 
   GrDirectContext *getDirectContext() { return _directContext.get(); }
-  void makeCurrent() { _glContext->makeCurrent(_glSurface.get()); }
+  void makeCurrent() {
+    if (_glContext != nullptr) {
+      _glContext->makeCurrent(_glSurface.get());
+    }
+  }
 
 private:
   std::unique_ptr<gl::Context> _glContext;
@@ -209,12 +230,17 @@ private:
     auto glConfig = OpenGLSharedContext::getInstance().getConfig();
     _glContext = display->makeContext(glConfig, sharedContext);
     _glSurface = display->makePixelBufferSurface(glConfig, 1, 1);
-    _glContext->makeCurrent(_glSurface.get());
+    if (_glContext == nullptr || _glSurface == nullptr ||
+        !_glContext->makeCurrent(_glSurface.get())) {
+      RNSkLogger::logToConsole(
+          "Couldn't create the OpenGL context, Skia rendering is disabled");
+      return;
+    }
     auto backendInterface = GrGLMakeNativeInterface();
     _directContext = GrDirectContexts::MakeGL(backendInterface);
 
     if (_directContext == nullptr) {
-      throw std::runtime_error("GrDirectContexts::MakeGL failed");
+      RNSkLogger::logToConsole("GrDirectContexts::MakeGL failed");
     }
   }
 };

package/android/cpp/rnskia-android/OpenGLWindowContext.cpp

@@ -16,7 +16,12 @@ namespace RNSkia {
 
 sk_sp<SkSurface> OpenGLWindowContext::getSurface() {
   if (_skSurface == nullptr) {
-    _glContext->makeCurrent(_glSurface.get());
+    if (_glSurface == nullptr || !_glContext->makeCurrent(_glSurface.get())) {
+      RNSkLogger::logToConsole(
+          "Couldn't create the EGL window surface, the surface will not be "
+          "rendered");
+      return nullptr;
+    }
     GLint stencil;
     glGetIntegerv(GL_STENCIL_BITS, &stencil);
 
@@ -52,7 +57,9 @@ sk_sp<SkSurface> OpenGLWindowContext::getSurface() {
 }
 
 void OpenGLWindowContext::present() {
-  _glContext->makeCurrent(_glSurface.get());
+  if (_glSurface == nullptr || !_glContext->makeCurrent(_glSurface.get())) {
+    return;
+  }
   _directContext->flushAndSubmit();
   _glSurface->present();
 }

package/android/cpp/rnskia-android/gl/Context.h

@@ -26,6 +26,9 @@ public:
     if (_context == EGL_NO_CONTEXT) {
       return false;
     }
+    if (surface == nullptr || !surface->isValid()) {
+      return false;
+    }
     const auto result =
         eglMakeCurrentIfNecessary(_display, surface->getHandle(),
                                   surface->getHandle(), _context) == EGL_TRUE;

package/android/cpp/rnskia-android/gl/Surface.h

@@ -17,7 +17,7 @@ public:
     }
   }
 
-  bool isValid() { return _surface != EGL_NO_SURFACE; }
+  bool isValid() const { return _surface != EGL_NO_SURFACE; }
 
   const EGLSurface &getHandle() const { return _surface; }
 

package/cpp/api/JsiSkParagraph.h

@@ -8,6 +8,7 @@
 #include <jsi/jsi.h>
 
 #include "JsiSkCanvas.h"
+#include "JsiSkFont.h"
 #include "JsiSkHostObjects.h"
 #include "JsiSkPath.h"
 #include "JsiSkRect.h"
@@ -141,6 +142,117 @@ public:
     return returnValue;
   }
 
+  JSI_HOST_FUNCTION(getPath) {
+    auto lineNumber =
+        static_cast<int>(getArgumentAsNumber(runtime, arguments, count, 0));
+    auto paragraph = getObject();
+    // Paragraph::getPath does not bounds-check the line number.
+    if (lineNumber < 0 ||
+        static_cast<size_t>(lineNumber) >= paragraph->lineNumber()) {
+      return jsi::Value::null();
+    }
+    // Paragraph::getPath resets its path builder after every visual run, so
+    // for lines shaped as multiple runs (e.g. through font fallback) it only
+    // returns the glyphs of the last run. Build the path from the per-glyph
+    // data exposed by extendedVisit instead.
+    SkPathBuilder builder;
+    paragraph->extendedVisit(
+        [lineNumber, &builder](
+            int visitedLine, const para::Paragraph::ExtendedVisitorInfo *info) {
+          if (visitedLine != lineNumber || info == nullptr) {
+            return;
+          }
+          struct Rec {
+            SkPathBuilder *builder;
+            SkPoint origin;
+            const SkPoint *pos;
+          } rec = {&builder, info->origin, info->positions};
+          info->font.getPaths(
+              {info->glyphs, static_cast<size_t>(info->count)},
+              [](const SkPath *src, const SkMatrix &mx, void *ctx) {
+                auto *rec = static_cast<Rec *>(ctx);
+                if (src != nullptr) {
+                  SkMatrix total = mx;
+                  total.postTranslate(rec->origin.fX + rec->pos->fX,
+                                      rec->origin.fY + rec->pos->fY);
+                  rec->builder->addPath(*src, total);
+                }
+                rec->pos += 1;
+              },
+              &rec);
+        });
+    SkPath path = builder.detach();
+    auto hostObjectInstance =
+        std::make_shared<JsiSkPath>(getContext(), std::move(path));
+    return JSI_CREATE_HOST_OBJECT_WITH_MEMORY_PRESSURE(
+        runtime, hostObjectInstance, getContext());
+  }
+
+  JSI_HOST_FUNCTION(extendedVisit) {
+    auto visitorObject = getArgumentAsFunction(runtime, arguments, count, 0);
+    auto visitor = visitorObject.asFunction(runtime);
+    auto context = getContext();
+    getObject()->extendedVisit(
+        [&runtime, &visitor, &context](
+            int lineNumber, const para::Paragraph::ExtendedVisitorInfo *info) {
+          if (info == nullptr) {
+            // Signals the end of the line
+            visitor.call(runtime, static_cast<double>(lineNumber),
+                         jsi::Value::null());
+            return;
+          }
+          auto value = jsi::Object(runtime);
+
+          auto fontInstance = std::make_shared<JsiSkFont>(context, info->font);
+          value.setProperty(runtime, "font",
+                            JSI_CREATE_HOST_OBJECT_WITH_MEMORY_PRESSURE(
+                                runtime, fontInstance, context));
+
+          auto origin = jsi::Object(runtime);
+          origin.setProperty(runtime, "x",
+                             static_cast<double>(info->origin.x()));
+          origin.setProperty(runtime, "y",
+                             static_cast<double>(info->origin.y()));
+          value.setProperty(runtime, "origin", origin);
+
+          auto advance = jsi::Object(runtime);
+          advance.setProperty(runtime, "width",
+                              static_cast<double>(info->advance.width()));
+          advance.setProperty(runtime, "height",
+                              static_cast<double>(info->advance.height()));
+          value.setProperty(runtime, "advance", advance);
+
+          auto size = info->count;
+          auto glyphs = jsi::Array(runtime, size);
+          auto positions = jsi::Array(runtime, size);
+          auto bounds = jsi::Array(runtime, size);
+          auto utf8Starts = jsi::Array(runtime, size);
+          for (int i = 0; i < size; ++i) {
+            glyphs.setValueAtIndex(runtime, i,
+                                   static_cast<double>(info->glyphs[i]));
+            auto position = jsi::Object(runtime);
+            position.setProperty(runtime, "x",
+                                 static_cast<double>(info->positions[i].x()));
+            position.setProperty(runtime, "y",
+                                 static_cast<double>(info->positions[i].y()));
+            positions.setValueAtIndex(runtime, i, position);
+            bounds.setValueAtIndex(
+                runtime, i,
+                JsiSkRect::toValue(runtime, context, info->bounds[i]));
+            utf8Starts.setValueAtIndex(
+                runtime, i, static_cast<double>(info->utf8Starts[i]));
+          }
+          value.setProperty(runtime, "glyphs", glyphs);
+          value.setProperty(runtime, "positions", positions);
+          value.setProperty(runtime, "bounds", bounds);
+          value.setProperty(runtime, "utf8Starts", utf8Starts);
+          value.setProperty(runtime, "flags", static_cast<double>(info->flags));
+
+          visitor.call(runtime, static_cast<double>(lineNumber), value);
+        });
+    return jsi::Value::undefined();
+  }
+
   JSI_HOST_FUNCTION(getRectsForPlaceholders) {
     std::vector<para::TextBox> placeholderInfos =
         getObject()->getRectsForPlaceholders();
@@ -169,6 +281,8 @@ public:
                                        getGlyphPositionAtCoordinate),
                        JSI_EXPORT_FUNC(JsiSkParagraph, getRectsForRange),
                        JSI_EXPORT_FUNC(JsiSkParagraph, getLineMetrics),
+                       JSI_EXPORT_FUNC(JsiSkParagraph, getPath),
+                       JSI_EXPORT_FUNC(JsiSkParagraph, extendedVisit),
                        JSI_EXPORT_FUNC(JsiSkParagraph, dispose))
 
   size_t getMemoryPressure() const override { return 1024 * 1024; }

package/cpp/api/JsiSkiaContext.h

@@ -79,6 +79,10 @@ public:
       }
       auto result =
           context->makeContextFromNativeSurface(surface, width, height);
+      if (result == nullptr) {
+        throw std::runtime_error(
+            "Couldn't create a Skia context from the native surface");
+      }
       // Return the newly constructed object
       auto hostObjectInstance =
           std::make_shared<JsiSkiaContext>(context, std::move(result));

package/cpp/rnskia/RNSkView.h

@@ -84,6 +84,9 @@ public:
    Returns a snapshot of the current surface/canvas
    */
   sk_sp<SkImage> makeSnapshot(SkRect *bounds) {
+    if (_surface == nullptr) {
+      return nullptr;
+    }
     sk_sp<SkImage> image;
     if (bounds != nullptr) {
       SkIRect b =
@@ -120,6 +123,9 @@ public:
    Render to a canvas
    */
   bool renderToCanvas(const std::function<void(SkCanvas *)> &cb) override {
+    if (_surface == nullptr) {
+      return false;
+    }
     cb(_surface->getCanvas());
     return true;
   };

package/lib/commonjs/Platform/Platform.js

@@ -10,8 +10,11 @@ const Platform = exports.Platform = {
   OS: _reactNative.Platform.OS,
   PixelRatio: _reactNative.PixelRatio.get(),
   resolveAsset: source => {
-    // eslint-disable-next-line no-nested-ternary
-    return (0, _types.isRNModule)(source) ? _reactNative.Image.resolveAssetSource(source).uri : "uri" in source ? source.uri : source.default;
+    const asset = (0, _types.unwrapModule)(source);
+    if (typeof asset === "string") {
+      return asset;
+    }
+    return (0, _types.isRNModule)(asset) ? _reactNative.Image.resolveAssetSource(asset).uri : asset.uri;
   },
   findNodeHandle: _reactNative.findNodeHandle,
   View: _reactNative.View

package/lib/commonjs/Platform/Platform.js.map

@@ -1 +1 @@
-{"version":3,"names":["_reactNative","require","_types","Platform","exports","OS","RNPlatform","PixelRatio","get","resolveAsset","source","isRNModule","Image","resolveAssetSource","uri","default","findNodeHandle","View"],"sources":["Platform.ts"],"sourcesContent":["import {\n  Image,\n  PixelRatio,\n  Platform as RNPlatform,\n  findNodeHandle,\n  View,\n} from \"react-native\";\n\nimport type { DataModule } from \"../skia/types\";\nimport { isRNModule } from \"../skia/types\";\n\nimport type { IPlatform } from \"./IPlatform\";\n\nexport const Platform: IPlatform = {\n  OS: RNPlatform.OS,\n  PixelRatio: PixelRatio.get(),\n  resolveAsset: (source: DataModule) => {\n    // eslint-disable-next-line no-nested-ternary\n    return isRNModule(source)\n      ? Image.resolveAssetSource(source).uri\n      : \"uri\" in source\n        ? source.uri\n        : source.default;\n  },\n  findNodeHandle,\n  View,\n};\n"],"mappings":";;;;;;AAAA,IAAAA,YAAA,GAAAC,OAAA;AASA,IAAAC,MAAA,GAAAD,OAAA;AAIO,MAAME,QAAmB,GAAAC,OAAA,CAAAD,QAAA,GAAG;EACjCE,EAAE,EAAEC,qBAAU,CAACD,EAAE;EACjBE,UAAU,EAAEA,uBAAU,CAACC,GAAG,CAAC,CAAC;EAC5BC,YAAY,EAAGC,MAAkB,IAAK;IACpC;IACA,OAAO,IAAAC,iBAAU,EAACD,MAAM,CAAC,GACrBE,kBAAK,CAACC,kBAAkB,CAACH,MAAM,CAAC,CAACI,GAAG,GACpC,KAAK,IAAIJ,MAAM,GACbA,MAAM,CAACI,GAAG,GACVJ,MAAM,CAACK,OAAO;EACtB,CAAC;EACDC,cAAc,EAAdA,2BAAc;EACdC,IAAI,EAAJA;AACF,CAAC","ignoreList":[]}
+{"version":3,"names":["_reactNative","require","_types","Platform","exports","OS","RNPlatform","PixelRatio","get","resolveAsset","source","asset","unwrapModule","isRNModule","Image","resolveAssetSource","uri","findNodeHandle","View"],"sources":["Platform.ts"],"sourcesContent":["import {\n  Image,\n  PixelRatio,\n  Platform as RNPlatform,\n  findNodeHandle,\n  View,\n} from \"react-native\";\n\nimport type { DataModule } from \"../skia/types\";\nimport { isRNModule, unwrapModule } from \"../skia/types\";\n\nimport type { IPlatform } from \"./IPlatform\";\n\nexport const Platform: IPlatform = {\n  OS: RNPlatform.OS,\n  PixelRatio: PixelRatio.get(),\n  resolveAsset: (source: DataModule) => {\n    const asset = unwrapModule(source);\n    if (typeof asset === \"string\") {\n      return asset;\n    }\n    return isRNModule(asset) ? Image.resolveAssetSource(asset).uri : asset.uri;\n  },\n  findNodeHandle,\n  View,\n};\n"],"mappings":";;;;;;AAAA,IAAAA,YAAA,GAAAC,OAAA;AASA,IAAAC,MAAA,GAAAD,OAAA;AAIO,MAAME,QAAmB,GAAAC,OAAA,CAAAD,QAAA,GAAG;EACjCE,EAAE,EAAEC,qBAAU,CAACD,EAAE;EACjBE,UAAU,EAAEA,uBAAU,CAACC,GAAG,CAAC,CAAC;EAC5BC,YAAY,EAAGC,MAAkB,IAAK;IACpC,MAAMC,KAAK,GAAG,IAAAC,mBAAY,EAACF,MAAM,CAAC;IAClC,IAAI,OAAOC,KAAK,KAAK,QAAQ,EAAE;MAC7B,OAAOA,KAAK;IACd;IACA,OAAO,IAAAE,iBAAU,EAACF,KAAK,CAAC,GAAGG,kBAAK,CAACC,kBAAkB,CAACJ,KAAK,CAAC,CAACK,GAAG,GAAGL,KAAK,CAACK,GAAG;EAC5E,CAAC;EACDC,cAAc,EAAdA,2BAAc;EACdC,IAAI,EAAJA;AACF,CAAC","ignoreList":[]}

package/lib/commonjs/Platform/Platform.web.js

@@ -44,8 +44,12 @@ const Platform = exports.Platform = {
   PixelRatio: typeof window !== "undefined" ? window.devicePixelRatio : 1,
   // window is not defined on node
   resolveAsset: source => {
-    if ((0, _types.isRNModule)(source)) {
-      if (typeof source === "number" && typeof require === "function") {
+    const asset = (0, _types.unwrapModule)(source);
+    if (typeof asset === "string") {
+      return asset;
+    }
+    if ((0, _types.isRNModule)(asset)) {
+      if (typeof require === "function") {
         const {
           getAssetByID
         } = require("react-native/Libraries/Image/AssetRegistry");
@@ -53,16 +57,13 @@ const Platform = exports.Platform = {
           httpServerLocation,
           name,
           type
-        } = getAssetByID(source);
+        } = getAssetByID(asset);
         const uri = `${httpServerLocation}/${name}.${type}`;
         return uri;
       }
       throw new Error("Asset source is a number - this is not supported on the web");
     }
-    if ("uri" in source) {
-      return source.uri;
-    }
-    return source.default;
+    return asset.uri;
   },
   findNodeHandle: () => {
     throw new Error("findNodeHandle is not supported on the web");

package/lib/commonjs/Platform/Platform.web.js.map

@@ -1 +1 @@
-{"version":3,"names":["_react","_interopRequireWildcard","require","_types","e","t","WeakMap","r","n","__esModule","o","i","f","__proto__","default","has","get","set","hasOwnProperty","call","Object","defineProperty","getOwnPropertyDescriptor","View","children","style","rawStyle","useMemo","cssStyles","alignItems","backgroundColor","border","boxSizing","display","flexBasis","flexDirection","flexShrink","listStyle","margin","minHeight","minWidth","padding","position","textDecoration","zIndex","createElement","Platform","exports","OS","PixelRatio","window","devicePixelRatio","resolveAsset","source","isRNModule","getAssetByID","httpServerLocation","name","type","uri","Error","findNodeHandle"],"sources":["Platform.web.tsx"],"sourcesContent":["import type { CSSProperties } from \"react\";\nimport React, { useMemo } from \"react\";\nimport type { ViewComponent, ViewProps } from \"react-native\";\n\nimport type { DataModule } from \"../skia/types\";\nimport { isRNModule } from \"../skia/types\";\n\nimport type { IPlatform } from \"./IPlatform\";\n\n// Layout is observed by the views themselves (see SkiaPictureView.web.tsx):\n// this shim only reproduces react-native-web's default View styling.\nconst View = (({ children, style: rawStyle }: ViewProps) => {\n  const style = useMemo(() => (rawStyle ?? {}) as CSSProperties, [rawStyle]);\n  const cssStyles = useMemo(() => {\n    return {\n      alignItems: \"stretch\" as const,\n      backgroundColor: \"transparent\" as const,\n      border: \"0 solid black\" as const,\n      boxSizing: \"border-box\" as const,\n      display: \"flex\" as const,\n      flexBasis: \"auto\" as const,\n      flexDirection: \"column\" as const,\n      flexShrink: 0,\n      listStyle: \"none\" as const,\n      margin: 0,\n      minHeight: 0,\n      minWidth: 0,\n      padding: 0,\n      position: \"relative\" as const,\n      textDecoration: \"none\" as const,\n      zIndex: 0,\n      ...style,\n    };\n  }, [style]);\n\n  return <div style={cssStyles}>{children}</div>;\n}) as unknown as typeof ViewComponent;\n\nexport const Platform: IPlatform = {\n  OS: \"web\",\n  PixelRatio: typeof window !== \"undefined\" ? window.devicePixelRatio : 1, // window is not defined on node\n  resolveAsset: (source: DataModule) => {\n    if (isRNModule(source)) {\n      if (typeof source === \"number\" && typeof require === \"function\") {\n        const {\n          getAssetByID,\n        } = require(\"react-native/Libraries/Image/AssetRegistry\");\n        const { httpServerLocation, name, type } = getAssetByID(source);\n        const uri = `${httpServerLocation}/${name}.${type}`;\n        return uri;\n      }\n      throw new Error(\n        \"Asset source is a number - this is not supported on the web\"\n      );\n    }\n    if (\"uri\" in source) {\n      return source.uri;\n    }\n    return source.default;\n  },\n  findNodeHandle: () => {\n    throw new Error(\"findNodeHandle is not supported on the web\");\n  },\n  View,\n};\n"],"mappings":"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","ignoreList":[]}
+{"version":3,"names":["_react","_interopRequireWildcard","require","_types","e","t","WeakMap","r","n","__esModule","o","i","f","__proto__","default","has","get","set","hasOwnProperty","call","Object","defineProperty","getOwnPropertyDescriptor","View","children","style","rawStyle","useMemo","cssStyles","alignItems","backgroundColor","border","boxSizing","display","flexBasis","flexDirection","flexShrink","listStyle","margin","minHeight","minWidth","padding","position","textDecoration","zIndex","createElement","Platform","exports","OS","PixelRatio","window","devicePixelRatio","resolveAsset","source","asset","unwrapModule","isRNModule","getAssetByID","httpServerLocation","name","type","uri","Error","findNodeHandle"],"sources":["Platform.web.tsx"],"sourcesContent":["import type { CSSProperties } from \"react\";\nimport React, { useMemo } from \"react\";\nimport type { ViewComponent, ViewProps } from \"react-native\";\n\nimport type { DataModule } from \"../skia/types\";\nimport { isRNModule, unwrapModule } from \"../skia/types\";\n\nimport type { IPlatform } from \"./IPlatform\";\n\n// Layout is observed by the views themselves (see SkiaPictureView.web.tsx):\n// this shim only reproduces react-native-web's default View styling.\nconst View = (({ children, style: rawStyle }: ViewProps) => {\n  const style = useMemo(() => (rawStyle ?? {}) as CSSProperties, [rawStyle]);\n  const cssStyles = useMemo(() => {\n    return {\n      alignItems: \"stretch\" as const,\n      backgroundColor: \"transparent\" as const,\n      border: \"0 solid black\" as const,\n      boxSizing: \"border-box\" as const,\n      display: \"flex\" as const,\n      flexBasis: \"auto\" as const,\n      flexDirection: \"column\" as const,\n      flexShrink: 0,\n      listStyle: \"none\" as const,\n      margin: 0,\n      minHeight: 0,\n      minWidth: 0,\n      padding: 0,\n      position: \"relative\" as const,\n      textDecoration: \"none\" as const,\n      zIndex: 0,\n      ...style,\n    };\n  }, [style]);\n\n  return <div style={cssStyles}>{children}</div>;\n}) as unknown as typeof ViewComponent;\n\nexport const Platform: IPlatform = {\n  OS: \"web\",\n  PixelRatio: typeof window !== \"undefined\" ? window.devicePixelRatio : 1, // window is not defined on node\n  resolveAsset: (source: DataModule) => {\n    const asset = unwrapModule(source);\n    if (typeof asset === \"string\") {\n      return asset;\n    }\n    if (isRNModule(asset)) {\n      if (typeof require === \"function\") {\n        const {\n          getAssetByID,\n        } = require(\"react-native/Libraries/Image/AssetRegistry\");\n        const { httpServerLocation, name, type } = getAssetByID(asset);\n        const uri = `${httpServerLocation}/${name}.${type}`;\n        return uri;\n      }\n      throw new Error(\n        \"Asset source is a number - this is not supported on the web\"\n      );\n    }\n    return asset.uri;\n  },\n  findNodeHandle: () => {\n    throw new Error(\"findNodeHandle is not supported on the web\");\n  },\n  View,\n};\n"],"mappings":"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","ignoreList":[]}

package/lib/commonjs/external/reanimated/useVideoLoading.js

@@ -8,7 +8,16 @@ var _react = require("react");
 var _skia = require("../../skia");
 var _ReanimatedProxy = _interopRequireDefault(require("./ReanimatedProxy"));
 function _interopRequireDefault(e) { return e && e.__esModule ? e : { default: e }; }
-const runtime = _ReanimatedProxy.default.createWorkletRuntime("video-metadata-runtime");
+// Created lazily: accessing the proxy at module scope would require
+// react-native-reanimated as soon as the package is imported, and would spawn
+// the runtime even for apps that never load a video.
+let runtime;
+const getRuntime = () => {
+  if (runtime === undefined) {
+    runtime = _ReanimatedProxy.default.createWorkletRuntime("video-metadata-runtime");
+  }
+  return runtime;
+};
 const useVideoLoading = source => {
   const {
     runOnJS
@@ -22,7 +31,7 @@ const useVideoLoading = source => {
   }, [runOnJS]);
   (0, _react.useEffect)(() => {
     if (source) {
-      _ReanimatedProxy.default.runOnRuntime(runtime, cb)(source);
+      _ReanimatedProxy.default.runOnRuntime(getRuntime(), cb)(source);
     }
   }, [cb, source]);
   return video;

package/lib/commonjs/external/reanimated/useVideoLoading.js.map

@@ -1 +1 @@
-{"version":3,"names":["_react","require","_skia","_ReanimatedProxy","_interopRequireDefault","e","__esModule","default","runtime","Rea","createWorkletRuntime","useVideoLoading","source","runOnJS","video","setVideo","useState","cb","useCallback","src","vid","Skia","Video","useEffect","runOnRuntime","exports"],"sources":["useVideoLoading.ts"],"sourcesContent":["import { useCallback, useEffect, useState } from \"react\";\n\nimport type { Video } from \"../../skia/types\";\nimport { Skia } from \"../../skia\";\n\nimport Rea from \"./ReanimatedProxy\";\n\nconst runtime = Rea.createWorkletRuntime(\"video-metadata-runtime\");\n\ntype VideoSource = string | null;\n\nexport const useVideoLoading = (source: VideoSource) => {\n  const { runOnJS } = Rea;\n  const [video, setVideo] = useState<Video | null>(null);\n  const cb = useCallback(\n    (src: string) => {\n      \"worklet\";\n      const vid = Skia.Video(src) as Video;\n      runOnJS(setVideo)(vid);\n    },\n    [runOnJS]\n  );\n  useEffect(() => {\n    if (source) {\n      Rea.runOnRuntime(runtime, cb)(source);\n    }\n  }, [cb, source]);\n  return video;\n};\n"],"mappings":";;;;;;AAAA,IAAAA,MAAA,GAAAC,OAAA;AAGA,IAAAC,KAAA,GAAAD,OAAA;AAEA,IAAAE,gBAAA,GAAAC,sBAAA,CAAAH,OAAA;AAAoC,SAAAG,uBAAAC,CAAA,WAAAA,CAAA,IAAAA,CAAA,CAAAC,UAAA,GAAAD,CAAA,KAAAE,OAAA,EAAAF,CAAA;AAEpC,MAAMG,OAAO,GAAGC,wBAAG,CAACC,oBAAoB,CAAC,wBAAwB,CAAC;AAI3D,MAAMC,eAAe,GAAIC,MAAmB,IAAK;EACtD,MAAM;IAAEC;EAAQ,CAAC,GAAGJ,wBAAG;EACvB,MAAM,CAACK,KAAK,EAAEC,QAAQ,CAAC,GAAG,IAAAC,eAAQ,EAAe,IAAI,CAAC;EACtD,MAAMC,EAAE,GAAG,IAAAC,kBAAW,EACnBC,GAAW,IAAK;IACf,SAAS;;IACT,MAAMC,GAAG,GAAGC,UAAI,CAACC,KAAK,CAACH,GAAG,CAAU;IACpCN,OAAO,CAACE,QAAQ,CAAC,CAACK,GAAG,CAAC;EACxB,CAAC,EACD,CAACP,OAAO,CACV,CAAC;EACD,IAAAU,gBAAS,EAAC,MAAM;IACd,IAAIX,MAAM,EAAE;MACVH,wBAAG,CAACe,YAAY,CAAChB,OAAO,EAAES,EAAE,CAAC,CAACL,MAAM,CAAC;IACvC;EACF,CAAC,EAAE,CAACK,EAAE,EAAEL,MAAM,CAAC,CAAC;EAChB,OAAOE,KAAK;AACd,CAAC;AAACW,OAAA,CAAAd,eAAA,GAAAA,eAAA","ignoreList":[]}
+{"version":3,"names":["_react","require","_skia","_ReanimatedProxy","_interopRequireDefault","e","__esModule","default","runtime","getRuntime","undefined","Rea","createWorkletRuntime","useVideoLoading","source","runOnJS","video","setVideo","useState","cb","useCallback","src","vid","Skia","Video","useEffect","runOnRuntime","exports"],"sources":["useVideoLoading.ts"],"sourcesContent":["import { useCallback, useEffect, useState } from \"react\";\nimport type { WorkletRuntime } from \"react-native-reanimated\";\n\nimport type { Video } from \"../../skia/types\";\nimport { Skia } from \"../../skia\";\n\nimport Rea from \"./ReanimatedProxy\";\n\n// Created lazily: accessing the proxy at module scope would require\n// react-native-reanimated as soon as the package is imported, and would spawn\n// the runtime even for apps that never load a video.\nlet runtime: WorkletRuntime | undefined;\nconst getRuntime = () => {\n  if (runtime === undefined) {\n    runtime = Rea.createWorkletRuntime(\"video-metadata-runtime\");\n  }\n  return runtime;\n};\n\ntype VideoSource = string | null;\n\nexport const useVideoLoading = (source: VideoSource) => {\n  const { runOnJS } = Rea;\n  const [video, setVideo] = useState<Video | null>(null);\n  const cb = useCallback(\n    (src: string) => {\n      \"worklet\";\n      const vid = Skia.Video(src) as Video;\n      runOnJS(setVideo)(vid);\n    },\n    [runOnJS]\n  );\n  useEffect(() => {\n    if (source) {\n      Rea.runOnRuntime(getRuntime(), cb)(source);\n    }\n  }, [cb, source]);\n  return video;\n};\n"],"mappings":";;;;;;AAAA,IAAAA,MAAA,GAAAC,OAAA;AAIA,IAAAC,KAAA,GAAAD,OAAA;AAEA,IAAAE,gBAAA,GAAAC,sBAAA,CAAAH,OAAA;AAAoC,SAAAG,uBAAAC,CAAA,WAAAA,CAAA,IAAAA,CAAA,CAAAC,UAAA,GAAAD,CAAA,KAAAE,OAAA,EAAAF,CAAA;AAEpC;AACA;AACA;AACA,IAAIG,OAAmC;AACvC,MAAMC,UAAU,GAAGA,CAAA,KAAM;EACvB,IAAID,OAAO,KAAKE,SAAS,EAAE;IACzBF,OAAO,GAAGG,wBAAG,CAACC,oBAAoB,CAAC,wBAAwB,CAAC;EAC9D;EACA,OAAOJ,OAAO;AAChB,CAAC;AAIM,MAAMK,eAAe,GAAIC,MAAmB,IAAK;EACtD,MAAM;IAAEC;EAAQ,CAAC,GAAGJ,wBAAG;EACvB,MAAM,CAACK,KAAK,EAAEC,QAAQ,CAAC,GAAG,IAAAC,eAAQ,EAAe,IAAI,CAAC;EACtD,MAAMC,EAAE,GAAG,IAAAC,kBAAW,EACnBC,GAAW,IAAK;IACf,SAAS;;IACT,MAAMC,GAAG,GAAGC,UAAI,CAACC,KAAK,CAACH,GAAG,CAAU;IACpCN,OAAO,CAACE,QAAQ,CAAC,CAACK,GAAG,CAAC;EACxB,CAAC,EACD,CAACP,OAAO,CACV,CAAC;EACD,IAAAU,gBAAS,EAAC,MAAM;IACd,IAAIX,MAAM,EAAE;MACVH,wBAAG,CAACe,YAAY,CAACjB,UAAU,CAAC,CAAC,EAAEU,EAAE,CAAC,CAACL,MAAM,CAAC;IAC5C;EACF,CAAC,EAAE,CAACK,EAAE,EAAEL,MAAM,CAAC,CAAC;EAChB,OAAOE,KAAK;AACd,CAAC;AAACW,OAAA,CAAAd,eAAA,GAAAA,eAAA","ignoreList":[]}

package/lib/commonjs/skia/core/Font.d.ts

@@ -1,18 +1,33 @@
+import { FontSlant, FontWeight } from "../types";
 import type { DataModule, DataSourceParam, SkFontMgr } from "../types";
 import type { SkTypefaceFontProvider } from "../types/Paragraph/TypefaceFontProvider";
 /**
  * Returns a Skia Font object
  * */
 export declare const useFont: (font: DataSourceParam, size?: number, onError?: (err: Error) => void) => import("../types").SkFont | null;
-type Slant = "normal" | "italic" | "oblique";
-type Weight = "normal" | "bold" | "100" | "200" | "300" | "400" | "500" | "600" | "700" | "800" | "900";
-interface RNFontStyle {
+/**
+ * React Native style font slant, as found in the `fontStyle` property of
+ * `TextStyle`. The Skia {@link FontSlant} enum is accepted as well.
+ */
+export type RNFontSlant = "normal" | "italic" | "oblique" | FontSlant;
+/**
+ * React Native style font weight, as found in the `fontWeight` property of
+ * `TextStyle`. Numeric weights such as the {@link FontWeight} enum values
+ * used by the Paragraph API are accepted as well.
+ */
+export type RNFontWeight = "normal" | "bold" | "100" | "200" | "300" | "400" | "500" | "600" | "700" | "800" | "900" | FontWeight;
+/**
+ * Font style accepted by {@link matchFont}.
+ * `fontStyle` and `fontWeight` accept both the React Native string values
+ * and the Skia enums ({@link FontSlant} and {@link FontWeight}), so the same
+ * values can be shared with the Paragraph API.
+ */
+export interface RNFontStyle {
     fontFamily: string;
     fontSize: number;
-    fontStyle: Slant;
-    fontWeight: Weight;
+    fontStyle: RNFontSlant;
+    fontWeight: RNFontWeight;
 }
 export declare const matchFont: (inputStyle?: Partial<RNFontStyle>, fontMgr?: SkFontMgr) => import("../types").SkFont;
 export declare const listFontFamilies: (fontMgr?: SkFontMgr) => string[];
 export declare const useFonts: (sources: Record<string, DataModule[]>) => SkTypefaceFontProvider | null;
-export {};

package/lib/commonjs/skia/core/Font.js

@@ -26,6 +26,24 @@ const useFont = (font, size = defaultFontSize, onError) => {
     }
   }, [size, typeface]);
 };
+
+/**
+ * React Native style font slant, as found in the `fontStyle` property of
+ * `TextStyle`. The Skia {@link FontSlant} enum is accepted as well.
+ */
+
+/**
+ * React Native style font weight, as found in the `fontWeight` property of
+ * `TextStyle`. Numeric weights such as the {@link FontWeight} enum values
+ * used by the Paragraph API are accepted as well.
+ */
+
+/**
+ * Font style accepted by {@link matchFont}.
+ * `fontStyle` and `fontWeight` accept both the React Native string values
+ * and the Skia enums ({@link FontSlant} and {@link FontWeight}), so the same
+ * values can be shared with the Paragraph API.
+ */
 exports.useFont = useFont;
 const defaultFontStyle = {
   fontFamily: "System",
@@ -34,7 +52,9 @@ const defaultFontStyle = {
   fontWeight: "normal"
 };
 const slant = s => {
-  if (s === "italic") {
+  if (typeof s === "number") {
+    return s;
+  } else if (s === "italic") {
     return _types.FontSlant.Italic;
   } else if (s === "oblique") {
     return _types.FontSlant.Oblique;
@@ -45,11 +65,11 @@ const slant = s => {
 const weight = fontWeight => {
   switch (fontWeight) {
     case "normal":
-      return 400;
+      return _types.FontWeight.Normal;
     case "bold":
-      return 700;
+      return _types.FontWeight.Bold;
     default:
-      return parseInt(fontWeight, 10);
+      return typeof fontWeight === "number" ? fontWeight : parseInt(fontWeight, 10);
   }
 };
 const matchFont = (inputStyle = {}, fontMgr = _Skia.Skia.FontMgr.System()) => {

package/lib/commonjs/skia/core/Font.js.map

@@ -1 +1 @@
-{"version":3,"names":["_react","require","_Skia","_types","_Platform","_Typeface","defaultFontSize","useFont","font","size","onError","typeface","useTypeface","useMemo","Skia","Font","exports","defaultFontStyle","fontFamily","fontSize","fontStyle","fontWeight","slant","s","FontSlant","Italic","Oblique","Upright","weight","parseInt","matchFont","inputStyle","fontMgr","FontMgr","System","style","width","matchFamilyStyle","listFontFamilies","families","Set","i","countFamilies","add","getFamilyName","Array","from","loadTypefaces","typefacesToLoad","promises","Object","keys","flatMap","familyName","map","typefaceToLoad","Data","fromURI","Platform","resolveAsset","then","data","tf","Typeface","MakeFreeTypeFaceFromData","Error","Promise","all","useFonts","sources","setFontMgr","useState","useEffect","result","fMgr","TypefaceFontProvider","Make","forEach","registerFont"],"sources":["Font.ts"],"sourcesContent":["/*global SkiaApi*/\nimport { useEffect, useMemo, useState } from \"react\";\n\nimport { Skia } from \"../Skia\";\nimport { FontSlant } from \"../types\";\nimport type { DataModule, DataSourceParam, SkFontMgr } from \"../types\";\nimport { Platform } from \"../../Platform\";\nimport type { SkTypefaceFontProvider } from \"../types/Paragraph/TypefaceFontProvider\";\n\nimport { useTypeface } from \"./Typeface\";\n\nconst defaultFontSize = 14;\n\n/**\n * Returns a Skia Font object\n * */\nexport const useFont = (\n  font: DataSourceParam,\n  size = defaultFontSize,\n  onError?: (err: Error) => void\n) => {\n  const typeface = useTypeface(font, onError);\n  return useMemo(() => {\n    if (typeface) {\n      return Skia.Font(typeface, size);\n    } else {\n      return null;\n    }\n  }, [size, typeface]);\n};\n\ntype Slant = \"normal\" | \"italic\" | \"oblique\";\ntype Weight =\n  | \"normal\"\n  | \"bold\"\n  | \"100\"\n  | \"200\"\n  | \"300\"\n  | \"400\"\n  | \"500\"\n  | \"600\"\n  | \"700\"\n  | \"800\"\n  | \"900\";\n\ninterface RNFontStyle {\n  fontFamily: string;\n  fontSize: number;\n  fontStyle: Slant;\n  fontWeight: Weight;\n}\n\nconst defaultFontStyle: RNFontStyle = {\n  fontFamily: \"System\",\n  fontSize: defaultFontSize,\n  fontStyle: \"normal\",\n  fontWeight: \"normal\",\n};\n\nconst slant = (s: Slant) => {\n  if (s === \"italic\") {\n    return FontSlant.Italic;\n  } else if (s === \"oblique\") {\n    return FontSlant.Oblique;\n  } else {\n    return FontSlant.Upright;\n  }\n};\n\nconst weight = (fontWeight: Weight) => {\n  switch (fontWeight) {\n    case \"normal\":\n      return 400;\n    case \"bold\":\n      return 700;\n    default:\n      return parseInt(fontWeight, 10);\n  }\n};\n\nexport const matchFont = (\n  inputStyle: Partial<RNFontStyle> = {},\n  fontMgr: SkFontMgr = Skia.FontMgr.System()\n) => {\n  const fontStyle = {\n    ...defaultFontStyle,\n    ...inputStyle,\n  };\n  const style = {\n    weight: weight(fontStyle.fontWeight),\n    width: 5,\n    slant: slant(fontStyle.fontStyle),\n  };\n  const typeface = fontMgr.matchFamilyStyle(fontStyle.fontFamily, style);\n  return Skia.Font(typeface, fontStyle.fontSize);\n};\n\nexport const listFontFamilies = (\n  fontMgr: SkFontMgr = Skia.FontMgr.System()\n) => {\n  const families = new Set<string>();\n  for (let i = 0; i < fontMgr.countFamilies(); i++) {\n    families.add(fontMgr.getFamilyName(i));\n  }\n  return Array.from(families);\n};\n\nconst loadTypefaces = (typefacesToLoad: Record<string, DataModule[]>) => {\n  const promises = Object.keys(typefacesToLoad).flatMap((familyName) => {\n    return typefacesToLoad[familyName].map((typefaceToLoad) => {\n      return Skia.Data.fromURI(Platform.resolveAsset(typefaceToLoad)).then(\n        (data) => {\n          const tf = Skia.Typeface.MakeFreeTypeFaceFromData(data);\n          if (tf === null) {\n            throw new Error(`Couldn't create typeface for ${familyName}`);\n          }\n          return [familyName, tf] as const;\n        }\n      );\n    });\n  });\n  return Promise.all(promises);\n};\n\nexport const useFonts = (sources: Record<string, DataModule[]>) => {\n  const [fontMgr, setFontMgr] = useState<null | SkTypefaceFontProvider>(null);\n\n  useEffect(() => {\n    loadTypefaces(sources).then((result) => {\n      const fMgr = Skia.TypefaceFontProvider.Make();\n      result.forEach(([familyName, typeface]) => {\n        fMgr.registerFont(typeface, familyName);\n      });\n      setFontMgr(fMgr);\n    });\n    // eslint-disable-next-line react-hooks/exhaustive-deps\n  }, []);\n  return fontMgr;\n};\n"],"mappings":"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","ignoreList":[]}
+{"version":3,"names":["_react","require","_Skia","_types","_Platform","_Typeface","defaultFontSize","useFont","font","size","onError","typeface","useTypeface","useMemo","Skia","Font","exports","defaultFontStyle","fontFamily","fontSize","fontStyle","fontWeight","slant","s","FontSlant","Italic","Oblique","Upright","weight","FontWeight","Normal","Bold","parseInt","matchFont","inputStyle","fontMgr","FontMgr","System","style","width","matchFamilyStyle","listFontFamilies","families","Set","i","countFamilies","add","getFamilyName","Array","from","loadTypefaces","typefacesToLoad","promises","Object","keys","flatMap","familyName","map","typefaceToLoad","Data","fromURI","Platform","resolveAsset","then","data","tf","Typeface","MakeFreeTypeFaceFromData","Error","Promise","all","useFonts","sources","setFontMgr","useState","useEffect","result","fMgr","TypefaceFontProvider","Make","forEach","registerFont"],"sources":["Font.ts"],"sourcesContent":["/*global SkiaApi*/\nimport { useEffect, useMemo, useState } from \"react\";\n\nimport { Skia } from \"../Skia\";\nimport { FontSlant, FontWeight } from \"../types\";\nimport type { DataModule, DataSourceParam, SkFontMgr } from \"../types\";\nimport { Platform } from \"../../Platform\";\nimport type { SkTypefaceFontProvider } from \"../types/Paragraph/TypefaceFontProvider\";\n\nimport { useTypeface } from \"./Typeface\";\n\nconst defaultFontSize = 14;\n\n/**\n * Returns a Skia Font object\n * */\nexport const useFont = (\n  font: DataSourceParam,\n  size = defaultFontSize,\n  onError?: (err: Error) => void\n) => {\n  const typeface = useTypeface(font, onError);\n  return useMemo(() => {\n    if (typeface) {\n      return Skia.Font(typeface, size);\n    } else {\n      return null;\n    }\n  }, [size, typeface]);\n};\n\n/**\n * React Native style font slant, as found in the `fontStyle` property of\n * `TextStyle`. The Skia {@link FontSlant} enum is accepted as well.\n */\nexport type RNFontSlant = \"normal\" | \"italic\" | \"oblique\" | FontSlant;\n\n/**\n * React Native style font weight, as found in the `fontWeight` property of\n * `TextStyle`. Numeric weights such as the {@link FontWeight} enum values\n * used by the Paragraph API are accepted as well.\n */\nexport type RNFontWeight =\n  | \"normal\"\n  | \"bold\"\n  | \"100\"\n  | \"200\"\n  | \"300\"\n  | \"400\"\n  | \"500\"\n  | \"600\"\n  | \"700\"\n  | \"800\"\n  | \"900\"\n  | FontWeight;\n\n/**\n * Font style accepted by {@link matchFont}.\n * `fontStyle` and `fontWeight` accept both the React Native string values\n * and the Skia enums ({@link FontSlant} and {@link FontWeight}), so the same\n * values can be shared with the Paragraph API.\n */\nexport interface RNFontStyle {\n  fontFamily: string;\n  fontSize: number;\n  fontStyle: RNFontSlant;\n  fontWeight: RNFontWeight;\n}\n\nconst defaultFontStyle: RNFontStyle = {\n  fontFamily: \"System\",\n  fontSize: defaultFontSize,\n  fontStyle: \"normal\",\n  fontWeight: \"normal\",\n};\n\nconst slant = (s: RNFontSlant): FontSlant => {\n  if (typeof s === \"number\") {\n    return s;\n  } else if (s === \"italic\") {\n    return FontSlant.Italic;\n  } else if (s === \"oblique\") {\n    return FontSlant.Oblique;\n  } else {\n    return FontSlant.Upright;\n  }\n};\n\nconst weight = (fontWeight: RNFontWeight): FontWeight => {\n  switch (fontWeight) {\n    case \"normal\":\n      return FontWeight.Normal;\n    case \"bold\":\n      return FontWeight.Bold;\n    default:\n      return typeof fontWeight === \"number\"\n        ? fontWeight\n        : (parseInt(fontWeight, 10) as FontWeight);\n  }\n};\n\nexport const matchFont = (\n  inputStyle: Partial<RNFontStyle> = {},\n  fontMgr: SkFontMgr = Skia.FontMgr.System()\n) => {\n  const fontStyle = {\n    ...defaultFontStyle,\n    ...inputStyle,\n  };\n  const style = {\n    weight: weight(fontStyle.fontWeight),\n    width: 5,\n    slant: slant(fontStyle.fontStyle),\n  };\n  const typeface = fontMgr.matchFamilyStyle(fontStyle.fontFamily, style);\n  return Skia.Font(typeface, fontStyle.fontSize);\n};\n\nexport const listFontFamilies = (\n  fontMgr: SkFontMgr = Skia.FontMgr.System()\n) => {\n  const families = new Set<string>();\n  for (let i = 0; i < fontMgr.countFamilies(); i++) {\n    families.add(fontMgr.getFamilyName(i));\n  }\n  return Array.from(families);\n};\n\nconst loadTypefaces = (typefacesToLoad: Record<string, DataModule[]>) => {\n  const promises = Object.keys(typefacesToLoad).flatMap((familyName) => {\n    return typefacesToLoad[familyName].map((typefaceToLoad) => {\n      return Skia.Data.fromURI(Platform.resolveAsset(typefaceToLoad)).then(\n        (data) => {\n          const tf = Skia.Typeface.MakeFreeTypeFaceFromData(data);\n          if (tf === null) {\n            throw new Error(`Couldn't create typeface for ${familyName}`);\n          }\n          return [familyName, tf] as const;\n        }\n      );\n    });\n  });\n  return Promise.all(promises);\n};\n\nexport const useFonts = (sources: Record<string, DataModule[]>) => {\n  const [fontMgr, setFontMgr] = useState<null | SkTypefaceFontProvider>(null);\n\n  useEffect(() => {\n    loadTypefaces(sources).then((result) => {\n      const fMgr = Skia.TypefaceFontProvider.Make();\n      result.forEach(([familyName, typeface]) => {\n        fMgr.registerFont(typeface, familyName);\n      });\n      setFontMgr(fMgr);\n    });\n    // eslint-disable-next-line react-hooks/exhaustive-deps\n  }, []);\n  return fontMgr;\n};\n"],"mappings":"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","ignoreList":[]}

package/lib/commonjs/skia/core/SVG.web.js

@@ -6,6 +6,7 @@ Object.defineProperty(exports, "__esModule", {
 exports.useSVG = void 0;
 var _react = require("react");
 var _Skia = require("../Skia");
+var _Platform = require("../../Platform");
 const useSVG = (source, onError) => {
   const [svg, setSVG] = (0, _react.useState)(null);
   if (source === null || source === undefined) {
@@ -16,12 +17,10 @@ const useSVG = (source, onError) => {
       let src;
       if (typeof source === "string") {
         src = source;
-      } else if (typeof source === "object" && "default" in source && typeof source.default === "string") {
-        src = source.default;
-      } else if (typeof source === "object" && "uri" in source) {
-        src = source.uri;
+      } else if (source instanceof Uint8Array) {
+        throw new Error(`Invalid svg data source. Make sure that the source resolves to a string. Got: ${source}`);
       } else {
-        throw new Error(`Invalid svg data source. Make sure that the source resolves to a string. Got: ${JSON.stringify(source, null, 2)}`);
+        src = _Platform.Platform.resolveAsset(source);
       }
       const result = await fetch(src);
       const svgStr = await result.text();

package/lib/commonjs/skia/core/SVG.web.js.map

@@ -1 +1 @@
-{"version":3,"names":["_react","require","_Skia","useSVG","source","onError","svg","setSVG","useState","undefined","Error","useEffect","src","default","uri","JSON","stringify","result","fetch","svgStr","text","newSvg","Skia","SVG","MakeFromString","exports"],"sources":["SVG.web.ts"],"sourcesContent":["import { useEffect, useState } from \"react\";\n\nimport { Skia } from \"../Skia\";\nimport type { DataSourceParam, SkSVG } from \"../types\";\n\nexport const useSVG = (\n  source: DataSourceParam,\n  onError?: (err: Error) => void\n) => {\n  const [svg, setSVG] = useState<SkSVG | null>(null);\n  if (source === null || source === undefined) {\n    throw new Error(`Invalid svg data source. Got: ${source}`);\n  }\n  useEffect(() => {\n    (async () => {\n      let src: string;\n      if (typeof source === \"string\") {\n        src = source;\n      } else if (\n        typeof source === \"object\" &&\n        \"default\" in source &&\n        typeof source.default === \"string\"\n      ) {\n        src = source.default;\n      } else if (typeof source === \"object\" && \"uri\" in source) {\n        src = source.uri;\n      } else {\n        throw new Error(\n          `Invalid svg data source. Make sure that the source resolves to a string. Got: ${JSON.stringify(\n            source,\n            null,\n            2\n          )}`\n        );\n      }\n      const result = await fetch(src);\n      const svgStr = await result.text();\n      const newSvg = Skia.SVG.MakeFromString(svgStr);\n      setSVG(newSvg);\n      if (newSvg === null && onError !== undefined) {\n        onError(new Error(\"Failed to create SVG from source.\"));\n      }\n    })();\n  }, [onError, source]);\n  return svg;\n};\n"],"mappings":";;;;;;AAAA,IAAAA,MAAA,GAAAC,OAAA;AAEA,IAAAC,KAAA,GAAAD,OAAA;AAGO,MAAME,MAAM,GAAGA,CACpBC,MAAuB,EACvBC,OAA8B,KAC3B;EACH,MAAM,CAACC,GAAG,EAAEC,MAAM,CAAC,GAAG,IAAAC,eAAQ,EAAe,IAAI,CAAC;EAClD,IAAIJ,MAAM,KAAK,IAAI,IAAIA,MAAM,KAAKK,SAAS,EAAE;IAC3C,MAAM,IAAIC,KAAK,CAAC,iCAAiCN,MAAM,EAAE,CAAC;EAC5D;EACA,IAAAO,gBAAS,EAAC,MAAM;IACd,CAAC,YAAY;MACX,IAAIC,GAAW;MACf,IAAI,OAAOR,MAAM,KAAK,QAAQ,EAAE;QAC9BQ,GAAG,GAAGR,MAAM;MACd,CAAC,MAAM,IACL,OAAOA,MAAM,KAAK,QAAQ,IAC1B,SAAS,IAAIA,MAAM,IACnB,OAAOA,MAAM,CAACS,OAAO,KAAK,QAAQ,EAClC;QACAD,GAAG,GAAGR,MAAM,CAACS,OAAO;MACtB,CAAC,MAAM,IAAI,OAAOT,MAAM,KAAK,QAAQ,IAAI,KAAK,IAAIA,MAAM,EAAE;QACxDQ,GAAG,GAAGR,MAAM,CAACU,GAAG;MAClB,CAAC,MAAM;QACL,MAAM,IAAIJ,KAAK,CACb,iFAAiFK,IAAI,CAACC,SAAS,CAC7FZ,MAAM,EACN,IAAI,EACJ,CACF,CAAC,EACH,CAAC;MACH;MACA,MAAMa,MAAM,GAAG,MAAMC,KAAK,CAACN,GAAG,CAAC;MAC/B,MAAMO,MAAM,GAAG,MAAMF,MAAM,CAACG,IAAI,CAAC,CAAC;MAClC,MAAMC,MAAM,GAAGC,UAAI,CAACC,GAAG,CAACC,cAAc,CAACL,MAAM,CAAC;MAC9CZ,MAAM,CAACc,MAAM,CAAC;MACd,IAAIA,MAAM,KAAK,IAAI,IAAIhB,OAAO,KAAKI,SAAS,EAAE;QAC5CJ,OAAO,CAAC,IAAIK,KAAK,CAAC,mCAAmC,CAAC,CAAC;MACzD;IACF,CAAC,EAAE,CAAC;EACN,CAAC,EAAE,CAACL,OAAO,EAAED,MAAM,CAAC,CAAC;EACrB,OAAOE,GAAG;AACZ,CAAC;AAACmB,OAAA,CAAAtB,MAAA,GAAAA,MAAA","ignoreList":[]}
+{"version":3,"names":["_react","require","_Skia","_Platform","useSVG","source","onError","svg","setSVG","useState","undefined","Error","useEffect","src","Uint8Array","Platform","resolveAsset","result","fetch","svgStr","text","newSvg","Skia","SVG","MakeFromString","exports"],"sources":["SVG.web.ts"],"sourcesContent":["import { useEffect, useState } from \"react\";\n\nimport { Skia } from \"../Skia\";\nimport type { DataSourceParam, SkSVG } from \"../types\";\nimport { Platform } from \"../../Platform\";\n\nexport const useSVG = (\n  source: DataSourceParam,\n  onError?: (err: Error) => void\n) => {\n  const [svg, setSVG] = useState<SkSVG | null>(null);\n  if (source === null || source === undefined) {\n    throw new Error(`Invalid svg data source. Got: ${source}`);\n  }\n  useEffect(() => {\n    (async () => {\n      let src: string;\n      if (typeof source === \"string\") {\n        src = source;\n      } else if (source instanceof Uint8Array) {\n        throw new Error(\n          `Invalid svg data source. Make sure that the source resolves to a string. Got: ${source}`\n        );\n      } else {\n        src = Platform.resolveAsset(source);\n      }\n      const result = await fetch(src);\n      const svgStr = await result.text();\n      const newSvg = Skia.SVG.MakeFromString(svgStr);\n      setSVG(newSvg);\n      if (newSvg === null && onError !== undefined) {\n        onError(new Error(\"Failed to create SVG from source.\"));\n      }\n    })();\n  }, [onError, source]);\n  return svg;\n};\n"],"mappings":";;;;;;AAAA,IAAAA,MAAA,GAAAC,OAAA;AAEA,IAAAC,KAAA,GAAAD,OAAA;AAEA,IAAAE,SAAA,GAAAF,OAAA;AAEO,MAAMG,MAAM,GAAGA,CACpBC,MAAuB,EACvBC,OAA8B,KAC3B;EACH,MAAM,CAACC,GAAG,EAAEC,MAAM,CAAC,GAAG,IAAAC,eAAQ,EAAe,IAAI,CAAC;EAClD,IAAIJ,MAAM,KAAK,IAAI,IAAIA,MAAM,KAAKK,SAAS,EAAE;IAC3C,MAAM,IAAIC,KAAK,CAAC,iCAAiCN,MAAM,EAAE,CAAC;EAC5D;EACA,IAAAO,gBAAS,EAAC,MAAM;IACd,CAAC,YAAY;MACX,IAAIC,GAAW;MACf,IAAI,OAAOR,MAAM,KAAK,QAAQ,EAAE;QAC9BQ,GAAG,GAAGR,MAAM;MACd,CAAC,MAAM,IAAIA,MAAM,YAAYS,UAAU,EAAE;QACvC,MAAM,IAAIH,KAAK,CACb,iFAAiFN,MAAM,EACzF,CAAC;MACH,CAAC,MAAM;QACLQ,GAAG,GAAGE,kBAAQ,CAACC,YAAY,CAACX,MAAM,CAAC;MACrC;MACA,MAAMY,MAAM,GAAG,MAAMC,KAAK,CAACL,GAAG,CAAC;MAC/B,MAAMM,MAAM,GAAG,MAAMF,MAAM,CAACG,IAAI,CAAC,CAAC;MAClC,MAAMC,MAAM,GAAGC,UAAI,CAACC,GAAG,CAACC,cAAc,CAACL,MAAM,CAAC;MAC9CX,MAAM,CAACa,MAAM,CAAC;MACd,IAAIA,MAAM,KAAK,IAAI,IAAIf,OAAO,KAAKI,SAAS,EAAE;QAC5CJ,OAAO,CAAC,IAAIK,KAAK,CAAC,mCAAmC,CAAC,CAAC;MACzD;IACF,CAAC,EAAE,CAAC;EACN,CAAC,EAAE,CAACL,OAAO,EAAED,MAAM,CAAC,CAAC;EACrB,OAAOE,GAAG;AACZ,CAAC;AAACkB,OAAA,CAAArB,MAAA,GAAAA,MAAA","ignoreList":[]}