@shopify/react-native-skia 1.12.0 → 1.12.2

package/src/skia/web/JsiSkImageFilterFactory.ts

@@ -13,7 +13,7 @@ import type {
   TileMode,
 } from "../types";
 
-import { Host, NotImplementedOnRNWeb, getEnum } from "./Host";
+import { Host, throwNotImplementedOnRNWeb, getEnum } from "./Host";
 import { JsiSkImageFilter } from "./JsiSkImageFilter";
 import { JsiSkColorFilter } from "./JsiSkColorFilter";
 
@@ -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)
       )
     );
@@ -107,9 +107,7 @@ export class JsiSkImageFilterFactory
     const inputFilter =
       input === null ? null : JsiSkImageFilter.fromValue<ImageFilter>(input);
     if (cropRect) {
-      throw new NotImplementedOnRNWeb(
-        "The cropRect argument is not yet supported on React Native Web."
-      );
+      throwNotImplementedOnRNWeb<SkImageFilter>();
     }
     const filter = this.CanvasKit.ImageFilter.MakeDropShadow(
       dx,
@@ -134,9 +132,7 @@ export class JsiSkImageFilterFactory
     const inputFilter =
       input === null ? null : JsiSkImageFilter.fromValue<ImageFilter>(input);
     if (cropRect) {
-      throw new NotImplementedOnRNWeb(
-        "The cropRect argument is not yet supported on React Native Web."
-      );
+      throwNotImplementedOnRNWeb<SkImageFilter>();
     }
     const filter = this.CanvasKit.ImageFilter.MakeDropShadowOnly(
       dx,
@@ -158,9 +154,7 @@ export class JsiSkImageFilterFactory
     const inputFilter =
       input === null ? null : JsiSkImageFilter.fromValue<ImageFilter>(input);
     if (cropRect) {
-      throw new NotImplementedOnRNWeb(
-        "The cropRect argument is not yet supported on React Native Web."
-      );
+      throwNotImplementedOnRNWeb<SkImageFilter>();
     }
     const filter = this.CanvasKit.ImageFilter.MakeErode(rx, ry, inputFilter);
     return new JsiSkImageFilter(this.CanvasKit, filter);
@@ -175,9 +169,7 @@ export class JsiSkImageFilterFactory
     const inputFilter =
       input === null ? null : JsiSkImageFilter.fromValue<ImageFilter>(input);
     if (cropRect) {
-      throw new NotImplementedOnRNWeb(
-        "The cropRect argument is not yet supported on React Native Web."
-      );
+      throwNotImplementedOnRNWeb<SkImageFilter>();
     }
     const filter = this.CanvasKit.ImageFilter.MakeDilate(rx, ry, inputFilter);
     return new JsiSkImageFilter(this.CanvasKit, filter);
@@ -194,12 +186,10 @@ export class JsiSkImageFilterFactory
         ? null
         : JsiSkImageFilter.fromValue<ImageFilter>(foreground);
     if (cropRect) {
-      throw new NotImplementedOnRNWeb(
-        "The cropRect argument is not yet supported on React Native Web."
-      );
+      throwNotImplementedOnRNWeb<SkImageFilter>();
     }
     const filter = this.CanvasKit.ImageFilter.MakeBlend(
-      getEnum(this.CanvasKit.BlendMode, mode),
+      getEnum(this.CanvasKit, "BlendMode", mode),
       JsiSkImageFilter.fromValue(background),
       inputFilter
     );
@@ -210,7 +200,7 @@ export class JsiSkImageFilterFactory
     _builder: SkRuntimeShaderBuilder,
     _childShaderName: string | null,
     _input: SkImageFilter | null
-  ): SkImageFilter {
-    throw new NotImplementedOnRNWeb();
+  ) {
+    return throwNotImplementedOnRNWeb<SkImageFilter>();
   }
 }

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

@@ -8,7 +8,7 @@ import type {
   SkPathEffect,
 } from "../types";
 
-import { getEnum, Host, NotImplementedOnRNWeb } from "./Host";
+import { getEnum, Host, throwNotImplementedOnRNWeb } from "./Host";
 import { JsiSkMatrix } from "./JsiSkMatrix";
 import { JsiSkPath } from "./JsiSkPath";
 import { JsiSkPathEffect } from "./JsiSkPathEffect";
@@ -40,12 +40,12 @@ export class JsiSkPathEffectFactory extends Host implements PathEffectFactory {
     return new JsiSkPathEffect(this.CanvasKit, pe);
   }
 
