@shopify/react-native-skia 1.7.6 → 1.7.7

package/libs/{ios → apple}/libskia.xcframework/Info.plist

@@ -37,6 +37,21 @@
 			<key>SupportedPlatformVariant</key>
 			<string>simulator</string>
 		</dict>
+		<dict>
+			<key>BinaryPath</key>
+			<string>libskia.a</string>
+			<key>LibraryIdentifier</key>
+			<string>macos-arm64_x86_64</string>
+			<key>LibraryPath</key>
+			<string>libskia.a</string>
+			<key>SupportedArchitectures</key>
+			<array>
+				<string>arm64</string>
+				<string>x86_64</string>
+			</array>
+			<key>SupportedPlatform</key>
+			<string>macos</string>
+		</dict>
 	</array>
 	<key>CFBundlePackageType</key>
 	<string>XFWK</string>

package/libs/{ios → apple}/libskottie.xcframework/Info.plist

@@ -8,34 +8,49 @@
 			<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>
+		<dict>
+			<key>BinaryPath</key>
+			<string>libskottie.a</string>
+			<key>LibraryIdentifier</key>
+			<string>macos-arm64_x86_64</string>
+			<key>LibraryPath</key>
+			<string>libskottie.a</string>
+			<key>SupportedArchitectures</key>
+			<array>
+				<string>arm64</string>
+				<string>x86_64</string>
+			</array>
+			<key>SupportedPlatform</key>
+			<string>macos</string>
 		</dict>
 	</array>
 	<key>CFBundlePackageType</key>

package/libs/{ios → apple}/libskparagraph.xcframework/Info.plist

@@ -8,34 +8,49 @@
 			<key>BinaryPath</key>
 			<string>libskparagraph.a</string>
 			<key>LibraryIdentifier</key>
-			<string>ios-arm64_arm64e</string>
+			<string>ios-arm64_arm64e_x86_64-simulator</string>
 			<key>LibraryPath</key>
 			<string>libskparagraph.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>libskparagraph.a</string>
 			<key>LibraryIdentifier</key>
-			<string>ios-arm64_arm64e_x86_64-simulator</string>
+			<string>ios-arm64_arm64e</string>
 			<key>LibraryPath</key>
 			<string>libskparagraph.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>libskparagraph.a</string>
+			<key>LibraryIdentifier</key>
+			<string>macos-arm64_x86_64</string>
+			<key>LibraryPath</key>
+			<string>libskparagraph.a</string>
+			<key>SupportedArchitectures</key>
+			<array>
+				<string>arm64</string>
+				<string>x86_64</string>
+			</array>
+			<key>SupportedPlatform</key>
+			<string>macos</string>
 		</dict>
 	</array>
 	<key>CFBundlePackageType</key>

package/libs/{ios → apple}/libsksg.xcframework/Info.plist

@@ -4,6 +4,21 @@
 <dict>
 	<key>AvailableLibraries</key>
 	<array>
+		<dict>
+			<key>BinaryPath</key>
+			<string>libsksg.a</string>
+			<key>LibraryIdentifier</key>
+			<string>macos-arm64_x86_64</string>
+			<key>LibraryPath</key>
+			<string>libsksg.a</string>
+			<key>SupportedArchitectures</key>
+			<array>
+				<string>arm64</string>
+				<string>x86_64</string>
+			</array>
+			<key>SupportedPlatform</key>
+			<string>macos</string>
+		</dict>
 		<dict>
 			<key>BinaryPath</key>
 			<string>libsksg.a</string>

package/libs/{ios → apple}/libskshaper.xcframework/Info.plist

@@ -8,19 +8,16 @@
 			<key>BinaryPath</key>
 			<string>libskshaper.a</string>
 			<key>LibraryIdentifier</key>
-			<string>ios-arm64_arm64e_x86_64-simulator</string>
+			<string>macos-arm64_x86_64</string>
 			<key>LibraryPath</key>
 			<string>libskshaper.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>
+			<string>macos</string>
 		</dict>
 		<dict>
 			<key>BinaryPath</key>
@@ -37,6 +34,24 @@
 			<key>SupportedPlatform</key>
 			<string>ios</string>
 		</dict>
+		<dict>
+			<key>BinaryPath</key>
+			<string>libskshaper.a</string>
+			<key>LibraryIdentifier</key>
+			<string>ios-arm64_arm64e_x86_64-simulator</string>
+			<key>LibraryPath</key>
+			<string>libskshaper.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>
 	<string>XFWK</string>

package/libs/{ios → apple}/libskunicode_core.xcframework/Info.plist

