@shopify/react-native-skia 0.1.202 → 0.1.203

package/android/CMakeLists.txt

@@ -9,8 +9,8 @@ set (PACKAGE_NAME "rnskia")
 set (SKIA_LIB "skia")
 set (SKIA_SVG_LIB "svg")
 set (SKIA_SKSHAPER_LIB "skshaper")
-#set (SKIA_SKPARAGRAPH_LIB "skparagraph")
-#set (SKIA_SKUNICODE_LIB "skunicode")
+set (SKIA_SKPARAGRAPH_LIB "skparagraph")
+set (SKIA_SKUNICODE_LIB "skunicode")
 
 # Clear some variables
 unset(LIBRN_DIR CACHE)
@@ -84,7 +84,7 @@ target_include_directories(
         ../cpp/skia/include/utils/
         ../cpp/skia/include/pathops/
         ../cpp/skia/modules/
-        #cpp/skia/modules/skparagraph/include/
+        ../cpp/skia/modules/skparagraph/include/
         ../cpp/skia/include/
         ../cpp/skia
 
@@ -113,11 +113,11 @@ set_property(TARGET svg PROPERTY IMPORTED_LOCATION "${SKIA_LIBS_PATH}/libsvg.a")
 add_library(skshaper STATIC IMPORTED)
 set_property(TARGET skshaper PROPERTY IMPORTED_LOCATION "${SKIA_LIBS_PATH}/libskshaper.a")
 
-#add_library(skparagraph STATIC IMPORTED)
-#set_property(TARGET skparagraph PROPERTY IMPORTED_LOCATION "${SKIA_LIBS_PATH}/libskparagraph.a")
+add_library(skparagraph STATIC IMPORTED)
+set_property(TARGET skparagraph PROPERTY IMPORTED_LOCATION "${SKIA_LIBS_PATH}/libskparagraph.a")
 
-#add_library(skunicode STATIC IMPORTED)
-#set_property(TARGET skunicode PROPERTY IMPORTED_LOCATION "${SKIA_LIBS_PATH}/libskunicode.a")
+add_library(skunicode STATIC IMPORTED)
+set_property(TARGET skunicode PROPERTY IMPORTED_LOCATION "${SKIA_LIBS_PATH}/libskunicode.a")
 
 
 find_library(
@@ -202,8 +202,8 @@ target_link_libraries(
         ${TURBOMODULES_LIB}
         ${SKIA_SVG_LIB}
         ${SKIA_SKSHAPER_LIB}
-        #${SKIA_SKPARAGRAPH_LIB}
-        #${SKIA_SKUNICODE_LIB}
+        ${SKIA_SKPARAGRAPH_LIB}
+        ${SKIA_SKUNICODE_LIB}
         ${SKIA_LIB}
         -ljnigraphics
         -lGLESv2

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

@@ -9,6 +9,13 @@
 #include <RNSkPlatformContext.h>
 #include <SkiaOpenGLSurfaceFactory.h>
 
+#pragma clang diagnostic push
+#pragma clang diagnostic ignored "-Wdocumentation"
+
+#include "include/ports/SkFontMgr_android.h"
+
+#pragma clang diagnostic pop
+
 namespace RNSkia {
 namespace jsi = facebook::jsi;
 
@@ -41,6 +48,10 @@ public:
     return SkiaOpenGLSurfaceFactory::makeOffscreenSurface(width, height);
   }
 
+  sk_sp<SkFontMgr> createFontMgr() override {
+    return SkFontMgr_New_Android(nullptr);
+  }
+
   void runOnMainThread(std::function<void()> task) override {
     _jniPlatformContext->runTaskOnMainThread(task);
   }

package/cpp/api/JsiSkApi.h

@@ -12,6 +12,8 @@
 #include "JsiSkContourMeasureIter.h"
 #include "JsiSkDataFactory.h"
 #include "JsiSkFont.h"
+#include "JsiSkFontMgr.h"
+#include "JsiSkFontMgrFactory.h"
 #include "JsiSkImage.h"
 #include "JsiSkImageFactory.h"
 #include "JsiSkImageFilter.h"
@@ -39,6 +41,7 @@
 #include "JsiSkShaderFactory.h"
 #include "JsiSkSurfaceFactory.h"
 #include "JsiSkTextBlobFactory.h"
+#include "JsiSkTypeFaceFontProviderFactory.h"
 #include "JsiSkTypeface.h"
 #include "JsiSkTypefaceFactory.h"
 #include "JsiSkVertices.h"
@@ -100,6 +103,11 @@ public:
                             std::make_shared<JsiSkSurfaceFactory>(context));
     installReadonlyProperty("Picture",
                             std::make_shared<JsiSkPictureFactory>(context));
+    installReadonlyProperty("FontMgr",
+                            std::make_shared<JsiSkFontMgrFactory>(context));
+    installReadonlyProperty(
+        "TypefaceFontProvider",
+        std::make_shared<JsiSkTypefaceFontProviderFactory>(context));
   }
 };
 } // namespace RNSkia

package/cpp/api/JsiSkFontMgr.h

