@shopify/react-native-skia 2.4.7 → 2.4.14

package/cpp/skia/include/private/gpu/ganesh/GrImageContext.h

@@ -30,7 +30,7 @@ public:
 protected:
     friend class GrImageContextPriv; // for hidden functions
 
-    GrImageContext(sk_sp<GrContextThreadSafeProxy>);
+    explicit GrImageContext(sk_sp<GrContextThreadSafeProxy>);
 
     SK_API virtual void abandonContext();
     SK_API virtual bool abandoned();

package/cpp/skia/include/private/gpu/ganesh/GrTypesPriv.h

@@ -367,21 +367,21 @@ enum class GrClipEdgeType {
 };
 static const int kGrClipEdgeTypeCnt = (int) GrClipEdgeType::kLast + 1;
 
-static constexpr bool GrClipEdgeTypeIsFill(const GrClipEdgeType edgeType) {
+static constexpr bool GrClipEdgeTypeIsFill(GrClipEdgeType edgeType) {
     return (GrClipEdgeType::kFillAA == edgeType || GrClipEdgeType::kFillBW == edgeType);
 }
 
-static constexpr bool GrClipEdgeTypeIsInverseFill(const GrClipEdgeType edgeType) {
+static constexpr bool GrClipEdgeTypeIsInverseFill(GrClipEdgeType edgeType) {
     return (GrClipEdgeType::kInverseFillAA == edgeType ||
             GrClipEdgeType::kInverseFillBW == edgeType);
 }
 
-static constexpr bool GrClipEdgeTypeIsAA(const GrClipEdgeType edgeType) {
+static constexpr bool GrClipEdgeTypeIsAA(GrClipEdgeType edgeType) {
     return (GrClipEdgeType::kFillBW != edgeType &&
             GrClipEdgeType::kInverseFillBW != edgeType);
 }
 
-static inline GrClipEdgeType GrInvertClipEdgeType(const GrClipEdgeType edgeType) {
+static inline GrClipEdgeType GrInvertClipEdgeType(GrClipEdgeType edgeType) {
     switch (edgeType) {
         case GrClipEdgeType::kFillBW:
             return GrClipEdgeType::kInverseFillBW;
@@ -620,7 +620,7 @@ static constexpr SkColorType GrColorTypeToSkColorType(GrColorType ct) {
         case GrColorType::kRG_F16:           return kR16G16_float_SkColorType;
         case GrColorType::kRGB_888:          return kUnknown_SkColorType;
         case GrColorType::kR_8:              return kR8_unorm_SkColorType;
-        case GrColorType::kR_16:             return kUnknown_SkColorType;
+        case GrColorType::kR_16:             return kR16_unorm_SkColorType;
         case GrColorType::kR_F16:            return kUnknown_SkColorType;
         case GrColorType::kGray_F16:         return kUnknown_SkColorType;
         case GrColorType::kARGB_4444:        return kUnknown_SkColorType;
@@ -653,6 +653,7 @@ static constexpr GrColorType SkColorTypeToGrColorType(SkColorType ct) {
         case kRGBA_F32_SkColorType:           return GrColorType::kRGBA_F32;
         case kR8G8_unorm_SkColorType:         return GrColorType::kRG_88;
         case kA16_unorm_SkColorType:          return GrColorType::kAlpha_16;
+        case kR16_unorm_SkColorType:          return GrColorType::kR_16;
         case kR16G16_unorm_SkColorType:       return GrColorType::kRG_1616;
         case kA16_float_SkColorType:          return GrColorType::kAlpha_F16;
         case kR16G16_float_SkColorType:       return GrColorType::kRG_F16;

package/cpp/skia/include/svg/SkSVGCanvas.h

@@ -15,16 +15,33 @@
 
 class SkCanvas;
 class SkWStream;
+class SkPixmap;
 struct SkRect;
 
 class SK_API SkSVGCanvas {
 public:
-    enum {
+    enum Flags {
         kConvertTextToPaths_Flag   = 0x01, // emit text as <path>s
         kNoPrettyXML_Flag          = 0x02, // suppress newlines and tabs in output
         kRelativePathEncoding_Flag = 0x04, // use relative commands for path encoding
     };
 
+    using EncodePngCallback = bool (*)(SkWStream* dst, const SkPixmap& src);
+
+    struct Options {
+        Flags flags = static_cast<Flags>(0x00);
+
+        /** Clients can provide a way to encode png.
+         *
+         *  If `pngEncoder` is null and `SK_DISABLE_LEGACY_SVG_FACTORIES` isn't
+         *  set then this will be (temporarily, until the legacy mode is
+         *  removed) filled based on presence of
+         *  `SK_CODEC_ENCODES_PNG_WITH_RUST` and/or
+         *  `SK_CODEC_ENCODES_PNG_WITH_LIBPNG`.
+         */
+        EncodePngCallback pngEncoder = nullptr;
+    };
+
     /**
      *  Returns a new canvas that will generate SVG commands from its draw calls, and send
      *  them to the provided stream. Ownership of the stream is not transfered, and it must
@@ -36,7 +53,10 @@ public:
      *  The 'bounds' parameter defines an initial SVG viewport (viewBox attribute on the root
      *  SVG element).
      */
+    static std::unique_ptr<SkCanvas> Make(const SkRect& bounds, SkWStream*, Options opts);
+#if !defined(SK_DISABLE_LEGACY_SVG_FACTORIES)
     static std::unique_ptr<SkCanvas> Make(const SkRect& bounds, SkWStream*, uint32_t flags = 0);
+#endif
 };
 
 #endif

package/cpp/skia/include/utils/SkNoDrawCanvas.h

@@ -24,7 +24,7 @@ struct SkIRect;
 class SK_API SkNoDrawCanvas : public SkCanvasVirtualEnforcer<SkCanvas> {
 public:
     SkNoDrawCanvas(int width, int height);
-    SkNoDrawCanvas(const SkIRect&);
+    explicit SkNoDrawCanvas(const SkIRect&);
 
     // Optimization to reset state to be the same as after construction.
     void resetCanvas(int w, int h)        { this->resetForNextPicture(SkIRect::MakeWH(w, h)); }

package/cpp/skia/include/utils/SkPaintFilterCanvas.h

@@ -57,7 +57,7 @@ public:
      * The new SkPaintFilterCanvas is configured for forwarding to the
      * specified canvas.  Also copies the target canvas matrix and clip bounds.
      */
-    SkPaintFilterCanvas(SkCanvas* canvas);
+    explicit SkPaintFilterCanvas(SkCanvas* canvas);
 
     enum Type {
         kPicture_Type,

package/cpp/skia/modules/skcms/src/skcms_public.h

@@ -9,8 +9,33 @@
 
 // skcms_public.h contains the entire public API for skcms.
 
-#ifndef SKCMS_API
-    #define SKCMS_API
+// Modeled after the FOX example in https://gcc.gnu.org/wiki/Visibility
+#if !defined(SKCMS_API)
+    // Client has opted in to building skcms as part of a DLL/shared object file.
+    #if defined(SKCMS_DLL)
+        // If on Windows (MSVC or Clang pretending to be MSVC)
+        #if defined(_MSC_VER)
+            // Client needs to set this when compiling the skcms files (but *not* when compiling
+            // other files which use the headers). In GN, this is handled with non-public configs.
+            // With Bazel, this can be implemented with local_defines.
+            #if defined(SKCMS_IMPLEMENTATION)
+                // If SKCMS is being built as a standalone DLL, it must be explicitly exported
+                // https://learn.microsoft.com/en-us/cpp/cpp/dllexport-dllimport?view=msvc-170
+                #define SKCMS_API __declspec(dllexport)
+            #else
+                // If a client is compiling and using the skcms header, this is an optimization
+                // to skip some indirection when resolving the function call.
+                // https://learn.microsoft.com/en-us/previous-versions/visualstudio/visual-studio-6.0/aa271769(v=vs.60)
+                #define SKCMS_API __declspec(dllimport)
+            #endif
+        #else
+            // On non-Windows platforms, we make sure the symbols are visible outside the
+            // shared object file.
+            #define SKCMS_API __attribute__((visibility("default")))
+        #endif
+    #else
+        #define SKCMS_API
+    #endif
 #endif
 
 #include <stdbool.h>
@@ -298,7 +323,7 @@ SKCMS_API bool skcms_GetWTPT(const skcms_ICCProfile*, float xyz[3]);
 SKCMS_API int skcms_GetInputChannelCount(const skcms_ICCProfile*);
 
 // These are common ICC signature values
-enum {
+typedef enum skcms_Signature {
     // common data_color_space values
     skcms_Signature_CMYK = 0x434D594B,
     skcms_Signature_Gray = 0x47524159,
@@ -329,7 +354,7 @@ enum {
     skcms_Signature_13CLR  = 0x44434C52,
     skcms_Signature_14CLR  = 0x45434C52,
     skcms_Signature_15CLR  = 0x46434C52,
-};
+} skcms_Signature;
 
 typedef enum skcms_PixelFormat {
     skcms_PixelFormat_A_8,

package/cpp/skia/modules/skottie/include/Skottie.h

@@ -11,6 +11,7 @@
 #include "include/core/SkRefCnt.h"
 #include "include/core/SkScalar.h"
 #include "include/core/SkSize.h"
+#include "include/core/SkSpan.h"
 #include "include/core/SkString.h"
 #include "include/core/SkTypes.h"
 #include "modules/skresources/include/SkResources.h"
@@ -45,6 +46,13 @@ namespace internal { class Animator; }
 using ImageAsset = skresources::ImageAsset;
 using ResourceProvider = skresources::ResourceProvider;
 
+struct LayerInfo {
+    SkString    fName;
+    SkSize      fSize;
+    const float fInPoint,
+                fOutPoint;
+};
+
 /**
  * A Logger subclass can be used to receive Animation::Builder parsing errors and warnings.
  */
@@ -181,6 +189,8 @@ public:
          */
         const sk_sp<SlotManager>& getSlotManager() const {return fSlotManager;}
 
+        SkSpan<const LayerInfo> getLayerInfo() const {return SkSpan(fLayerInfo);}
+
     private:
         const uint32_t          fFlags;
 
@@ -194,6 +204,7 @@ public:
         sk_sp<SkShapers::Factory> fShapingFactory;
         sk_sp<SlotManager>        fSlotManager;
         Stats                     fStats;
+        std::vector<LayerInfo>    fLayerInfo;
     };
 
     /**

package/cpp/skia/modules/skottie/include/SlotManager.h

@@ -42,7 +42,7 @@ class SK_API SlotManager final : public SkRefCnt {
 public:
     using SlotID = SkString;
 
-    SlotManager(sk_sp<skottie::internal::SceneGraphRevalidator>);
+    explicit SlotManager(sk_sp<skottie::internal::SceneGraphRevalidator>);
     ~SlotManager() override;
 
     bool setColorSlot(const SlotID&, SkColor);

package/cpp/skia/modules/skparagraph/include/Metrics.h

@@ -9,7 +9,7 @@ namespace skia {
 namespace textlayout {
 class StyleMetrics {
 public:
-    StyleMetrics(const TextStyle* style) : text_style(style) {}
+    explicit StyleMetrics(const TextStyle* style) : text_style(style) {}
 
     StyleMetrics(const TextStyle* style, SkFontMetrics& metrics)
             : text_style(style), font_metrics(metrics) {}

package/cpp/skia/modules/skparagraph/include/Paragraph.h

@@ -241,7 +241,7 @@ public:
     virtual bool getClosestUTF16GlyphInfoAt(SkScalar dx, SkScalar dy, GlyphInfo* glyphInfo) = 0;
 
     struct FontInfo {
-        FontInfo(const SkFont& font, const TextRange textRange)
+        FontInfo(const SkFont& font, const TextRange& textRange)
                 : fFont(font), fTextRange(textRange) {}
         virtual ~FontInfo() = default;
         FontInfo(const FontInfo& ) = default;

package/cpp/skia/modules/sksg/include/SkSGMerge.h

@@ -61,7 +61,7 @@ protected:
     SkPath onAsPath() const override;
 
 private:
-    Merge(std::vector<Rec>&& recs);
+    explicit Merge(std::vector<Rec>&& recs);
 
     const std::vector<Rec> fRecs;
     SkPath                 fMerged;

package/cpp/skia/modules/sksg/include/SkSGPath.h

@@ -26,7 +26,7 @@ class InvalidationController;
 /**
  * Concrete Geometry node, wrapping an SkPath.
  */
-class Path : public GeometryNode {
+class Path final : public GeometryNode {
 public:
     static sk_sp<Path> Make()                { return sk_sp<Path>(new Path(SkPath())); }
     static sk_sp<Path> Make(const SkPath& r) { return sk_sp<Path>(new Path(r)); }

package/cpp/skia/modules/skshaper/include/SkShaper.h

@@ -209,6 +209,8 @@ public:
         struct RunInfo {
             const SkFont& fFont;
             uint8_t fBidiLevel;
+            SkFourByteTag fScript;
+            const char* fLanguage;
             SkVector fAdvance;
             size_t glyphCount;
             Range utf8Range;

package/cpp/skia/modules/skunicode/include/SkUnicode.h

@@ -200,15 +200,15 @@ class SKUNICODE_API SkUnicode : public SkRefCnt {
         static bool extractUtfConversionMapping(SkSpan<const char> utf8, Appender8&& appender8, Appender16&& appender16) {
             size_t size8 = 0;
             size_t size16 = 0;
-            auto ptr = utf8.begin();
-            auto end = utf8.end();
+            auto ptr = utf8.data();
+            auto end = ptr + utf8.size();
             while (ptr < end) {
 
-                size_t index = SkToSizeT(ptr - utf8.begin());
+                size_t index = SkToSizeT(ptr - utf8.data());
                 SkUnichar u = SkUTF::NextUTF8(&ptr, end);
 
                 // All UTF8 code units refer to the same codepoint
-                size_t next = SkToSizeT(ptr - utf8.begin());
+                size_t next = SkToSizeT(ptr - utf8.data());
                 for (auto i = index; i < next; ++i) {
                     //fUTF16IndexForUTF8Index.emplace_back(fUTF8IndexForUTF16Index.size());
                     appender16(size8);

package/cpp/skia/modules/svg/include/SkSVGAttributeParser.h

@@ -25,7 +25,7 @@ class SkString;
 
 class SkSVGAttributeParser : public SkNoncopyable {
 public:
-    SkSVGAttributeParser(const char[]);
+    explicit SkSVGAttributeParser(const char[]);
 
     bool parseInteger(SkSVGIntegerType*);
     bool parseViewBox(SkSVGViewBoxType*);

package/cpp/skia/modules/svg/include/SkSVGFeComponentTransfer.h

@@ -54,7 +54,7 @@ protected:
     bool parseAndSetAttribute(const char*, const char*) override;
 
 private:
-    SkSVGFeFunc(SkSVGTag tag) : INHERITED(tag) {}
+    explicit SkSVGFeFunc(SkSVGTag tag) : SkSVGHiddenContainer(tag) {}
 
     using INHERITED = SkSVGHiddenContainer;
 };

package/cpp/skia/modules/svg/include/SkSVGNode.h

@@ -159,7 +159,7 @@ public:
     SVG_PRES_ATTR(LightingColor            , SkSVGColor     , false)
 
 protected:
-    SkSVGNode(SkSVGTag);
+    explicit SkSVGNode(SkSVGTag);
 
     static SkMatrix ComputeViewboxMatrix(const SkRect&, const SkRect&, SkSVGPreserveAspectRatio);
 

package/cpp/skia/modules/svg/include/SkSVGPoly.h

@@ -46,7 +46,7 @@ protected:
     SkRect onTransformableObjectBoundingBox(const SkSVGRenderContext&) const override;
 
 private:
-    SkSVGPoly(SkSVGTag);
+    explicit SkSVGPoly(SkSVGTag);
 
     mutable SkPath fPath;  // mutated in onDraw(), to apply inherited fill types.
 

package/cpp/skia/modules/svg/include/SkSVGShape.h

@@ -26,7 +26,7 @@ public:
     void appendChild(sk_sp<SkSVGNode>) override;
 
 protected:
-    SkSVGShape(SkSVGTag);
+    explicit SkSVGShape(SkSVGTag);
 
     void onRender(const SkSVGRenderContext&) const final;
 

package/cpp/skia/modules/svg/include/SkSVGTransformableNode.h

@@ -24,7 +24,7 @@ public:
     void setTransform(const SkSVGTransformType& t) { fTransform = t; }
 
 protected:
-    SkSVGTransformableNode(SkSVGTag);
+    explicit SkSVGTransformableNode(SkSVGTag);
 
     bool onPrepareToRender(SkSVGRenderContext*) const override;
 

package/cpp/skia/modules/svg/include/SkSVGValue.h

@@ -38,7 +38,7 @@ public:
     }
 
 protected:
-    SkSVGValue(Type t) : fType(t) { }
+    explicit SkSVGValue(Type t) : fType(t) {}
 
 private:
     Type fType;

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

@@ -66,7 +66,13 @@ const matchFont = (inputStyle = {}, fontMgr = _Skia.Skia.FontMgr.System()) => {
   return _Skia.Skia.Font(typeface, fontStyle.fontSize);
 };
 exports.matchFont = matchFont;
-const listFontFamilies = (fontMgr = _Skia.Skia.FontMgr.System()) => new Array(fontMgr.countFamilies()).fill(0).map((_, i) => fontMgr.getFamilyName(i));
+const listFontFamilies = (fontMgr = _Skia.Skia.FontMgr.System()) => {
+  const families = new Set();
+  for (let i = 0; i < fontMgr.countFamilies(); i++) {
+    families.add(fontMgr.getFamilyName(i));
+  }
+  return Array.from(families);
+};
 exports.listFontFamilies = listFontFamilies;
 const loadTypefaces = typefacesToLoad => {
   const promises = Object.keys(typefacesToLoad).flatMap(familyName => {

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","Array","countFamilies","fill","map","_","i","getFamilyName","loadTypefaces","typefacesToLoad","promises","Object","keys","flatMap","familyName","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 = (fontMgr: SkFontMgr = Skia.FontMgr.System()) =>\n  new Array(fontMgr.countFamilies())\n    .fill(0)\n    .map((_, i) => fontMgr.getFamilyName(i));\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","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":";;;;;;AACA,IAAAA,MAAA,GAAAC,OAAA;AAEA,IAAAC,KAAA,GAAAD,OAAA;AACA,IAAAE,MAAA,GAAAF,OAAA;AAEA,IAAAG,SAAA,GAAAH,OAAA;AAGA,IAAAI,SAAA,GAAAJ,OAAA;AATA;;AAWA,MAAMK,eAAe,GAAG,EAAE;;AAE1B;AACA;AACA;AACO,MAAMC,OAAO,GAAGA,CACrBC,IAAqB,EACrBC,IAAI,GAAGH,eAAe,EACtBI,OAA8B,KAC3B;EACH,MAAMC,QAAQ,GAAG,IAAAC,qBAAW,EAACJ,IAAI,EAAEE,OAAO,CAAC;EAC3C,OAAO,IAAAG,cAAO,EAAC,MAAM;IACnB,IAAIF,QAAQ,EAAE;MACZ,OAAOG,UAAI,CAACC,IAAI,CAACJ,QAAQ,EAAEF,IAAI,CAAC;IAClC,CAAC,MAAM;MACL,OAAO,IAAI;IACb;EACF,CAAC,EAAE,CAACA,IAAI,EAAEE,QAAQ,CAAC,CAAC;AACtB,CAAC;AAACK,OAAA,CAAAT,OAAA,GAAAA,OAAA;AAuBF,MAAMU,gBAA6B,GAAG;EACpCC,UAAU,EAAE,QAAQ;EACpBC,QAAQ,EAAEb,eAAe;EACzBc,SAAS,EAAE,QAAQ;EACnBC,UAAU,EAAE;AACd,CAAC;AAED,MAAMC,KAAK,GAAIC,CAAQ,IAAK;EAC1B,IAAIA,CAAC,KAAK,QAAQ,EAAE;IAClB,OAAOC,gBAAS,CAACC,MAAM;EACzB,CAAC,MAAM,IAAIF,CAAC,KAAK,SAAS,EAAE;IAC1B,OAAOC,gBAAS,CAACE,OAAO;EAC1B,CAAC,MAAM;IACL,OAAOF,gBAAS,CAACG,OAAO;EAC1B;AACF,CAAC;AAED,MAAMC,MAAM,GAAIP,UAAkB,IAAK;EACrC,QAAQA,UAAU;IAChB,KAAK,QAAQ;MACX,OAAO,GAAG;IACZ,KAAK,MAAM;MACT,OAAO,GAAG;IACZ;MACE,OAAOQ,QAAQ,CAACR,UAAU,EAAE,EAAE,CAAC;EACnC;AACF,CAAC;AAEM,MAAMS,SAAS,GAAGA,CACvBC,UAAgC,GAAG,CAAC,CAAC,EACrCC,OAAkB,GAAGlB,UAAI,CAACmB,OAAO,CAACC,MAAM,CAAC,CAAC,KACvC;EACH,MAAMd,SAAS,GAAG;IAChB,GAAGH,gBAAgB;IACnB,GAAGc;EACL,CAAC;EACD,MAAMI,KAAK,GAAG;IACZP,MAAM,EAAEA,MAAM,CAACR,SAAS,CAACC,UAAU,CAAC;IACpCe,KAAK,EAAE,CAAC;IACRd,KAAK,EAAEA,KAAK,CAACF,SAAS,CAACA,SAAS;EAClC,CAAC;EACD,MAAMT,QAAQ,GAAGqB,OAAO,CAACK,gBAAgB,CAACjB,SAAS,CAACF,UAAU,EAAEiB,KAAK,CAAC;EACtE,OAAOrB,UAAI,CAACC,IAAI,CAACJ,QAAQ,EAAES,SAAS,CAACD,QAAQ,CAAC;AAChD,CAAC;AAACH,OAAA,CAAAc,SAAA,GAAAA,SAAA;AAEK,MAAMQ,gBAAgB,GAAGA,CAC9BN,OAAkB,GAAGlB,UAAI,CAACmB,OAAO,CAACC,MAAM,CAAC,CAAC,KACvC;EACH,MAAMK,QAAQ,GAAG,IAAIC,GAAG,CAAS,CAAC;EAClC,KAAK,IAAIC,CAAC,GAAG,CAAC,EAAEA,CAAC,GAAGT,OAAO,CAACU,aAAa,CAAC,CAAC,EAAED,CAAC,EAAE,EAAE;IAChDF,QAAQ,CAACI,GAAG,CAACX,OAAO,CAACY,aAAa,CAACH,CAAC,CAAC,CAAC;EACxC;EACA,OAAOI,KAAK,CAACC,IAAI,CAACP,QAAQ,CAAC;AAC7B,CAAC;AAACvB,OAAA,CAAAsB,gBAAA,GAAAA,gBAAA;AAEF,MAAMS,aAAa,GAAIC,eAA6C,IAAK;EACvE,MAAMC,QAAQ,GAAGC,MAAM,CAACC,IAAI,CAACH,eAAe,CAAC,CAACI,OAAO,CAAEC,UAAU,IAAK;IACpE,OAAOL,eAAe,CAACK,UAAU,CAAC,CAACC,GAAG,CAAEC,cAAc,IAAK;MACzD,OAAOzC,UAAI,CAAC0C,IAAI,CAACC,OAAO,CAACC,kBAAQ,CAACC,YAAY,CAACJ,cAAc,CAAC,CAAC,CAACK,IAAI,CACjEC,IAAI,IAAK;QACR,MAAMC,EAAE,GAAGhD,UAAI,CAACiD,QAAQ,CAACC,wBAAwB,CAACH,IAAI,CAAC;QACvD,IAAIC,EAAE,KAAK,IAAI,EAAE;UACf,MAAM,IAAIG,KAAK,CAAC,gCAAgCZ,UAAU,EAAE,CAAC;QAC/D;QACA,OAAO,CAACA,UAAU,EAAES,EAAE,CAAC;MACzB,CACF,CAAC;IACH,CAAC,CAAC;EACJ,CAAC,CAAC;EACF,OAAOI,OAAO,CAACC,GAAG,CAAClB,QAAQ,CAAC;AAC9B,CAAC;AAEM,MAAMmB,QAAQ,GAAIC,OAAqC,IAAK;EACjE,MAAM,CAACrC,OAAO,EAAEsC,UAAU,CAAC,GAAG,IAAAC,eAAQ,EAAgC,IAAI,CAAC;EAE3E,IAAAC,gBAAS,EAAC,MAAM;IACdzB,aAAa,CAACsB,OAAO,CAAC,CAACT,IAAI,CAAEa,MAAM,IAAK;MACtC,MAAMC,IAAI,GAAG5D,UAAI,CAAC6D,oBAAoB,CAACC,IAAI,CAAC,CAAC;MAC7CH,MAAM,CAACI,OAAO,CAAC,CAAC,CAACxB,UAAU,EAAE1C,QAAQ,CAAC,KAAK;QACzC+D,IAAI,CAACI,YAAY,CAACnE,QAAQ,EAAE0C,UAAU,CAAC;MACzC,CAAC,CAAC;MACFiB,UAAU,CAACI,IAAI,CAAC;IAClB,CAAC,CAAC;IACF;EACF,CAAC,EAAE,EAAE,CAAC;EACN,OAAO1C,OAAO;AAChB,CAAC;AAAChB,OAAA,CAAAoD,QAAA,GAAAA,QAAA","ignoreList":[]}

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

@@ -57,7 +57,13 @@ export const matchFont = (inputStyle = {}, fontMgr = Skia.FontMgr.System()) => {
   const typeface = fontMgr.matchFamilyStyle(fontStyle.fontFamily, style);
   return Skia.Font(typeface, fontStyle.fontSize);
 };
-export const listFontFamilies = (fontMgr = Skia.FontMgr.System()) => new Array(fontMgr.countFamilies()).fill(0).map((_, i) => fontMgr.getFamilyName(i));
+export const listFontFamilies = (fontMgr = Skia.FontMgr.System()) => {
+  const families = new Set();
+  for (let i = 0; i < fontMgr.countFamilies(); i++) {
+    families.add(fontMgr.getFamilyName(i));
+  }
+  return Array.from(families);
+};
 const loadTypefaces = typefacesToLoad => {
   const promises = Object.keys(typefacesToLoad).flatMap(familyName => {
     return typefacesToLoad[familyName].map(typefaceToLoad => {

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

@@ -1 +1 @@
-{"version":3,"names":["useEffect","useMemo","useState","Skia","FontSlant","Platform","useTypeface","defaultFontSize","useFont","font","size","onError","typeface","Font","defaultFontStyle","fontFamily","fontSize","fontStyle","fontWeight","slant","s","Italic","Oblique","Upright","weight","parseInt","matchFont","inputStyle","fontMgr","FontMgr","System","style","width","matchFamilyStyle","listFontFamilies","Array","countFamilies","fill","map","_","i","getFamilyName","loadTypefaces","typefacesToLoad","promises","Object","keys","flatMap","familyName","typefaceToLoad","Data","fromURI","resolveAsset","then","data","tf","Typeface","MakeFreeTypeFaceFromData","Error","Promise","all","useFonts","sources","setFontMgr","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 = (fontMgr: SkFontMgr = Skia.FontMgr.System()) =>\n  new Array(fontMgr.countFamilies())\n    .fill(0)\n    .map((_, i) => fontMgr.getFamilyName(i));\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":"AAAA;AACA,SAASA,SAAS,EAAEC,OAAO,EAAEC,QAAQ,QAAQ,OAAO;AAEpD,SAASC,IAAI,QAAQ,SAAS;AAC9B,SAASC,SAAS,QAAQ,UAAU;AAEpC,SAASC,QAAQ,QAAQ,gBAAgB;AAGzC,SAASC,WAAW,QAAQ,YAAY;AAExC,MAAMC,eAAe,GAAG,EAAE;;AAE1B;AACA;AACA;AACA,OAAO,MAAMC,OAAO,GAAGA,CACrBC,IAAqB,EACrBC,IAAI,GAAGH,eAAe,EACtBI,OAA8B,KAC3B;EACH,MAAMC,QAAQ,GAAGN,WAAW,CAACG,IAAI,EAAEE,OAAO,CAAC;EAC3C,OAAOV,OAAO,CAAC,MAAM;IACnB,IAAIW,QAAQ,EAAE;MACZ,OAAOT,IAAI,CAACU,IAAI,CAACD,QAAQ,EAAEF,IAAI,CAAC;IAClC,CAAC,MAAM;MACL,OAAO,IAAI;IACb;EACF,CAAC,EAAE,CAACA,IAAI,EAAEE,QAAQ,CAAC,CAAC;AACtB,CAAC;AAuBD,MAAME,gBAA6B,GAAG;EACpCC,UAAU,EAAE,QAAQ;EACpBC,QAAQ,EAAET,eAAe;EACzBU,SAAS,EAAE,QAAQ;EACnBC,UAAU,EAAE;AACd,CAAC;AAED,MAAMC,KAAK,GAAIC,CAAQ,IAAK;EAC1B,IAAIA,CAAC,KAAK,QAAQ,EAAE;IAClB,OAAOhB,SAAS,CAACiB,MAAM;EACzB,CAAC,MAAM,IAAID,CAAC,KAAK,SAAS,EAAE;IAC1B,OAAOhB,SAAS,CAACkB,OAAO;EAC1B,CAAC,MAAM;IACL,OAAOlB,SAAS,CAACmB,OAAO;EAC1B;AACF,CAAC;AAED,MAAMC,MAAM,GAAIN,UAAkB,IAAK;EACrC,QAAQA,UAAU;IAChB,KAAK,QAAQ;MACX,OAAO,GAAG;IACZ,KAAK,MAAM;MACT,OAAO,GAAG;IACZ;MACE,OAAOO,QAAQ,CAACP,UAAU,EAAE,EAAE,CAAC;EACnC;AACF,CAAC;AAED,OAAO,MAAMQ,SAAS,GAAGA,CACvBC,UAAgC,GAAG,CAAC,CAAC,EACrCC,OAAkB,GAAGzB,IAAI,CAAC0B,OAAO,CAACC,MAAM,CAAC,CAAC,KACvC;EACH,MAAMb,SAAS,GAAG;IAChB,GAAGH,gBAAgB;IACnB,GAAGa;EACL,CAAC;EACD,MAAMI,KAAK,GAAG;IACZP,MAAM,EAAEA,MAAM,CAACP,SAAS,CAACC,UAAU,CAAC;IACpCc,KAAK,EAAE,CAAC;IACRb,KAAK,EAAEA,KAAK,CAACF,SAAS,CAACA,SAAS;EAClC,CAAC;EACD,MAAML,QAAQ,GAAGgB,OAAO,CAACK,gBAAgB,CAAChB,SAAS,CAACF,UAAU,EAAEgB,KAAK,CAAC;EACtE,OAAO5B,IAAI,CAACU,IAAI,CAACD,QAAQ,EAAEK,SAAS,CAACD,QAAQ,CAAC;AAChD,CAAC;AAED,OAAO,MAAMkB,gBAAgB,GAAGA,CAACN,OAAkB,GAAGzB,IAAI,CAAC0B,OAAO,CAACC,MAAM,CAAC,CAAC,KACzE,IAAIK,KAAK,CAACP,OAAO,CAACQ,aAAa,CAAC,CAAC,CAAC,CAC/BC,IAAI,CAAC,CAAC,CAAC,CACPC,GAAG,CAAC,CAACC,CAAC,EAAEC,CAAC,KAAKZ,OAAO,CAACa,aAAa,CAACD,CAAC,CAAC,CAAC;AAE5C,MAAME,aAAa,GAAIC,eAA6C,IAAK;EACvE,MAAMC,QAAQ,GAAGC,MAAM,CAACC,IAAI,CAACH,eAAe,CAAC,CAACI,OAAO,CAAEC,UAAU,IAAK;IACpE,OAAOL,eAAe,CAACK,UAAU,CAAC,CAACV,GAAG,CAAEW,cAAc,IAAK;MACzD,OAAO9C,IAAI,CAAC+C,IAAI,CAACC,OAAO,CAAC9C,QAAQ,CAAC+C,YAAY,CAACH,cAAc,CAAC,CAAC,CAACI,IAAI,CACjEC,IAAI,IAAK;QACR,MAAMC,EAAE,GAAGpD,IAAI,CAACqD,QAAQ,CAACC,wBAAwB,CAACH,IAAI,CAAC;QACvD,IAAIC,EAAE,KAAK,IAAI,EAAE;UACf,MAAM,IAAIG,KAAK,CAAC,gCAAgCV,UAAU,EAAE,CAAC;QAC/D;QACA,OAAO,CAACA,UAAU,EAAEO,EAAE,CAAC;MACzB,CACF,CAAC;IACH,CAAC,CAAC;EACJ,CAAC,CAAC;EACF,OAAOI,OAAO,CAACC,GAAG,CAAChB,QAAQ,CAAC;AAC9B,CAAC;AAED,OAAO,MAAMiB,QAAQ,GAAIC,OAAqC,IAAK;EACjE,MAAM,CAAClC,OAAO,EAAEmC,UAAU,CAAC,GAAG7D,QAAQ,CAAgC,IAAI,CAAC;EAE3EF,SAAS,CAAC,MAAM;IACd0C,aAAa,CAACoB,OAAO,CAAC,CAACT,IAAI,CAAEW,MAAM,IAAK;MACtC,MAAMC,IAAI,GAAG9D,IAAI,CAAC+D,oBAAoB,CAACC,IAAI,CAAC,CAAC;MAC7CH,MAAM,CAACI,OAAO,CAAC,CAAC,CAACpB,UAAU,EAAEpC,QAAQ,CAAC,KAAK;QACzCqD,IAAI,CAACI,YAAY,CAACzD,QAAQ,EAAEoC,UAAU,CAAC;MACzC,CAAC,CAAC;MACFe,UAAU,CAACE,IAAI,CAAC;IAClB,CAAC,CAAC;IACF;EACF,CAAC,EAAE,EAAE,CAAC;EACN,OAAOrC,OAAO;AAChB,CAAC","ignoreList":[]}
+{"version":3,"names":["useEffect","useMemo","useState","Skia","FontSlant","Platform","useTypeface","defaultFontSize","useFont","font","size","onError","typeface","Font","defaultFontStyle","fontFamily","fontSize","fontStyle","fontWeight","slant","s","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","resolveAsset","then","data","tf","Typeface","MakeFreeTypeFaceFromData","Error","Promise","all","useFonts","sources","setFontMgr","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":[]}

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

@@ -4,5 +4,5 @@ export const __esModule: boolean;
  * */
 export function useFont(font: any, size: number | undefined, onError: any): import("../../../..").SkFont | null;
 export function matchFont(inputStyle?: {}, fontMgr?: import("../../../..").SkFontMgr): import("../../../..").SkFont;
-export function listFontFamilies(fontMgr?: import("../../../..").SkFontMgr): string[];
+export function listFontFamilies(fontMgr?: import("../../../..").SkFontMgr): any[];
 export function useFonts(sources: any): null;

package/lib/typescript/lib/module/mock/index.d.ts

@@ -173,7 +173,7 @@ export function Mock(CanvasKit: any): {
     loadData: (source: any, factory: any, onError: any) => Promise<any>;
     useCollectionLoading: (source: any, loader: any) => null;
     matchFont: (inputStyle?: {}, fontMgr?: import("../../..").SkFontMgr) => import("../../..").SkFont;
-    listFontFamilies: (fontMgr?: import("../../..").SkFontMgr) => string[];
+    listFontFamilies: (fontMgr?: import("../../..").SkFontMgr) => any[];
     makeImageFromView: (viewRef: any, callback?: null) => any;
     useAnimatedImage: (source: any, onError: any) => null;
     createPicture: (cb: any, rect: any) => import("../../..").SkPicture;

package/lib/typescript/lib/module/skia/core/Font.d.ts

@@ -1,4 +1,4 @@
 export function useFont(font: any, size: number | undefined, onError: any): import("../../../..").SkFont | null;
 export function matchFont(inputStyle?: {}, fontMgr?: import("../../../..").SkFontMgr): import("../../../..").SkFont;
-export function listFontFamilies(fontMgr?: import("../../../..").SkFontMgr): string[];
+export function listFontFamilies(fontMgr?: import("../../../..").SkFontMgr): any[];
 export function useFonts(sources: any): null;

package/package.json

@@ -8,15 +8,15 @@
     "setup-skia-web": "scripts/setup-canvaskit.js"
   },
   "title": "React Native Skia",
-  "version": "2.4.7",
+  "version": "2.4.14",
   "skia": {
-    "version": "m142",
+    "version": "m144",
     "checksums": {
-      "android-armeabi-v7a": "5ae357eb26d9ec93797bacbc865b86eff6ac54b3a9466a1b0c41c27018cc3150",
-      "android-arm64-v8a": "c310bd5261de1ab5f4afdb05aa51bf0f56d625f6285617e149af517a2d375e52",
-      "android-x86": "26a18ade07de8318be2ec82bd82a1d7f2709893462229d70f0d353c6c8691cc3",
-      "android-x86_64": "46a5576b6f8e7d1372c27576ad750384c2d6f892bfe3fc0ee260c68d08ebd844",
-      "apple-xcframeworks": "343fad71c01e1f8331d4421c7efe0ae6dff3a7d25361c466dcda7dc3737cdd5c"
+      "android-armeabi-v7a": "8f7f83a4ae210cc28007f2c226d754e9ef7c929822ef60c56a4ccc134e726148",
+      "android-arm64-v8a": "5d799d988a6cbc0cb844a92882a2458e67990314791ea38f928d83d5e01cb828",
+      "android-x86": "711fbee4a1721b92604daa78fa6f8c7ce4a6a6c901973919bd030848adc4f81d",
+      "android-x86_64": "fe068aa70b5c8bcf991cfe99e9db38617aaeaf92defd08bc4f89384b4d4dbed4",
+      "apple-xcframeworks": "63e2789bd75236b16779abc7171b351aa50cd01c13f05b3e1d83b34336ceb77c"
     }
   },
   "skia-graphite": {
@@ -26,7 +26,7 @@
       "android-arm64-v8a": "6be2711ca4c31523d381420e98cabfe7e7939e246975c7b427968d5dd3b62be9",
       "android-x86": "888934ddc34f431c7fac5628f633dc11a4e84d68c41adb33307ae7586cc7b0b5",
       "android-x86_64": "2180a5be52d51bbf1dabaf95051ed0ce422b047157bcda6e486657c2c7b87ceb",
-      "apple-xcframeworks": "cb50d9c85c9f02389ecc433912145e4a7ce2277bfe26a69dd7f7a9db74c9e276"
+      "apple-xcframeworks": "6c9e4c565977acaf9d4f4b113050cfe8f9804602fd3cd4ec982c605fa7b040e6"
     }
   },
   "description": "High-performance React Native Graphics using Skia",