@shopify/react-native-skia 0.1.209 → 0.1.211

package/src/skia/types/AnimatedImage/AnimatedImageFactory.ts

@@ -0,0 +1,15 @@
+import type { SkData } from "../Data";
+
+import type { SkAnimatedImage } from "./AnimatedImage";
+
+export interface AnimatedImageFactory {
+  /**
+   * Decodes the given bytes into an animated image. Returns null if the bytes were invalid.
+   * The passed in bytes will be copied into the WASM heap, so the caller can dispose of them.
+   *
+   * The returned AnimatedImage will be "pointing to" the first frame, i.e. currentFrameDuration
+   * and makeImageAtCurrentFrame will be referring to the first frame.
+   * @param encoded
+   */
+  MakeAnimatedImageFromEncoded: (encoded: SkData) => SkAnimatedImage | null;
+}

package/src/skia/types/AnimatedImage/index.ts

@@ -0,0 +1,2 @@
+export * from "./AnimatedImage";
+export * from "./AnimatedImageFactory";

package/src/skia/types/Font/Font.ts

@@ -12,10 +12,20 @@ export interface FontMetrics {
 }
 
 export interface SkFont extends SkJSIInstance<"Font"> {
+  /**
+   * Returns the advance width of text.
+   * The advance is the normal distance to move before drawing additional text.
+   * Returns the bounding box of text
+   * @param text
+   * @param paint
+   */
+  measureText(text: string, paint?: SkPaint): SkRect;
+
   /**
    * Retrieves the total width of the provided text
    * @param text
    * @param paint
+   * @deprecated Use measureText or getGlyphWidths instead
    */
   getTextWidth(text: string, paint?: SkPaint): number;
 

package/src/skia/types/Skia.ts

@@ -28,6 +28,8 @@ import type { SkContourMeasureIter } from "./ContourMeasure";
 import type { PictureFactory, SkPictureRecorder } from "./Picture";
 import type { Color, SkColor } from "./Color";
 import type { TypefaceFontProviderFactory } from "./Paragraph/TypefaceFontProviderFactory";
+import type { AnimatedImageFactory } from "./AnimatedImage";
+
 /**
  * Declares the interface for the native Skia API
  */
@@ -78,6 +80,7 @@ export interface Skia {
   ): SkVertices;
   Data: DataFactory;
   Image: ImageFactory;
+  AnimatedImage: AnimatedImageFactory;
   SVG: SVGFactory;
   TextBlob: TextBlobFactory;
   Surface: SurfaceFactory;

package/src/skia/types/index.ts

@@ -6,6 +6,7 @@ export * from "./Vertices";
 export * from "./RuntimeEffect";
 export * from "./Shader";
 export * from "./Image";
+export * from "./AnimatedImage";
 export * from "./ColorFilter";
 export * from "./ImageFilter";
 export * from "./Font";

package/src/skia/web/JsiSkAnimatedImage.ts

@@ -0,0 +1,35 @@
+import type { AnimatedImage, CanvasKit } from "canvaskit-wasm";
+
+import type { SkAnimatedImage } from "../types/AnimatedImage";
+
+import { HostObject } from "./Host";
+import { JsiSkImage } from "./JsiSkImage";
+
+export class JsiSkAnimatedImage
+  extends HostObject<AnimatedImage, "AnimatedImage">
+  implements SkAnimatedImage
+{
+  constructor(CanvasKit: CanvasKit, ref: AnimatedImage) {
+    super(CanvasKit, ref, "AnimatedImage");
+  }
+
+  decodeNextFrame() {
+    return this.ref.decodeNextFrame();
+  }
+
+  currentFrameDuration() {
+    return this.ref.currentFrameDuration();
+  }
+
+  getCurrentFrame() {
+    const image = this.ref.makeImageAtCurrentFrame();
+    if (image === null) {
+      return null;
+    }
+    return new JsiSkImage(this.CanvasKit, image);
+  }
+
+  dispose = () => {
+    this.ref.delete();
+  };
+}

package/src/skia/web/JsiSkAnimatedImageFactory.ts

@@ -0,0 +1,27 @@
+import type { CanvasKit } from "canvaskit-wasm";
+
+import type { SkData } from "../types";
+import type { AnimatedImageFactory } from "../types/AnimatedImage/AnimatedImageFactory";
+
+import { Host } from "./Host";
+import { JsiSkData } from "./JsiSkData";
+import { JsiSkAnimatedImage } from "./JsiSkAnimatedImage";
+
+export class JsiSkAnimatedImageFactory
+  extends Host
+  implements AnimatedImageFactory
+{
+  constructor(CanvasKit: CanvasKit) {
+    super(CanvasKit);
+  }
+
+  MakeAnimatedImageFromEncoded(encoded: SkData) {
+    const image = this.CanvasKit.MakeAnimatedImageFromEncoded(
+      JsiSkData.fromValue(encoded)
+    );
+    if (image === null) {
+      return null;
+    }
+    return new JsiSkAnimatedImage(this.CanvasKit, image);
+  }
+}

package/src/skia/web/JsiSkFont.ts

@@ -6,10 +6,11 @@ import type {
   SkFont,
   SkPaint,
   SkPoint,
+  SkRect,
   SkTypeface,
 } from "../types";
 
-import { HostObject, ckEnum } from "./Host";
+import { HostObject, NotImplementedOnRNWeb, ckEnum } from "./Host";
 import { JsiSkPaint } from "./JsiSkPaint";
 import { JsiSkPoint } from "./JsiSkPoint";
 import { JsiSkRect } from "./JsiSkRect";
@@ -20,6 +21,10 @@ export class JsiSkFont extends HostObject<Font, "Font"> implements SkFont {
     super(CanvasKit, ref, "Font");
   }
 
+  measureText(_text: string, _paint?: SkPaint | undefined): SkRect {
+    throw new NotImplementedOnRNWeb();
+  }
+
   dispose = () => {
     this.ref.delete();
   };

package/src/skia/web/JsiSkia.ts

@@ -39,6 +39,7 @@ import { JsiSkPath } from "./JsiSkPath";
 import { JsiSkTypeface } from "./JsiSkTypeface";
 import { JsiSkTypefaceFontProviderFactory } from "./JsiSkTypefaceFontProviderFactory";
 import { JsiSkFontMgrFactory } from "./JsiSkFontMgrFactory";
+import { JsiSkAnimatedImageFactory } from "./JsiSkAnimatedImageFactory";
 
 export const JsiSkApi = (CanvasKit: CanvasKit): Skia => ({
   Point: (x: number, y: number) =>
@@ -98,6 +99,7 @@ export const JsiSkApi = (CanvasKit: CanvasKit): Skia => ({
   MakeVertices: MakeVertices.bind(null, CanvasKit),
   Data: new JsiSkDataFactory(CanvasKit),
   Image: new JsiSkImageFactory(CanvasKit),
+  AnimatedImage: new JsiSkAnimatedImageFactory(CanvasKit),
   SVG: new JsiSkSVGFactory(CanvasKit),
   TextBlob: new JsiSkTextBlobFactory(CanvasKit),
   XYWHRect: (x: number, y: number, width: number, height: number) => {

package/lib/commonjs/dom/nodes/PaintContext.d.ts

@@ -1,19 +0,0 @@
-import type { BlendMode, PaintStyle, SkColorFilter, SkImageFilter, SkMaskFilter, SkPathEffect, SkShader, StrokeCap, StrokeJoin } from "../../skia/types";
-import type { SkColor } from "../../skia/types/Color";
-export interface PaintContext {
-    color?: SkColor;
-    strokeWidth?: number;
-    blendMode?: BlendMode;
-    style?: PaintStyle;
-    strokeJoin?: StrokeJoin;
-    strokeCap?: StrokeCap;
-    strokeMiter?: number;
-    opacity?: number;
-    antiAlias?: boolean;
-    dither?: boolean;
-    shader?: SkShader;
-    colorFilter?: SkColorFilter;
-    imageFilter?: SkImageFilter;
-    maskFilter?: SkMaskFilter;
-    pathEffect?: SkPathEffect;
-}

package/lib/commonjs/dom/nodes/PaintContext.js.map

@@ -1 +0,0 @@
-{"version":3,"names":[],"sources":["PaintContext.ts"],"sourcesContent":["import type {\n  BlendMode,\n  PaintStyle,\n  SkColorFilter,\n  SkImageFilter,\n  SkMaskFilter,\n  SkPathEffect,\n  SkShader,\n  StrokeCap,\n  StrokeJoin,\n} from \"../../skia/types\";\nimport type { SkColor } from \"../../skia/types/Color\";\n\n// TODO: to remove\nexport interface PaintContext {\n  color?: SkColor;\n  strokeWidth?: number;\n  blendMode?: BlendMode;\n  style?: PaintStyle;\n  strokeJoin?: StrokeJoin;\n  strokeCap?: StrokeCap;\n  strokeMiter?: number;\n  opacity?: number;\n  antiAlias?: boolean;\n  dither?: boolean;\n\n  shader?: SkShader;\n  colorFilter?: SkColorFilter;\n  imageFilter?: SkImageFilter;\n  maskFilter?: SkMaskFilter;\n  pathEffect?: SkPathEffect;\n}\n"],"mappings":""}

package/lib/module/dom/nodes/PaintContext.d.ts

@@ -1,19 +0,0 @@
-import type { BlendMode, PaintStyle, SkColorFilter, SkImageFilter, SkMaskFilter, SkPathEffect, SkShader, StrokeCap, StrokeJoin } from "../../skia/types";
-import type { SkColor } from "../../skia/types/Color";
-export interface PaintContext {
-    color?: SkColor;
-    strokeWidth?: number;
-    blendMode?: BlendMode;
-    style?: PaintStyle;
-    strokeJoin?: StrokeJoin;
-    strokeCap?: StrokeCap;
-    strokeMiter?: number;
-    opacity?: number;
-    antiAlias?: boolean;
-    dither?: boolean;
-    shader?: SkShader;
-    colorFilter?: SkColorFilter;
-    imageFilter?: SkImageFilter;
-    maskFilter?: SkMaskFilter;
-    pathEffect?: SkPathEffect;
-}

package/lib/module/dom/nodes/PaintContext.js

@@ -1,2 +0,0 @@
-export {};
-//# sourceMappingURL=PaintContext.js.map

package/lib/module/dom/nodes/PaintContext.js.map

@@ -1 +0,0 @@
-{"version":3,"names":[],"sources":["PaintContext.ts"],"sourcesContent":["import type {\n  BlendMode,\n  PaintStyle,\n  SkColorFilter,\n  SkImageFilter,\n  SkMaskFilter,\n  SkPathEffect,\n  SkShader,\n  StrokeCap,\n  StrokeJoin,\n} from \"../../skia/types\";\nimport type { SkColor } from \"../../skia/types/Color\";\n\n// TODO: to remove\nexport interface PaintContext {\n  color?: SkColor;\n  strokeWidth?: number;\n  blendMode?: BlendMode;\n  style?: PaintStyle;\n  strokeJoin?: StrokeJoin;\n  strokeCap?: StrokeCap;\n  strokeMiter?: number;\n  opacity?: number;\n  antiAlias?: boolean;\n  dither?: boolean;\n\n  shader?: SkShader;\n  colorFilter?: SkColorFilter;\n  imageFilter?: SkImageFilter;\n  maskFilter?: SkMaskFilter;\n  pathEffect?: SkPathEffect;\n}\n"],"mappings":""}

package/lib/typescript/src/dom/nodes/PaintContext.d.ts

@@ -1,19 +0,0 @@
-import type { BlendMode, PaintStyle, SkColorFilter, SkImageFilter, SkMaskFilter, SkPathEffect, SkShader, StrokeCap, StrokeJoin } from "../../skia/types";
-import type { SkColor } from "../../skia/types/Color";
-export interface PaintContext {
-    color?: SkColor;
-    strokeWidth?: number;
-    blendMode?: BlendMode;
-    style?: PaintStyle;
-    strokeJoin?: StrokeJoin;
-    strokeCap?: StrokeCap;
-    strokeMiter?: number;
-    opacity?: number;
-    antiAlias?: boolean;
-    dither?: boolean;
-    shader?: SkShader;
-    colorFilter?: SkColorFilter;
-    imageFilter?: SkImageFilter;
-    maskFilter?: SkMaskFilter;
-    pathEffect?: SkPathEffect;
-}

package/src/dom/nodes/PaintContext.ts

@@ -1,32 +0,0 @@
-import type {
-  BlendMode,
-  PaintStyle,
-  SkColorFilter,
-  SkImageFilter,
-  SkMaskFilter,
-  SkPathEffect,
-  SkShader,
-  StrokeCap,
-  StrokeJoin,
-} from "../../skia/types";
-import type { SkColor } from "../../skia/types/Color";
-
-// TODO: to remove
-export interface PaintContext {
-  color?: SkColor;
-  strokeWidth?: number;
-  blendMode?: BlendMode;
-  style?: PaintStyle;
-  strokeJoin?: StrokeJoin;
-  strokeCap?: StrokeCap;
-  strokeMiter?: number;
-  opacity?: number;
-  antiAlias?: boolean;
-  dither?: boolean;
-
-  shader?: SkShader;
-  colorFilter?: SkColorFilter;
-  imageFilter?: SkImageFilter;
-  maskFilter?: SkMaskFilter;
-  pathEffect?: SkPathEffect;
-}