@shopify/react-native-skia 1.12.1 → 1.12.2

package/lib/module/skia/web/JsiSkVerticesFactory.js

@@ -13,7 +13,7 @@ const concat = (...arrays) => {
   }
   return result;
 };
-export const MakeVertices = (CanvasKit, mode, positions, textureCoordinates, colors, indices, isVolatile) => new JsiSkVertices(CanvasKit, CanvasKit.MakeVertices(getEnum(CanvasKit.VertexMode, mode), positions.map(({
+export const MakeVertices = (CanvasKit, mode, positions, textureCoordinates, colors, indices, isVolatile) => new JsiSkVertices(CanvasKit, CanvasKit.MakeVertices(getEnum(CanvasKit, "VertexMode", mode), positions.map(({
   x,
   y
 }) => [x, y]).flat(), (textureCoordinates || []).map(({

package/lib/module/skia/web/JsiSkVerticesFactory.js.map

@@ -1 +1 @@
-{"version":3,"names":["JsiSkVertices","getEnum","concat","arrays","totalLength","arr","length","result","Float32Array","offset","set","MakeVertices","CanvasKit","mode","positions","textureCoordinates","colors","indices","isVolatile","VertexMode","map","x","y","flat","reduce","a","c"],"sources":["JsiSkVerticesFactory.ts"],"sourcesContent":["import type { CanvasKit } from \"canvaskit-wasm\";\n\nimport type { SkColor, SkPoint, VertexMode } from \"../types\";\n\nimport { JsiSkVertices } from \"./JsiSkVertices\";\nimport { getEnum } from \"./Host\";\n\nconst concat = (...arrays: Float32Array[]) => {\n  let totalLength = 0;\n  for (const arr of arrays) {\n    totalLength += arr.length;\n  }\n  const result = new Float32Array(totalLength);\n  let offset = 0;\n  for (const arr of arrays) {\n    result.set(arr, offset);\n    offset += arr.length;\n  }\n  return result;\n};\n\nexport const MakeVertices = (\n  CanvasKit: CanvasKit,\n  mode: VertexMode,\n  positions: SkPoint[],\n  textureCoordinates?: SkPoint[] | null,\n  colors?: SkColor[],\n  indices?: number[] | null,\n  isVolatile?: boolean\n) =>\n  new JsiSkVertices(\n    CanvasKit,\n    CanvasKit.MakeVertices(\n      getEnum(CanvasKit.VertexMode, mode),\n      positions.map(({ x, y }) => [x, y]).flat(),\n      (textureCoordinates || []).map(({ x, y }) => [x, y]).flat(),\n      !colors ? null : colors.reduce((a, c) => concat(a, c)),\n      indices,\n      isVolatile\n    )\n  );\n"],"mappings":"AAIA,SAASA,aAAa,QAAQ,iBAAiB;AAC/C,SAASC,OAAO,QAAQ,QAAQ;AAEhC,MAAMC,MAAM,GAAGA,CAAC,GAAGC,MAAsB,KAAK;EAC5C,IAAIC,WAAW,GAAG,CAAC;EACnB,KAAK,MAAMC,GAAG,IAAIF,MAAM,EAAE;IACxBC,WAAW,IAAIC,GAAG,CAACC,MAAM;EAC3B;EACA,MAAMC,MAAM,GAAG,IAAIC,YAAY,CAACJ,WAAW,CAAC;EAC5C,IAAIK,MAAM,GAAG,CAAC;EACd,KAAK,MAAMJ,GAAG,IAAIF,MAAM,EAAE;IACxBI,MAAM,CAACG,GAAG,CAACL,GAAG,EAAEI,MAAM,CAAC;IACvBA,MAAM,IAAIJ,GAAG,CAACC,MAAM;EACtB;EACA,OAAOC,MAAM;AACf,CAAC;AAED,OAAO,MAAMI,YAAY,GAAGA,CAC1BC,SAAoB,EACpBC,IAAgB,EAChBC,SAAoB,EACpBC,kBAAqC,EACrCC,MAAkB,EAClBC,OAAyB,EACzBC,UAAoB,KAEpB,IAAIlB,aAAa,CACfY,SAAS,EACTA,SAAS,CAACD,YAAY,CACpBV,OAAO,CAACW,SAAS,CAACO,UAAU,EAAEN,IAAI,CAAC,EACnCC,SAAS,CAACM,GAAG,CAAC,CAAC;EAAEC,CAAC;EAAEC;AAAE,CAAC,KAAK,CAACD,CAAC,EAAEC,CAAC,CAAC,CAAC,CAACC,IAAI,CAAC,CAAC,EAC1C,CAACR,kBAAkB,IAAI,EAAE,EAAEK,GAAG,CAAC,CAAC;EAAEC,CAAC;EAAEC;AAAE,CAAC,KAAK,CAACD,CAAC,EAAEC,CAAC,CAAC,CAAC,CAACC,IAAI,CAAC,CAAC,EAC3D,CAACP,MAAM,GAAG,IAAI,GAAGA,MAAM,CAACQ,MAAM,CAAC,CAACC,CAAC,EAAEC,CAAC,KAAKxB,MAAM,CAACuB,CAAC,EAAEC,CAAC,CAAC,CAAC,EACtDT,OAAO,EACPC,UACF,CACF,CAAC","ignoreList":[]}
+{"version":3,"names":["JsiSkVertices","getEnum","concat","arrays","totalLength","arr","length","result","Float32Array","offset","set","MakeVertices","CanvasKit","mode","positions","textureCoordinates","colors","indices","isVolatile","map","x","y","flat","reduce","a","c"],"sources":["JsiSkVerticesFactory.ts"],"sourcesContent":["import type { CanvasKit } from \"canvaskit-wasm\";\n\nimport type { SkColor, SkPoint, VertexMode } from \"../types\";\n\nimport { JsiSkVertices } from \"./JsiSkVertices\";\nimport { getEnum } from \"./Host\";\n\nconst concat = (...arrays: Float32Array[]) => {\n  let totalLength = 0;\n  for (const arr of arrays) {\n    totalLength += arr.length;\n  }\n  const result = new Float32Array(totalLength);\n  let offset = 0;\n  for (const arr of arrays) {\n    result.set(arr, offset);\n    offset += arr.length;\n  }\n  return result;\n};\n\nexport const MakeVertices = (\n  CanvasKit: CanvasKit,\n  mode: VertexMode,\n  positions: SkPoint[],\n  textureCoordinates?: SkPoint[] | null,\n  colors?: SkColor[],\n  indices?: number[] | null,\n  isVolatile?: boolean\n) =>\n  new JsiSkVertices(\n    CanvasKit,\n    CanvasKit.MakeVertices(\n      getEnum(CanvasKit, \"VertexMode\", mode),\n      positions.map(({ x, y }) => [x, y]).flat(),\n      (textureCoordinates || []).map(({ x, y }) => [x, y]).flat(),\n      !colors ? null : colors.reduce((a, c) => concat(a, c)),\n      indices,\n      isVolatile\n    )\n  );\n"],"mappings":"AAIA,SAASA,aAAa,QAAQ,iBAAiB;AAC/C,SAASC,OAAO,QAAQ,QAAQ;AAEhC,MAAMC,MAAM,GAAGA,CAAC,GAAGC,MAAsB,KAAK;EAC5C,IAAIC,WAAW,GAAG,CAAC;EACnB,KAAK,MAAMC,GAAG,IAAIF,MAAM,EAAE;IACxBC,WAAW,IAAIC,GAAG,CAACC,MAAM;EAC3B;EACA,MAAMC,MAAM,GAAG,IAAIC,YAAY,CAACJ,WAAW,CAAC;EAC5C,IAAIK,MAAM,GAAG,CAAC;EACd,KAAK,MAAMJ,GAAG,IAAIF,MAAM,EAAE;IACxBI,MAAM,CAACG,GAAG,CAACL,GAAG,EAAEI,MAAM,CAAC;IACvBA,MAAM,IAAIJ,GAAG,CAACC,MAAM;EACtB;EACA,OAAOC,MAAM;AACf,CAAC;AAED,OAAO,MAAMI,YAAY,GAAGA,CAC1BC,SAAoB,EACpBC,IAAgB,EAChBC,SAAoB,EACpBC,kBAAqC,EACrCC,MAAkB,EAClBC,OAAyB,EACzBC,UAAoB,KAEpB,IAAIlB,aAAa,CACfY,SAAS,EACTA,SAAS,CAACD,YAAY,CACpBV,OAAO,CAACW,SAAS,EAAE,YAAY,EAAEC,IAAI,CAAC,EACtCC,SAAS,CAACK,GAAG,CAAC,CAAC;EAAEC,CAAC;EAAEC;AAAE,CAAC,KAAK,CAACD,CAAC,EAAEC,CAAC,CAAC,CAAC,CAACC,IAAI,CAAC,CAAC,EAC1C,CAACP,kBAAkB,IAAI,EAAE,EAAEI,GAAG,CAAC,CAAC;EAAEC,CAAC;EAAEC;AAAE,CAAC,KAAK,CAACD,CAAC,EAAEC,CAAC,CAAC,CAAC,CAACC,IAAI,CAAC,CAAC,EAC3D,CAACN,MAAM,GAAG,IAAI,GAAGA,MAAM,CAACO,MAAM,CAAC,CAACC,CAAC,EAAEC,CAAC,KAAKvB,MAAM,CAACsB,CAAC,EAAEC,CAAC,CAAC,CAAC,EACtDR,OAAO,EACPC,UACF,CACF,CAAC","ignoreList":[]}

package/lib/typescript/lib/commonjs/skia/web/Host.d.ts

@@ -12,5 +12,5 @@ export class BaseHostObject extends Host {
 export class HostObject extends BaseHostObject {
     static fromValue(value: any): any;
 }
-export function getEnum(e: any, v: any): any;
-export function optEnum(e: any, value: any): any;
+export function getEnum(CanvasKit: any, name: any, v: any): any;
+export function optEnum(CanvasKit: any, name: any, v: any): any;

package/lib/typescript/lib/module/skia/web/Host.d.ts

@@ -11,5 +11,5 @@ export class BaseHostObject extends Host {
 export class HostObject extends BaseHostObject {
     static fromValue(value: any): any;
 }
-export function getEnum(e: any, v: any): any;
-export function optEnum(e: any, value: any): any;
+export function getEnum(CanvasKit: any, name: any, v: any): any;
+export function optEnum(CanvasKit: any, name: any, v: any): any;

package/lib/typescript/src/skia/web/Host.d.ts

@@ -1,4 +1,4 @@
-import type { CanvasKit, EmbindEnumEntity, EmbindEnum } from "canvaskit-wasm";
+import type { CanvasKit, EmbindEnumEntity } from "canvaskit-wasm";
 import type { SkJSIInstance } from "../types";
 export declare const throwNotImplementedOnRNWeb: <T>() => T;
 export declare abstract class Host {
@@ -14,5 +14,5 @@ export declare abstract class BaseHostObject<T, N extends string> extends Host i
 export declare abstract class HostObject<T, N extends string> extends BaseHostObject<T, N> {
     static fromValue<T>(value: SkJSIInstance<string>): T;
 }
-export declare const getEnum: (e: EmbindEnum, v: number) => EmbindEnumEntity;
-export declare const optEnum: (e: EmbindEnum, value: number | undefined) => EmbindEnumEntity | undefined;
+export declare const getEnum: (CanvasKit: CanvasKit, name: keyof CanvasKit, v: number) => EmbindEnumEntity;
+export declare const optEnum: (CanvasKit: CanvasKit, name: keyof CanvasKit, v: number | undefined) => EmbindEnumEntity | undefined;

package/package.json

@@ -8,7 +8,7 @@
     "setup-skia-web": "scripts/setup-canvaskit.js"
   },
   "title": "React Native Skia",
-  "version": "1.12.1",
+  "version": "1.12.2",
   "description": "High-performance React Native Graphics using Skia",
   "main": "lib/module/index.js",
   "react-native": "src/index.ts",
@@ -29,7 +29,7 @@
     "jestSetup.mjs",
     "jestEnv.mjs",
     "cpp/**/*.{h,cpp}",
-    "ios/**",
+    "apple/**",
     "libs/apple/*.xcframework/**",
     "react-native-skia.podspec",
     "scripts/setup-canvaskit.js",

package/src/skia/__tests__/Enums.spec.ts

@@ -111,4 +111,38 @@ describe("Enums", () => {
     );
     checkEnum(ClipOp, CanvasKit.ClipOp);
   });
+  it("Should match color types with CanvasKit", () => {
+    const { CanvasKit } = setupSkia();
+    //expect(CanvasKit.ColorType.Unknown.value).toBe(ColorType.Unknown);
+    expect(CanvasKit.ColorType.Alpha_8.value).toBe(ColorTypeCanvasKit.Alpha_8);
+    expect(CanvasKit.ColorType.RGB_565.value).toBe(ColorTypeCanvasKit.RGB_565);
+    //expect(CanvasKit.ColorType.ARGB_4444.value).toBe(ColorType.ARGB_4444);
+    expect(CanvasKit.ColorType.RGBA_8888.value).toBe(
+      ColorTypeCanvasKit.RGBA_8888
+    );
+    //expect(CanvasKit.ColorType.RGB_888x.value).toBe(ColorType.RGB_888x);
+    expect(CanvasKit.ColorType.BGRA_8888.value).toBe(
+      ColorTypeCanvasKit.BGRA_8888
+    );
+    expect(CanvasKit.ColorType.RGBA_1010102.value).toBe(
+      ColorTypeCanvasKit.RGBA_1010102
+    );
+    //expect(CanvasKit.ColorType.BGRA_1010102.value).toBe(ColorType.BGRA_1010102);
+    expect(CanvasKit.ColorType.RGB_101010x.value).toBe(
+      ColorTypeCanvasKit.RGB_101010x
+    );
+    //expect(CanvasKit.ColorType.BGR_101010x.value).toBe(ColorType.BGR_101010x);
+    //expect(CanvasKit.ColorType.BGR_101010x_XR.value).toBe(ColorType.BGR_101010x_XR);
+    //expect(CanvasKit.ColorType.BGRA_10101010_XR.value).toBe(ColorType.BGRA_10101010_XR);
+    //expect(CanvasKit.ColorType.RGBA_10x6.value).toBe(ColorType.RGBA_10x6);
+    expect(CanvasKit.ColorType.Gray_8.value).toBe(ColorTypeCanvasKit.Gray_8);
+    //expect(CanvasKit.ColorType.RGBA_F16Norm.value).toBe(ColorType.RGBA_F16Norm);
+    expect(CanvasKit.ColorType.RGBA_F16.value).toBe(
+      ColorTypeCanvasKit.RGBA_F16
+    );
+    //expect(CanvasKit.ColorType.RGB_F16F16F16x.value).toBe(ColorType.RGB_F16F16F16x);
+    expect(CanvasKit.ColorType.RGBA_F32.value).toBe(
+      ColorTypeCanvasKit.RGBA_F32
+    );
+  });
 });

package/src/skia/web/Host.ts

@@ -1,4 +1,4 @@
-import type { CanvasKit, EmbindEnumEntity, EmbindEnum } from "canvaskit-wasm";
+import type { CanvasKit, EmbindEnumEntity } from "canvaskit-wasm";
 
 import type { SkJSIInstance } from "../types";
 
@@ -42,11 +42,28 @@ export abstract class HostObject<T, N extends string> extends BaseHostObject<
   }
 }
 
-export const getEnum = (e: EmbindEnum, v: number): EmbindEnumEntity =>
-  Object.values(e).find(({ value }) => value === v);
+export const getEnum = (
+  CanvasKit: CanvasKit,
+  name: keyof CanvasKit,
+  v: number
+): EmbindEnumEntity => {
+  const e = CanvasKit[name];
+  if (typeof e !== "function") {
+    throw new Error(`${name} is not an number`);
+  }
+  const result = Object.values(e).find(({ value }) => value === v);
+  if (!result) {
+    throw new Error(
+      `Enum ${name} does not have value ${v} on React Native Web`
+    );
+  }
+  return result;
+};
 
 export const optEnum = (
-  e: EmbindEnum,
-  value: number | undefined
-): EmbindEnumEntity | undefined =>
-  value === undefined ? undefined : getEnum(e, value);
+  CanvasKit: CanvasKit,
+  name: keyof CanvasKit,
+  v: number | undefined
+): EmbindEnumEntity | undefined => {
+  return v === undefined ? undefined : getEnum(CanvasKit, name, v);
+};

package/src/skia/web/JsiSkCanvas.ts

@@ -124,8 +124,8 @@ export class JsiSkCanvas
       JsiSkImage.fromValue(img),
       left,
       top,
-      getEnum(this.CanvasKit.FilterMode, fm),
-      getEnum(this.CanvasKit.MipmapMode, mm),
+      getEnum(this.CanvasKit, "FilterMode", fm),
+      getEnum(this.CanvasKit, "MipmapMode", mm),
       paint ? JsiSkPaint.fromValue(paint) : paint
     );
   }
@@ -141,7 +141,7 @@ export class JsiSkCanvas
       JsiSkImage.fromValue(img),
       Array.from(JsiSkRect.fromValue(this.CanvasKit, center)),
       JsiSkRect.fromValue(this.CanvasKit, dest),
-      getEnum(this.CanvasKit.FilterMode, filter),
+      getEnum(this.CanvasKit, "FilterMode", filter),
       paint ? JsiSkPaint.fromValue(paint) : paint
     );
   }
@@ -176,8 +176,8 @@ export class JsiSkCanvas
       JsiSkImage.fromValue(img),
       JsiSkRect.fromValue(this.CanvasKit, src),
       JsiSkRect.fromValue(this.CanvasKit, dest),
-      getEnum(this.CanvasKit.FilterMode, fm),
-      getEnum(this.CanvasKit.MipmapMode, mm),
+      getEnum(this.CanvasKit, "FilterMode", fm),
+      getEnum(this.CanvasKit, "MipmapMode", mm),
       paint ? JsiSkPaint.fromValue(paint) : paint
     );
   }
