@shopify/react-native-skia 0.1.227 → 0.1.228

package/src/skia/web/JsiSkMatrix.ts

@@ -1,9 +1,13 @@
 import type { CanvasKit, Matrix3x3 } from "canvaskit-wasm";
 
-import type { SkMatrix } from "../types";
+import { toMatrix3, type Matrix3, type Matrix4, type SkMatrix } from "../types";
 
 import { HostObject } from "./Host";
 
+const isMatrixHostObject = (
+  obj: SkMatrix | number[] | Matrix4 | Matrix3
+): obj is SkMatrix => !Array.isArray(obj);
+
 export class JsiSkMatrix
   extends HostObject<Matrix3x3, "Matrix">
   implements SkMatrix
@@ -24,9 +28,14 @@ export class JsiSkMatrix
     // Do nothing - the matrix is represenetd by a Float32Array
   };
 
-  concat(matrix: SkMatrix | number[]) {
+  concat(matrix: SkMatrix | number[] | Matrix4 | Matrix3) {
     this.preMultiply(
-      Array.isArray(matrix) ? matrix : JsiSkMatrix.fromValue(matrix)
+      // eslint-disable-next-line no-nested-ternary
+      isMatrixHostObject(matrix)
+        ? JsiSkMatrix.fromValue(matrix)
+        : matrix.length === 16
+        ? toMatrix3(matrix as Matrix4)
+        : [...matrix]
     );
     return this;
   }

package/src/skia/web/JsiSkPaint.ts

@@ -14,7 +14,7 @@ import type {
   SkPathEffect,
 } from "../types";
 
-import { HostObject, ckEnum } from "./Host";
+import { HostObject, getEnum } from "./Host";
 import { JsiSkColorFilter } from "./JsiSkColorFilter";
 import { JsiSkImageFilter } from "./JsiSkImageFilter";
 import { JsiSkMaskFilter } from "./JsiSkMaskFilter";
@@ -75,7 +75,7 @@ export class JsiSkPaint extends HostObject<Paint, "Paint"> implements SkPaint {
   }
 
   setBlendMode(blendMode: BlendMode) {
-    this.ref.setBlendMode(ckEnum(blendMode));
+    this.ref.setBlendMode(getEnum(this.CanvasKit.BlendMode, blendMode));
   }
 
   setColor(color: SkColor) {
@@ -103,11 +103,11 @@ export class JsiSkPaint extends HostObject<Paint, "Paint"> implements SkPaint {
   }
 
   setStrokeCap(cap: StrokeCap) {
-    this.ref.setStrokeCap(ckEnum(cap));
+    this.ref.setStrokeCap(getEnum(this.CanvasKit.StrokeCap, cap));
   }
 
   setStrokeJoin(join: StrokeJoin) {
-    this.ref.setStrokeJoin(ckEnum(join));
+    this.ref.setStrokeJoin(getEnum(this.CanvasKit.StrokeJoin, join));
   }
 
   setStrokeMiter(limit: number) {

package/src/skia/web/JsiSkPath.ts

@@ -13,7 +13,7 @@ import type {
   StrokeOpts,
 } from "../types";
 
-import { ckEnum, HostObject, optEnum } from "./Host";
+import { getEnum, HostObject, optEnum } from "./Host";
 import { JsiSkPoint } from "./JsiSkPoint";
 import { JsiSkRect } from "./JsiSkRect";
 import { JsiSkRRect } from "./JsiSkRRect";
@@ -149,7 +149,7 @@ export class JsiSkPath extends HostObject<Path, "Path"> implements SkPath {
   }
 
   setFillType(fill: FillType) {
-    this.ref.setFillType(ckEnum(fill));
+    this.ref.setFillType(getEnum(this.CanvasKit.FillType, fill));
     return this;
   }
 
@@ -167,8 +167,8 @@ export class JsiSkPath extends HostObject<Path, "Path"> implements SkPath {
             // eslint-disable-next-line camelcase
             miter_limit: opts.width,
             precision: opts.width,
-            join: optEnum(opts.join),
-            cap: optEnum(opts.cap),
+            join: optEnum(this.CanvasKit.StrokeJoin, opts.join),
+            cap: optEnum(this.CanvasKit.StrokeCap, opts.cap),
           }
     );
     return result === null ? result : this;
@@ -315,7 +315,10 @@ export class JsiSkPath extends HostObject<Path, "Path"> implements SkPath {
   }
 
   op(path: SkPath, op: PathOp) {
-    return this.ref.op(JsiSkPath.fromValue(path), ckEnum(op));
+    return this.ref.op(
+      JsiSkPath.fromValue(path),
+      getEnum(this.CanvasKit.PathOp, op)
+    );
   }
 
   simplify() {

package/src/skia/web/JsiSkPathEffectFactory.ts

@@ -8,7 +8,7 @@ import type {
   SkPathEffect,
 } from "../types";
 
-import { ckEnum, Host, NotImplementedOnRNWeb } from "./Host";
+import { getEnum, Host, NotImplementedOnRNWeb } from "./Host";
 import { JsiSkMatrix } from "./JsiSkMatrix";
 import { JsiSkPath } from "./JsiSkPath";
 import { JsiSkPathEffect } from "./JsiSkPathEffect";
@@ -69,7 +69,7 @@ export class JsiSkPathEffectFactory extends Host implements PathEffectFactory {
       JsiSkPath.fromValue(path),
       advance,
       phase,
-      ckEnum(style)
+      getEnum(this.CanvasKit.Path1DEffect, style)
     );
     if (pe === null) {
       return null;

package/src/skia/web/JsiSkPathFactory.ts

@@ -3,7 +3,7 @@ import type { CanvasKit } from "canvaskit-wasm";
 import type { PathCommand, PathOp, SkFont, SkPath } from "../types";
 import type { PathFactory } from "../types/Path/PathFactory";
 
-import { Host, ckEnum, NotImplementedOnRNWeb } from "./Host";
+import { Host, getEnum, NotImplementedOnRNWeb } from "./Host";
 import { JsiSkPath } from "./JsiSkPath";
 
 export class JsiSkPathFactory extends Host implements PathFactory {
@@ -27,7 +27,7 @@ export class JsiSkPathFactory extends Host implements PathFactory {
     const path = this.CanvasKit.Path.MakeFromOp(
       JsiSkPath.fromValue(one),
       JsiSkPath.fromValue(two),
-      ckEnum(op)
+      getEnum(this.CanvasKit.PathOp, op)
     );
     if (path === null) {
       return null;

package/src/skia/web/JsiSkPicture.ts

@@ -9,7 +9,7 @@ import type {
   SkMatrix,
 } from "../types";
 
-import { HostObject, ckEnum } from "./Host";
+import { HostObject, getEnum } from "./Host";
 import { JsiSkShader } from "./JsiSkShader";
 import { JsiSkMatrix } from "./JsiSkMatrix";
 import { JsiSkRect } from "./JsiSkRect";
@@ -36,9 +36,9 @@ export class JsiSkPicture
     return new JsiSkShader(
       this.CanvasKit,
       this.ref.makeShader(
-        ckEnum(tmx),
-        ckEnum(tmy),
-        ckEnum(mode),
+        getEnum(this.CanvasKit.TileMode, tmx),
+        getEnum(this.CanvasKit.TileMode, tmy),
+        getEnum(this.CanvasKit.FilterMode, mode),
         localMatrix ? JsiSkMatrix.fromValue(localMatrix) : undefined,
         tileRect ? JsiSkRect.fromValue(this.CanvasKit, tileRect) : undefined
       )

package/src/skia/web/JsiSkShaderFactory.ts

@@ -10,7 +10,7 @@ import type {
 } from "../types";
 import type { ShaderFactory } from "../types/Shader/ShaderFactory";
 
-import { Host, ckEnum } from "./Host";
+import { Host, getEnum } from "./Host";
 import { JsiSkMatrix } from "./JsiSkMatrix";
 import { JsiSkPoint } from "./JsiSkPoint";
 import { JsiSkShader } from "./JsiSkShader";
@@ -36,7 +36,7 @@ export class JsiSkShaderFactory extends Host implements ShaderFactory {
         JsiSkPoint.fromValue(end),
         colors,
         pos,
-        ckEnum(mode),
+        getEnum(this.CanvasKit.TileMode, mode),
         localMatrix === undefined
           ? undefined
           : JsiSkMatrix.fromValue(localMatrix),
@@ -61,7 +61,7 @@ export class JsiSkShaderFactory extends Host implements ShaderFactory {
         radius,
         colors,
         pos,
-        ckEnum(mode),
+        getEnum(this.CanvasKit.TileMode, mode),
         localMatrix === undefined
           ? undefined
           : JsiSkMatrix.fromValue(localMatrix),
@@ -90,7 +90,7 @@ export class JsiSkShaderFactory extends Host implements ShaderFactory {
         endRadius,
         colors,
         pos,
-        ckEnum(mode),
+        getEnum(this.CanvasKit.TileMode, mode),
         localMatrix === undefined
           ? undefined
           : JsiSkMatrix.fromValue(localMatrix),
@@ -117,7 +117,7 @@ export class JsiSkShaderFactory extends Host implements ShaderFactory {
         cy,
         colors,
         pos,
-        ckEnum(mode),
+        getEnum(this.CanvasKit.TileMode, mode),
         localMatrix === undefined || localMatrix === null
           ? undefined
           : JsiSkMatrix.fromValue(localMatrix),
@@ -174,7 +174,7 @@ export class JsiSkShaderFactory extends Host implements ShaderFactory {
     return new JsiSkShader(
       this.CanvasKit,
       this.CanvasKit.Shader.MakeBlend(
-        ckEnum(mode),
+        getEnum(this.CanvasKit.BlendMode, mode),
         JsiSkShader.fromValue(one),
         JsiSkShader.fromValue(two)
       )

package/src/skia/web/JsiSkVerticesFactory.ts

@@ -2,8 +2,8 @@ import type { CanvasKit } from "canvaskit-wasm";
 
 import type { SkColor, SkPoint, VertexMode } from "../types";
 
-import { ckEnum } from "./Host";
 import { JsiSkVertices } from "./JsiSkVertices";
+import { getEnum } from "./Host";
 
 const concat = (...arrays: Float32Array[]) => {
   let totalLength = 0;
@@ -31,7 +31,7 @@ export const MakeVertices = (
   new JsiSkVertices(
     CanvasKit,
     CanvasKit.MakeVertices(
-      ckEnum(mode),
+      getEnum(CanvasKit.VertexMode, mode),
       positions.map(({ x, y }) => [x, y]).flat(),
       (textureCoordinates || []).map(({ x, y }) => [x, y]).flat(),
       !colors ? null : colors.reduce((a, c) => concat(a, c)),