@@ -4,6 +4,21 @@
 <dict>
 	<key>AvailableLibraries</key>
 	<array>
+		<dict>
+			<key>BinaryPath</key>
+			<string>libskunicode_core.a</string>
+			<key>LibraryIdentifier</key>
+			<string>ios-arm64_arm64e</string>
+			<key>LibraryPath</key>
+			<string>libskunicode_core.a</string>
+			<key>SupportedArchitectures</key>
+			<array>
+				<string>arm64</string>
+				<string>arm64e</string>
+			</array>
+			<key>SupportedPlatform</key>
+			<string>ios</string>
+		</dict>
 		<dict>
 			<key>BinaryPath</key>
 			<string>libskunicode_core.a</string>
@@ -26,16 +41,16 @@
 			<key>BinaryPath</key>
 			<string>libskunicode_core.a</string>
 			<key>LibraryIdentifier</key>
-			<string>ios-arm64_arm64e</string>
+			<string>macos-arm64_x86_64</string>
 			<key>LibraryPath</key>
 			<string>libskunicode_core.a</string>
 			<key>SupportedArchitectures</key>
 			<array>
 				<string>arm64</string>
-				<string>arm64e</string>
+				<string>x86_64</string>
 			</array>
 			<key>SupportedPlatform</key>
-			<string>ios</string>
+			<string>macos</string>
 		</dict>
 	</array>
 	<key>CFBundlePackageType</key>

package/libs/{ios → apple}/libskunicode_libgrapheme.xcframework/Info.plist

@@ -22,6 +22,21 @@
 			<key>SupportedPlatformVariant</key>
 			<string>simulator</string>
 		</dict>
+		<dict>
+			<key>BinaryPath</key>
+			<string>libskunicode_libgrapheme.a</string>
+			<key>LibraryIdentifier</key>
+			<string>macos-arm64_x86_64</string>
+			<key>LibraryPath</key>
+			<string>libskunicode_libgrapheme.a</string>
+			<key>SupportedArchitectures</key>
+			<array>
+				<string>arm64</string>
+				<string>x86_64</string>
+			</array>
+			<key>SupportedPlatform</key>
+			<string>macos</string>
+		</dict>
 		<dict>
 			<key>BinaryPath</key>
 			<string>libskunicode_libgrapheme.a</string>

package/libs/{ios → apple}/libsvg.xcframework/Info.plist

@@ -22,6 +22,21 @@
 			<key>SupportedPlatformVariant</key>
 			<string>simulator</string>
 		</dict>
+		<dict>
+			<key>BinaryPath</key>
+			<string>libsvg.a</string>
+			<key>LibraryIdentifier</key>
+			<string>macos-arm64_x86_64</string>
+			<key>LibraryPath</key>
+			<string>libsvg.a</string>
+			<key>SupportedArchitectures</key>
+			<array>
+				<string>arm64</string>
+				<string>x86_64</string>
+			</array>
+			<key>SupportedPlatform</key>
+			<string>macos</string>
+		</dict>
 		<dict>
 			<key>BinaryPath</key>
 			<string>libsvg.a</string>

package/package.json

@@ -7,7 +7,7 @@
     "setup-skia-web": "./scripts/setup-canvaskit.js"
   },
   "title": "React Native Skia",
-  "version": "1.7.6",
+  "version": "1.7.7",
   "description": "High-performance React Native Graphics using Skia",
   "main": "lib/module/index.js",
   "react-native": "src/index.ts",
@@ -29,7 +29,7 @@
     "jestEnv.mjs",
     "cpp/**/*.{h,cpp}",
     "ios/**",
-    "libs/ios/*.xcframework/**",
+    "libs/apple/*.xcframework/**",
     "react-native-skia.podspec",
     "scripts/setup-canvaskit.js",
     "dist/**"
@@ -95,7 +95,7 @@
     "@types/pixelmatch": "5.2.4",
     "@types/pngjs": "6.0.1",
     "@types/react": "^18.2.6",
-    "@types/react-reconciler": "0.26.7",
+    "@types/react-reconciler": "0.28.9",
     "@types/ws": "8.5.3",
     "eslint": "8",
     "eslint-config-react-native-wcandillon": "^3.10.2",

package/react-native-skia.podspec

@@ -13,18 +13,18 @@ preprocessor_defs = use_graphite ?
   '$(inherited) SK_METAL=1 SK_GANESH=1 SK_IMAGE_READ_PIXELS_DISABLE_LEGACY_API=1'
 
 # Define base frameworks
