@shopify/react-native-skia 0.1.191 → 0.1.193

package/src/skia/types/JsiInstance.ts

@@ -1,7 +1,7 @@
-export interface SkJSIInstance<T extends string> {
-  __typename__: T;
+export interface BaseSkJSIInstance {
+  dispose: () => void;
 }
 
-export interface JsiDisposable {
-  dispose: () => void;
+export interface SkJSIInstance<T extends string> extends BaseSkJSIInstance {
+  __typename__: T;
 }

package/src/skia/types/SVG/SVG.ts

@@ -1,6 +1,6 @@
-import type { JsiDisposable, SkJSIInstance } from "../JsiInstance";
+import type { SkJSIInstance } from "../JsiInstance";
 
-export interface SkSVG extends SkJSIInstance<"SVG">, JsiDisposable {
+export interface SkSVG extends SkJSIInstance<"SVG"> {
   width(): number;
   height(): number;
 }

package/src/skia/types/Typeface/Typeface.ts

@@ -1,3 +1,3 @@
-import type { JsiDisposable, SkJSIInstance } from "../JsiInstance";
+import type { SkJSIInstance } from "../JsiInstance";
 
-export type SkTypeface = SkJSIInstance<"Typeface"> & JsiDisposable;
+export type SkTypeface = SkJSIInstance<"Typeface">;

package/src/skia/web/Host.ts

@@ -28,6 +28,8 @@ export abstract class BaseHostObject<T, N extends string>
     this.ref = ref;
     this.__typename__ = typename;
   }
+
+  abstract dispose: () => void;
 }
 
 export abstract class HostObject<T, N extends string> extends BaseHostObject<

package/src/skia/web/JsiSkCanvas.ts

@@ -46,6 +46,10 @@ export class JsiSkCanvas
     super(CanvasKit, ref, "Canvas");
   }
 
+  dispose = () => {
+    this.ref.delete();
+  };
+
   drawRect(rect: SkRect, paint: SkPaint) {
     this.ref.drawRect(
       JsiSkRect.fromValue(this.CanvasKit, rect),

package/src/skia/web/JsiSkColorFilter.ts

@@ -11,4 +11,8 @@ export class JsiSkColorFilter
   constructor(CanvasKit: CanvasKit, ref: ColorFilter) {
     super(CanvasKit, ref, "ColorFilter");
   }
+
+  dispose = () => {
+    this.ref.delete();
+  };
 }

package/src/skia/web/JsiSkContourMeasure.ts

@@ -36,4 +36,8 @@ export class JsiSkContourMeasure
   length() {
     return this.ref.length();
   }
+
+  dispose = () => {
+    this.ref.delete();
+  };
 }

package/src/skia/web/JsiSkContourMeasureIter.ts

@@ -20,4 +20,8 @@ export class JsiSkContourMeasureIter
     }
     return new JsiSkContourMeasure(this.CanvasKit, result);
   }
+
+  dispose = () => {
+    this.ref.delete();
+  };
 }

package/src/skia/web/JsiSkData.ts

@@ -11,7 +11,7 @@ export class JsiSkData extends HostObject<Data, "Data"> implements SkData {
     super(CanvasKit, ref, "Data");
   }
 
-  dispose() {
-    // Not implemented in data
-  }
+  dispose = () => {
+    // Not implemented in data - since data is a raw ArrayBuffer
+  };
 }

package/src/skia/web/JsiSkFont.ts

@@ -20,6 +20,10 @@ export class JsiSkFont extends HostObject<Font, "Font"> implements SkFont {
     super(CanvasKit, ref, "Font");
   }
 
+  dispose = () => {
+    this.ref.delete();
+  };
+
   getTextWidth(text: string, paint?: SkPaint | undefined) {
     const ids = this.getGlyphIDs(text);
     const widths = this.getGlyphWidths(ids, paint);

package/src/skia/web/JsiSkImage.ts

@@ -110,9 +110,9 @@ export class JsiSkImage extends HostObject<Image, "Image"> implements SkImage {
     return toBase64String(bytes);
   }
 
-  dispose() {
+  dispose = () => {
     this.ref.delete();
-  }
+  };
 
   makeNonTextureImage(): SkImage {
     return new JsiSkImage(

package/src/skia/web/JsiSkImageFilter.ts

@@ -11,4 +11,8 @@ export class JsiSkImageFilter
   constructor(CanvasKit: CanvasKit, ref: ImageFilter) {
     super(CanvasKit, ref, "ImageFilter");
   }
+
+  dispose = () => {
+    this.ref.delete();
+  };
 }

package/src/skia/web/JsiSkMaskFilter.ts

@@ -11,4 +11,8 @@ export class JsiSkMaskFilter
   constructor(CanvasKit: CanvasKit, ref: MaskFilter) {
     super(CanvasKit, ref, "MaskFilter");
   }
+
+  dispose = () => {
+    this.ref.delete();
+  };
 }

package/src/skia/web/JsiSkMatrix.ts

@@ -12,6 +12,10 @@ export class JsiSkMatrix
     super(CanvasKit, ref, "Matrix");
   }
 