@@ -197,7 +197,7 @@ export class JsiSkCanvas
   drawVertices(verts: SkVertices, mode: BlendMode, paint: SkPaint) {
     this.ref.drawVertices(
       JsiSkVertices.fromValue(verts),
-      getEnum(this.CanvasKit.BlendMode, mode),
+      getEnum(this.CanvasKit, "BlendMode", mode),
       JsiSkPaint.fromValue(paint)
     );
   }
@@ -213,7 +213,7 @@ export class JsiSkCanvas
       cubics.map(({ x, y }) => [x, y]).flat(),
       colors,
       texs ? texs.flatMap((p) => Array.from(JsiSkPoint.fromValue(p))) : texs,
-      mode ? getEnum(this.CanvasKit.BlendMode, mode) : null,
+      mode ? getEnum(this.CanvasKit, "BlendMode", mode) : null,
       paint ? JsiSkPaint.fromValue(paint) : undefined
     );
   }
@@ -224,7 +224,7 @@ export class JsiSkCanvas
 
   drawPoints(mode: PointMode, points: SkPoint[], paint: SkPaint) {
     this.ref.drawPoints(
-      getEnum(this.CanvasKit.PointMode, mode),
+      getEnum(this.CanvasKit, "PointMode", mode),
       points.map(({ x, y }) => [x, y]).flat(),
       JsiSkPaint.fromValue(paint)
     );
@@ -357,7 +357,7 @@ export class JsiSkCanvas
   drawColor(color: SkColor, blendMode?: BlendMode) {
     this.ref.drawColor(
       color,
-      blendMode ? getEnum(this.CanvasKit.BlendMode, blendMode) : undefined
+      blendMode ? getEnum(this.CanvasKit, "BlendMode", blendMode) : undefined
     );
   }
 
@@ -368,7 +368,7 @@ export class JsiSkCanvas
   clipPath(path: SkPath, op: ClipOp, doAntiAlias: boolean) {
     this.ref.clipPath(
       JsiSkPath.fromValue(path),
-      getEnum(this.CanvasKit.PathOp, op),
+      getEnum(this.CanvasKit, "PathOp", op),
       doAntiAlias
     );
   }
@@ -376,7 +376,7 @@ export class JsiSkCanvas
   clipRect(rect: SkRect, op: ClipOp, doAntiAlias: boolean) {
     this.ref.clipRect(
       JsiSkRect.fromValue(this.CanvasKit, rect),
-      getEnum(this.CanvasKit.PathOp, op),
+      getEnum(this.CanvasKit, "PathOp", op),
       doAntiAlias
     );
   }
@@ -384,7 +384,7 @@ export class JsiSkCanvas
   clipRRect(rrect: InputRRect, op: ClipOp, doAntiAlias: boolean) {
     this.ref.clipRRect(
       JsiSkRRect.fromValue(this.CanvasKit, rrect),
-      getEnum(this.CanvasKit.PathOp, op),
+      getEnum(this.CanvasKit, "PathOp", op),
       doAntiAlias
     );
   }
@@ -426,9 +426,9 @@ export class JsiSkCanvas
       ckSampling = sampling;
     } else if (sampling) {
       ckSampling = {
-        filter: getEnum(this.CanvasKit.FilterMode, sampling.filter),
+        filter: getEnum(this.CanvasKit, "FilterMode", sampling.filter),
         mipmap: sampling.mipmap
-          ? getEnum(this.CanvasKit.MipmapMode, sampling.mipmap)
+          ? getEnum(this.CanvasKit, "MipmapMode", sampling.mipmap)
           : this.CanvasKit.MipmapMode.None,
       };
     }
