@shopify/react-native-skia 1.3.7 → 1.3.8

package/cpp/api/JsiSkTypefaceFontProvider.h

@@ -45,10 +45,20 @@ public:
   }
 
   JSI_HOST_FUNCTION(matchFamilyStyle) {
-    auto name = arguments[0].asString(runtime).utf8(runtime);
-    auto fontStyle = JsiSkFontStyle::fromValue(runtime, arguments[1]);
-    sk_sp<SkFontStyleSet> set(getObject()->onMatchFamily(name.c_str()));
-    sk_sp<SkTypeface> typeface(set->matchStyle(*fontStyle));
+    auto name = count > 0 ? arguments[0].asString(runtime).utf8(runtime) : "";
+    auto fontStyle =
+        count > 1 ? JsiSkFontStyle::fromValue(runtime, arguments[1]) : nullptr;
+    if (name == "" || fontStyle == nullptr) {
+      throw std::runtime_error("matchFamilyStyle requires a name and a style");
+    }
+    auto set = getObject()->onMatchFamily(name.c_str());
+    if (!set) {
+      throw std::runtime_error("Could not find font family " + name);
+    }
+    auto typeface = set->matchStyle(*fontStyle);
+    if (!typeface) {
+      throw std::runtime_error("Could not find font style for " + name);
+    }
     return jsi::Object::createFromHostObject(
         runtime, std::make_shared<JsiSkTypeface>(getContext(), typeface));
   }

package/lib/commonjs/skia/types/Font/FontMgr.d.ts

@@ -4,5 +4,5 @@ import type { FontStyle } from "./Font";
 export interface SkFontMgr extends SkJSIInstance<"FontMgr"> {
     countFamilies(): number;
     getFamilyName(index: number): string;
-    matchFamilyStyle(name?: string, style?: FontStyle): SkTypeface;
+    matchFamilyStyle(name: string, style: FontStyle): SkTypeface;
 }

package/lib/commonjs/skia/types/Font/FontMgr.js.map

@@ -1 +1 @@
-{"version":3,"names":[],"sources":["FontMgr.ts"],"sourcesContent":["import type { SkJSIInstance } from \"../JsiInstance\";\nimport type { SkTypeface } from \"../Typeface\";\n\nimport type { FontStyle } from \"./Font\";\n\nexport interface SkFontMgr extends SkJSIInstance<\"FontMgr\"> {\n  countFamilies(): number;\n  getFamilyName(index: number): string;\n  matchFamilyStyle(name?: string, style?: FontStyle): SkTypeface;\n}\n"],"mappings":""}
+{"version":3,"names":[],"sources":["FontMgr.ts"],"sourcesContent":["import type { SkJSIInstance } from \"../JsiInstance\";\nimport type { SkTypeface } from \"../Typeface\";\n\nimport type { FontStyle } from \"./Font\";\n\nexport interface SkFontMgr extends SkJSIInstance<\"FontMgr\"> {\n  countFamilies(): number;\n  getFamilyName(index: number): string;\n  matchFamilyStyle(name: string, style: FontStyle): SkTypeface;\n}\n"],"mappings":""}

package/lib/module/skia/types/Font/FontMgr.d.ts

@@ -4,5 +4,5 @@ import type { FontStyle } from "./Font";
 export interface SkFontMgr extends SkJSIInstance<"FontMgr"> {
     countFamilies(): number;
     getFamilyName(index: number): string;
-    matchFamilyStyle(name?: string, style?: FontStyle): SkTypeface;
+    matchFamilyStyle(name: string, style: FontStyle): SkTypeface;
 }

package/lib/module/skia/types/Font/FontMgr.js.map

@@ -1 +1 @@
-{"version":3,"names":[],"sources":["FontMgr.ts"],"sourcesContent":["import type { SkJSIInstance } from \"../JsiInstance\";\nimport type { SkTypeface } from \"../Typeface\";\n\nimport type { FontStyle } from \"./Font\";\n\nexport interface SkFontMgr extends SkJSIInstance<\"FontMgr\"> {\n  countFamilies(): number;\n  getFamilyName(index: number): string;\n  matchFamilyStyle(name?: string, style?: FontStyle): SkTypeface;\n}\n"],"mappings":""}
+{"version":3,"names":[],"sources":["FontMgr.ts"],"sourcesContent":["import type { SkJSIInstance } from \"../JsiInstance\";\nimport type { SkTypeface } from \"../Typeface\";\n\nimport type { FontStyle } from \"./Font\";\n\nexport interface SkFontMgr extends SkJSIInstance<\"FontMgr\"> {\n  countFamilies(): number;\n  getFamilyName(index: number): string;\n  matchFamilyStyle(name: string, style: FontStyle): SkTypeface;\n}\n"],"mappings":""}

package/lib/typescript/src/skia/types/Font/FontMgr.d.ts

@@ -4,5 +4,5 @@ import type { FontStyle } from "./Font";
 export interface SkFontMgr extends SkJSIInstance<"FontMgr"> {
     countFamilies(): number;
     getFamilyName(index: number): string;
-    matchFamilyStyle(name?: string, style?: FontStyle): SkTypeface;
+    matchFamilyStyle(name: string, style: FontStyle): SkTypeface;
 }

package/package.json

@@ -7,7 +7,7 @@
     "setup-skia-web": "./scripts/setup-canvaskit.js"
   },
   "title": "React Native Skia",
-  "version": "1.3.7",
+  "version": "1.3.8",
   "description": "High-performance React Native Graphics using Skia",
   "main": "lib/module/index.js",
   "react-native": "src/index.ts",

package/src/skia/types/Font/FontMgr.ts

@@ -6,5 +6,5 @@ import type { FontStyle } from "./Font";
 export interface SkFontMgr extends SkJSIInstance<"FontMgr"> {
   countFamilies(): number;
   getFamilyName(index: number): string;
-  matchFamilyStyle(name?: string, style?: FontStyle): SkTypeface;
+  matchFamilyStyle(name: string, style: FontStyle): SkTypeface;
 }