@shopify/react-native-skia 1.3.7 → 1.3.9

package/android/cpp/rnskia-android/RNSkAndroidVideo.cpp

@@ -88,7 +88,7 @@ void RNSkAndroidVideo::seek(double timestamp) {
     RNSkLogger::logToConsole("seek method not found");
     return;
   }
-  env->CallVoidMethod(_jniVideo.get(), mid, static_cast<jlong>(timestamp));
+  env->CallVoidMethod(_jniVideo.get(), mid, static_cast<jdouble>(timestamp));
 }
 
 float RNSkAndroidVideo::getRotationInDegrees() {

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/cpp/rnskia/RNSkJsiViewApi.h

@@ -206,11 +206,6 @@ public:
    */
   void unregisterAll() {
     std::lock_guard<std::mutex> lock(_mutex);
-    // Unregister all views
-    auto tempList = _viewInfos;
-    for (const auto &info : tempList) {
-      unregisterSkiaView(info.first);
-    }
     _viewInfos.clear();
   }
 

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/libs/ios/libskia.xcframework/Info.plist

@@ -5,33 +5,37 @@
 	<key>AvailableLibraries</key>
 	<array>
 		<dict>
+			<key>BinaryPath</key>
+			<string>libskia.a</string>
 			<key>LibraryIdentifier</key>
-			<string>ios-arm64_arm64e_x86_64-simulator</string>
+			<string>ios-arm64_arm64e</string>
 			<key>LibraryPath</key>
 			<string>libskia.a</string>
 			<key>SupportedArchitectures</key>
 			<array>
 				<string>arm64</string>
 				<string>arm64e</string>
-				<string>x86_64</string>
 			</array>
 			<key>SupportedPlatform</key>
 			<string>ios</string>
-			<key>SupportedPlatformVariant</key>
-			<string>simulator</string>
 		</dict>
 		<dict>
+			<key>BinaryPath</key>
+			<string>libskia.a</string>
 			<key>LibraryIdentifier</key>
-			<string>ios-arm64_arm64e</string>
+			<string>ios-arm64_arm64e_x86_64-simulator</string>
 			<key>LibraryPath</key>
 			<string>libskia.a</string>
 			<key>SupportedArchitectures</key>
 			<array>
 				<string>arm64</string>
 				<string>arm64e</string>
+				<string>x86_64</string>
 			</array>
 			<key>SupportedPlatform</key>
 			<string>ios</string>
+			<key>SupportedPlatformVariant</key>
+			<string>simulator</string>
 		</dict>
 	</array>
 	<key>CFBundlePackageType</key>

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

@@ -5,33 +5,37 @@
 	<key>AvailableLibraries</key>
 	<array>
 		<dict>
+			<key>BinaryPath</key>
+			<string>libskottie.a</string>
 			<key>LibraryIdentifier</key>
-			<string>ios-arm64_arm64e</string>
+			<string>ios-arm64_arm64e_x86_64-simulator</string>
 			<key>LibraryPath</key>
 			<string>libskottie.a</string>
 			<key>SupportedArchitectures</key>
 			<array>
 				<string>arm64</string>
 				<string>arm64e</string>
+				<string>x86_64</string>
 			</array>
 			<key>SupportedPlatform</key>
 			<string>ios</string>
+			<key>SupportedPlatformVariant</key>
+			<string>simulator</string>
 		</dict>
 		<dict>
+			<key>BinaryPath</key>
+			<string>libskottie.a</string>
 			<key>LibraryIdentifier</key>
-			<string>ios-arm64_arm64e_x86_64-simulator</string>
+			<string>ios-arm64_arm64e</string>
 			<key>LibraryPath</key>
 			<string>libskottie.a</string>
 			<key>SupportedArchitectures</key>
 			<array>
 				<string>arm64</string>
 				<string>arm64e</string>
-				<string>x86_64</string>
 			</array>
 			<key>SupportedPlatform</key>
 			<string>ios</string>
-			<key>SupportedPlatformVariant</key>
-			<string>simulator</string>
 		</dict>
 	</array>
 	<key>CFBundlePackageType</key>

package/libs/ios/libskparagraph.xcframework/Info.plist

@@ -5,6 +5,8 @@
 	<key>AvailableLibraries</key>
 	<array>
 		<dict>
+			<key>BinaryPath</key>
+			<string>libskparagraph.a</string>
 			<key>LibraryIdentifier</key>
 			<string>ios-arm64_arm64e_x86_64-simulator</string>
 			<key>LibraryPath</key>
@@ -21,6 +23,8 @@
 			<string>simulator</string>
 		</dict>
 		<dict>
+			<key>BinaryPath</key>
+			<string>libskparagraph.a</string>
 			<key>LibraryIdentifier</key>
 			<string>ios-arm64_arm64e</string>
 			<key>LibraryPath</key>

package/libs/ios/libsksg.xcframework/Info.plist

@@ -5,33 +5,37 @@
 	<key>AvailableLibraries</key>
 	<array>
 		<dict>
+			<key>BinaryPath</key>
+			<string>libsksg.a</string>
 			<key>LibraryIdentifier</key>
-			<string>ios-arm64_arm64e_x86_64-simulator</string>
+			<string>ios-arm64_arm64e</string>
 			<key>LibraryPath</key>
 			<string>libsksg.a</string>
 			<key>SupportedArchitectures</key>
 			<array>
 				<string>arm64</string>
 				<string>arm64e</string>
-				<string>x86_64</string>
 			</array>
 			<key>SupportedPlatform</key>
 			<string>ios</string>
-			<key>SupportedPlatformVariant</key>
-			<string>simulator</string>
 		</dict>
 		<dict>
+			<key>BinaryPath</key>
+			<string>libsksg.a</string>
 			<key>LibraryIdentifier</key>
-			<string>ios-arm64_arm64e</string>
+			<string>ios-arm64_arm64e_x86_64-simulator</string>
 			<key>LibraryPath</key>
 			<string>libsksg.a</string>
 			<key>SupportedArchitectures</key>
 			<array>
 				<string>arm64</string>
 				<string>arm64e</string>
+				<string>x86_64</string>
 			</array>
 			<key>SupportedPlatform</key>
 			<string>ios</string>
+			<key>SupportedPlatformVariant</key>
+			<string>simulator</string>
 		</dict>
 	</array>
 	<key>CFBundlePackageType</key>

package/libs/ios/libskshaper.xcframework/Info.plist

@@ -5,6 +5,8 @@
 	<key>AvailableLibraries</key>
 	<array>
 		<dict>
+			<key>BinaryPath</key>
+			<string>libskshaper.a</string>
 			<key>LibraryIdentifier</key>
 			<string>ios-arm64_arm64e_x86_64-simulator</string>
 			<key>LibraryPath</key>
@@ -21,6 +23,8 @@
 			<string>simulator</string>
 		</dict>
 		<dict>
+			<key>BinaryPath</key>
+			<string>libskshaper.a</string>
 			<key>LibraryIdentifier</key>
 			<string>ios-arm64_arm64e</string>
 			<key>LibraryPath</key>

package/libs/ios/libskunicode.xcframework/Info.plist

@@ -5,6 +5,8 @@
 	<key>AvailableLibraries</key>
 	<array>
 		<dict>
+			<key>BinaryPath</key>
+			<string>libskunicode.a</string>
 			<key>LibraryIdentifier</key>
 			<string>ios-arm64_arm64e</string>
 			<key>LibraryPath</key>
@@ -18,6 +20,8 @@
 			<string>ios</string>
 		</dict>
 		<dict>
+			<key>BinaryPath</key>
+			<string>libskunicode.a</string>
 			<key>LibraryIdentifier</key>
 			<string>ios-arm64_arm64e_x86_64-simulator</string>
 			<key>LibraryPath</key>

package/libs/ios/libsvg.xcframework/Info.plist

@@ -5,6 +5,8 @@
 	<key>AvailableLibraries</key>
 	<array>
 		<dict>
+			<key>BinaryPath</key>
+			<string>libsvg.a</string>
 			<key>LibraryIdentifier</key>
 			<string>ios-arm64_arm64e</string>
 			<key>LibraryPath</key>
@@ -18,6 +20,8 @@
 			<string>ios</string>
 		</dict>
 		<dict>
+			<key>BinaryPath</key>
+			<string>libsvg.a</string>
 			<key>LibraryIdentifier</key>
 			<string>ios-arm64_arm64e_x86_64-simulator</string>
 			<key>LibraryPath</key>

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.9",
   "description": "High-performance React Native Graphics using Skia",
   "main": "lib/module/index.js",
   "react-native": "src/index.ts",
@@ -108,7 +108,7 @@
     "react-native-reanimated": "3.6.2",
     "ts-jest": "29.1.1",
     "typescript": "5.1.6",
-    "ws": "8.17.1"
+    "ws": "8.18.0"
   },
   "dependencies": {
     "canvaskit-wasm": "0.39.1",

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;
 }