@@ -0,0 +1,54 @@
+#pragma once
+
+#include <memory>
+#include <numeric>
+#include <utility>
+#include <vector>
+
+#include "JsiSkFontStyle.h"
+#include "JsiSkHostObjects.h"
+#include "RNSkLog.h"
+#include <jsi/jsi.h>
+
+#pragma clang diagnostic push
+#pragma clang diagnostic ignored "-Wdocumentation"
+
+#include "SkFontMgr.h"
+
+#pragma clang diagnostic pop
+
+namespace RNSkia {
+
+namespace jsi = facebook::jsi;
+
+class JsiSkFontMgr : public JsiSkWrappingSkPtrHostObject<SkFontMgr> {
+public:
+  EXPORT_JSI_API_TYPENAME(JsiSkFontMgr, "FontMgr")
+
+  JsiSkFontMgr(std::shared_ptr<RNSkPlatformContext> context,
+               sk_sp<SkFontMgr> fontMgr)
+      : JsiSkWrappingSkPtrHostObject(std::move(context), fontMgr) {}
+
+  JSI_HOST_FUNCTION(countFamilies) { return getObject()->countFamilies(); }
+
+  JSI_HOST_FUNCTION(getFamilyName) {
+    auto i = static_cast<int>(arguments[0].asNumber());
+    SkString name;
+    getObject()->getFamilyName(i, &name);
+    return jsi::String::createFromUtf8(runtime, name.c_str());
+  }
+
+  JSI_HOST_FUNCTION(matchFamilyStyle) {
+    auto name = arguments[0].asString(runtime).utf8(runtime);
+    auto fontStyle = JsiSkFontStyle::fromValue(runtime, arguments[1]);
+    auto typeface = getObject()->matchFamilyStyle(name.c_str(), *fontStyle);
+    return jsi::Object::createFromHostObject(
+        runtime, std::make_shared<JsiSkTypeface>(getContext(), typeface));
+  }
+
+  JSI_EXPORT_FUNCTIONS(JSI_EXPORT_FUNC(JsiSkFontMgr, countFamilies),
+                       JSI_EXPORT_FUNC(JsiSkFontMgr, getFamilyName),
+                       JSI_EXPORT_FUNC(JsiSkFontMgr, matchFamilyStyle))
+};
+
+} // namespace RNSkia

package/cpp/api/JsiSkFontMgrFactory.h

@@ -0,0 +1,40 @@
+#pragma once
+
+#include <memory>
+#include <utility>
+#include <vector>
+
+#include <jsi/jsi.h>
+
+#include "JsiSkHostObjects.h"
+
+#pragma clang diagnostic push
+#pragma clang diagnostic ignored "-Wdocumentation"
+
+#include "SkFontMgr.h"
+#include "include/ports/SkFontMgr_data.h"
+
+#pragma clang diagnostic pop
+
+namespace RNSkia {
+
+namespace jsi = facebook::jsi;
+
+class JsiSkFontMgrFactory : public JsiSkHostObject {
+public:
+  JSI_HOST_FUNCTION(System) {
+    auto context = getContext();
+    static SkOnce once;
+    static sk_sp<SkFontMgr> fontMgr;
+    once([&context, &runtime] { fontMgr = context->createFontMgr(); });
+    return jsi::Object::createFromHostObject(
+        runtime, std::make_shared<JsiSkFontMgr>(std::move(context), fontMgr));
+  }
+
+  JSI_EXPORT_FUNCTIONS(JSI_EXPORT_FUNC(JsiSkFontMgrFactory, System))
+
+  explicit JsiSkFontMgrFactory(std::shared_ptr<RNSkPlatformContext> context)
+      : JsiSkHostObject(std::move(context)) {}
+};
+
+} // namespace RNSkia

package/cpp/api/JsiSkFontStyle.h

@@ -0,0 +1,61 @@
+#pragma once
+
+#include <memory>
+#include <utility>
+
+#include <jsi/jsi.h>
+
+#include "JsiSkHostObjects.h"
+
+#pragma clang diagnostic push
+#pragma clang diagnostic ignored "-Wdocumentation"
+
+#include "SkFontStyle.h"
+
+#pragma clang diagnostic pop
+
+namespace RNSkia {
+
+namespace jsi = facebook::jsi;
+
+class JsiSkFontStyle : public JsiSkWrappingSharedPtrHostObject<SkFontStyle> {
+public:
+  JSI_API_TYPENAME("FontStyle");
+
+  JsiSkFontStyle(std::shared_ptr<RNSkPlatformContext> context,
+                 const SkFontStyle &fontStyle)
+      : JsiSkWrappingSharedPtrHostObject<SkFontStyle>(
+            std::move(context), std::make_shared<SkFontStyle>(fontStyle)) {}
+
+  /**
+  Returns the underlying object from a host object of this type
+ */
+  static std::shared_ptr<SkFontStyle> fromValue(jsi::Runtime &runtime,
+                                                const jsi::Value &obj) {
+    const auto &object = obj.asObject(runtime);
+    if (object.isHostObject(runtime)) {
+      return object.asHostObject<JsiSkFontStyle>(runtime)->getObject();
+    } else {
+      auto weight =
+          static_cast<int>(object.getProperty(runtime, "weight").asNumber());
+      auto width =
+          static_cast<int>(object.getProperty(runtime, "width").asNumber());
+      auto slant = static_cast<SkFontStyle::Slant>(
+          object.getProperty(runtime, "slant").asNumber());
+      SkFontStyle style(weight, width, slant);
+      return std::make_shared<SkFontStyle>(style);
+    }
+  }
+
+  /**
+  Returns the jsi object from a host object of this type
+ */
+  static jsi::Value toValue(jsi::Runtime &runtime,
+                            std::shared_ptr<RNSkPlatformContext> context,
+                            const SkFontStyle &fontStyle) {
+    return jsi::Object::createFromHostObject(
+        runtime,
+        std::make_shared<JsiSkFontStyle>(std::move(context), fontStyle));
+  }
+};
+} // namespace RNSkia

