@shopify/react-native-skia 2.6.9 → 2.8.0

package/lib/commonjs/skia/web/JsiSkParagraphStyle.js

@@ -5,15 +5,26 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.JsiSkParagraphStyle = void 0;
 var _types = require("../types");
+var _JsiSkTextStyle = require("./JsiSkTextStyle");
 class JsiSkParagraphStyle {
   static toParagraphStyle(ck, value) {
     var _value$disableHinting, _value$ellipsis, _value$heightMultipli, _value$maxLines, _value$replaceTabChar, _ps$strutStyle, _value$strutStyle$fon, _value$strutStyle, _value$strutStyle$fon2, _value$strutStyle2, _value$strutStyle$hei, _value$strutStyle3, _value$strutStyle$lea, _value$strutStyle4, _value$strutStyle$for, _value$strutStyle5, _ps$strutStyle$fontSt, _value$strutStyle6, _value$strutStyle7, _value$strutStyle8, _value$strutStyle$hal, _value$strutStyle9, _value$strutStyle$str, _value$strutStyle0;
     // Seems like we need to provide the textStyle.color value, otherwise
     // the constructor crashes.
+    const textStyle = {
+      color: ck.BLACK
+    };
+    if (value.textStyle) {
+      // Only merge the properties that are set; toTextStyle() emits undefined
+      // for the others and the ParagraphStyle constructor requires a color.
+      Object.entries(_JsiSkTextStyle.JsiSkTextStyle.toTextStyle(value.textStyle)).forEach(([key, v]) => {
+        if (v !== undefined) {
+          textStyle[key] = v;
+        }
+      });
+    }
     const ps = new ck.ParagraphStyle({
-      textStyle: {
-        color: ck.BLACK
-      }
+      textStyle
     });
     ps.disableHinting = (_value$disableHinting = value.disableHinting) !== null && _value$disableHinting !== void 0 ? _value$disableHinting : ps.disableHinting;
     ps.ellipsis = (_value$ellipsis = value.ellipsis) !== null && _value$ellipsis !== void 0 ? _value$ellipsis : ps.ellipsis;

package/lib/commonjs/skia/web/JsiSkParagraphStyle.js.map

@@ -1 +1 @@
-{"version":3,"names":["_types","require","JsiSkParagraphStyle","toParagraphStyle","ck","value","_value$disableHinting","_value$ellipsis","_value$heightMultipli","_value$maxLines","_value$replaceTabChar","_ps$strutStyle","_value$strutStyle$fon","_value$strutStyle","_value$strutStyle$fon2","_value$strutStyle2","_value$strutStyle$hei","_value$strutStyle3","_value$strutStyle$lea","_value$strutStyle4","_value$strutStyle$for","_value$strutStyle5","_ps$strutStyle$fontSt","_value$strutStyle6","_value$strutStyle7","_value$strutStyle8","_value$strutStyle$hal","_value$strutStyle9","_value$strutStyle$str","_value$strutStyle0","ps","ParagraphStyle","textStyle","color","BLACK","disableHinting","ellipsis","heightMultiplier","maxLines","replaceTabCharacters","textAlign","undefined","textDirection","TextDirection","LTR","textHeightBehavior","strutStyle","fontFamilies","fontSize","leading","forceStrutHeight","fontStyle","slant","width","weight","halfLeading","strutEnabled","exports"],"sources":["JsiSkParagraphStyle.ts"],"sourcesContent":["import type { CanvasKit, ParagraphStyle } from \"canvaskit-wasm\";\n\nimport { TextDirection } from \"../types\";\nimport type { SkParagraphStyle } from \"../types\";\n\nexport class JsiSkParagraphStyle {\n  static toParagraphStyle(\n    ck: CanvasKit,\n    value: SkParagraphStyle\n  ): ParagraphStyle {\n    // Seems like we need to provide the textStyle.color value, otherwise\n    // the constructor crashes.\n    const ps = new ck.ParagraphStyle({ textStyle: { color: ck.BLACK } });\n\n    ps.disableHinting = value.disableHinting ?? ps.disableHinting;\n    ps.ellipsis = value.ellipsis ?? ps.ellipsis;\n    ps.heightMultiplier = value.heightMultiplier ?? ps.heightMultiplier;\n    ps.maxLines = value.maxLines ?? ps.maxLines;\n    ps.replaceTabCharacters =\n      value.replaceTabCharacters ?? ps.replaceTabCharacters;\n    ps.textAlign =\n      value.textAlign !== undefined ? { value: value.textAlign } : ps.textAlign;\n    ps.textDirection =\n      value.textDirection !== undefined\n        ? { value: value.textDirection === TextDirection.LTR ? 1 : 0 }\n        : ps.textDirection;\n    ps.textHeightBehavior =\n      value.textHeightBehavior !== undefined\n        ? { value: value.textHeightBehavior }\n        : ps.textHeightBehavior;\n\n    ps.strutStyle = ps.strutStyle ?? {};\n    ps.strutStyle.fontFamilies =\n      value.strutStyle?.fontFamilies ?? ps.strutStyle.fontFamilies;\n    ps.strutStyle.fontSize =\n      value.strutStyle?.fontSize ?? ps.strutStyle.fontSize;\n    ps.strutStyle.heightMultiplier =\n      value.strutStyle?.heightMultiplier ?? ps.strutStyle.heightMultiplier;\n    ps.strutStyle.leading = value.strutStyle?.leading ?? ps.strutStyle.leading;\n    ps.strutStyle.forceStrutHeight =\n      value.strutStyle?.forceStrutHeight ?? ps.strutStyle.forceStrutHeight;\n\n    ps.strutStyle.fontStyle = ps.strutStyle.fontStyle ?? {};\n\n    ps.strutStyle.fontStyle.slant =\n      value.strutStyle?.fontStyle?.slant !== undefined\n        ? { value: value.strutStyle.fontStyle.slant }\n        : ps.strutStyle.fontStyle.slant;\n    ps.strutStyle.fontStyle.width =\n      value.strutStyle?.fontStyle?.width !== undefined\n        ? { value: value.strutStyle.fontStyle.width }\n        : ps.strutStyle.fontStyle.width;\n    ps.strutStyle.fontStyle.weight =\n      value.strutStyle?.fontStyle?.weight !== undefined\n        ? { value: value.strutStyle.fontStyle.weight }\n        : ps.strutStyle.fontStyle.weight;\n    ps.strutStyle.halfLeading =\n      value.strutStyle?.halfLeading ?? ps.strutStyle.halfLeading;\n    ps.strutStyle.strutEnabled =\n      value.strutStyle?.strutEnabled ?? ps.strutStyle.strutEnabled;\n\n    return ps;\n  }\n}\n"],"mappings":"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","ignoreList":[]}
+{"version":3,"names":["_types","require","_JsiSkTextStyle","JsiSkParagraphStyle","toParagraphStyle","ck","value","_value$disableHinting","_value$ellipsis","_value$heightMultipli","_value$maxLines","_value$replaceTabChar","_ps$strutStyle","_value$strutStyle$fon","_value$strutStyle","_value$strutStyle$fon2","_value$strutStyle2","_value$strutStyle$hei","_value$strutStyle3","_value$strutStyle$lea","_value$strutStyle4","_value$strutStyle$for","_value$strutStyle5","_ps$strutStyle$fontSt","_value$strutStyle6","_value$strutStyle7","_value$strutStyle8","_value$strutStyle$hal","_value$strutStyle9","_value$strutStyle$str","_value$strutStyle0","textStyle","color","BLACK","Object","entries","JsiSkTextStyle","toTextStyle","forEach","key","v","undefined","ps","ParagraphStyle","disableHinting","ellipsis","heightMultiplier","maxLines","replaceTabCharacters","textAlign","textDirection","TextDirection","LTR","textHeightBehavior","strutStyle","fontFamilies","fontSize","leading","forceStrutHeight","fontStyle","slant","width","weight","halfLeading","strutEnabled","exports"],"sources":["JsiSkParagraphStyle.ts"],"sourcesContent":["import type { CanvasKit, ParagraphStyle, TextStyle } from \"canvaskit-wasm\";\n\nimport { TextDirection } from \"../types\";\nimport type { SkParagraphStyle } from \"../types\";\n\nimport { JsiSkTextStyle } from \"./JsiSkTextStyle\";\n\nexport class JsiSkParagraphStyle {\n  static toParagraphStyle(\n    ck: CanvasKit,\n    value: SkParagraphStyle\n  ): ParagraphStyle {\n    // Seems like we need to provide the textStyle.color value, otherwise\n    // the constructor crashes.\n    const textStyle: TextStyle = { color: ck.BLACK };\n    if (value.textStyle) {\n      // Only merge the properties that are set; toTextStyle() emits undefined\n      // for the others and the ParagraphStyle constructor requires a color.\n      Object.entries(JsiSkTextStyle.toTextStyle(value.textStyle)).forEach(\n        ([key, v]) => {\n          if (v !== undefined) {\n            (textStyle as Record<string, unknown>)[key] = v;\n          }\n        }\n      );\n    }\n    const ps = new ck.ParagraphStyle({ textStyle });\n\n    ps.disableHinting = value.disableHinting ?? ps.disableHinting;\n    ps.ellipsis = value.ellipsis ?? ps.ellipsis;\n    ps.heightMultiplier = value.heightMultiplier ?? ps.heightMultiplier;\n    ps.maxLines = value.maxLines ?? ps.maxLines;\n    ps.replaceTabCharacters =\n      value.replaceTabCharacters ?? ps.replaceTabCharacters;\n    ps.textAlign =\n      value.textAlign !== undefined ? { value: value.textAlign } : ps.textAlign;\n    ps.textDirection =\n      value.textDirection !== undefined\n        ? { value: value.textDirection === TextDirection.LTR ? 1 : 0 }\n        : ps.textDirection;\n    ps.textHeightBehavior =\n      value.textHeightBehavior !== undefined\n        ? { value: value.textHeightBehavior }\n        : ps.textHeightBehavior;\n\n    ps.strutStyle = ps.strutStyle ?? {};\n    ps.strutStyle.fontFamilies =\n      value.strutStyle?.fontFamilies ?? ps.strutStyle.fontFamilies;\n    ps.strutStyle.fontSize =\n      value.strutStyle?.fontSize ?? ps.strutStyle.fontSize;\n    ps.strutStyle.heightMultiplier =\n      value.strutStyle?.heightMultiplier ?? ps.strutStyle.heightMultiplier;\n    ps.strutStyle.leading = value.strutStyle?.leading ?? ps.strutStyle.leading;\n    ps.strutStyle.forceStrutHeight =\n      value.strutStyle?.forceStrutHeight ?? ps.strutStyle.forceStrutHeight;\n\n    ps.strutStyle.fontStyle = ps.strutStyle.fontStyle ?? {};\n\n    ps.strutStyle.fontStyle.slant =\n      value.strutStyle?.fontStyle?.slant !== undefined\n        ? { value: value.strutStyle.fontStyle.slant }\n        : ps.strutStyle.fontStyle.slant;\n    ps.strutStyle.fontStyle.width =\n      value.strutStyle?.fontStyle?.width !== undefined\n        ? { value: value.strutStyle.fontStyle.width }\n        : ps.strutStyle.fontStyle.width;\n    ps.strutStyle.fontStyle.weight =\n      value.strutStyle?.fontStyle?.weight !== undefined\n        ? { value: value.strutStyle.fontStyle.weight }\n        : ps.strutStyle.fontStyle.weight;\n    ps.strutStyle.halfLeading =\n      value.strutStyle?.halfLeading ?? ps.strutStyle.halfLeading;\n    ps.strutStyle.strutEnabled =\n      value.strutStyle?.strutEnabled ?? ps.strutStyle.strutEnabled;\n\n    return ps;\n  }\n}\n"],"mappings":"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","ignoreList":[]}

package/lib/commonjs/skia/web/JsiSkSurface.d.ts

@@ -5,7 +5,7 @@ import { JsiSkImage } from "./JsiSkImage";
 export declare class JsiSkSurface extends HostObject<Surface, "Surface"> implements SkSurface {
     constructor(CanvasKit: CanvasKit, ref: Surface);
     [Symbol.dispose](): void;
-    flush(): void;
+    flush(_sync?: boolean): void;
     width(): number;
     height(): number;
     getCanvas(): SkCanvas;

package/lib/commonjs/skia/web/JsiSkSurface.js

@@ -15,7 +15,8 @@ class JsiSkSurface extends _Host.HostObject {
   [Symbol.dispose]() {
     this.ref.dispose();
   }
-  flush() {
+  flush(_sync) {
+    // CanvasKit has no separate CPU sync; flush() is sufficient on the web backend.
     this.ref.flush();
   }
   width() {

package/lib/commonjs/skia/web/JsiSkSurface.js.map

@@ -1 +1 @@
-{"version":3,"names":["_Host","require","_JsiSkCanvas","_JsiSkImage","_JsiSkRect","JsiSkSurface","HostObject","constructor","CanvasKit","ref","Symbol","dispose","flush","width","height","getCanvas","JsiSkCanvas","makeImageSnapshot","bounds","outputImage","image","Array","from","JsiSkRect","fromValue","undefined","JsiSkImage","getNativeTextureUnstable","console","warn","exports"],"sources":["JsiSkSurface.ts"],"sourcesContent":["import type { CanvasKit, Surface } from \"canvaskit-wasm\";\n\nimport type { SkCanvas, SkImage, SkRect, SkSurface } from \"../types\";\n\nimport { HostObject } from \"./Host\";\nimport { JsiSkCanvas } from \"./JsiSkCanvas\";\nimport { JsiSkImage } from \"./JsiSkImage\";\nimport { JsiSkRect } from \"./JsiSkRect\";\n\nexport class JsiSkSurface\n  extends HostObject<Surface, \"Surface\">\n  implements SkSurface\n{\n  constructor(CanvasKit: CanvasKit, ref: Surface) {\n    super(CanvasKit, ref, \"Surface\");\n  }\n\n  [Symbol.dispose]() {\n    this.ref.dispose();\n  }\n\n  flush() {\n    this.ref.flush();\n  }\n\n  width() {\n    return this.ref.width();\n  }\n\n  height() {\n    return this.ref.height();\n  }\n\n  getCanvas(): SkCanvas {\n    return new JsiSkCanvas(this.CanvasKit, this.ref.getCanvas());\n  }\n\n  makeImageSnapshot(bounds?: SkRect, outputImage?: JsiSkImage): SkImage {\n    const image = this.ref.makeImageSnapshot(\n      bounds\n        ? Array.from(JsiSkRect.fromValue(this.CanvasKit, bounds))\n        : undefined\n    );\n    if (outputImage) {\n      outputImage.ref = image;\n    }\n    return new JsiSkImage(this.CanvasKit, image);\n  }\n\n  getNativeTextureUnstable(): unknown {\n    console.warn(\"getBackendTexture is not implemented on Web\");\n    return null;\n  }\n}\n"],"mappings":";;;;;;AAIA,IAAAA,KAAA,GAAAC,OAAA;AACA,IAAAC,YAAA,GAAAD,OAAA;AACA,IAAAE,WAAA,GAAAF,OAAA;AACA,IAAAG,UAAA,GAAAH,OAAA;AAEO,MAAMI,YAAY,SACfC,gBAAU,CAEpB;EACEC,WAAWA,CAACC,SAAoB,EAAEC,GAAY,EAAE;IAC9C,KAAK,CAACD,SAAS,EAAEC,GAAG,EAAE,SAAS,CAAC;EAClC;EAEA,CAACC,MAAM,CAACC,OAAO,IAAI;IACjB,IAAI,CAACF,GAAG,CAACE,OAAO,CAAC,CAAC;EACpB;EAEAC,KAAKA,CAAA,EAAG;IACN,IAAI,CAACH,GAAG,CAACG,KAAK,CAAC,CAAC;EAClB;EAEAC,KAAKA,CAAA,EAAG;IACN,OAAO,IAAI,CAACJ,GAAG,CAACI,KAAK,CAAC,CAAC;EACzB;EAEAC,MAAMA,CAAA,EAAG;IACP,OAAO,IAAI,CAACL,GAAG,CAACK,MAAM,CAAC,CAAC;EAC1B;EAEAC,SAASA,CAAA,EAAa;IACpB,OAAO,IAAIC,wBAAW,CAAC,IAAI,CAACR,SAAS,EAAE,IAAI,CAACC,GAAG,CAACM,SAAS,CAAC,CAAC,CAAC;EAC9D;EAEAE,iBAAiBA,CAACC,MAAe,EAAEC,WAAwB,EAAW;IACpE,MAAMC,KAAK,GAAG,IAAI,CAACX,GAAG,CAACQ,iBAAiB,CACtCC,MAAM,GACFG,KAAK,CAACC,IAAI,CAACC,oBAAS,CAACC,SAAS,CAAC,IAAI,CAAChB,SAAS,EAAEU,MAAM,CAAC,CAAC,GACvDO,SACN,CAAC;IACD,IAAIN,WAAW,EAAE;MACfA,WAAW,CAACV,GAAG,GAAGW,KAAK;IACzB;IACA,OAAO,IAAIM,sBAAU,CAAC,IAAI,CAAClB,SAAS,EAAEY,KAAK,CAAC;EAC9C;EAEAO,wBAAwBA,CAAA,EAAY;IAClCC,OAAO,CAACC,IAAI,CAAC,6CAA6C,CAAC;IAC3D,OAAO,IAAI;EACb;AACF;AAACC,OAAA,CAAAzB,YAAA,GAAAA,YAAA","ignoreList":[]}
+{"version":3,"names":["_Host","require","_JsiSkCanvas","_JsiSkImage","_JsiSkRect","JsiSkSurface","HostObject","constructor","CanvasKit","ref","Symbol","dispose","flush","_sync","width","height","getCanvas","JsiSkCanvas","makeImageSnapshot","bounds","outputImage","image","Array","from","JsiSkRect","fromValue","undefined","JsiSkImage","getNativeTextureUnstable","console","warn","exports"],"sources":["JsiSkSurface.ts"],"sourcesContent":["import type { CanvasKit, Surface } from \"canvaskit-wasm\";\n\nimport type { SkCanvas, SkImage, SkRect, SkSurface } from \"../types\";\n\nimport { HostObject } from \"./Host\";\nimport { JsiSkCanvas } from \"./JsiSkCanvas\";\nimport { JsiSkImage } from \"./JsiSkImage\";\nimport { JsiSkRect } from \"./JsiSkRect\";\n\nexport class JsiSkSurface\n  extends HostObject<Surface, \"Surface\">\n  implements SkSurface\n{\n  constructor(CanvasKit: CanvasKit, ref: Surface) {\n    super(CanvasKit, ref, \"Surface\");\n  }\n\n  [Symbol.dispose]() {\n    this.ref.dispose();\n  }\n\n  flush(_sync?: boolean) {\n    // CanvasKit has no separate CPU sync; flush() is sufficient on the web backend.\n    this.ref.flush();\n  }\n\n  width() {\n    return this.ref.width();\n  }\n\n  height() {\n    return this.ref.height();\n  }\n\n  getCanvas(): SkCanvas {\n    return new JsiSkCanvas(this.CanvasKit, this.ref.getCanvas());\n  }\n\n  makeImageSnapshot(bounds?: SkRect, outputImage?: JsiSkImage): SkImage {\n    const image = this.ref.makeImageSnapshot(\n      bounds\n        ? Array.from(JsiSkRect.fromValue(this.CanvasKit, bounds))\n        : undefined\n    );\n    if (outputImage) {\n      outputImage.ref = image;\n    }\n    return new JsiSkImage(this.CanvasKit, image);\n  }\n\n  getNativeTextureUnstable(): unknown {\n    console.warn(\"getBackendTexture is not implemented on Web\");\n    return null;\n  }\n}\n"],"mappings":";;;;;;AAIA,IAAAA,KAAA,GAAAC,OAAA;AACA,IAAAC,YAAA,GAAAD,OAAA;AACA,IAAAE,WAAA,GAAAF,OAAA;AACA,IAAAG,UAAA,GAAAH,OAAA;AAEO,MAAMI,YAAY,SACfC,gBAAU,CAEpB;EACEC,WAAWA,CAACC,SAAoB,EAAEC,GAAY,EAAE;IAC9C,KAAK,CAACD,SAAS,EAAEC,GAAG,EAAE,SAAS,CAAC;EAClC;EAEA,CAACC,MAAM,CAACC,OAAO,IAAI;IACjB,IAAI,CAACF,GAAG,CAACE,OAAO,CAAC,CAAC;EACpB;EAEAC,KAAKA,CAACC,KAAe,EAAE;IACrB;IACA,IAAI,CAACJ,GAAG,CAACG,KAAK,CAAC,CAAC;EAClB;EAEAE,KAAKA,CAAA,EAAG;IACN,OAAO,IAAI,CAACL,GAAG,CAACK,KAAK,CAAC,CAAC;EACzB;EAEAC,MAAMA,CAAA,EAAG;IACP,OAAO,IAAI,CAACN,GAAG,CAACM,MAAM,CAAC,CAAC;EAC1B;EAEAC,SAASA,CAAA,EAAa;IACpB,OAAO,IAAIC,wBAAW,CAAC,IAAI,CAACT,SAAS,EAAE,IAAI,CAACC,GAAG,CAACO,SAAS,CAAC,CAAC,CAAC;EAC9D;EAEAE,iBAAiBA,CAACC,MAAe,EAAEC,WAAwB,EAAW;IACpE,MAAMC,KAAK,GAAG,IAAI,CAACZ,GAAG,CAACS,iBAAiB,CACtCC,MAAM,GACFG,KAAK,CAACC,IAAI,CAACC,oBAAS,CAACC,SAAS,CAAC,IAAI,CAACjB,SAAS,EAAEW,MAAM,CAAC,CAAC,GACvDO,SACN,CAAC;IACD,IAAIN,WAAW,EAAE;MACfA,WAAW,CAACX,GAAG,GAAGY,KAAK;IACzB;IACA,OAAO,IAAIM,sBAAU,CAAC,IAAI,CAACnB,SAAS,EAAEa,KAAK,CAAC;EAC9C;EAEAO,wBAAwBA,CAAA,EAAY;IAClCC,OAAO,CAACC,IAAI,CAAC,6CAA6C,CAAC;IAC3D,OAAO,IAAI;EACb;AACF;AAACC,OAAA,CAAA1B,YAAA,GAAAA,YAAA","ignoreList":[]}

package/lib/commonjs/sksg/Container.native.d.ts

@@ -7,6 +7,7 @@ declare class NativeReanimatedContainer extends Container {
     private mapperId;
     private picture;
     constructor(Skia: Skia, nativeId: number);
+    unmount(): void;
     redraw(): void;
 }
 export declare const createContainer: (Skia: Skia, nativeId: number) => StaticContainer | NativeReanimatedContainer;

package/lib/commonjs/sksg/Container.native.js

@@ -36,9 +36,20 @@ class NativeReanimatedContainer extends _StaticContainer.Container {
     _defineProperty(this, "picture", void 0);
     this.picture = Skia.Picture.MakePicture(null);
   }
+  unmount() {
+    super.unmount();
+    if (this.mapperId !== null) {
+      // The mapper closure retains the recorder and its resources (e.g.
+      // images) on the UI runtime and keeps updating the picture of an
+      // unmounted view — stop it or it leaks for the lifetime of the app.
+      _ReanimatedProxy.default.stopMapper(this.mapperId);
+      this.mapperId = null;
+    }
+  }
   redraw() {
     if (this.mapperId !== null) {
       _ReanimatedProxy.default.stopMapper(this.mapperId);
+      this.mapperId = null;
     }
     if (this.unmounted) {
       return;

package/lib/commonjs/sksg/Container.native.js.map

@@ -1 +1 @@
-{"version":3,"names":["_ReanimatedProxy","_interopRequireDefault","require","_renderHelpers","_ReanimatedRecorder","_StaticContainer","_Visitor","e","__esModule","default","_defineProperty","r","t","_toPropertyKey","Object","defineProperty","value","enumerable","configurable","writable","i","_toPrimitive","Symbol","toPrimitive","call","TypeError","String","Number","SkiaViewApi","globalThis","nativeDrawOnscreen","nativeId","recorder","picture","play","setJsiProperty","NativeReanimatedContainer","Container","constructor","Skia","Picture","MakePicture","redraw","mapperId","Rea","stopMapper","unmounted","ReanimatedRecorder","visit","root","sharedValues","getSharedValues","sharedRecorder","getRecorder","runOnUI","length","startMapper","applyUpdates","createContainer","HAS_REANIMATED_3","StaticContainer","exports"],"sources":["Container.native.ts"],"sourcesContent":["import Rea from \"../external/reanimated/ReanimatedProxy\";\nimport type { Skia, SkPicture } from \"../skia/types\";\nimport { HAS_REANIMATED_3 } from \"../external/reanimated/renderHelpers\";\nimport type { JsiRecorder } from \"../skia/types/Recorder\";\n\nimport { ReanimatedRecorder } from \"./Recorder/ReanimatedRecorder\";\nimport { Container, StaticContainer } from \"./StaticContainer\";\nimport { visit } from \"./Recorder/Visitor\";\n\nimport \"../skia/NativeSetup\";\nimport \"../views/api\";\n\n// create local reference for `strictGlobal` option in Worklets\nconst { SkiaViewApi } = globalThis;\n\nconst nativeDrawOnscreen = (\n  nativeId: number,\n  recorder: JsiRecorder,\n  picture: SkPicture\n) => {\n  \"worklet\";\n\n  //const start = performance.now();\n  recorder.play(picture);\n  //const end = performance.now();\n  //console.log(\"Recording time: \", end - start);\n  SkiaViewApi.setJsiProperty(nativeId, \"picture\", picture);\n};\n\nclass NativeReanimatedContainer extends Container {\n  private mapperId: number | null = null;\n  private picture: SkPicture;\n\n  constructor(\n    Skia: Skia,\n    private nativeId: number\n  ) {\n    super(Skia);\n    this.picture = Skia.Picture.MakePicture(null)!;\n  }\n\n  redraw() {\n    if (this.mapperId !== null) {\n      Rea.stopMapper(this.mapperId);\n    }\n    if (this.unmounted) {\n      return;\n    }\n    const recorder = new ReanimatedRecorder(this.Skia);\n    const { nativeId, picture } = this;\n    visit(recorder, this.root);\n    const sharedValues = recorder.getSharedValues();\n    const sharedRecorder = recorder.getRecorder();\n    // Draw first frame\n    Rea.runOnUI(() => {\n      \"worklet\";\n      nativeDrawOnscreen(nativeId, sharedRecorder, picture);\n    })();\n    // Animate\n    if (sharedValues.length > 0) {\n      this.mapperId = Rea.startMapper(() => {\n        \"worklet\";\n        sharedRecorder.applyUpdates(sharedValues);\n        nativeDrawOnscreen(nativeId, sharedRecorder, picture);\n      }, sharedValues);\n    }\n  }\n}\n\nexport const createContainer = (Skia: Skia, nativeId: number) => {\n  if (HAS_REANIMATED_3 && nativeId !== -1) {\n    return new NativeReanimatedContainer(Skia, nativeId);\n  } else {\n    return new StaticContainer(Skia, nativeId);\n  }\n};\n"],"mappings":"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","ignoreList":[]}
+{"version":3,"names":["_ReanimatedProxy","_interopRequireDefault","require","_renderHelpers","_ReanimatedRecorder","_StaticContainer","_Visitor","e","__esModule","default","_defineProperty","r","t","_toPropertyKey","Object","defineProperty","value","enumerable","configurable","writable","i","_toPrimitive","Symbol","toPrimitive","call","TypeError","String","Number","SkiaViewApi","globalThis","nativeDrawOnscreen","nativeId","recorder","picture","play","setJsiProperty","NativeReanimatedContainer","Container","constructor","Skia","Picture","MakePicture","unmount","mapperId","Rea","stopMapper","redraw","unmounted","ReanimatedRecorder","visit","root","sharedValues","getSharedValues","sharedRecorder","getRecorder","runOnUI","length","startMapper","applyUpdates","createContainer","HAS_REANIMATED_3","StaticContainer","exports"],"sources":["Container.native.ts"],"sourcesContent":["import Rea from \"../external/reanimated/ReanimatedProxy\";\nimport type { Skia, SkPicture } from \"../skia/types\";\nimport { HAS_REANIMATED_3 } from \"../external/reanimated/renderHelpers\";\nimport type { JsiRecorder } from \"../skia/types/Recorder\";\n\nimport { ReanimatedRecorder } from \"./Recorder/ReanimatedRecorder\";\nimport { Container, StaticContainer } from \"./StaticContainer\";\nimport { visit } from \"./Recorder/Visitor\";\n\nimport \"../skia/NativeSetup\";\nimport \"../views/api\";\n\n// create local reference for `strictGlobal` option in Worklets\nconst { SkiaViewApi } = globalThis;\n\nconst nativeDrawOnscreen = (\n  nativeId: number,\n  recorder: JsiRecorder,\n  picture: SkPicture\n) => {\n  \"worklet\";\n\n  //const start = performance.now();\n  recorder.play(picture);\n  //const end = performance.now();\n  //console.log(\"Recording time: \", end - start);\n  SkiaViewApi.setJsiProperty(nativeId, \"picture\", picture);\n};\n\nclass NativeReanimatedContainer extends Container {\n  private mapperId: number | null = null;\n  private picture: SkPicture;\n\n  constructor(\n    Skia: Skia,\n    private nativeId: number\n  ) {\n    super(Skia);\n    this.picture = Skia.Picture.MakePicture(null)!;\n  }\n\n  unmount() {\n    super.unmount();\n    if (this.mapperId !== null) {\n      // The mapper closure retains the recorder and its resources (e.g.\n      // images) on the UI runtime and keeps updating the picture of an\n      // unmounted view — stop it or it leaks for the lifetime of the app.\n      Rea.stopMapper(this.mapperId);\n      this.mapperId = null;\n    }\n  }\n\n  redraw() {\n    if (this.mapperId !== null) {\n      Rea.stopMapper(this.mapperId);\n      this.mapperId = null;\n    }\n    if (this.unmounted) {\n      return;\n    }\n    const recorder = new ReanimatedRecorder(this.Skia);\n    const { nativeId, picture } = this;\n    visit(recorder, this.root);\n    const sharedValues = recorder.getSharedValues();\n    const sharedRecorder = recorder.getRecorder();\n    // Draw first frame\n    Rea.runOnUI(() => {\n      \"worklet\";\n      nativeDrawOnscreen(nativeId, sharedRecorder, picture);\n    })();\n    // Animate\n    if (sharedValues.length > 0) {\n      this.mapperId = Rea.startMapper(() => {\n        \"worklet\";\n        sharedRecorder.applyUpdates(sharedValues);\n        nativeDrawOnscreen(nativeId, sharedRecorder, picture);\n      }, sharedValues);\n    }\n  }\n}\n\nexport const createContainer = (Skia: Skia, nativeId: number) => {\n  if (HAS_REANIMATED_3 && nativeId !== -1) {\n    return new NativeReanimatedContainer(Skia, nativeId);\n  } else {\n    return new StaticContainer(Skia, nativeId);\n  }\n};\n"],"mappings":"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","ignoreList":[]}

package/lib/commonjs/sksg/Container.web.d.ts

@@ -6,6 +6,7 @@ declare class ReanimatedContainer extends Container {
     private nativeId;
     private mapperId;
     constructor(Skia: Skia, nativeId: number);
+    unmount(): void;
     redraw(): void;
 }
 export declare const createContainer: (Skia: Skia, nativeId: number) => StaticContainer | ReanimatedContainer;

package/lib/commonjs/sksg/Container.web.js

@@ -24,17 +24,30 @@ const {
 const drawOnscreen = (Skia, nativeId, recording) => {
   "worklet";
 
+  var _recording$lastPictur;
   const rec = Skia.PictureRecorder();
   const canvas = rec.beginRecording();
   //const start = performance.now();
 
   const ctx = (0, _DrawingContext.createDrawingContext)(Skia, recording.paintPool, canvas);
-  (0, _Player.replay)(ctx, recording.commands);
-  const picture = rec.finishRecordingAsPicture();
-  rec.dispose();
+  let picture;
+  try {
+    (0, _Player.replay)(ctx, recording.commands);
+    picture = rec.finishRecordingAsPicture();
+  } finally {
+    // Frame-scoped objects (shaders, filters, paint copies, ...) are
+    // referenced by the picture once it is finished — delete the JS handles,
+    // otherwise they leak on Web where the GC cannot see WASM memory.
+    ctx.dispose();
+    rec.dispose();
+  }
   //const end = performance.now();
   //console.log("Recording time: ", end - start);
   SkiaViewApi.setJsiProperty(nativeId, "picture", picture);
+  // The view now references the new picture; the previous one is ours to
+  // delete.
+  (_recording$lastPictur = recording.lastPicture) === null || _recording$lastPictur === void 0 || _recording$lastPictur.dispose();
+  recording.lastPicture = picture;
 };
 class ReanimatedContainer extends _StaticContainer.Container {
   constructor(Skia, nativeId) {
@@ -42,13 +55,38 @@ class ReanimatedContainer extends _StaticContainer.Container {
     this.nativeId = nativeId;
     _defineProperty(this, "mapperId", null);
   }
+  unmount() {
+    super.unmount();
+    if (this.mapperId !== null) {
+      // The mapper closure retains the recording and keeps updating the
+      // picture of an unmounted view — stop it or it leaks for the
+      // lifetime of the app.
+      _ReanimatedProxy.default.stopMapper(this.mapperId);
+      this.mapperId = null;
+    }
+    const {
+      recording
+    } = this;
+    if (recording) {
+      this.recording = null;
+      // Deferred through the same channel as the draw calls so it runs after
+      // any of them that are still queued.
+      _ReanimatedProxy.default.runOnUI(() => {
+        "worklet";
+
+        (0, _Recorder.disposeRecording)(recording);
+      })();
+    }
+  }
   redraw() {
     if (this.mapperId !== null) {
       _ReanimatedProxy.default.stopMapper(this.mapperId);
+      this.mapperId = null;
     }
     if (this.unmounted) {
       return;
     }
+    const previousRecording = this.recording;
     const recorder = new _Recorder.Recorder();
     (0, _Visitor.visit)(recorder, this.root);
     const record = recorder.getRecording();
@@ -74,6 +112,10 @@ class ReanimatedContainer extends _StaticContainer.Container {
     _ReanimatedProxy.default.runOnUI(() => {
       "worklet";
 
+      if (previousRecording) {
+        // Runs after any still-queued draw of the previous recording.
+        (0, _Recorder.disposeRecording)(previousRecording);
+      }
       drawOnscreen(Skia, nativeId, recording);
     })();
   }

package/lib/commonjs/sksg/Container.web.js.map

@@ -1 +1 @@
-{"version":3,"names":["_ReanimatedProxy","_interopRequireDefault","require","_renderHelpers","_Recorder","_Visitor","_Player","_DrawingContext","_StaticContainer","e","__esModule","default","_defineProperty","r","t","_toPropertyKey","Object","defineProperty","value","enumerable","configurable","writable","i","_toPrimitive","Symbol","toPrimitive","call","TypeError","String","Number","SkiaViewApi","globalThis","drawOnscreen","Skia","nativeId","recording","rec","PictureRecorder","canvas","beginRecording","ctx","createDrawingContext","paintPool","replay","commands","picture","finishRecordingAsPicture","dispose","setJsiProperty","ReanimatedContainer","Container","constructor","redraw","mapperId","Rea","stopMapper","unmounted","recorder","Recorder","visit","root","record","getRecording","animationValues","size","startMapper","Array","from","runOnUI","createContainer","HAS_REANIMATED_3","StaticContainer","exports"],"sources":["Container.web.ts"],"sourcesContent":["import Rea from \"../external/reanimated/ReanimatedProxy\";\nimport type { Skia } from \"../skia/types\";\nimport { HAS_REANIMATED_3 } from \"../external/reanimated/renderHelpers\";\n\nimport type { Recording } from \"./Recorder/Recorder\";\nimport { Recorder } from \"./Recorder/Recorder\";\nimport { visit } from \"./Recorder/Visitor\";\nimport { replay } from \"./Recorder/Player\";\nimport { createDrawingContext } from \"./Recorder/DrawingContext\";\nimport { Container, StaticContainer } from \"./StaticContainer\";\n\nimport \"../skia/NativeSetup\";\nimport \"../views/api\";\n\n// create local reference for `strictGlobal` option in Worklets\nconst { SkiaViewApi } = globalThis;\n\nconst drawOnscreen = (Skia: Skia, nativeId: number, recording: Recording) => {\n  \"worklet\";\n  const rec = Skia.PictureRecorder();\n  const canvas = rec.beginRecording();\n  //const start = performance.now();\n\n  const ctx = createDrawingContext(Skia, recording.paintPool, canvas);\n  replay(ctx, recording.commands);\n  const picture = rec.finishRecordingAsPicture();\n  rec.dispose();\n  //const end = performance.now();\n  //console.log(\"Recording time: \", end - start);\n  SkiaViewApi.setJsiProperty(nativeId, \"picture\", picture);\n};\n\nclass ReanimatedContainer extends Container {\n  private mapperId: number | null = null;\n\n  constructor(\n    Skia: Skia,\n    private nativeId: number\n  ) {\n    super(Skia);\n  }\n\n  redraw() {\n    if (this.mapperId !== null) {\n      Rea.stopMapper(this.mapperId);\n    }\n    if (this.unmounted) {\n      return;\n    }\n    const recorder = new Recorder();\n    visit(recorder, this.root);\n    const record = recorder.getRecording();\n    const { animationValues } = record;\n    this.recording = {\n      commands: record.commands,\n      paintPool: record.paintPool,\n    };\n    const { nativeId, Skia, recording } = this;\n    if (animationValues.size > 0) {\n      this.mapperId = Rea.startMapper(() => {\n        \"worklet\";\n        drawOnscreen(Skia, nativeId, recording!);\n      }, Array.from(animationValues));\n    }\n    Rea.runOnUI(() => {\n      \"worklet\";\n      drawOnscreen(Skia, nativeId, recording!);\n    })();\n  }\n}\n\nexport const createContainer = (Skia: Skia, nativeId: number) => {\n  if (HAS_REANIMATED_3 && nativeId !== -1) {\n    return new ReanimatedContainer(Skia, nativeId);\n  } else {\n    return new StaticContainer(Skia, nativeId);\n  }\n};\n"],"mappings":";;;;;;AAAA,IAAAA,gBAAA,GAAAC,sBAAA,CAAAC,OAAA;AAEA,IAAAC,cAAA,GAAAD,OAAA;AAGA,IAAAE,SAAA,GAAAF,OAAA;AACA,IAAAG,QAAA,GAAAH,OAAA;AACA,IAAAI,OAAA,GAAAJ,OAAA;AACA,IAAAK,eAAA,GAAAL,OAAA;AACA,IAAAM,gBAAA,GAAAN,OAAA;AAEAA,OAAA;AACAA,OAAA;AAAsB,SAAAD,uBAAAQ,CAAA,WAAAA,CAAA,IAAAA,CAAA,CAAAC,UAAA,GAAAD,CAAA,KAAAE,OAAA,EAAAF,CAAA;AAAA,SAAAG,gBAAAH,CAAA,EAAAI,CAAA,EAAAC,CAAA,YAAAD,CAAA,GAAAE,cAAA,CAAAF,CAAA,MAAAJ,CAAA,GAAAO,MAAA,CAAAC,cAAA,CAAAR,CAAA,EAAAI,CAAA,IAAAK,KAAA,EAAAJ,CAAA,EAAAK,UAAA,MAAAC,YAAA,MAAAC,QAAA,UAAAZ,CAAA,CAAAI,CAAA,IAAAC,CAAA,EAAAL,CAAA;AAAA,SAAAM,eAAAD,CAAA,QAAAQ,CAAA,GAAAC,YAAA,CAAAT,CAAA,uCAAAQ,CAAA,GAAAA,CAAA,GAAAA,CAAA;AAAA,SAAAC,aAAAT,CAAA,EAAAD,CAAA,2BAAAC,CAAA,KAAAA,CAAA,SAAAA,CAAA,MAAAL,CAAA,GAAAK,CAAA,CAAAU,MAAA,CAAAC,WAAA,kBAAAhB,CAAA,QAAAa,CAAA,GAAAb,CAAA,CAAAiB,IAAA,CAAAZ,CAAA,EAAAD,CAAA,uCAAAS,CAAA,SAAAA,CAAA,YAAAK,SAAA,yEAAAd,CAAA,GAAAe,MAAA,GAAAC,MAAA,EAAAf,CAAA;AAEtB;AACA,MAAM;EAAEgB;AAAY,CAAC,GAAGC,UAAU;AAElC,MAAMC,YAAY,GAAGA,CAACC,IAAU,EAAEC,QAAgB,EAAEC,SAAoB,KAAK;EAC3E,SAAS;;EACT,MAAMC,GAAG,GAAGH,IAAI,CAACI,eAAe,CAAC,CAAC;EAClC,MAAMC,MAAM,GAAGF,GAAG,CAACG,cAAc,CAAC,CAAC;EACnC;;EAEA,MAAMC,GAAG,GAAG,IAAAC,oCAAoB,EAACR,IAAI,EAAEE,SAAS,CAACO,SAAS,EAAEJ,MAAM,CAAC;EACnE,IAAAK,cAAM,EAACH,GAAG,EAAEL,SAAS,CAACS,QAAQ,CAAC;EAC/B,MAAMC,OAAO,GAAGT,GAAG,CAACU,wBAAwB,CAAC,CAAC;EAC9CV,GAAG,CAACW,OAAO,CAAC,CAAC;EACb;EACA;EACAjB,WAAW,CAACkB,cAAc,CAACd,QAAQ,EAAE,SAAS,EAAEW,OAAO,CAAC;AAC1D,CAAC;AAED,MAAMI,mBAAmB,SAASC,0BAAS,CAAC;EAG1CC,WAAWA,CACTlB,IAAU,EACFC,QAAgB,EACxB;IACA,KAAK,CAACD,IAAI,CAAC;IAAC,KAFJC,QAAgB,GAAhBA,QAAgB;IAAAtB,eAAA,mBAJQ,IAAI;EAOtC;EAEAwC,MAAMA,CAAA,EAAG;IACP,IAAI,IAAI,CAACC,QAAQ,KAAK,IAAI,EAAE;MAC1BC,wBAAG,CAACC,UAAU,CAAC,IAAI,CAACF,QAAQ,CAAC;IAC/B;IACA,IAAI,IAAI,CAACG,SAAS,EAAE;MAClB;IACF;IACA,MAAMC,QAAQ,GAAG,IAAIC,kBAAQ,CAAC,CAAC;IAC/B,IAAAC,cAAK,EAACF,QAAQ,EAAE,IAAI,CAACG,IAAI,CAAC;IAC1B,MAAMC,MAAM,GAAGJ,QAAQ,CAACK,YAAY,CAAC,CAAC;IACtC,MAAM;MAAEC;IAAgB,CAAC,GAAGF,MAAM;IAClC,IAAI,CAAC1B,SAAS,GAAG;MACfS,QAAQ,EAAEiB,MAAM,CAACjB,QAAQ;MACzBF,SAAS,EAAEmB,MAAM,CAACnB;IACpB,CAAC;IACD,MAAM;MAAER,QAAQ;MAAED,IAAI;MAAEE;IAAU,CAAC,GAAG,IAAI;IAC1C,IAAI4B,eAAe,CAACC,IAAI,GAAG,CAAC,EAAE;MAC5B,IAAI,CAACX,QAAQ,GAAGC,wBAAG,CAACW,WAAW,CAAC,MAAM;QACpC,SAAS;;QACTjC,YAAY,CAACC,IAAI,EAAEC,QAAQ,EAAEC,SAAU,CAAC;MAC1C,CAAC,EAAE+B,KAAK,CAACC,IAAI,CAACJ,eAAe,CAAC,CAAC;IACjC;IACAT,wBAAG,CAACc,OAAO,CAAC,MAAM;MAChB,SAAS;;MACTpC,YAAY,CAACC,IAAI,EAAEC,QAAQ,EAAEC,SAAU,CAAC;IAC1C,CAAC,CAAC,CAAC,CAAC;EACN;AACF;AAEO,MAAMkC,eAAe,GAAGA,CAACpC,IAAU,EAAEC,QAAgB,KAAK;EAC/D,IAAIoC,+BAAgB,IAAIpC,QAAQ,KAAK,CAAC,CAAC,EAAE;IACvC,OAAO,IAAIe,mBAAmB,CAAChB,IAAI,EAAEC,QAAQ,CAAC;EAChD,CAAC,MAAM;IACL,OAAO,IAAIqC,gCAAe,CAACtC,IAAI,EAAEC,QAAQ,CAAC;EAC5C;AACF,CAAC;AAACsC,OAAA,CAAAH,eAAA,GAAAA,eAAA","ignoreList":[]}
+{"version":3,"names":["_ReanimatedProxy","_interopRequireDefault","require","_renderHelpers","_Recorder","_Visitor","_Player","_DrawingContext","_StaticContainer","e","__esModule","default","_defineProperty","r","t","_toPropertyKey","Object","defineProperty","value","enumerable","configurable","writable","i","_toPrimitive","Symbol","toPrimitive","call","TypeError","String","Number","SkiaViewApi","globalThis","drawOnscreen","Skia","nativeId","recording","_recording$lastPictur","rec","PictureRecorder","canvas","beginRecording","ctx","createDrawingContext","paintPool","picture","replay","commands","finishRecordingAsPicture","dispose","setJsiProperty","lastPicture","ReanimatedContainer","Container","constructor","unmount","mapperId","Rea","stopMapper","runOnUI","disposeRecording","redraw","unmounted","previousRecording","recorder","Recorder","visit","root","record","getRecording","animationValues","size","startMapper","Array","from","createContainer","HAS_REANIMATED_3","StaticContainer","exports"],"sources":["Container.web.ts"],"sourcesContent":["import Rea from \"../external/reanimated/ReanimatedProxy\";\nimport type { Skia } from \"../skia/types\";\nimport { HAS_REANIMATED_3 } from \"../external/reanimated/renderHelpers\";\n\nimport type { Recording } from \"./Recorder/Recorder\";\nimport { Recorder, disposeRecording } from \"./Recorder/Recorder\";\nimport { visit } from \"./Recorder/Visitor\";\nimport { replay } from \"./Recorder/Player\";\nimport { createDrawingContext } from \"./Recorder/DrawingContext\";\nimport { Container, StaticContainer } from \"./StaticContainer\";\n\nimport \"../skia/NativeSetup\";\nimport \"../views/api\";\n\n// create local reference for `strictGlobal` option in Worklets\nconst { SkiaViewApi } = globalThis;\n\nconst drawOnscreen = (Skia: Skia, nativeId: number, recording: Recording) => {\n  \"worklet\";\n  const rec = Skia.PictureRecorder();\n  const canvas = rec.beginRecording();\n  //const start = performance.now();\n\n  const ctx = createDrawingContext(Skia, recording.paintPool, canvas);\n  let picture;\n  try {\n    replay(ctx, recording.commands);\n    picture = rec.finishRecordingAsPicture();\n  } finally {\n    // Frame-scoped objects (shaders, filters, paint copies, ...) are\n    // referenced by the picture once it is finished — delete the JS handles,\n    // otherwise they leak on Web where the GC cannot see WASM memory.\n    ctx.dispose();\n    rec.dispose();\n  }\n  //const end = performance.now();\n  //console.log(\"Recording time: \", end - start);\n  SkiaViewApi.setJsiProperty(nativeId, \"picture\", picture);\n  // The view now references the new picture; the previous one is ours to\n  // delete.\n  recording.lastPicture?.dispose();\n  recording.lastPicture = picture;\n};\n\nclass ReanimatedContainer extends Container {\n  private mapperId: number | null = null;\n\n  constructor(\n    Skia: Skia,\n    private nativeId: number\n  ) {\n    super(Skia);\n  }\n\n  unmount() {\n    super.unmount();\n    if (this.mapperId !== null) {\n      // The mapper closure retains the recording and keeps updating the\n      // picture of an unmounted view — stop it or it leaks for the\n      // lifetime of the app.\n      Rea.stopMapper(this.mapperId);\n      this.mapperId = null;\n    }\n    const { recording } = this;\n    if (recording) {\n      this.recording = null;\n      // Deferred through the same channel as the draw calls so it runs after\n      // any of them that are still queued.\n      Rea.runOnUI(() => {\n        \"worklet\";\n        disposeRecording(recording);\n      })();\n    }\n  }\n\n  redraw() {\n    if (this.mapperId !== null) {\n      Rea.stopMapper(this.mapperId);\n      this.mapperId = null;\n    }\n    if (this.unmounted) {\n      return;\n    }\n    const previousRecording = this.recording;\n    const recorder = new Recorder();\n    visit(recorder, this.root);\n    const record = recorder.getRecording();\n    const { animationValues } = record;\n    this.recording = {\n      commands: record.commands,\n      paintPool: record.paintPool,\n    };\n    const { nativeId, Skia, recording } = this;\n    if (animationValues.size > 0) {\n      this.mapperId = Rea.startMapper(() => {\n        \"worklet\";\n        drawOnscreen(Skia, nativeId, recording!);\n      }, Array.from(animationValues));\n    }\n    Rea.runOnUI(() => {\n      \"worklet\";\n      if (previousRecording) {\n        // Runs after any still-queued draw of the previous recording.\n        disposeRecording(previousRecording);\n      }\n      drawOnscreen(Skia, nativeId, recording!);\n    })();\n  }\n}\n\nexport const createContainer = (Skia: Skia, nativeId: number) => {\n  if (HAS_REANIMATED_3 && nativeId !== -1) {\n    return new ReanimatedContainer(Skia, nativeId);\n  } else {\n    return new StaticContainer(Skia, nativeId);\n  }\n};\n"],"mappings":";;;;;;AAAA,IAAAA,gBAAA,GAAAC,sBAAA,CAAAC,OAAA;AAEA,IAAAC,cAAA,GAAAD,OAAA;AAGA,IAAAE,SAAA,GAAAF,OAAA;AACA,IAAAG,QAAA,GAAAH,OAAA;AACA,IAAAI,OAAA,GAAAJ,OAAA;AACA,IAAAK,eAAA,GAAAL,OAAA;AACA,IAAAM,gBAAA,GAAAN,OAAA;AAEAA,OAAA;AACAA,OAAA;AAAsB,SAAAD,uBAAAQ,CAAA,WAAAA,CAAA,IAAAA,CAAA,CAAAC,UAAA,GAAAD,CAAA,KAAAE,OAAA,EAAAF,CAAA;AAAA,SAAAG,gBAAAH,CAAA,EAAAI,CAAA,EAAAC,CAAA,YAAAD,CAAA,GAAAE,cAAA,CAAAF,CAAA,MAAAJ,CAAA,GAAAO,MAAA,CAAAC,cAAA,CAAAR,CAAA,EAAAI,CAAA,IAAAK,KAAA,EAAAJ,CAAA,EAAAK,UAAA,MAAAC,YAAA,MAAAC,QAAA,UAAAZ,CAAA,CAAAI,CAAA,IAAAC,CAAA,EAAAL,CAAA;AAAA,SAAAM,eAAAD,CAAA,QAAAQ,CAAA,GAAAC,YAAA,CAAAT,CAAA,uCAAAQ,CAAA,GAAAA,CAAA,GAAAA,CAAA;AAAA,SAAAC,aAAAT,CAAA,EAAAD,CAAA,2BAAAC,CAAA,KAAAA,CAAA,SAAAA,CAAA,MAAAL,CAAA,GAAAK,CAAA,CAAAU,MAAA,CAAAC,WAAA,kBAAAhB,CAAA,QAAAa,CAAA,GAAAb,CAAA,CAAAiB,IAAA,CAAAZ,CAAA,EAAAD,CAAA,uCAAAS,CAAA,SAAAA,CAAA,YAAAK,SAAA,yEAAAd,CAAA,GAAAe,MAAA,GAAAC,MAAA,EAAAf,CAAA;AAEtB;AACA,MAAM;EAAEgB;AAAY,CAAC,GAAGC,UAAU;AAElC,MAAMC,YAAY,GAAGA,CAACC,IAAU,EAAEC,QAAgB,EAAEC,SAAoB,KAAK;EAC3E,SAAS;;EAAC,IAAAC,qBAAA;EACV,MAAMC,GAAG,GAAGJ,IAAI,CAACK,eAAe,CAAC,CAAC;EAClC,MAAMC,MAAM,GAAGF,GAAG,CAACG,cAAc,CAAC,CAAC;EACnC;;EAEA,MAAMC,GAAG,GAAG,IAAAC,oCAAoB,EAACT,IAAI,EAAEE,SAAS,CAACQ,SAAS,EAAEJ,MAAM,CAAC;EACnE,IAAIK,OAAO;EACX,IAAI;IACF,IAAAC,cAAM,EAACJ,GAAG,EAAEN,SAAS,CAACW,QAAQ,CAAC;IAC/BF,OAAO,GAAGP,GAAG,CAACU,wBAAwB,CAAC,CAAC;EAC1C,CAAC,SAAS;IACR;IACA;IACA;IACAN,GAAG,CAACO,OAAO,CAAC,CAAC;IACbX,GAAG,CAACW,OAAO,CAAC,CAAC;EACf;EACA;EACA;EACAlB,WAAW,CAACmB,cAAc,CAACf,QAAQ,EAAE,SAAS,EAAEU,OAAO,CAAC;EACxD;EACA;EACA,CAAAR,qBAAA,GAAAD,SAAS,CAACe,WAAW,cAAAd,qBAAA,eAArBA,qBAAA,CAAuBY,OAAO,CAAC,CAAC;EAChCb,SAAS,CAACe,WAAW,GAAGN,OAAO;AACjC,CAAC;AAED,MAAMO,mBAAmB,SAASC,0BAAS,CAAC;EAG1CC,WAAWA,CACTpB,IAAU,EACFC,QAAgB,EACxB;IACA,KAAK,CAACD,IAAI,CAAC;IAAC,KAFJC,QAAgB,GAAhBA,QAAgB;IAAAtB,eAAA,mBAJQ,IAAI;EAOtC;EAEA0C,OAAOA,CAAA,EAAG;IACR,KAAK,CAACA,OAAO,CAAC,CAAC;IACf,IAAI,IAAI,CAACC,QAAQ,KAAK,IAAI,EAAE;MAC1B;MACA;MACA;MACAC,wBAAG,CAACC,UAAU,CAAC,IAAI,CAACF,QAAQ,CAAC;MAC7B,IAAI,CAACA,QAAQ,GAAG,IAAI;IACtB;IACA,MAAM;MAAEpB;IAAU,CAAC,GAAG,IAAI;IAC1B,IAAIA,SAAS,EAAE;MACb,IAAI,CAACA,SAAS,GAAG,IAAI;MACrB;MACA;MACAqB,wBAAG,CAACE,OAAO,CAAC,MAAM;QAChB,SAAS;;QACT,IAAAC,0BAAgB,EAACxB,SAAS,CAAC;MAC7B,CAAC,CAAC,CAAC,CAAC;IACN;EACF;EAEAyB,MAAMA,CAAA,EAAG;IACP,IAAI,IAAI,CAACL,QAAQ,KAAK,IAAI,EAAE;MAC1BC,wBAAG,CAACC,UAAU,CAAC,IAAI,CAACF,QAAQ,CAAC;MAC7B,IAAI,CAACA,QAAQ,GAAG,IAAI;IACtB;IACA,IAAI,IAAI,CAACM,SAAS,EAAE;MAClB;IACF;IACA,MAAMC,iBAAiB,GAAG,IAAI,CAAC3B,SAAS;IACxC,MAAM4B,QAAQ,GAAG,IAAIC,kBAAQ,CAAC,CAAC;IAC/B,IAAAC,cAAK,EAACF,QAAQ,EAAE,IAAI,CAACG,IAAI,CAAC;IAC1B,MAAMC,MAAM,GAAGJ,QAAQ,CAACK,YAAY,CAAC,CAAC;IACtC,MAAM;MAAEC;IAAgB,CAAC,GAAGF,MAAM;IAClC,IAAI,CAAChC,SAAS,GAAG;MACfW,QAAQ,EAAEqB,MAAM,CAACrB,QAAQ;MACzBH,SAAS,EAAEwB,MAAM,CAACxB;IACpB,CAAC;IACD,MAAM;MAAET,QAAQ;MAAED,IAAI;MAAEE;IAAU,CAAC,GAAG,IAAI;IAC1C,IAAIkC,eAAe,CAACC,IAAI,GAAG,CAAC,EAAE;MAC5B,IAAI,CAACf,QAAQ,GAAGC,wBAAG,CAACe,WAAW,CAAC,MAAM;QACpC,SAAS;;QACTvC,YAAY,CAACC,IAAI,EAAEC,QAAQ,EAAEC,SAAU,CAAC;MAC1C,CAAC,EAAEqC,KAAK,CAACC,IAAI,CAACJ,eAAe,CAAC,CAAC;IACjC;IACAb,wBAAG,CAACE,OAAO,CAAC,MAAM;MAChB,SAAS;;MACT,IAAII,iBAAiB,EAAE;QACrB;QACA,IAAAH,0BAAgB,EAACG,iBAAiB,CAAC;MACrC;MACA9B,YAAY,CAACC,IAAI,EAAEC,QAAQ,EAAEC,SAAU,CAAC;IAC1C,CAAC,CAAC,CAAC,CAAC;EACN;AACF;AAEO,MAAMuC,eAAe,GAAGA,CAACzC,IAAU,EAAEC,QAAgB,KAAK;EAC/D,IAAIyC,+BAAgB,IAAIzC,QAAQ,KAAK,CAAC,CAAC,EAAE;IACvC,OAAO,IAAIiB,mBAAmB,CAAClB,IAAI,EAAEC,QAAQ,CAAC;EAChD,CAAC,MAAM;IACL,OAAO,IAAI0C,gCAAe,CAAC3C,IAAI,EAAEC,QAAQ,CAAC;EAC5C;AACF,CAAC;AAAC2C,OAAA,CAAAH,eAAA,GAAAA,eAAA","ignoreList":[]}

package/lib/commonjs/sksg/Recorder/DrawingContext.d.ts

@@ -2,6 +2,8 @@ import type { Skia, SkCanvas, SkColorFilter, SkPaint, SkShader, SkImageFilter, S
 export declare const createDrawingContext: (Skia: Skia, paintPool: SkPaint[], canvas: SkCanvas) => {
     Skia: Skia;
     canvas: SkCanvas;
+    track: <T>(value: T) => T;
+    dispose: () => void;
     paints: SkPaint[];
     colorFilters: SkColorFilter[];
     shaders: SkShader[];

package/lib/commonjs/sksg/Recorder/DrawingContext.js

@@ -4,9 +4,19 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.createDrawingContext = void 0;
+var _FrameScope = require("./FrameScope");
 const createDrawingContext = (Skia, paintPool, canvas) => {
   "worklet";
 
+  // Everything the renderer creates through frameSkia is frame-scoped and
+  // deleted by dispose() once the frame has been recorded. The paint pool is
+  // recording-scoped and deliberately allocated with the raw Skia instance.
+  const {
+    Skia: frameSkia,
+    track,
+    dispose
+  } = (0, _FrameScope.createFrameScope)(Skia);
+
   // State (formerly class fields)
   const paints = [];
   const colorFilters = [];
@@ -18,7 +28,11 @@ const createDrawingContext = (Skia, paintPool, canvas) => {
   let nextPaintIndex = 1;
 
   // Initialize first paint and opacity
-  paintPool[0] = Skia.Paint();
+  if (paintPool.length === 0) {
+    paintPool.push(Skia.Paint());
+  } else {
+    paintPool[0].reset();
+  }
   paints.push(paintPool[0]);
   opacities.push(1);
 
@@ -48,7 +62,7 @@ const createDrawingContext = (Skia, paintPool, canvas) => {
     } else {
       const cf = colorFilters.pop();
       if (cf) {
-        imageFilter = Skia.ImageFilter.MakeColorFilter(cf, null);
+        imageFilter = frameSkia.ImageFilter.MakeColorFilter(cf, null);
       }
     }
     canvas.saveLayer(undefined, null, imageFilter);
@@ -66,7 +80,7 @@ const createDrawingContext = (Skia, paintPool, canvas) => {
   const materializePaint = () => {
     // Color Filters
     if (colorFilters.length > 0) {
-      getCurrentPaint().setColorFilter(colorFilters.reduceRight((inner, outer) => inner ? Skia.ColorFilter.MakeCompose(outer, inner) : outer));
+      getCurrentPaint().setColorFilter(colorFilters.reduceRight((inner, outer) => inner ? frameSkia.ColorFilter.MakeCompose(outer, inner) : outer));
     }
     // Shaders
     if (shaders.length > 0) {
@@ -74,12 +88,12 @@ const createDrawingContext = (Skia, paintPool, canvas) => {
     }
     // Image Filters
     if (imageFilters.length > 0) {
-      getCurrentPaint().setImageFilter(imageFilters.reduceRight((inner, outer) => inner ? Skia.ImageFilter.MakeCompose(outer, inner) : outer));
+      getCurrentPaint().setImageFilter(imageFilters.reduceRight((inner, outer) => inner ? frameSkia.ImageFilter.MakeCompose(outer, inner) : outer));
     }
 
     // Path Effects
     if (pathEffects.length > 0) {
-      getCurrentPaint().setPathEffect(pathEffects.reduceRight((inner, outer) => inner ? Skia.PathEffect.MakeCompose(outer, inner) : outer));
+      getCurrentPaint().setPathEffect(pathEffects.reduceRight((inner, outer) => inner ? frameSkia.PathEffect.MakeCompose(outer, inner) : outer));
     }
 
     // Clear arrays
@@ -92,8 +106,10 @@ const createDrawingContext = (Skia, paintPool, canvas) => {
   // Return an object containing the Skia reference, the canvas, and the methods
   return {
     // Public fields
-    Skia,
+    Skia: frameSkia,
     canvas,
+    track,
+    dispose,
     paints,
     colorFilters,
     shaders,

package/lib/commonjs/sksg/Recorder/DrawingContext.js.map

@@ -1 +1 @@
-{"version":3,"names":["createDrawingContext","Skia","paintPool","canvas","paints","colorFilters","shaders","imageFilters","pathEffects","paintDeclarations","opacities","nextPaintIndex","Paint","push","savePaint","length","nextPaint","assign","getCurrentPaint","getOpacity","setOpacity","newOpacity","Math","max","min","saveBackdropFilter","imageFilter","imgf","pop","cf","ImageFilter","MakeColorFilter","saveLayer","undefined","restore","restorePaint","materializePaint","setColorFilter","reduceRight","inner","outer","ColorFilter","MakeCompose","setShader","setImageFilter","setPathEffect","PathEffect","paint","exports"],"sources":["DrawingContext.ts"],"sourcesContent":["import type {\n  Skia,\n  SkCanvas,\n  SkColorFilter,\n  SkPaint,\n  SkShader,\n  SkImageFilter,\n  SkPathEffect,\n} from \"../../skia/types\";\n\nexport const createDrawingContext = (\n  Skia: Skia,\n  paintPool: SkPaint[],\n  canvas: SkCanvas\n) => {\n  \"worklet\";\n\n  // State (formerly class fields)\n  const paints: SkPaint[] = [];\n  const colorFilters: SkColorFilter[] = [];\n  const shaders: SkShader[] = [];\n  const imageFilters: SkImageFilter[] = [];\n  const pathEffects: SkPathEffect[] = [];\n  const paintDeclarations: SkPaint[] = [];\n  const opacities: number[] = [];\n\n  let nextPaintIndex = 1;\n\n  // Initialize first paint and opacity\n  paintPool[0] = Skia.Paint();\n  paints.push(paintPool[0]);\n  opacities.push(1);\n\n  // Methods (formerly class methods)\n  const savePaint = () => {\n    // Get next available paint from pool or create new one if needed\n    if (nextPaintIndex >= paintPool.length) {\n      paintPool.push(Skia.Paint());\n    }\n\n    const nextPaint = paintPool[nextPaintIndex];\n    nextPaint.assign(getCurrentPaint()); // Reuse allocation by copying properties\n    paints.push(nextPaint);\n    opacities.push(opacities[opacities.length - 1]);\n    nextPaintIndex++;\n  };\n\n  const getOpacity = () => {\n    return opacities[opacities.length - 1];\n  };\n\n  const setOpacity = (newOpacity: number) => {\n    opacities[opacities.length - 1] = Math.max(0, Math.min(1, newOpacity));\n  };\n\n  const saveBackdropFilter = () => {\n    let imageFilter: SkImageFilter | null = null;\n    const imgf = imageFilters.pop();\n    if (imgf) {\n      imageFilter = imgf;\n    } else {\n      const cf = colorFilters.pop();\n      if (cf) {\n        imageFilter = Skia.ImageFilter.MakeColorFilter(cf, null);\n      }\n    }\n    canvas.saveLayer(undefined, null, imageFilter);\n    canvas.restore();\n  };\n\n  // Equivalent to the `get paint()` getter in the original class\n  const getCurrentPaint = () => {\n    return paints[paints.length - 1];\n  };\n\n  const restorePaint = () => {\n    opacities.pop();\n    return paints.pop();\n  };\n\n  const materializePaint = () => {\n    // Color Filters\n    if (colorFilters.length > 0) {\n      getCurrentPaint().setColorFilter(\n        colorFilters.reduceRight((inner, outer) =>\n          inner ? Skia.ColorFilter.MakeCompose(outer, inner) : outer\n        )\n      );\n    }\n    // Shaders\n    if (shaders.length > 0) {\n      getCurrentPaint().setShader(shaders[shaders.length - 1]);\n    }\n    // Image Filters\n    if (imageFilters.length > 0) {\n      getCurrentPaint().setImageFilter(\n        imageFilters.reduceRight((inner, outer) =>\n          inner ? Skia.ImageFilter.MakeCompose(outer, inner) : outer\n        )\n      );\n    }\n\n    // Path Effects\n    if (pathEffects.length > 0) {\n      getCurrentPaint().setPathEffect(\n        pathEffects.reduceRight((inner, outer) =>\n          inner ? Skia.PathEffect.MakeCompose(outer, inner) : outer\n        )\n      );\n    }\n\n    // Clear arrays\n    colorFilters.length = 0;\n    shaders.length = 0;\n    imageFilters.length = 0;\n    pathEffects.length = 0;\n  };\n\n  // Return an object containing the Skia reference, the canvas, and the methods\n  return {\n    // Public fields\n    Skia,\n    canvas,\n    paints,\n    colorFilters,\n    shaders,\n    imageFilters,\n    pathEffects,\n    paintDeclarations,\n    paintPool,\n\n    // Public methods\n    savePaint,\n    saveBackdropFilter,\n    get paint() {\n      return paints[paints.length - 1];\n    }, // the \"getter\" for the current paint\n    restorePaint,\n    materializePaint,\n    getOpacity,\n    setOpacity,\n  };\n};\n\nexport type DrawingContext = ReturnType<typeof createDrawingContext>;\n"],"mappings":"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","ignoreList":[]}
+{"version":3,"names":["_FrameScope","require","createDrawingContext","Skia","paintPool","canvas","frameSkia","track","dispose","createFrameScope","paints","colorFilters","shaders","imageFilters","pathEffects","paintDeclarations","opacities","nextPaintIndex","length","push","Paint","reset","savePaint","nextPaint","assign","getCurrentPaint","getOpacity","setOpacity","newOpacity","Math","max","min","saveBackdropFilter","imageFilter","imgf","pop","cf","ImageFilter","MakeColorFilter","saveLayer","undefined","restore","restorePaint","materializePaint","setColorFilter","reduceRight","inner","outer","ColorFilter","MakeCompose","setShader","setImageFilter","setPathEffect","PathEffect","paint","exports"],"sources":["DrawingContext.ts"],"sourcesContent":["import type {\n  Skia,\n  SkCanvas,\n  SkColorFilter,\n  SkPaint,\n  SkShader,\n  SkImageFilter,\n  SkPathEffect,\n} from \"../../skia/types\";\n\nimport { createFrameScope } from \"./FrameScope\";\n\nexport const createDrawingContext = (\n  Skia: Skia,\n  paintPool: SkPaint[],\n  canvas: SkCanvas\n) => {\n  \"worklet\";\n\n  // Everything the renderer creates through frameSkia is frame-scoped and\n  // deleted by dispose() once the frame has been recorded. The paint pool is\n  // recording-scoped and deliberately allocated with the raw Skia instance.\n  const { Skia: frameSkia, track, dispose } = createFrameScope(Skia);\n\n  // State (formerly class fields)\n  const paints: SkPaint[] = [];\n  const colorFilters: SkColorFilter[] = [];\n  const shaders: SkShader[] = [];\n  const imageFilters: SkImageFilter[] = [];\n  const pathEffects: SkPathEffect[] = [];\n  const paintDeclarations: SkPaint[] = [];\n  const opacities: number[] = [];\n\n  let nextPaintIndex = 1;\n\n  // Initialize first paint and opacity\n  if (paintPool.length === 0) {\n    paintPool.push(Skia.Paint());\n  } else {\n    paintPool[0].reset();\n  }\n  paints.push(paintPool[0]);\n  opacities.push(1);\n\n  // Methods (formerly class methods)\n  const savePaint = () => {\n    // Get next available paint from pool or create new one if needed\n    if (nextPaintIndex >= paintPool.length) {\n      paintPool.push(Skia.Paint());\n    }\n\n    const nextPaint = paintPool[nextPaintIndex];\n    nextPaint.assign(getCurrentPaint()); // Reuse allocation by copying properties\n    paints.push(nextPaint);\n    opacities.push(opacities[opacities.length - 1]);\n    nextPaintIndex++;\n  };\n\n  const getOpacity = () => {\n    return opacities[opacities.length - 1];\n  };\n\n  const setOpacity = (newOpacity: number) => {\n    opacities[opacities.length - 1] = Math.max(0, Math.min(1, newOpacity));\n  };\n\n  const saveBackdropFilter = () => {\n    let imageFilter: SkImageFilter | null = null;\n    const imgf = imageFilters.pop();\n    if (imgf) {\n      imageFilter = imgf;\n    } else {\n      const cf = colorFilters.pop();\n      if (cf) {\n        imageFilter = frameSkia.ImageFilter.MakeColorFilter(cf, null);\n      }\n    }\n    canvas.saveLayer(undefined, null, imageFilter);\n    canvas.restore();\n  };\n\n  // Equivalent to the `get paint()` getter in the original class\n  const getCurrentPaint = () => {\n    return paints[paints.length - 1];\n  };\n\n  const restorePaint = () => {\n    opacities.pop();\n    return paints.pop();\n  };\n\n  const materializePaint = () => {\n    // Color Filters\n    if (colorFilters.length > 0) {\n      getCurrentPaint().setColorFilter(\n        colorFilters.reduceRight((inner, outer) =>\n          inner ? frameSkia.ColorFilter.MakeCompose(outer, inner) : outer\n        )\n      );\n    }\n    // Shaders\n    if (shaders.length > 0) {\n      getCurrentPaint().setShader(shaders[shaders.length - 1]);\n    }\n    // Image Filters\n    if (imageFilters.length > 0) {\n      getCurrentPaint().setImageFilter(\n        imageFilters.reduceRight((inner, outer) =>\n          inner ? frameSkia.ImageFilter.MakeCompose(outer, inner) : outer\n        )\n      );\n    }\n\n    // Path Effects\n    if (pathEffects.length > 0) {\n      getCurrentPaint().setPathEffect(\n        pathEffects.reduceRight((inner, outer) =>\n          inner ? frameSkia.PathEffect.MakeCompose(outer, inner) : outer\n        )\n      );\n    }\n\n    // Clear arrays\n    colorFilters.length = 0;\n    shaders.length = 0;\n    imageFilters.length = 0;\n    pathEffects.length = 0;\n  };\n\n  // Return an object containing the Skia reference, the canvas, and the methods\n  return {\n    // Public fields\n    Skia: frameSkia,\n    canvas,\n    track,\n    dispose,\n    paints,\n    colorFilters,\n    shaders,\n    imageFilters,\n    pathEffects,\n    paintDeclarations,\n    paintPool,\n\n    // Public methods\n    savePaint,\n    saveBackdropFilter,\n    get paint() {\n      return paints[paints.length - 1];\n    }, // the \"getter\" for the current paint\n    restorePaint,\n    materializePaint,\n    getOpacity,\n    setOpacity,\n  };\n};\n\nexport type DrawingContext = ReturnType<typeof createDrawingContext>;\n"],"mappings":"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","ignoreList":[]}

package/lib/commonjs/sksg/Recorder/FrameScope.d.ts

@@ -0,0 +1,18 @@
+import type { Skia } from "../../skia/types";
+export interface FrameScope {
+    Skia: Skia;
+    track: <T>(value: T) => T;
+    dispose: () => void;
+}
+/**
+ * Wraps a Skia instance so that every object created through its factories is
+ * collected and deleted when the scope is disposed. The renderer only keeps
+ * the objects it creates alive for the duration of a frame: once the frame
+ * has been recorded they can be deleted. This is required on Web where
+ * CanvasKit objects live in WASM memory that the JS garbage collector does
+ * not perceive, so it (almost) never reclaims them on its own.
+ *
+ * Objects passed in via props are user-owned: they are not created through
+ * this facade and are therefore never tracked nor disposed.
+ */
+export declare const createFrameScope: (Skia: Skia) => FrameScope;

package/lib/commonjs/sksg/Recorder/FrameScope.js

@@ -0,0 +1,66 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.createFrameScope = void 0;
+const isDisposable = value => {
+  "worklet";
+
+  return value !== null && typeof value === "object" && typeof value.dispose === "function";
+};
+/**
+ * Wraps a Skia instance so that every object created through its factories is
+ * collected and deleted when the scope is disposed. The renderer only keeps
+ * the objects it creates alive for the duration of a frame: once the frame
+ * has been recorded they can be deleted. This is required on Web where
+ * CanvasKit objects live in WASM memory that the JS garbage collector does
+ * not perceive, so it (almost) never reclaims them on its own.
+ *
+ * Objects passed in via props are user-owned: they are not created through
+ * this facade and are therefore never tracked nor disposed.
+ */
+const createFrameScope = Skia => {
+  "worklet";
+
+  const disposables = [];
+  const track = value => {
+    if (isDisposable(value)) {
+      disposables.push(value);
+    }
+    return value;
+  };
+  const wrap = obj => {
+    const cache = new Map();
+    return new Proxy(obj, {
+      get(target, prop) {
+        if (cache.has(prop)) {
+          return cache.get(prop);
+        }
+        // eslint-disable-next-line @typescript-eslint/no-explicit-any
+        const value = target[prop];
+        let wrapped = value;
+        if (typeof value === "function") {
+          wrapped = (...args) => track(value.apply(target, args));
+        } else if (value !== null && typeof value === "object") {
+          wrapped = wrap(value);
+        }
+        cache.set(prop, wrapped);
+        return wrapped;
+      }
+    });
+  };
+  const dispose = () => {
+    for (let i = 0; i < disposables.length; i++) {
+      disposables[i].dispose();
+    }
+    disposables.length = 0;
+  };
+  return {
+    Skia: wrap(Skia),
+    track,
+    dispose
+  };
+};
+exports.createFrameScope = createFrameScope;
+//# sourceMappingURL=FrameScope.js.map

package/lib/commonjs/sksg/Recorder/FrameScope.js.map

@@ -0,0 +1 @@
+{"version":3,"names":["isDisposable","value","dispose","createFrameScope","Skia","disposables","track","push","wrap","obj","cache","Map","Proxy","get","target","prop","has","wrapped","args","apply","set","i","length","exports"],"sources":["FrameScope.ts"],"sourcesContent":["import type { Skia } from \"../../skia/types\";\n\ninterface Disposable {\n  dispose: () => void;\n}\n\nconst isDisposable = (value: unknown): value is Disposable => {\n  \"worklet\";\n  return (\n    value !== null &&\n    typeof value === \"object\" &&\n    typeof (value as Disposable).dispose === \"function\"\n  );\n};\n\nexport interface FrameScope {\n  Skia: Skia;\n  track: <T>(value: T) => T;\n  dispose: () => void;\n}\n\n/**\n * Wraps a Skia instance so that every object created through its factories is\n * collected and deleted when the scope is disposed. The renderer only keeps\n * the objects it creates alive for the duration of a frame: once the frame\n * has been recorded they can be deleted. This is required on Web where\n * CanvasKit objects live in WASM memory that the JS garbage collector does\n * not perceive, so it (almost) never reclaims them on its own.\n *\n * Objects passed in via props are user-owned: they are not created through\n * this facade and are therefore never tracked nor disposed.\n */\nexport const createFrameScope = (Skia: Skia): FrameScope => {\n  \"worklet\";\n  const disposables: Disposable[] = [];\n  const track = <T>(value: T): T => {\n    if (isDisposable(value)) {\n      disposables.push(value);\n    }\n    return value;\n  };\n  const wrap = <T extends object>(obj: T): T => {\n    const cache = new Map<PropertyKey, unknown>();\n    return new Proxy(obj, {\n      get(target, prop) {\n        if (cache.has(prop)) {\n          return cache.get(prop);\n        }\n        // eslint-disable-next-line @typescript-eslint/no-explicit-any\n        const value = (target as any)[prop];\n        let wrapped: unknown = value;\n        if (typeof value === \"function\") {\n          wrapped = (...args: unknown[]) => track(value.apply(target, args));\n        } else if (value !== null && typeof value === \"object\") {\n          wrapped = wrap(value);\n        }\n        cache.set(prop, wrapped);\n        return wrapped;\n      },\n    }) as T;\n  };\n  const dispose = () => {\n    for (let i = 0; i < disposables.length; i++) {\n      disposables[i].dispose();\n    }\n    disposables.length = 0;\n  };\n  return { Skia: wrap(Skia), track, dispose };\n};\n"],"mappings":";;;;;;AAMA,MAAMA,YAAY,GAAIC,KAAc,IAA0B;EAC5D,SAAS;;EACT,OACEA,KAAK,KAAK,IAAI,IACd,OAAOA,KAAK,KAAK,QAAQ,IACzB,OAAQA,KAAK,CAAgBC,OAAO,KAAK,UAAU;AAEvD,CAAC;AAQD;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACO,MAAMC,gBAAgB,GAAIC,IAAU,IAAiB;EAC1D,SAAS;;EACT,MAAMC,WAAyB,GAAG,EAAE;EACpC,MAAMC,KAAK,GAAOL,KAAQ,IAAQ;IAChC,IAAID,YAAY,CAACC,KAAK,CAAC,EAAE;MACvBI,WAAW,CAACE,IAAI,CAACN,KAAK,CAAC;IACzB;IACA,OAAOA,KAAK;EACd,CAAC;EACD,MAAMO,IAAI,GAAsBC,GAAM,IAAQ;IAC5C,MAAMC,KAAK,GAAG,IAAIC,GAAG,CAAuB,CAAC;IAC7C,OAAO,IAAIC,KAAK,CAACH,GAAG,EAAE;MACpBI,GAAGA,CAACC,MAAM,EAAEC,IAAI,EAAE;QAChB,IAAIL,KAAK,CAACM,GAAG,CAACD,IAAI,CAAC,EAAE;UACnB,OAAOL,KAAK,CAACG,GAAG,CAACE,IAAI,CAAC;QACxB;QACA;QACA,MAAMd,KAAK,GAAIa,MAAM,CAASC,IAAI,CAAC;QACnC,IAAIE,OAAgB,GAAGhB,KAAK;QAC5B,IAAI,OAAOA,KAAK,KAAK,UAAU,EAAE;UAC/BgB,OAAO,GAAGA,CAAC,GAAGC,IAAe,KAAKZ,KAAK,CAACL,KAAK,CAACkB,KAAK,CAACL,MAAM,EAAEI,IAAI,CAAC,CAAC;QACpE,CAAC,MAAM,IAAIjB,KAAK,KAAK,IAAI,IAAI,OAAOA,KAAK,KAAK,QAAQ,EAAE;UACtDgB,OAAO,GAAGT,IAAI,CAACP,KAAK,CAAC;QACvB;QACAS,KAAK,CAACU,GAAG,CAACL,IAAI,EAAEE,OAAO,CAAC;QACxB,OAAOA,OAAO;MAChB;IACF,CAAC,CAAC;EACJ,CAAC;EACD,MAAMf,OAAO,GAAGA,CAAA,KAAM;IACpB,KAAK,IAAImB,CAAC,GAAG,CAAC,EAAEA,CAAC,GAAGhB,WAAW,CAACiB,MAAM,EAAED,CAAC,EAAE,EAAE;MAC3ChB,WAAW,CAACgB,CAAC,CAAC,CAACnB,OAAO,CAAC,CAAC;IAC1B;IACAG,WAAW,CAACiB,MAAM,GAAG,CAAC;EACxB,CAAC;EACD,OAAO;IAAElB,IAAI,EAAEI,IAAI,CAACJ,IAAI,CAAC;IAAEE,KAAK;IAAEJ;EAAQ,CAAC;AAC7C,CAAC;AAACqB,OAAA,CAAApB,gBAAA,GAAAA,gBAAA","ignoreList":[]}

package/lib/commonjs/sksg/Recorder/FrameScope.native.d.ts

@@ -0,0 +1,10 @@
+import type { Skia } from "../../skia/types";
+import type { FrameScope } from "./FrameScope";
+/**
+ * No-op on native. The JSI wrappers report the size of the native objects
+ * they hold to the garbage collector (setExternalMemoryPressure), so the GC
+ * is aware of the real cost of the objects the renderer creates and reclaims
+ * them on its own. The tracking scope is only needed on Web, where CanvasKit
+ * objects live in WASM memory the GC cannot see (see FrameScope.ts).
+ */
+export declare const createFrameScope: (Skia: Skia) => FrameScope;

package/lib/commonjs/sksg/Recorder/FrameScope.native.js

@@ -0,0 +1,26 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.createFrameScope = void 0;
+/**
+ * No-op on native. The JSI wrappers report the size of the native objects
+ * they hold to the garbage collector (setExternalMemoryPressure), so the GC
+ * is aware of the real cost of the objects the renderer creates and reclaims
+ * them on its own. The tracking scope is only needed on Web, where CanvasKit
+ * objects live in WASM memory the GC cannot see (see FrameScope.ts).
+ */
+const createFrameScope = Skia => {
+  "worklet";
+
+  return {
+    Skia,
+    track: value => value,
+    dispose: () => {
+      // nothing to dispose: no objects are tracked on native
+    }
+  };
+};
+exports.createFrameScope = createFrameScope;
+//# sourceMappingURL=FrameScope.native.js.map

package/lib/commonjs/sksg/Recorder/FrameScope.native.js.map

@@ -0,0 +1 @@
+{"version":3,"names":["createFrameScope","Skia","track","value","dispose","exports"],"sources":["FrameScope.native.ts"],"sourcesContent":["import type { Skia } from \"../../skia/types\";\n\nimport type { FrameScope } from \"./FrameScope\";\n\n/**\n * No-op on native. The JSI wrappers report the size of the native objects\n * they hold to the garbage collector (setExternalMemoryPressure), so the GC\n * is aware of the real cost of the objects the renderer creates and reclaims\n * them on its own. The tracking scope is only needed on Web, where CanvasKit\n * objects live in WASM memory the GC cannot see (see FrameScope.ts).\n */\nexport const createFrameScope = (Skia: Skia): FrameScope => {\n  \"worklet\";\n  return {\n    Skia,\n    track: <T>(value: T): T => value,\n    dispose: () => {\n      // nothing to dispose: no objects are tracked on native\n    },\n  };\n};\n"],"mappings":";;;;;;AAIA;AACA;AACA;AACA;AACA;AACA;AACA;AACO,MAAMA,gBAAgB,GAAIC,IAAU,IAAiB;EAC1D,SAAS;;EACT,OAAO;IACLA,IAAI;IACJC,KAAK,EAAMC,KAAQ,IAAQA,KAAK;IAChCC,OAAO,EAAEA,CAAA,KAAM;MACb;IAAA;EAEJ,CAAC;AACH,CAAC;AAACC,OAAA,CAAAL,gBAAA,GAAAA,gBAAA","ignoreList":[]}

package/lib/commonjs/sksg/Recorder/Player.js

@@ -116,9 +116,8 @@ const play = (ctx, _command) => {
   } else if ((0, _Core.isCommand)(command, _Core.CommandType.RestoreCTM)) {
     ctx.canvas.restore();
   } else {
-    // TODO: is a copy needed here?
     // apply opacity to the current paint.
-    const paint = ctx.paint.copy();
+    const paint = ctx.track(ctx.paint.copy());
     paint.setAlphaf(paint.getAlphaf() * ctx.getOpacity());
     const paints = [paint, ...ctx.paintDeclarations];
     ctx.paintDeclarations = [];