-  MakeCompose(_outer: SkPathEffect, _inner: SkPathEffect): SkPathEffect {
-    throw new NotImplementedOnRNWeb();
+  MakeCompose(_outer: SkPathEffect, _inner: SkPathEffect) {
+    return throwNotImplementedOnRNWeb<SkPathEffect>();
   }
 
-  MakeSum(_outer: SkPathEffect, _inner: SkPathEffect): SkPathEffect {
-    throw new NotImplementedOnRNWeb();
+  MakeSum(_outer: SkPathEffect, _inner: SkPathEffect) {
+    return throwNotImplementedOnRNWeb<SkPathEffect>();
   }
 
   MakeLine2D(width: number, matrix: SkMatrix) {
@@ -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

@@ -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, getEnum, NotImplementedOnRNWeb } from "./Host";
+import { Host, getEnum, throwNotImplementedOnRNWeb } 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),
-      getEnum(this.CanvasKit.PathOp, op)
+      getEnum(this.CanvasKit, "PathOp", op)
     );
     if (path === null) {
       return null;
@@ -43,12 +43,7 @@ export class JsiSkPathFactory extends Host implements PathFactory {
     return new JsiSkPath(this.CanvasKit, path);
   }
 
-  MakeFromText(
-    _text: string,
-    _x: number,
-    _y: number,
-    _font: SkFont
-  ): SkPath | null {
-    throw new NotImplementedOnRNWeb();
+  MakeFromText(_text: string, _x: number, _y: number, _font: SkFont) {
+    return throwNotImplementedOnRNWeb<SkPath>();
   }
 }

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/JsiSkTypefaceFontProvider.ts

@@ -3,7 +3,7 @@ import type { CanvasKit, TypefaceFontProvider } from "canvaskit-wasm";
 import type { SkTypefaceFontProvider } from "../types/Paragraph/TypefaceFontProvider";
 import type { FontStyle, SkTypeface } from "../types";
 
-import { HostObject, NotImplementedOnRNWeb } from "./Host";
+import { HostObject, throwNotImplementedOnRNWeb } from "./Host";
 
 export class JsiSkTypefaceFontProvider
   extends HostObject<TypefaceFontProvider, "FontMgr">
@@ -15,8 +15,8 @@ export class JsiSkTypefaceFontProvider
     super(CanvasKit, ref, "FontMgr");
   }
 
-  matchFamilyStyle(_name: string, _style: FontStyle): SkTypeface {
-    throw new NotImplementedOnRNWeb();
+  matchFamilyStyle(_name: string, _style: FontStyle) {
+    return throwNotImplementedOnRNWeb<SkTypeface>();
   }
   countFamilies() {
     return this.ref.countFamilies();

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)),

package/src/skia/web/JsiSkia.ts

@@ -1,8 +1,10 @@
 import type { CanvasKit } from "canvaskit-wasm";
 
 import type {
+  JsiRecorder,
   SkContourMeasureIter,
   Skia,
+  SkiaContext,
   SkPath,
   SkRect,
   SkRuntimeEffect,
@@ -43,12 +45,13 @@ import { JsiSkAnimatedImageFactory } from "./JsiSkAnimatedImageFactory";
 import { JsiSkParagraphBuilderFactory } from "./JsiSkParagraphBuilderFactory";
 import { JsiSkNativeBufferFactory } from "./JsiSkNativeBufferFactory";
 import { createVideo } from "./JsiVideo";
+import { throwNotImplementedOnRNWeb } from "./Host";
 
 export const JsiSkApi = (CanvasKit: CanvasKit): Skia => ({
   Point: (x: number, y: number) =>
     new JsiSkPoint(CanvasKit, Float32Array.of(x, y)),
-  RuntimeShaderBuilder: (_: SkRuntimeEffect): SkRuntimeShaderBuilder => {
-    throw new Error("Not implemented on React Native Web");
+  RuntimeShaderBuilder: (_: SkRuntimeEffect) => {
+    return throwNotImplementedOnRNWeb<SkRuntimeShaderBuilder>();
   },
   RRectXY: (rect: SkRect, rx: number, ry: number) =>
     new JsiSkRRect(CanvasKit, rect, rx, ry),
@@ -130,9 +133,9 @@ export const JsiSkApi = (CanvasKit: CanvasKit): Skia => ({
   NativeBuffer: new JsiSkNativeBufferFactory(CanvasKit),
   Video: createVideo.bind(null, CanvasKit),
   Context: (_surface: bigint, _width: number, _height: number) => {
-    throw new Error("Not implemented on React Native Web");
+    return throwNotImplementedOnRNWeb<SkiaContext>();
   },
   Recorder: () => {
-    throw new Error("Not implemented on React Native Web");
+    return throwNotImplementedOnRNWeb<JsiRecorder>();
   },
 });

package/src/skia/web/JsiVideo.ts

@@ -4,6 +4,7 @@ import type { CanvasKitWebGLBuffer, Video, ImageFactory } from "../types";
 
 import { CanvasKitWebGLBufferImpl } from "./CanvasKitWebGLBufferImpl";
 import { JsiSkImageFactory } from "./JsiSkImageFactory";
+import { throwNotImplementedOnRNWeb } from "./Host";
 
 export const createVideo = async (
   CanvasKit: CanvasKit,
@@ -42,7 +43,7 @@ export class JsiVideo implements Video {
   }
 
   framerate(): number {
-    throw new Error("Video.frame is not available on React Native Web");
+    return throwNotImplementedOnRNWeb<number>();
   }
 
   setSurface(surface: Surface) {