package/cpp/api/JsiSkTypeFaceFontProvider.h

@@ -0,0 +1,80 @@
+#pragma once
+
+#include <memory>
+#include <utility>
+
+#include <jsi/jsi.h>
+
+#include "JsiSkFontStyle.h"
+#include "JsiSkHostObjects.h"
+#include "JsiSkTypeface.h"
+
+#include "RNSkLog.h"
+
+#pragma clang diagnostic push
+#pragma clang diagnostic ignored "-Wdocumentation"
+
+#include "SkFont.h"
+#include "skparagraph/include/TypefaceFontProvider.h"
+
+#pragma clang diagnostic pop
+
+namespace RNSkia {
+
+namespace jsi = facebook::jsi;
+namespace para = skia::textlayout;
+
+class JsiSkTypefaceFontProvider
+    : public JsiSkWrappingSkPtrHostObject<para::TypefaceFontProvider> {
+public:
+  EXPORT_JSI_API_TYPENAME(JsiSkTypefaceFontProvider, "FontMgr")
+  JSI_EXPORT_FUNCTIONS(
+      JSI_EXPORT_FUNC(JsiSkTypefaceFontProvider, dispose),
+      JSI_EXPORT_FUNC(JsiSkTypefaceFontProvider, registerFont),
+      JSI_EXPORT_FUNC(JsiSkTypefaceFontProvider, matchFamilyStyle),
+      JSI_EXPORT_FUNC(JsiSkTypefaceFontProvider, countFamilies),
+      JSI_EXPORT_FUNC(JsiSkTypefaceFontProvider, getFamilyName))
+
+  JSI_HOST_FUNCTION(registerFont) {
+    sk_sp<SkTypeface> typeface =
+        JsiSkTypeface::fromValue(runtime, arguments[0]);
+    SkString familyName(arguments[1].asString(runtime).utf8(runtime).c_str());
+    auto result = getObject()->registerTypeface(typeface, familyName);
+    return jsi::Value::undefined();
+  }
+
+  JSI_HOST_FUNCTION(matchFamilyStyle) {
+    auto name = arguments[0].asString(runtime).utf8(runtime);
+    auto fontStyle = JsiSkFontStyle::fromValue(runtime, arguments[1]);
+    auto typeface = getObject()->matchFamilyStyle(name.c_str(), *fontStyle);
+    return jsi::Object::createFromHostObject(
+        runtime, std::make_shared<JsiSkTypeface>(getContext(), typeface));
+  }
+
+  JSI_HOST_FUNCTION(countFamilies) { return getObject()->countFamilies(); }
+
+  JSI_HOST_FUNCTION(getFamilyName) {
+    auto i = static_cast<int>(arguments[0].asNumber());
+    SkString name;
+    getObject()->getFamilyName(i, &name);
+    return jsi::String::createFromUtf8(runtime, name.c_str());
+  }
+
+  JsiSkTypefaceFontProvider(std::shared_ptr<RNSkPlatformContext> context,
+                            sk_sp<para::TypefaceFontProvider> tfProvider)
+      : JsiSkWrappingSkPtrHostObject(std::move(context),
+                                     std::move(tfProvider)) {}
+
+  /**
+   Returns the jsi object from a host object of this type
+  */
+  static jsi::Value toValue(jsi::Runtime &runtime,
+                            std::shared_ptr<RNSkPlatformContext> context,
+                            sk_sp<para::TypefaceFontProvider> tfProvider) {
+    return jsi::Object::createFromHostObject(
+        runtime, std::make_shared<JsiSkTypefaceFontProvider>(
+                     std::move(context), std::move(tfProvider)));
+  }
+};
+
+} // namespace RNSkia

package/cpp/api/JsiSkTypeFaceFontProviderFactory.h

@@ -0,0 +1,32 @@
+#pragma once
+
+#include <memory>
+#include <utility>
+
+#include <jsi/jsi.h>
+
+#include "JsiSkData.h"
+#include "JsiSkHostObjects.h"
+#include "JsiSkTypefaceFontProvider.h"
+
+namespace RNSkia {
+
+namespace jsi = facebook::jsi;
+namespace para = skia::textlayout;
+
+class JsiSkTypefaceFontProviderFactory : public JsiSkHostObject {
+public:
+  JSI_HOST_FUNCTION(Make) {
+    return jsi::Object::createFromHostObject(
+        runtime, std::make_shared<JsiSkTypefaceFontProvider>(
+                     getContext(), sk_make_sp<para::TypefaceFontProvider>()));
+  }
+
+  JSI_EXPORT_FUNCTIONS(JSI_EXPORT_FUNC(JsiSkTypefaceFontProviderFactory, Make))
+
+  explicit JsiSkTypefaceFontProviderFactory(
+      std::shared_ptr<RNSkPlatformContext> context)
+      : JsiSkHostObject(std::move(context)) {}
+};
+
+} // namespace RNSkia

