@shopify/react-native-skia 1.12.0 → 1.12.2

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

@@ -1,6 +1,4 @@
-export class NotImplementedOnRNWeb extends Error {
-    constructor(msg: any);
-}
+export function throwNotImplementedOnRNWeb(): jest.Mock<any, any, any>;
 export class Host {
     constructor(CanvasKit: any);
     CanvasKit: any;
@@ -13,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/lib/module/skia/web/JsiSkFont.d.ts

@@ -1,6 +1,6 @@
 export class JsiSkFont extends HostObject {
     constructor(CanvasKit: any, ref: any);
-    measureText(_text: any, _paint: any): void;
+    measureText(_text: any, _paint: any): jest.Mock<any, any, any>;
     getTextWidth(text: any, paint: any): any;
     getMetrics(): {
         ascent: any;

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

@@ -3,6 +3,6 @@ export class JsiSkFontMgr extends HostObject {
     dispose(): void;
     countFamilies(): any;
     getFamilyName(index: any): any;
-    matchFamilyStyle(_familyName: any, _fontStyle: any): void;
+    matchFamilyStyle(_familyName: any, _fontStyle: any): jest.Mock<any, any, any>;
 }
 import { HostObject } from "./Host";

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

@@ -2,7 +2,7 @@ export class JsiSkImageFactory extends Host {
     MakeImageFromViewTag(viewTag: any): Promise<null>;
     MakeImageFromNativeBuffer(buffer: any, surface: any, image: any): JsiSkImage;
     MakeImageFromEncoded(encoded: any): JsiSkImage | null;
-    MakeImageFromNativeTextureUnstable(): void;
+    MakeImageFromNativeTextureUnstable(): jest.Mock<any, any, any>;
     MakeImage(info: any, data: any, bytesPerRow: any): JsiSkImage | null;
 }
 import { Host } from "./Host";

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

@@ -10,7 +10,7 @@ export class JsiSkImageFilterFactory extends Host {
     MakeErode(rx: any, ry: any, input: any, cropRect: any): JsiSkImageFilter;
     MakeDilate(rx: any, ry: any, input: any, cropRect: any): JsiSkImageFilter;
     MakeBlend(mode: any, background: any, foreground: any, cropRect: any): JsiSkImageFilter;
-    MakeRuntimeShader(_builder: any, _childShaderName: any, _input: any): void;
+    MakeRuntimeShader(_builder: any, _childShaderName: any, _input: any): jest.Mock<any, any, any>;
 }
 import { Host } from "./Host";
 import { JsiSkImageFilter } from "./JsiSkImageFilter";

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

@@ -2,8 +2,8 @@ export class JsiSkPathEffectFactory extends Host {
     MakeCorner(radius: any): JsiSkPathEffect | null;
     MakeDash(intervals: any, phase: any): JsiSkPathEffect;
     MakeDiscrete(segLength: any, dev: any, seedAssist: any): JsiSkPathEffect;
-    MakeCompose(_outer: any, _inner: any): void;
-    MakeSum(_outer: any, _inner: any): void;
+    MakeCompose(_outer: any, _inner: any): jest.Mock<any, any, any>;
+    MakeSum(_outer: any, _inner: any): jest.Mock<any, any, any>;
     MakeLine2D(width: any, matrix: any): JsiSkPathEffect | null;
     MakePath1D(path: any, advance: any, phase: any, style: any): JsiSkPathEffect | null;
     MakePath2D(matrix: any, path: any): JsiSkPathEffect | null;

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

@@ -3,7 +3,7 @@ export class JsiSkPathFactory extends Host {
     MakeFromSVGString(str: any): JsiSkPath | null;
     MakeFromOp(one: any, two: any, op: any): JsiSkPath | null;
     MakeFromCmds(cmds: any): JsiSkPath | null;
-    MakeFromText(_text: any, _x: any, _y: any, _font: any): void;
+    MakeFromText(_text: any, _x: any, _y: any, _font: any): jest.Mock<any, any, any>;
 }
 import { Host } from "./Host";
 import { JsiSkPath } from "./JsiSkPath";

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

@@ -1,6 +1,6 @@
 export class JsiSkTypefaceFontProvider extends HostObject {
     constructor(CanvasKit: any, ref: any);
-    matchFamilyStyle(_name: any, _style: any): void;
+    matchFamilyStyle(_name: any, _style: any): jest.Mock<any, any, any>;
     countFamilies(): any;
     getFamilyName(index: any): any;
     registerFont(typeface: any, familyName: any): void;

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

@@ -1,6 +1,6 @@
 export function JsiSkApi(CanvasKit: any): {
     Point: (x: any, y: any) => JsiSkPoint;
-    RuntimeShaderBuilder: (_: any) => never;
+    RuntimeShaderBuilder: (_: any) => jest.Mock<any, any, any>;
     RRectXY: (rect: any, rx: any, ry: any) => JsiSkRRect;
     RSXform: (scos: any, ssin: any, tx: any, ty: any) => JsiSkRSXform;
     RSXformFromRadians: (scale: any, r: any, tx: any, ty: any, px: any, py: any) => JsiSkRSXform;
@@ -32,8 +32,8 @@ export function JsiSkApi(CanvasKit: any): {
     ParagraphBuilder: JsiSkParagraphBuilderFactory;
     NativeBuffer: JsiSkNativeBufferFactory;
     Video: (url?: any) => Promise<any>;
-    Context: (_surface: any, _width: any, _height: any) => never;
-    Recorder: () => never;
+    Context: (_surface: any, _width: any, _height: any) => jest.Mock<any, any, any>;
+    Recorder: () => jest.Mock<any, any, any>;
 };
 import { JsiSkPoint } from "./JsiSkPoint";
 import { JsiSkRRect } from "./JsiSkRRect";

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

@@ -4,7 +4,7 @@ export class JsiVideo {
     ImageFactory: any;
     videoElement: any;
     duration(): number;
-    framerate(): void;
+    framerate(): jest.Mock<any, any, any>;
     setSurface(surface: any): void;
     webglBuffer: CanvasKitWebGLBufferImpl | undefined;
     nextImage(): any;

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

@@ -1,8 +1,6 @@
-import type { CanvasKit, EmbindEnumEntity, EmbindEnum } from "canvaskit-wasm";
+import type { CanvasKit, EmbindEnumEntity } from "canvaskit-wasm";
 import type { SkJSIInstance } from "../types";
-export declare class NotImplementedOnRNWeb extends Error {
-    constructor(msg?: string);
-}
+export declare const throwNotImplementedOnRNWeb: <T>() => T;
 export declare abstract class Host {
     readonly CanvasKit: CanvasKit;
     constructor(CanvasKit: CanvasKit);
@@ -16,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/lib/typescript/src/skia/web/JsiSkPathFactory.d.ts

@@ -9,5 +9,5 @@ export declare class JsiSkPathFactory extends Host implements PathFactory {
     MakeFromSVGString(str: string): JsiSkPath | null;
     MakeFromOp(one: SkPath, two: SkPath, op: PathOp): JsiSkPath | null;
     MakeFromCmds(cmds: PathCommand[]): JsiSkPath | null;
-    MakeFromText(_text: string, _x: number, _y: number, _font: SkFont): SkPath | null;
+    MakeFromText(_text: string, _x: number, _y: number, _font: SkFont): SkPath;
 }

package/package.json

@@ -8,7 +8,7 @@
     "setup-skia-web": "scripts/setup-canvaskit.js"
   },
   "title": "React Native Skia",
-  "version": "1.12.0",
+  "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/external/reanimated/useAnimatedImageValue.ts

@@ -40,10 +40,11 @@ export const useAnimatedImageValue = (
 
     // Update the current frame
     animatedImage.decodeNextFrame();
-    if (currentFrame.value) {
-      currentFrame.value.dispose();
-    }
+    const oldFrame = currentFrame.value;
     currentFrame.value = animatedImage.getCurrentFrame();
+    if (oldFrame) {
+      oldFrame.dispose();
+    }
 
     // Update the last timestamp
     lastTimestamp.value = timestamp;

package/src/mock/index.ts

@@ -21,8 +21,7 @@ export const Mock = (CanvasKit: CanvasKit) => {
     ...require("../animation"),
     ...require("../dom/types"),
     ...require("../dom/nodes"),
-    // We could use the real Canvas if we mock the SkiaView component for node
-    Canvas: Noop,
+    Canvas: require("react-native").View,
     // Skia Animations
     useValue: NoopValue,
     useComputedValue: NoopValue,

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,12 +1,13 @@
-import type { CanvasKit, EmbindEnumEntity, EmbindEnum } from "canvaskit-wasm";
+import type { CanvasKit, EmbindEnumEntity } from "canvaskit-wasm";
 
 import type { SkJSIInstance } from "../types";
 
-export class NotImplementedOnRNWeb extends Error {
-  constructor(msg?: string) {
-    super(msg ?? "Not implemented on React Native Web");
+export const throwNotImplementedOnRNWeb = <T>(): T => {
+  if (typeof jest !== "undefined") {
+    return jest.fn() as unknown as T;
   }
-}
+  throw new Error("Not implemented on React Native Web");
+};
 
 export abstract class Host {
   readonly CanvasKit: CanvasKit;
@@ -41,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

@@ -10,7 +10,7 @@ import type {
   SkTypeface,
 } from "../types";
 
-import { HostObject, NotImplementedOnRNWeb, getEnum } from "./Host";
+import { HostObject, getEnum, throwNotImplementedOnRNWeb } from "./Host";
 import { JsiSkPaint } from "./JsiSkPaint";
 import { JsiSkPoint } from "./JsiSkPoint";
 import { JsiSkRect } from "./JsiSkRect";
@@ -21,8 +21,8 @@ export class JsiSkFont extends HostObject<Font, "Font"> implements SkFont {
     super(CanvasKit, ref, "Font");
   }
 
-  measureText(_text: string, _paint?: SkPaint | undefined): SkRect {
-    throw new NotImplementedOnRNWeb();
+  measureText(_text: string, _paint?: SkPaint | undefined) {
+    return throwNotImplementedOnRNWeb<SkRect>();
   }
 
   dispose = () => {
@@ -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/JsiSkFontMgr.ts

@@ -2,7 +2,7 @@ import type { CanvasKit, FontMgr } from "canvaskit-wasm";
 
 import type { FontStyle, SkFontMgr, SkTypeface } from "../types";
 
-import { HostObject, NotImplementedOnRNWeb } from "./Host";
+import { HostObject, throwNotImplementedOnRNWeb } from "./Host";
 
 export class JsiSkFontMgr
   extends HostObject<FontMgr, "FontMgr">
@@ -20,7 +20,7 @@ export class JsiSkFontMgr
   getFamilyName(index: number) {
     return this.ref.getFamilyName(index);
   }
-  matchFamilyStyle(_familyName: string, _fontStyle: FontStyle): SkTypeface {
-    throw new NotImplementedOnRNWeb();
+  matchFamilyStyle(_familyName: string, _fontStyle: FontStyle) {
+    return throwNotImplementedOnRNWeb<SkTypeface>();
   }
 }

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

@@ -9,7 +9,7 @@ import type {
   ImageFactory,
 } from "../types";
 
-import { Host, getEnum } from "./Host";
+import { Host, getEnum, throwNotImplementedOnRNWeb } from "./Host";
 import { JsiSkImage } from "./JsiSkImage";
 import { JsiSkData } from "./JsiSkData";
 import type { JsiSkSurface } from "./JsiSkSurface";
@@ -75,17 +75,17 @@ export class JsiSkImageFactory extends Host implements ImageFactory {
     return new JsiSkImage(this.CanvasKit, image);
   }
 
-  MakeImageFromNativeTextureUnstable(): SkImage {
-    throw new Error("MakeImageFromNativeTexture is not implemented on web");
+  MakeImageFromNativeTextureUnstable() {
+    return throwNotImplementedOnRNWeb<SkImage>();
   }
 
   MakeImage(info: ImageInfo, data: SkData, bytesPerRow: number) {
     // 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,
       },