@@ -438,7 +438,7 @@ export class JsiSkCanvas
       dst,
       JsiSkPaint.fromValue(paint),
       blendMode
-        ? getEnum(this.CanvasKit.BlendMode, blendMode)
+        ? getEnum(this.CanvasKit, "BlendMode", blendMode)
         : this.CanvasKit.BlendMode.DstOver,
       cls,
       ckSampling
@@ -450,8 +450,8 @@ export class JsiSkCanvas
       width: imageInfo.width,
       height: imageInfo.height,
       colorSpace: this.CanvasKit.ColorSpace.SRGB,
-      alphaType: getEnum(this.CanvasKit.AlphaType, imageInfo.alphaType),
-      colorType: getEnum(this.CanvasKit.ColorType, imageInfo.colorType),
+      alphaType: getEnum(this.CanvasKit, "AlphaType", imageInfo.alphaType),
+      colorType: getEnum(this.CanvasKit, "ColorType", imageInfo.colorType),
     };
     return this.ref.readPixels(srcX, srcY, pxInfo);
   }

package/src/skia/web/JsiSkColorFilterFactory.ts

@@ -31,7 +31,7 @@ export class JsiSkColorFilterFactory
       this.CanvasKit,
       this.CanvasKit.ColorFilter.MakeBlend(
         color,
-        getEnum(this.CanvasKit.BlendMode, mode)
+        getEnum(this.CanvasKit, "BlendMode", mode)
       )
     );
   }