package/cpp/rnskia/RNSkPlatformContext.h

@@ -15,6 +15,7 @@
 #pragma clang diagnostic ignored "-Wdocumentation"
 
 #include "SkData.h"
+#include "SkFontMgr.h"
 #include "SkImage.h"
 #include "SkStream.h"
 #include "SkSurface.h"
@@ -132,6 +133,11 @@ public:
    */
   virtual sk_sp<SkSurface> makeOffscreenSurface(int width, int height) = 0;
 
+  /**
+   * Return the Platform specific font manager
+   */
+  virtual sk_sp<SkFontMgr> createFontMgr() = 0;
+
   /**
    * Creates an skImage containing the screenshot of a native view and its
    * children.

package/cpp/skia/include/core/SkColorTable.h

@@ -19,7 +19,7 @@ class SkWriteBuffer;
  * of `SkColorFilters::Table`, and provides a way to share the table data between client code and
  * the returned SkColorFilter. Once created, an SkColorTable is immutable.
 */
-class SkColorTable : public SkRefCnt {
+class SK_API SkColorTable : public SkRefCnt {
 public:
     // Creates a new SkColorTable with 'table' used for all four channels. The table is copied into
     // the SkColorTable.

package/ios/RNSkia-iOS/RNSkiOSPlatformContext.h

@@ -64,6 +64,7 @@ public:
 
   void raiseError(const std::exception &err) override;
   sk_sp<SkSurface> makeOffscreenSurface(int width, int height) override;
+  sk_sp<SkFontMgr> createFontMgr() override;
 
   void willInvalidateModules() {
     // We need to do some house-cleaning here!

package/ios/RNSkia-iOS/RNSkiOSPlatformContext.mm

@@ -9,8 +9,11 @@
 #pragma clang diagnostic push
 #pragma clang diagnostic ignored "-Wdocumentation"
 
+#include "SkFontMgr.h"
 #include "SkSurface.h"
 
+#include "include/ports/SkFontMgr_mac_ct.h"
+
 #pragma clang diagnostic pop
 
 namespace RNSkia {
@@ -62,6 +65,10 @@ sk_sp<SkSurface> RNSkiOSPlatformContext::makeOffscreenSurface(int width,
   return SkiaMetalSurfaceFactory::makeOffscreenSurface(width, height);
 }
 
+sk_sp<SkFontMgr> RNSkiOSPlatformContext::createFontMgr() {
+  return SkFontMgr_New_CoreText(nullptr);
+}
+
 void RNSkiOSPlatformContext::runOnMainThread(std::function<void()> func) {
   dispatch_async(dispatch_get_main_queue(), ^{
     func();

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

@@ -1,3 +1,5 @@
 import type { SkData, DataSourceParam, SkJSIInstance } from "../types";
+export declare const loadData: <T>(source: DataSourceParam, factory: (data: SkData) => T | null, onError?: ((err: Error) => void) | undefined) => Promise<T | null>;
+export declare const useCollectionLoading: <T extends SkJSIInstance<string>>(source: DataSourceParam[], loader: () => Promise<(T | null)[]>) => T[] | null;
 export declare const useRawData: <T extends SkJSIInstance<string>>(source: DataSourceParam, factory: (data: SkData) => T | null, onError?: ((err: Error) => void) | undefined) => T | null;
 export declare const useData: (source: DataSourceParam, onError?: ((err: Error) => void) | undefined) => SkData | null;

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

@@ -3,7 +3,7 @@
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.useRawData = exports.useData = void 0;
+exports.useRawData = exports.useData = exports.useCollectionLoading = exports.loadData = void 0;
 
 var _react = require("react");
 
@@ -33,6 +33,8 @@ const loadData = (source, factory, onError) => {
   }
 };
 
+exports.loadData = loadData;
+
 const useLoading = (source, loader) => {
   const mounted = (0, _react.useRef)(false);
   const [data, setData] = (0, _react.useState)(null);
@@ -55,6 +57,32 @@ const useLoading = (source, loader) => {
   return data;
 };
 
+const useCollectionLoading = (source, loader) => {
+  const mounted = (0, _react.useRef)(false);
+  const [data, setData] = (0, _react.useState)(null);
+  const dataRef = (0, _react.useRef)(null);
+  (0, _react.useEffect)(() => {
+    mounted.current = true;
+    loader().then(result => {
+      const value = result.filter(r => r !== null);
+
+      if (mounted.current) {
+        setData(value);
+        dataRef.current = value;
+      }
+    });
+    return () => {
+      var _dataRef$current2;
+
+      (_dataRef$current2 = dataRef.current) === null || _dataRef$current2 === void 0 ? void 0 : _dataRef$current2.forEach(instance => instance === null || instance === void 0 ? void 0 : instance.dispose());
+      mounted.current = false;
+    }; // eslint-disable-next-line react-hooks/exhaustive-deps
+  }, [source]);
+  return data;
+};
+
+exports.useCollectionLoading = useCollectionLoading;
+
 const useRawData = (source, factory, onError) => useLoading(source, () => loadData(source, factory, onError));
 
 exports.useRawData = useRawData;

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

@@ -1 +1 @@
-{"version":3,"names":["factoryWrapper","data2","factory","onError","factoryResult","Error","loadData","source","undefined","Promise","resolve","Uint8Array","Skia","Data","fromBytes","uri","Platform","resolveAsset","fromURI","then","d","useLoading","loader","mounted","useRef","data","setData","useState","dataRef","useEffect","current","value","dispose","useRawData","identity","useData"],"sources":["Data.ts"],"sourcesContent":["import { useEffect, useRef, useState } from \"react\";\n\nimport { Skia } from \"../Skia\";\nimport type { SkData, DataSourceParam, SkJSIInstance } from \"../types\";\nimport { Platform } from \"../../Platform\";\n\nconst factoryWrapper = <T>(\n  data2: SkData,\n  factory: (data: SkData) => T,\n  onError?: (err: Error) => void\n) => {\n  const factoryResult = factory(data2);\n  if (factoryResult === null) {\n    onError && onError(new Error(\"Could not load data\"));\n    return null;\n  } else {\n    return factoryResult;\n  }\n};\n\nconst loadData = <T>(\n  source: DataSourceParam,\n  factory: (data: SkData) => T | null,\n  onError?: (err: Error) => void\n): Promise<T | null> => {\n  if (source === null || source === undefined) {\n    return new Promise((resolve) => resolve(null));\n  } else if (source instanceof Uint8Array) {\n    return new Promise((resolve) =>\n      resolve(factoryWrapper(Skia.Data.fromBytes(source), factory, onError))\n    );\n  } else {\n    const uri =\n      typeof source === \"string\" ? source : Platform.resolveAsset(source);\n    return Skia.Data.fromURI(uri).then((d) =>\n      factoryWrapper(d, factory, onError)\n    );\n  }\n};\nconst useLoading = <T extends SkJSIInstance<string>>(\n  source: DataSourceParam,\n  loader: () => Promise<T | null>\n) => {\n  const mounted = useRef(false);\n  const [data, setData] = useState<T | null>(null);\n  const dataRef = useRef<T | null>(null);\n  useEffect(() => {\n    mounted.current = true;\n    loader().then((value) => {\n      if (mounted.current) {\n        setData(value);\n        dataRef.current = value;\n      }\n    });\n    return () => {\n      dataRef.current?.dispose();\n      mounted.current = false;\n    };\n    // eslint-disable-next-line react-hooks/exhaustive-deps\n  }, [source]);\n  return data;\n};\n\nexport const useRawData = <T extends SkJSIInstance<string>>(\n  source: DataSourceParam,\n  factory: (data: SkData) => T | null,\n  onError?: (err: Error) => void\n) => useLoading(source, () => loadData<T>(source, factory, onError));\n\nconst identity = (data: SkData) => data;\n\nexport const useData = (\n  source: DataSourceParam,\n  onError?: (err: Error) => void\n) => useRawData(source, identity, onError);\n"],"mappings":";;;;;;;AAAA;;AAEA;;AAEA;;AAEA,MAAMA,cAAc,GAAG,CACrBC,KADqB,EAErBC,OAFqB,EAGrBC,OAHqB,KAIlB;EACH,MAAMC,aAAa,GAAGF,OAAO,CAACD,KAAD,CAA7B;;EACA,IAAIG,aAAa,KAAK,IAAtB,EAA4B;IAC1BD,OAAO,IAAIA,OAAO,CAAC,IAAIE,KAAJ,CAAU,qBAAV,CAAD,CAAlB;IACA,OAAO,IAAP;EACD,CAHD,MAGO;IACL,OAAOD,aAAP;EACD;AACF,CAZD;;AAcA,MAAME,QAAQ,GAAG,CACfC,MADe,EAEfL,OAFe,EAGfC,OAHe,KAIO;EACtB,IAAII,MAAM,KAAK,IAAX,IAAmBA,MAAM,KAAKC,SAAlC,EAA6C;IAC3C,OAAO,IAAIC,OAAJ,CAAaC,OAAD,IAAaA,OAAO,CAAC,IAAD,CAAhC,CAAP;EACD,CAFD,MAEO,IAAIH,MAAM,YAAYI,UAAtB,EAAkC;IACvC,OAAO,IAAIF,OAAJ,CAAaC,OAAD,IACjBA,OAAO,CAACV,cAAc,CAACY,UAAA,CAAKC,IAAL,CAAUC,SAAV,CAAoBP,MAApB,CAAD,EAA8BL,OAA9B,EAAuCC,OAAvC,CAAf,CADF,CAAP;EAGD,CAJM,MAIA;IACL,MAAMY,GAAG,GACP,OAAOR,MAAP,KAAkB,QAAlB,GAA6BA,MAA7B,GAAsCS,kBAAA,CAASC,YAAT,CAAsBV,MAAtB,CADxC;IAEA,OAAOK,UAAA,CAAKC,IAAL,CAAUK,OAAV,CAAkBH,GAAlB,EAAuBI,IAAvB,CAA6BC,CAAD,IACjCpB,cAAc,CAACoB,CAAD,EAAIlB,OAAJ,EAAaC,OAAb,CADT,CAAP;EAGD;AACF,CAlBD;;AAmBA,MAAMkB,UAAU,GAAG,CACjBd,MADiB,EAEjBe,MAFiB,KAGd;EACH,MAAMC,OAAO,GAAG,IAAAC,aAAA,EAAO,KAAP,CAAhB;EACA,MAAM,CAACC,IAAD,EAAOC,OAAP,IAAkB,IAAAC,eAAA,EAAmB,IAAnB,CAAxB;EACA,MAAMC,OAAO,GAAG,IAAAJ,aAAA,EAAiB,IAAjB,CAAhB;EACA,IAAAK,gBAAA,EAAU,MAAM;IACdN,OAAO,CAACO,OAAR,GAAkB,IAAlB;IACAR,MAAM,GAAGH,IAAT,CAAeY,KAAD,IAAW;MACvB,IAAIR,OAAO,CAACO,OAAZ,EAAqB;QACnBJ,OAAO,CAACK,KAAD,CAAP;QACAH,OAAO,CAACE,OAAR,GAAkBC,KAAlB;MACD;IACF,CALD;IAMA,OAAO,MAAM;MAAA;;MACX,oBAAAH,OAAO,CAACE,OAAR,sEAAiBE,OAAjB;MACAT,OAAO,CAACO,OAAR,GAAkB,KAAlB;IACD,CAHD,CARc,CAYd;EACD,CAbD,EAaG,CAACvB,MAAD,CAbH;EAcA,OAAOkB,IAAP;AACD,CAtBD;;AAwBO,MAAMQ,UAAU,GAAG,CACxB1B,MADwB,EAExBL,OAFwB,EAGxBC,OAHwB,KAIrBkB,UAAU,CAACd,MAAD,EAAS,MAAMD,QAAQ,CAAIC,MAAJ,EAAYL,OAAZ,EAAqBC,OAArB,CAAvB,CAJR;;;;AAMP,MAAM+B,QAAQ,GAAIT,IAAD,IAAkBA,IAAnC;;AAEO,MAAMU,OAAO,GAAG,CACrB5B,MADqB,EAErBJ,OAFqB,KAGlB8B,UAAU,CAAC1B,MAAD,EAAS2B,QAAT,EAAmB/B,OAAnB,CAHR"}
+{"version":3,"names":["factoryWrapper","data2","factory","onError","factoryResult","Error","loadData","source","undefined","Promise","resolve","Uint8Array","Skia","Data","fromBytes","uri","Platform","resolveAsset","fromURI","then","d","useLoading","loader","mounted","useRef","data","setData","useState","dataRef","useEffect","current","value","dispose","useCollectionLoading","result","filter","r","forEach","instance","useRawData","identity","useData"],"sources":["Data.ts"],"sourcesContent":["import { useEffect, useRef, useState } from \"react\";\n\nimport { Skia } from \"../Skia\";\nimport type { SkData, DataSourceParam, SkJSIInstance } from \"../types\";\nimport { Platform } from \"../../Platform\";\n\nconst factoryWrapper = <T>(\n  data2: SkData,\n  factory: (data: SkData) => T,\n  onError?: (err: Error) => void\n) => {\n  const factoryResult = factory(data2);\n  if (factoryResult === null) {\n    onError && onError(new Error(\"Could not load data\"));\n    return null;\n  } else {\n    return factoryResult;\n  }\n};\n\nexport const loadData = <T>(\n  source: DataSourceParam,\n  factory: (data: SkData) => T | null,\n  onError?: (err: Error) => void\n): Promise<T | null> => {\n  if (source === null || source === undefined) {\n    return new Promise((resolve) => resolve(null));\n  } else if (source instanceof Uint8Array) {\n    return new Promise((resolve) =>\n      resolve(factoryWrapper(Skia.Data.fromBytes(source), factory, onError))\n    );\n  } else {\n    const uri =\n      typeof source === \"string\" ? source : Platform.resolveAsset(source);\n    return Skia.Data.fromURI(uri).then((d) =>\n      factoryWrapper(d, factory, onError)\n    );\n  }\n};\n\nconst useLoading = <T extends SkJSIInstance<string>>(\n  source: DataSourceParam,\n  loader: () => Promise<T | null>\n) => {\n  const mounted = useRef(false);\n  const [data, setData] = useState<T | null>(null);\n  const dataRef = useRef<T | null>(null);\n  useEffect(() => {\n    mounted.current = true;\n    loader().then((value) => {\n      if (mounted.current) {\n        setData(value);\n        dataRef.current = value;\n      }\n    });\n    return () => {\n      dataRef.current?.dispose();\n      mounted.current = false;\n    };\n    // eslint-disable-next-line react-hooks/exhaustive-deps\n  }, [source]);\n  return data;\n};\n\nexport const useCollectionLoading = <T extends SkJSIInstance<string>>(\n  source: DataSourceParam[],\n  loader: () => Promise<(T | null)[]>\n) => {\n  const mounted = useRef(false);\n  const [data, setData] = useState<T[] | null>(null);\n  const dataRef = useRef<T[] | null>(null);\n\n  useEffect(() => {\n    mounted.current = true;\n    loader().then((result) => {\n      const value = result.filter((r) => r !== null) as T[];\n      if (mounted.current) {\n        setData(value);\n        dataRef.current = value;\n      }\n    });\n\n    return () => {\n      dataRef.current?.forEach((instance) => instance?.dispose());\n      mounted.current = false;\n    };\n\n    // eslint-disable-next-line react-hooks/exhaustive-deps\n  }, [source]);\n\n  return data;\n};\n\nexport const useRawData = <T extends SkJSIInstance<string>>(\n  source: DataSourceParam,\n  factory: (data: SkData) => T | null,\n  onError?: (err: Error) => void\n) => useLoading(source, () => loadData<T>(source, factory, onError));\n\nconst identity = (data: SkData) => data;\n\nexport const useData = (\n  source: DataSourceParam,\n  onError?: (err: Error) => void\n) => useRawData(source, identity, onError);\n"],"mappings":";;;;;;;AAAA;;AAEA;;AAEA;;AAEA,MAAMA,cAAc,GAAG,CACrBC,KADqB,EAErBC,OAFqB,EAGrBC,OAHqB,KAIlB;EACH,MAAMC,aAAa,GAAGF,OAAO,CAACD,KAAD,CAA7B;;EACA,IAAIG,aAAa,KAAK,IAAtB,EAA4B;IAC1BD,OAAO,IAAIA,OAAO,CAAC,IAAIE,KAAJ,CAAU,qBAAV,CAAD,CAAlB;IACA,OAAO,IAAP;EACD,CAHD,MAGO;IACL,OAAOD,aAAP;EACD;AACF,CAZD;;AAcO,MAAME,QAAQ,GAAG,CACtBC,MADsB,EAEtBL,OAFsB,EAGtBC,OAHsB,KAIA;EACtB,IAAII,MAAM,KAAK,IAAX,IAAmBA,MAAM,KAAKC,SAAlC,EAA6C;IAC3C,OAAO,IAAIC,OAAJ,CAAaC,OAAD,IAAaA,OAAO,CAAC,IAAD,CAAhC,CAAP;EACD,CAFD,MAEO,IAAIH,MAAM,YAAYI,UAAtB,EAAkC;IACvC,OAAO,IAAIF,OAAJ,CAAaC,OAAD,IACjBA,OAAO,CAACV,cAAc,CAACY,UAAA,CAAKC,IAAL,CAAUC,SAAV,CAAoBP,MAApB,CAAD,EAA8BL,OAA9B,EAAuCC,OAAvC,CAAf,CADF,CAAP;EAGD,CAJM,MAIA;IACL,MAAMY,GAAG,GACP,OAAOR,MAAP,KAAkB,QAAlB,GAA6BA,MAA7B,GAAsCS,kBAAA,CAASC,YAAT,CAAsBV,MAAtB,CADxC;IAEA,OAAOK,UAAA,CAAKC,IAAL,CAAUK,OAAV,CAAkBH,GAAlB,EAAuBI,IAAvB,CAA6BC,CAAD,IACjCpB,cAAc,CAACoB,CAAD,EAAIlB,OAAJ,EAAaC,OAAb,CADT,CAAP;EAGD;AACF,CAlBM;;;;AAoBP,MAAMkB,UAAU,GAAG,CACjBd,MADiB,EAEjBe,MAFiB,KAGd;EACH,MAAMC,OAAO,GAAG,IAAAC,aAAA,EAAO,KAAP,CAAhB;EACA,MAAM,CAACC,IAAD,EAAOC,OAAP,IAAkB,IAAAC,eAAA,EAAmB,IAAnB,CAAxB;EACA,MAAMC,OAAO,GAAG,IAAAJ,aAAA,EAAiB,IAAjB,CAAhB;EACA,IAAAK,gBAAA,EAAU,MAAM;IACdN,OAAO,CAACO,OAAR,GAAkB,IAAlB;IACAR,MAAM,GAAGH,IAAT,CAAeY,KAAD,IAAW;MACvB,IAAIR,OAAO,CAACO,OAAZ,EAAqB;QACnBJ,OAAO,CAACK,KAAD,CAAP;QACAH,OAAO,CAACE,OAAR,GAAkBC,KAAlB;MACD;IACF,CALD;IAMA,OAAO,MAAM;MAAA;;MACX,oBAAAH,OAAO,CAACE,OAAR,sEAAiBE,OAAjB;MACAT,OAAO,CAACO,OAAR,GAAkB,KAAlB;IACD,CAHD,CARc,CAYd;EACD,CAbD,EAaG,CAACvB,MAAD,CAbH;EAcA,OAAOkB,IAAP;AACD,CAtBD;;AAwBO,MAAMQ,oBAAoB,GAAG,CAClC1B,MADkC,EAElCe,MAFkC,KAG/B;EACH,MAAMC,OAAO,GAAG,IAAAC,aAAA,EAAO,KAAP,CAAhB;EACA,MAAM,CAACC,IAAD,EAAOC,OAAP,IAAkB,IAAAC,eAAA,EAAqB,IAArB,CAAxB;EACA,MAAMC,OAAO,GAAG,IAAAJ,aAAA,EAAmB,IAAnB,CAAhB;EAEA,IAAAK,gBAAA,EAAU,MAAM;IACdN,OAAO,CAACO,OAAR,GAAkB,IAAlB;IACAR,MAAM,GAAGH,IAAT,CAAee,MAAD,IAAY;MACxB,MAAMH,KAAK,GAAGG,MAAM,CAACC,MAAP,CAAeC,CAAD,IAAOA,CAAC,KAAK,IAA3B,CAAd;;MACA,IAAIb,OAAO,CAACO,OAAZ,EAAqB;QACnBJ,OAAO,CAACK,KAAD,CAAP;QACAH,OAAO,CAACE,OAAR,GAAkBC,KAAlB;MACD;IACF,CAND;IAQA,OAAO,MAAM;MAAA;;MACX,qBAAAH,OAAO,CAACE,OAAR,wEAAiBO,OAAjB,CAA0BC,QAAD,IAAcA,QAAd,aAAcA,QAAd,uBAAcA,QAAQ,CAAEN,OAAV,EAAvC;MACAT,OAAO,CAACO,OAAR,GAAkB,KAAlB;IACD,CAHD,CAVc,CAed;EACD,CAhBD,EAgBG,CAACvB,MAAD,CAhBH;EAkBA,OAAOkB,IAAP;AACD,CA3BM;;;;AA6BA,MAAMc,UAAU,GAAG,CACxBhC,MADwB,EAExBL,OAFwB,EAGxBC,OAHwB,KAIrBkB,UAAU,CAACd,MAAD,EAAS,MAAMD,QAAQ,CAAIC,MAAJ,EAAYL,OAAZ,EAAqBC,OAArB,CAAvB,CAJR;;;;AAMP,MAAMqC,QAAQ,GAAIf,IAAD,IAAkBA,IAAnC;;AAEO,MAAMgB,OAAO,GAAG,CACrBlC,MADqB,EAErBJ,OAFqB,KAGlBoC,UAAU,CAAChC,MAAD,EAASiC,QAAT,EAAmBrC,OAAnB,CAHR"}

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

@@ -1,5 +1,18 @@
-import type { DataSourceParam } 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) | undefined) => import("../types").SkFont | null;
+declare type Slant = "normal" | "italic" | "oblique";
+declare type Weight = "normal" | "bold" | "100" | "200" | "300" | "400" | "500" | "600" | "700" | "800" | "900";
+interface RNFontStyle {
+    fontFamily: string;
+    fontSize: number;
+    fontStyle: Slant;
+    fontWeight: Weight;
+}
+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

@@ -3,12 +3,16 @@
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.useFont = void 0;
+exports.useFonts = exports.useFont = exports.matchFont = exports.listFontFamilies = void 0;
 
 var _react = require("react");
 
 var _Skia = require("../Skia");
 
+var _types = require("../types");
+
+var _Platform = require("../../Platform");
+
 var _Typeface = require("./Typeface");
 
 /*global SkiaApi*/
@@ -30,4 +34,92 @@ const useFont = (font, size, onError) => {
 };
 
 exports.useFont = useFont;
+const defaultFontStyle = {
+  fontFamily: "System",
+  fontSize: 14,
+  fontStyle: "normal",
+  fontWeight: "normal"
+};
+
+const slant = s => {
+  if (s === "italic") {
+    return _types.FontSlant.Italic;
+  } else if (s === "oblique") {
+    return _types.FontSlant.Oblique;
+  } else {
+    return _types.FontSlant.Upright;
+  }
+};
+
+const weight = fontWeight => {
+  switch (fontWeight) {
+    case "normal":
+      return 400;
+
+    case "bold":
+      return 700;
+
+    default:
+      return parseInt(fontWeight, 10);
+  }
+};
+
+const matchFont = function () {
+  let inputStyle = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : {};
+  let fontMgr = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : _Skia.Skia.FontMgr.System();
+  const fontStyle = { ...defaultFontStyle,
+    ...inputStyle
+  };
+  const style = {
+    weight: weight(fontStyle.fontWeight),
+    width: 5,
+    slant: slant(fontStyle.fontStyle)
+  };
+  const typeface = fontMgr.matchFamilyStyle(fontStyle.fontFamily, style);
+  return _Skia.Skia.Font(typeface, fontStyle.fontSize);
+};
+
+exports.matchFont = matchFont;
+
+const listFontFamilies = function () {
+  let fontMgr = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : _Skia.Skia.FontMgr.System();
+  return new Array(fontMgr.countFamilies()).fill(0).map((_, i) => fontMgr.getFamilyName(i));
+};
+
+exports.listFontFamilies = listFontFamilies;
+
+const loadTypefaces = typefacesToLoad => {
+  const promises = Object.keys(typefacesToLoad).flatMap(familyName => {
+    return typefacesToLoad[familyName].map(typefaceToLoad => {
+      return _Skia.Skia.Data.fromURI(_Platform.Platform.resolveAsset(typefaceToLoad)).then(data => {
+        const tf = _Skia.Skia.Typeface.MakeFreeTypeFaceFromData(data);
+
+        if (tf === null) {
+          throw new Error(`Couldn't create typeface for ${familyName}`);
+        }
+
+        return [familyName, tf];
+      });
+    });
+  });
+  return Promise.all(promises);
+};
+
+const useFonts = sources => {
+  const [fontMgr, setFontMgr] = (0, _react.useState)(null);
+  (0, _react.useEffect)(() => {
+    loadTypefaces(sources).then(result => {
+      const fMgr = _Skia.Skia.TypefaceFontProvider.Make();
+
+      result.forEach(_ref => {
+        let [familyName, typeface] = _ref;
+        fMgr.registerFont(typeface, familyName);
+      });
+      setFontMgr(fMgr);
+    }); // eslint-disable-next-line react-hooks/exhaustive-deps
+  }, []);
+  return fontMgr;
+};
+
+exports.useFonts = useFonts;
 //# sourceMappingURL=Font.js.map