+  dispose = () => {
+    // Do nothing - the matrix is represenetd by a Float32Array
+  };
+
   concat(matrix: SkMatrix) {
     this.ref.set(
       this.CanvasKit.Matrix.multiply(this.ref, JsiSkMatrix.fromValue(matrix))

package/src/skia/web/JsiSkPaint.ts

@@ -26,6 +26,10 @@ export class JsiSkPaint extends HostObject<Paint, "Paint"> implements SkPaint {
     super(CanvasKit, ref, "Paint");
   }
 
+  dispose = () => {
+    this.ref.delete();
+  };
+
   copy() {
     return new JsiSkPaint(this.CanvasKit, this.ref.copy());
   }

package/src/skia/web/JsiSkPath.ts

@@ -33,6 +33,10 @@ export class JsiSkPath extends HostObject<Path, "Path"> implements SkPath {
     super(CanvasKit, ref, "Path");
   }
 
+  dispose = () => {
+    this.ref.delete();
+  };
+
   addPath(src: SkPath, matrix?: SkMatrix, extend = false) {
     const args = [
       JsiSkPath.fromValue(src),

package/src/skia/web/JsiSkPathEffect.ts

@@ -11,4 +11,8 @@ export class JsiSkPathEffect
   constructor(CanvasKit: CanvasKit, ref: PathEffect) {
     super(CanvasKit, ref, "PathEffect");
   }
+
+  dispose = () => {
+    this.ref.delete();
+  };
 }

package/src/skia/web/JsiSkPicture.ts

@@ -22,6 +22,10 @@ export class JsiSkPicture
     super(CanvasKit, ref, "Picture");
   }
 
+  dispose = () => {
+    this.ref.delete();
+  };
+
   makeShader(
     tmx: TileMode,
     tmy: TileMode,

package/src/skia/web/JsiSkPictureRecorder.ts

@@ -16,6 +16,10 @@ export class JsiSkPictureRecorder
     super(CanvasKit, ref, "PictureRecorder");
   }
 
+  dispose = () => {
+    this.ref.delete();
+  };
+
   beginRecording(bounds: SkRect) {
     return new JsiSkCanvas(
       this.CanvasKit,

package/src/skia/web/JsiSkPoint.ts

@@ -19,6 +19,10 @@ export class JsiSkPoint
     super(CanvasKit, ref, "Point");
   }
 
+  dispose = () => {
+    // Float32Array
+  };
+
   get x() {
     return this.ref[0];
   }

package/src/skia/web/JsiSkRRect.ts

@@ -9,6 +9,10 @@ export class JsiSkRRect
   extends BaseHostObject<RRect, "RRect">
   implements SkRRect
 {
+  dispose = () => {
+    // Float32Array
+  };
+
   static fromValue(CanvasKit: CanvasKit, rect: SkRRect) {
     if (rect instanceof JsiSkRect) {
       return rect.ref;

package/src/skia/web/JsiSkRSXform.ts

@@ -13,4 +13,8 @@ export class JsiSkRSXform
   constructor(CanvasKit: CanvasKit, ref: RSXform) {
     super(CanvasKit, ref, "RSXform");
   }
+
+  dispose = () => {
+    // Do nothing in the web implementation
+  };
 }

package/src/skia/web/JsiSkRect.ts

@@ -12,6 +12,10 @@ export class JsiSkRect extends BaseHostObject<Rect, "Rect"> implements SkRect {
     return CanvasKit.XYWHRect(rect.x, rect.y, rect.width, rect.height);
   }
 
+  dispose = () => {
+    // Float32Array
+  };
+
   constructor(CanvasKit: CanvasKit, ref: Rect) {
     super(CanvasKit, ref, "Rect");
   }

package/src/skia/web/JsiSkRuntimeEffect.ts

@@ -15,6 +15,10 @@ export class JsiSkRuntimeEffect
     super(CanvasKit, ref, "RuntimeEffect");
   }
 
+  dispose = () => {
+    this.ref.delete();
+  };
+
   source() {
     return this.sksl;
   }

package/src/skia/web/JsiSkShader.ts

@@ -11,4 +11,8 @@ export class JsiSkShader
   constructor(CanvasKit: CanvasKit, ref: Shader) {
     super(CanvasKit, ref, "Shader");
   }
+
+  dispose = () => {
+    this.ref.delete();
+  };
 }

package/src/skia/web/JsiSkSurface.ts

@@ -15,6 +15,10 @@ export class JsiSkSurface
     super(CanvasKit, ref, "Surface");
   }
 
+  dispose = () => {
+    this.ref.delete();
+  };
+
   flush() {
     this.ref.flush();
   }

package/src/skia/web/JsiSkTextBlob.ts

@@ -11,4 +11,8 @@ export class JsiSkTextBlob
   constructor(CanvasKit: CanvasKit, ref: TextBlob) {
     super(CanvasKit, ref, "TextBlob");
   }
+
+  dispose = () => {
+    this.ref.delete();
+  };
 }

package/src/skia/web/JsiSkTypeface.ts

@@ -26,7 +26,7 @@ export class JsiSkTypeface
     return false;
   }
 