package/src/skia/web/JsiSkFont.ts

@@ -100,7 +100,7 @@ export class JsiSkFont extends HostObject<Font, "Font"> implements SkFont {
   }
 
   setEdging(edging: FontEdging) {
-    this.ref.setEdging(getEnum(this.CanvasKit.FontEdging, edging));
+    this.ref.setEdging(getEnum(this.CanvasKit, "FontEdging", edging));
   }
 
   setEmbeddedBitmaps(embeddedBitmaps: boolean) {
@@ -108,7 +108,7 @@ export class JsiSkFont extends HostObject<Font, "Font"> implements SkFont {
   }
 
   setHinting(hinting: FontHinting) {
-    this.ref.setHinting(getEnum(this.CanvasKit.FontHinting, hinting));
+    this.ref.setHinting(getEnum(this.CanvasKit, "FontHinting", hinting));
   }
 
   setLinearMetrics(linearMetrics: boolean) {

package/src/skia/web/JsiSkImage.ts

@@ -77,10 +77,10 @@ export class JsiSkImage extends HostObject<Image, "Image"> implements SkImage {
     return new JsiSkShader(
       this.CanvasKit,
       this.ref.makeShaderOptions(
-        getEnum(this.CanvasKit.TileMode, tx),
-        getEnum(this.CanvasKit.TileMode, ty),
-        getEnum(this.CanvasKit.FilterMode, fm),
-        getEnum(this.CanvasKit.MipmapMode, mm),
+        getEnum(this.CanvasKit, "TileMode", tx),
+        getEnum(this.CanvasKit, "TileMode", ty),
+        getEnum(this.CanvasKit, "FilterMode", fm),
+        getEnum(this.CanvasKit, "MipmapMode", mm),
         localMatrix ? JsiSkMatrix.fromValue(localMatrix) : undefined
       )
     );
@@ -96,8 +96,8 @@ export class JsiSkImage extends HostObject<Image, "Image"> implements SkImage {
     return new JsiSkShader(
       this.CanvasKit,
       this.ref.makeShaderCubic(
-        getEnum(this.CanvasKit.TileMode, tx),
-        getEnum(this.CanvasKit.TileMode, ty),
+        getEnum(this.CanvasKit, "TileMode", tx),
+        getEnum(this.CanvasKit, "TileMode", ty),
         B,
         C,
         localMatrix ? JsiSkMatrix.fromValue(localMatrix) : undefined
@@ -109,11 +109,13 @@ export class JsiSkImage extends HostObject<Image, "Image"> implements SkImage {
     let result: Uint8Array | null;
     if (fmt && quality) {
       result = this.ref.encodeToBytes(
-        getEnum(this.CanvasKit.ImageFormat, fmt),
+        getEnum(this.CanvasKit, "ImageFormat", fmt),
         quality
       );
     } else if (fmt) {
-      result = this.ref.encodeToBytes(getEnum(this.CanvasKit.ImageFormat, fmt));
+      result = this.ref.encodeToBytes(
+        getEnum(this.CanvasKit, "ImageFormat", fmt)
+      );
     } else {
       result = this.ref.encodeToBytes();
     }
@@ -137,11 +139,13 @@ export class JsiSkImage extends HostObject<Image, "Image"> implements SkImage {
       width: imageInfo?.width ?? info.width,
       height: imageInfo?.height ?? info.height,
       alphaType: getEnum(
-        this.CanvasKit.AlphaType,
+        this.CanvasKit,
+        "AlphaType",
         (imageInfo ?? info).alphaType
       ),
       colorType: getEnum(
-        this.CanvasKit.ColorType,
+        this.CanvasKit,
+        "ColorType",
         (imageInfo ?? info).colorType
       ),
     };

package/src/skia/web/JsiSkImageFactory.ts

@@ -83,9 +83,9 @@ export class JsiSkImageFactory extends Host implements ImageFactory {
     // see toSkImageInfo() from canvaskit
     const image = this.CanvasKit.MakeImage(
       {
-        alphaType: getEnum(this.CanvasKit.AlphaType, info.alphaType),
+        alphaType: getEnum(this.CanvasKit, "AlphaType", info.alphaType),
         colorSpace: this.CanvasKit.ColorSpace.SRGB,
-        colorType: getEnum(this.CanvasKit.ColorType, info.colorType),
+        colorType: getEnum(this.CanvasKit, "ColorType", info.colorType),
         height: info.height,
         width: info.width,
       },

package/src/skia/web/JsiSkImageFilterFactory.ts

@@ -42,8 +42,8 @@ export class JsiSkImageFilterFactory
     const inputFilter =
       input === null ? null : JsiSkImageFilter.fromValue<ImageFilter>(input);
     const filter = this.CanvasKit.ImageFilter.MakeDisplacementMap(
-      getEnum(this.CanvasKit.ColorChannel, channelX),
-      getEnum(this.CanvasKit.ColorChannel, channelY),
+      getEnum(this.CanvasKit, "ColorChannel", channelX),
+      getEnum(this.CanvasKit, "ColorChannel", channelY),
       scale,
       JsiSkImageFilter.fromValue(in1),
       inputFilter
@@ -69,7 +69,7 @@ export class JsiSkImageFilterFactory
       this.CanvasKit.ImageFilter.MakeBlur(
         sigmaX,
         sigmaY,
-        getEnum(this.CanvasKit.TileMode, mode),
+        getEnum(this.CanvasKit, "TileMode", mode),
         input === null ? null : JsiSkImageFilter.fromValue(input)
       )
     );
@@ -189,7 +189,7 @@ export class JsiSkImageFilterFactory
       throwNotImplementedOnRNWeb<SkImageFilter>();
     }
     const filter = this.CanvasKit.ImageFilter.MakeBlend(
-      getEnum(this.CanvasKit.BlendMode, mode),
+      getEnum(this.CanvasKit, "BlendMode", mode),
       JsiSkImageFilter.fromValue(background),
       inputFilter
     );

package/src/skia/web/JsiSkMaskFilterFactory.ts

@@ -15,7 +15,7 @@ export class JsiSkMaskFilterFactory extends Host implements MaskFilterFactory {
     return new JsiSkMaskFilter(
       this.CanvasKit,
       this.CanvasKit.MaskFilter.MakeBlur(
-        getEnum(this.CanvasKit.BlurStyle, style),
+        getEnum(this.CanvasKit, "BlurStyle", style),
         sigma,
         respectCTM
       )

package/src/skia/web/JsiSkPaint.ts

@@ -79,7 +79,7 @@ export class JsiSkPaint extends HostObject<Paint, "Paint"> implements SkPaint {
   }
 
   setBlendMode(blendMode: BlendMode) {
-    this.ref.setBlendMode(getEnum(this.CanvasKit.BlendMode, blendMode));
+    this.ref.setBlendMode(getEnum(this.CanvasKit, "BlendMode", blendMode));
   }
 
   setColor(color: SkColor) {
@@ -107,11 +107,11 @@ export class JsiSkPaint extends HostObject<Paint, "Paint"> implements SkPaint {
   }
 
   setStrokeCap(cap: StrokeCap) {
-    this.ref.setStrokeCap(getEnum(this.CanvasKit.StrokeCap, cap));
+    this.ref.setStrokeCap(getEnum(this.CanvasKit, "StrokeCap", cap));
   }
 
   setStrokeJoin(join: StrokeJoin) {
-    this.ref.setStrokeJoin(getEnum(this.CanvasKit.StrokeJoin, join));
+    this.ref.setStrokeJoin(getEnum(this.CanvasKit, "StrokeJoin", join));
   }
 
   setStrokeMiter(limit: number) {

package/src/skia/web/JsiSkPath.ts

@@ -150,7 +150,7 @@ export class JsiSkPath extends HostObject<Path, "Path"> implements SkPath {
   }
 
   setFillType(fill: FillType) {
-    this.ref.setFillType(getEnum(this.CanvasKit.FillType, fill));
+    this.ref.setFillType(getEnum(this.CanvasKit, "FillType", fill));
     return this;
   }
 
@@ -168,8 +168,8 @@ export class JsiSkPath extends HostObject<Path, "Path"> implements SkPath {
             // eslint-disable-next-line camelcase
             miter_limit: opts.width,
             precision: opts.width,
-            join: optEnum(this.CanvasKit.StrokeJoin, opts.join),
-            cap: optEnum(this.CanvasKit.StrokeCap, opts.cap),
+            join: optEnum(this.CanvasKit, "StrokeJoin", opts.join),
+            cap: optEnum(this.CanvasKit, "StrokeCap", opts.cap),
           }
     );
     return result === null ? result : this;
@@ -318,7 +318,7 @@ export class JsiSkPath extends HostObject<Path, "Path"> implements SkPath {
   op(path: SkPath, op: PathOp) {
     return this.ref.op(
       JsiSkPath.fromValue(path),
-      getEnum(this.CanvasKit.PathOp, op)
+      getEnum(this.CanvasKit, "PathOp", op)
     );
   }
 

package/src/skia/web/JsiSkPathEffectFactory.ts

@@ -69,7 +69,7 @@ export class JsiSkPathEffectFactory extends Host implements PathEffectFactory {
       JsiSkPath.fromValue(path),
       advance,
       phase,
-      getEnum(this.CanvasKit.Path1DEffect, style)
+      getEnum(this.CanvasKit, "Path1DEffect", style)
     );
     if (pe === null) {
       return null;

package/src/skia/web/JsiSkPathFactory.ts

@@ -27,7 +27,7 @@ export class JsiSkPathFactory extends Host implements PathFactory {
     const path = this.CanvasKit.Path.MakeFromOp(
       JsiSkPath.fromValue(one),
       JsiSkPath.fromValue(two),
-      getEnum(this.CanvasKit.PathOp, op)
+      getEnum(this.CanvasKit, "PathOp", op)
     );
     if (path === null) {
       return null;

package/src/skia/web/JsiSkPicture.ts

@@ -36,9 +36,9 @@ export class JsiSkPicture
     return new JsiSkShader(
       this.CanvasKit,
       this.ref.makeShader(
-        getEnum(this.CanvasKit.TileMode, tmx),
-        getEnum(this.CanvasKit.TileMode, tmy),
-        getEnum(this.CanvasKit.FilterMode, 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

@@ -36,7 +36,7 @@ export class JsiSkShaderFactory extends Host implements ShaderFactory {
         JsiSkPoint.fromValue(end),
         colors,
         pos,
-        getEnum(this.CanvasKit.TileMode, 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,
-        getEnum(this.CanvasKit.TileMode, 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,
-        getEnum(this.CanvasKit.TileMode, 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,
-        getEnum(this.CanvasKit.TileMode, 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(
-        getEnum(this.CanvasKit.BlendMode, mode),
+        getEnum(this.CanvasKit, "BlendMode", mode),
         JsiSkShader.fromValue(one),
         JsiSkShader.fromValue(two)
       )

package/src/skia/web/JsiSkVerticesFactory.ts

@@ -31,7 +31,7 @@ export const MakeVertices = (
   new JsiSkVertices(
     CanvasKit,
     CanvasKit.MakeVertices(
-      getEnum(CanvasKit.VertexMode, 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)),