-base_frameworks = ['libs/ios/libskia.xcframework', 
-'libs/ios/libsvg.xcframework', 
-'libs/ios/libskshaper.xcframework',
-'libs/ios/libskparagraph.xcframework',
-'libs/ios/libskunicode_core.xcframework',
-'libs/ios/libskunicode_libgrapheme.xcframework',]
+base_frameworks = ['libs/apple/libskia.xcframework', 
+'libs/apple/libsvg.xcframework', 
+'libs/apple/libskshaper.xcframework',
+'libs/apple/libskparagraph.xcframework',
+'libs/apple/libskunicode_core.xcframework',
+'libs/apple/libskunicode_libgrapheme.xcframework',]
 
 # Add Graphite frameworks if enabled
 graphite_frameworks = [
-  'libs/ios/libdawn_native_static.xcframework',
-  'libs/ios/libdawn_platform_static.xcframework', 
-  'libs/ios/libdawn_proc_static.xcframework'
+  'libs/apple/libdawn_native_static.xcframework',
+  'libs/apple/libdawn_platform_static.xcframework', 
+  'libs/apple/libdawn_proc_static.xcframework'
 ]
 
 Pod::Spec.new do |s|

package/src/__tests__/setup.ts

@@ -82,7 +82,7 @@ export const checkImage = (
       if (diffPixelsCount > maxPixelDiff && !shouldFail) {
         console.log(`${p} didn't match`);
         fs.writeFileSync(`${p}.test.png`, PNG.sync.write(toTest));
-        fs.writeFileSync(`${p}-diff-test.png`, PNG.sync.write(diffImage));
+        //fs.writeFileSync(`${p}-diff-test.png`, PNG.sync.write(diffImage));
       }
       if (shouldFail) {
         expect(diffPixelsCount).not.toBeLessThanOrEqual(maxPixelDiff);

package/src/dom/nodes/JsiSkDOM.ts

@@ -331,7 +331,8 @@ export class JsiSkDOM implements SkDOM {
   }
 
   LinearToSRGBGammaColorFilter() {
-    return this.native? global.SkiaDomApi.LinearToSRGBGammaColorFilterNode()
+    return this.native
+      ? global.SkiaDomApi.LinearToSRGBGammaColorFilterNode()
       : new LinearToSRGBGammaColorFilterNode(this.ctx);
   }
 

package/src/dom/nodes/datatypes/Circle.ts

@@ -1,14 +1,16 @@
-import type { Skia } from "../../../skia/types";
+"worklet";
+
 import type { CircleDef, ScalarCircleDef } from "../../types";
 
-export const isCircleScalarDef = (def: CircleDef): def is ScalarCircleDef =>
+export const isCircleScalarDef = (def: CircleDef): def is ScalarCircleDef => {
   // We have an issue to check property existence on JSI backed instances
   // eslint-disable-next-line @typescript-eslint/no-explicit-any
-  (def as any).cx !== undefined;
+  return (def as any).cx !== undefined;
+};
 
-export const processCircle = (Skia: Skia, def: CircleDef) => {
+export const processCircle = (def: CircleDef) => {
   if (isCircleScalarDef(def)) {
-    return { c: Skia.Point(def.cx, def.cy), r: def.r };
+    return { c: { x: def.cx, y: def.cy }, r: def.r };
   }
   return { ...def, c: def.c ?? { x: 0, y: 0 } };
 };

package/src/dom/nodes/datatypes/Enum.ts

@@ -1,2 +1,4 @@
+"worklet";
+
 export const enumKey = <K extends string>(k: K) =>
   (k.charAt(0).toUpperCase() + k.slice(1)) as Capitalize<K>;

package/src/dom/nodes/datatypes/Fitting.ts

@@ -1,3 +1,5 @@
+"worklet";
+
 import { exhaustiveCheck } from "../../../renderer/typeddash";
 import type { SkRect } from "../../../skia/types";
 import type { Fit } from "../../types";
@@ -8,7 +10,6 @@ export interface Size {
 }
 
 export const size = (width = 0, height = 0) => {
-  "worklet";
   return { width, height };
 };
 
@@ -21,7 +22,6 @@ export const rect2rect = (
   { scaleX: number },
   { scaleY: number }
 ] => {
-  "worklet";
   const scaleX = dst.width / src.width;
   const scaleY = dst.height / src.height;
   const translateX = dst.x - src.x * scaleX;
@@ -33,7 +33,6 @@ const inscribe = (
   { width, height }: Size,
   rect: { x: number; y: number; width: number; height: number }
 ) => {
-  "worklet";
   const halfWidthDelta = (rect.width - width) / 2.0;
   const halfHeightDelta = (rect.height - height) / 2.0;
   return {
@@ -45,7 +44,6 @@ const inscribe = (
 };
 
 const applyBoxFit = (fit: Fit, input: Size, output: Size) => {
-  "worklet";
   let src = size(),
     dst = size();
   if (
@@ -114,7 +112,6 @@ export const fitRects = (
   rect: SkRect,
   { x, y, width, height }: SkRect
 ) => {
-  "worklet";
   const sizes = applyBoxFit(
     fit,
     { width: rect.width, height: rect.height },

package/src/dom/nodes/datatypes/Gradient.ts

@@ -1,3 +1,5 @@
+"worklet";
+
 import type { Skia, SkRect, Transforms3d, Vector } from "../../../skia/types";
 import { TileMode } from "../../../skia/types";
 import type { GradientProps, ImageShaderProps } from "../../types";
@@ -35,13 +37,8 @@ export const getRect = (
   const { x, y, width, height } = props;
   if (props.rect) {
     return props.rect;
-  } else if (
-    x !== undefined &&
-    y !== undefined &&
-    width !== undefined &&
-    height !== undefined
-  ) {
-    return Skia.XYWHRect(x, y, width, height);
+  } else if (width !== undefined && height !== undefined) {
+    return Skia.XYWHRect(x ?? 0, y ?? 0, width, height);
   } else {
     return undefined;
   }

package/src/dom/nodes/datatypes/Path.ts

@@ -1,3 +1,5 @@
+"worklet";
+
 import type { Skia } from "../../../skia/types";
 import { isPath } from "../../../skia/types";
 import type { PathDef } from "../../types";
@@ -14,5 +16,6 @@ export const processPath = (Skia: Skia, rawPath: PathDef) => {
 };
 
 // eslint-disable-next-line @typescript-eslint/no-explicit-any
-export const isPathDef = (def: any): def is PathDef =>
-  typeof def === "string" || isPath(def);
+export const isPathDef = (def: any): def is PathDef => {
+  return typeof def === "string" || isPath(def);
+};

package/src/dom/nodes/datatypes/Radius.ts

@@ -1,3 +1,5 @@
+"worklet";
+
 import type { Skia, Vector } from "../../../skia/types";
 import type { Radius } from "../../types";
 

package/src/dom/nodes/datatypes/Rect.ts

@@ -1,22 +1,25 @@
+"worklet";
+
 /* eslint-disable @typescript-eslint/no-explicit-any */
-import type { Skia, SkRect, Vector } from "../../../skia/types";
+import type { Skia, SkRect, SkRRect, Vector } from "../../../skia/types";
 import type { RectCtor, RectDef, RRectCtor, RRectDef } from "../../types";
 
 import { processRadius } from "./Radius";
 
 export const isEdge = (pos: Vector, b: SkRect) => {
-  "worklet";
   return (
     pos.x === b.x || pos.y === b.y || pos.x === b.width || pos.y === b.height
   );
 };
 
 // We have an issue to check property existence on JSI backed instances
-const isRRectCtor = (def: RRectDef): def is RRectCtor =>
-  (def as any).rect === undefined;
+const isRRectCtor = (def: RRectDef): def is RRectCtor => {
+  return (def as any).rect === undefined;
+};
 // We have an issue to check property existence on JSI backed instances
-const isRectCtor = (def: RectDef): def is RectCtor =>
-  (def as any).rect === undefined;
+const isRectCtor = (def: RectDef): def is RectCtor => {
+  return (def as any).rect === undefined;
+};
 
 export const processRect = (Skia: Skia, def: RectDef) => {
   if (isRectCtor(def)) {
@@ -38,3 +41,34 @@ export const processRRect = (Skia: Skia, def: RRectDef) => {
     return def.rect;
   }
 };
+
+export const inflate = (
+  Skia: Skia,
+  box: SkRRect,
+  dx: number,
+  dy: number,
+  tx = 0,
+  ty = 0
+) => {
+  return Skia.RRectXY(
+    Skia.XYWHRect(
+      box.rect.x - dx + tx,
+      box.rect.y - dy + ty,
+      box.rect.width + 2 * dx,
+      box.rect.height + 2 * dy
+    ),
+    box.rx + dx,
+    box.ry + dy
+  );
+};
+
+export const deflate = (
+  Skia: Skia,
+  box: SkRRect,
+  dx: number,
+  dy: number,
+  tx = 0,
+  ty = 0
+) => {
+  return inflate(Skia, box, -dx, -dy, tx, ty);
+};