-  dispose() {
+  dispose = () => {
     this.ref.delete();
-  }
+  };
 }

package/src/skia/web/JsiSkVertices.ts

@@ -13,6 +13,10 @@ export class JsiSkVertices
     super(CanvasKit, ref, "Vertices");
   }
 
+  dispose = () => {
+    this.ref.delete();
+  };
+
   bounds() {
     return new JsiSkRect(this.CanvasKit, this.ref.bounds());
   }

package/src/values/hooks/useComputedValue.ts

@@ -16,6 +16,6 @@ export const useComputedValue = <R>(cb: () => R, values: unknown[]) => {
     // eslint-disable-next-line react-hooks/exhaustive-deps
     values
   );
-  useEffect(() => () => value.__invalidate(), [value]);
+  useEffect(() => () => value.dispose(), [value]);
   return value;
 };

package/src/values/types.ts

@@ -11,7 +11,7 @@ export interface SkiaValue<T = number> {
   /**
    * Invalidates the value. Has different meaning depending on the type of the value.
    */
-  __invalidate: () => void;
+  dispose: () => void;
   /**
    * Field to make typechecking easier
    */

package/src/values/web/RNSkComputedValue.ts

@@ -42,7 +42,7 @@ export class RNSkComputedValue<T> extends RNSkReadonlyValue<T> {
     this._unsubscribers = [];
   }
 
-  public __invalidate(): void {
+  public dispose(): void {
     this._unsubscribers.forEach((unsubscribe) => unsubscribe());
     this._unsubscribers = [];
   }

package/src/values/web/RNSkReadonlyValue.ts

@@ -32,7 +32,7 @@ export class RNSkReadonlyValue<T> implements SkiaValue<T> {
     };
   }
 
-  public __invalidate(): void {
+  public dispose(): void {
     this._listeners = [];
   }
 }

package/src/views/SkiaDomView.web.tsx

@@ -1,6 +1,7 @@
 import { Skia } from "../skia";
 import type { SkCanvas } from "../skia/types";
 import { JsiDrawingContext } from "../dom/types/DrawingContext";
+import { isValue } from "../renderer/processors/Animations/Animations";
 
 import { SkiaBaseWebView } from "./SkiaBaseWebView";
 import type { SkiaDomViewProps, TouchInfo } from "./types";
@@ -16,7 +17,11 @@ export class SkiaDomView extends SkiaBaseWebView<SkiaDomViewProps> {
     }
     if (this.props.onSize) {
       const { width, height } = this.getSize();
-      this.props.onSize.current = { width, height };
+      if (isValue(this.props.onSize)) {
+        this.props.onSize.current = { width, height };
+      } else {
+        this.props.onSize.value = { width, height };
+      }
     }
     if (this.props.root) {
       const ctx = new JsiDrawingContext(Skia, canvas);

package/src/views/types.ts

@@ -9,6 +9,7 @@ import type {
   SkSize,
 } from "../skia/types";
 import type { SkiaMutableValue, SkiaValue } from "../values";
+import type { SharedValueType } from "../renderer/processors/Animations/Animations";
 
 export type DrawMode = "continuous" | "default";
 
@@ -97,7 +98,7 @@ export interface SkiaBaseViewProps extends ViewProps {
    * Pass an animated value to the onSize property to get updates when
    * the Skia view is resized.
    */
-  onSize?: SkiaMutableValue<SkSize>;
+  onSize?: SkiaMutableValue<SkSize> | SharedValueType<SkSize>;
 }
 
 export interface SkiaDrawViewProps extends SkiaBaseViewProps {

package/cpp/skia/include/core/SkImageEncoder.h

@@ -1,71 +0,0 @@
-/*
- * Copyright 2011 Google Inc.
- *
- * Use of this source code is governed by a BSD-style license that can be
- * found in the LICENSE file.
- */
-
-#ifndef SkImageEncoder_DEFINED
-#define SkImageEncoder_DEFINED
-
-#include "include/core/SkEncodedImageFormat.h"
-#include "include/core/SkRefCnt.h"
-#include "include/core/SkTypes.h"
-
-class SkBitmap;
-class SkData;
-class SkPixmap;
-class SkWStream;
-
-/**
- * Encode SkPixmap in the given binary image format.
- *
- * @param  dst     results are written to this stream.
- * @param  src     source pixels.
- * @param  format  image format, not all formats are supported.
- * @param  quality range from 0-100, this is supported by jpeg and webp.
- *                 higher values correspond to improved visual quality, but less compression.
- *
- * @return false iff input is bad or format is unsupported.
- *
- * Will always return false if Skia is compiled without image
- * encoders.
- *
- * For SkEncodedImageFormat::kWEBP, if quality is 100, it will use lossless compression. Otherwise
- * it will use lossy.
- *
- * For examples of encoding an image to a file or to a block of memory,
- * see tools/ToolUtils.h.
- */
-SK_API bool SkEncodeImage(SkWStream* dst, const SkPixmap& src,
-                          SkEncodedImageFormat format, int quality);
-
-/**
- * The following helper function wraps SkEncodeImage().
- */
-SK_API bool SkEncodeImage(SkWStream* dst, const SkBitmap& src, SkEncodedImageFormat f, int q);
-
-/**
- * Encode SkPixmap in the given binary image format.
- *
- * @param  src     source pixels.
- * @param  format  image format, not all formats are supported.
- * @param  quality range from 0-100, this is supported by jpeg and webp.
- *                 higher values correspond to improved visual quality, but less compression.
- *
- * @return encoded data or nullptr if input is bad or format is unsupported.
- *
- * Will always return nullptr if Skia is compiled without image
- * encoders.
- *
- * For SkEncodedImageFormat::kWEBP, if quality is 100, it will use lossless compression. Otherwise
- * it will use lossy.
- */
-SK_API sk_sp<SkData> SkEncodePixmap(const SkPixmap& src, SkEncodedImageFormat format, int quality);
-
-/**
- *  Helper that extracts the pixmap from the bitmap, and then calls SkEncodePixmap()
- */
-SK_API sk_sp<SkData> SkEncodeBitmap(const SkBitmap& src, SkEncodedImageFormat format, int quality);
-
-#endif  // SkImageEncoder_DEFINED

package/cpp/skia/include/gpu/GrConfig.h

@@ -1,53 +0,0 @@
-
-/*
- * Copyright 2010 Google Inc.
- *
- * Use of this source code is governed by a BSD-style license that can be
- * found in the LICENSE file.
- */
-
-#ifndef GrConfig_DEFINED
-#define GrConfig_DEFINED
-
-#include "include/core/SkTypes.h"
-
-/**
- *  Gr defines are set to 0 or 1, rather than being undefined or defined
- */
-
-#if !defined(GR_CACHE_STATS)
-  #if defined(SK_DEBUG) || defined(SK_DUMP_STATS)
-      #define GR_CACHE_STATS  1
-  #else
-      #define GR_CACHE_STATS  0
-  #endif
-#endif
-
-#if !defined(GR_GPU_STATS)
-  #if defined(SK_DEBUG) || defined(SK_DUMP_STATS) || GR_TEST_UTILS
-      #define GR_GPU_STATS    1
-  #else
-      #define GR_GPU_STATS    0
-  #endif
-#endif
-
-#endif
-
-/**
- *  GR_STRING makes a string of X where X is expanded before conversion to a string
- *  if X itself contains macros.
- */
-#define GR_STRING(X) GR_STRING_IMPL(X)
-#define GR_STRING_IMPL(X) #X
-
-/**
- *  GR_CONCAT concatenates X and Y  where each is expanded before
- *  contanenation if either contains macros.
- */
-#define GR_CONCAT(X,Y) GR_CONCAT_IMPL(X,Y)
-#define GR_CONCAT_IMPL(X,Y) X##Y
-
-/**
- *  Creates a string of the form "<filename>(<linenumber>) : "
- */
-#define GR_FILE_AND_LINE_STR __FILE__ "(" GR_STRING(__LINE__) ") : "