@rive-app/canvas-lite 2.31.2 → 2.31.3

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@rive-app/canvas-lite",
-  "version": "2.31.2",
+  "version": "2.31.3",
   "description": "A lite version of Rive's canvas based web api.",
   "main": "rive.js",
   "homepage": "https://rive.app",

package/rive.d.ts

@@ -1,4 +1,5 @@
 import * as rc from "./rive_advanced.mjs";
+import { FinalizableTarget } from "./utils";
 export type AssetLoadCallback = (asset: rc.FileAsset, bytes: Uint8Array) => Boolean;
 export type { FileAsset, AudioAsset, FontAsset, ImageAsset, } from "./rive_advanced.mjs";
 /**
@@ -306,7 +307,7 @@ export interface RiveFileParameters {
     onLoad?: EventCallback;
     onLoadError?: EventCallback;
 }
-export declare class RiveFile {
+export declare class RiveFile implements FinalizableTarget {
     private static readonly missingErrorMessage;
     private static readonly fileLoadErrorMessage;
     private src;
@@ -318,7 +319,9 @@ export declare class RiveFile {
     private eventManager;
     private referenceCount;
     private destroyed;
+    selfUnref: boolean;
     constructor(params: RiveFileParameters);
+    private releaseFile;
     private initData;
     init(): Promise<void>;
     private fireLoadError;

package/rive.js

@@ -2272,7 +2272,7 @@ Qc();
 /* 2 */
 /***/ ((module) => {
 
-module.exports = /*#__PURE__*/JSON.parse('{"name":"@rive-app/canvas-lite","version":"2.31.2","description":"A lite version of Rive\'s canvas based web api.","main":"rive.js","homepage":"https://rive.app","repository":{"type":"git","url":"https://github.com/rive-app/rive-wasm/tree/master/js"},"keywords":["rive","animation"],"author":"Rive","contributors":["Luigi Rosso <luigi@rive.app> (https://rive.app)","Maxwell Talbot <max@rive.app> (https://rive.app)","Arthur Vivian <arthur@rive.app> (https://rive.app)","Umberto Sonnino <umberto@rive.app> (https://rive.app)","Matthew Sullivan <matt.j.sullivan@gmail.com> (mailto:matt.j.sullivan@gmail.com)"],"license":"MIT","files":["rive.js","rive.js.map","rive.wasm","rive_fallback.wasm","rive.d.ts","rive_advanced.mjs.d.ts"],"typings":"rive.d.ts","dependencies":{},"browser":{"fs":false,"path":false}}');
+module.exports = /*#__PURE__*/JSON.parse('{"name":"@rive-app/canvas-lite","version":"2.31.3","description":"A lite version of Rive\'s canvas based web api.","main":"rive.js","homepage":"https://rive.app","repository":{"type":"git","url":"https://github.com/rive-app/rive-wasm/tree/master/js"},"keywords":["rive","animation"],"author":"Rive","contributors":["Luigi Rosso <luigi@rive.app> (https://rive.app)","Maxwell Talbot <max@rive.app> (https://rive.app)","Arthur Vivian <arthur@rive.app> (https://rive.app)","Umberto Sonnino <umberto@rive.app> (https://rive.app)","Matthew Sullivan <matt.j.sullivan@gmail.com> (mailto:matt.j.sullivan@gmail.com)"],"license":"MIT","files":["rive.js","rive.js.map","rive.wasm","rive_fallback.wasm","rive.d.ts","rive_advanced.mjs.d.ts"],"typings":"rive.d.ts","dependencies":{},"browser":{"fs":false,"path":false}}');
 
 /***/ }),
 /* 3 */
@@ -2419,11 +2419,12 @@ __webpack_require__.r(__webpack_exports__);
 /* harmony export */   BLANK_URL: () => (/* reexport safe */ _sanitizeUrl__WEBPACK_IMPORTED_MODULE_1__.BLANK_URL),
 /* harmony export */   CustomFileAssetLoaderWrapper: () => (/* reexport safe */ _finalizationRegistry__WEBPACK_IMPORTED_MODULE_2__.CustomFileAssetLoaderWrapper),
 /* harmony export */   FileAssetWrapper: () => (/* reexport safe */ _finalizationRegistry__WEBPACK_IMPORTED_MODULE_2__.FileAssetWrapper),
-/* harmony export */   Finalizable: () => (/* reexport safe */ _finalizationRegistry__WEBPACK_IMPORTED_MODULE_2__.Finalizable),
+/* harmony export */   FileFinalizer: () => (/* reexport safe */ _finalizationRegistry__WEBPACK_IMPORTED_MODULE_2__.FileFinalizer),
 /* harmony export */   FontAssetWrapper: () => (/* reexport safe */ _finalizationRegistry__WEBPACK_IMPORTED_MODULE_2__.FontAssetWrapper),
 /* harmony export */   FontWrapper: () => (/* reexport safe */ _finalizationRegistry__WEBPACK_IMPORTED_MODULE_2__.FontWrapper),
 /* harmony export */   ImageAssetWrapper: () => (/* reexport safe */ _finalizationRegistry__WEBPACK_IMPORTED_MODULE_2__.ImageAssetWrapper),
 /* harmony export */   ImageWrapper: () => (/* reexport safe */ _finalizationRegistry__WEBPACK_IMPORTED_MODULE_2__.ImageWrapper),
+/* harmony export */   createFinalization: () => (/* reexport safe */ _finalizationRegistry__WEBPACK_IMPORTED_MODULE_2__.createFinalization),
 /* harmony export */   finalizationRegistry: () => (/* reexport safe */ _finalizationRegistry__WEBPACK_IMPORTED_MODULE_2__.finalizationRegistry),
 /* harmony export */   registerTouchInteractions: () => (/* reexport safe */ _registerTouchInteractions__WEBPACK_IMPORTED_MODULE_0__.registerTouchInteractions),
 /* harmony export */   sanitizeUrl: () => (/* reexport safe */ _sanitizeUrl__WEBPACK_IMPORTED_MODULE_1__.sanitizeUrl)
@@ -2690,11 +2691,12 @@ __webpack_require__.r(__webpack_exports__);
 /* harmony export */   AudioWrapper: () => (/* binding */ AudioWrapper),
 /* harmony export */   CustomFileAssetLoaderWrapper: () => (/* binding */ CustomFileAssetLoaderWrapper),
 /* harmony export */   FileAssetWrapper: () => (/* binding */ FileAssetWrapper),
-/* harmony export */   Finalizable: () => (/* binding */ Finalizable),
+/* harmony export */   FileFinalizer: () => (/* binding */ FileFinalizer),
 /* harmony export */   FontAssetWrapper: () => (/* binding */ FontAssetWrapper),
 /* harmony export */   FontWrapper: () => (/* binding */ FontWrapper),
 /* harmony export */   ImageAssetWrapper: () => (/* binding */ ImageAssetWrapper),
 /* harmony export */   ImageWrapper: () => (/* binding */ ImageWrapper),
+/* harmony export */   createFinalization: () => (/* binding */ createFinalization),
 /* harmony export */   finalizationRegistry: () => (/* binding */ finalizationRegistry)
 /* harmony export */ });
 var __extends = (undefined && undefined.__extends) || (function () {
@@ -2712,11 +2714,33 @@ var __extends = (undefined && undefined.__extends) || (function () {
         d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
     };
 })();
-var Finalizable = /** @class */ (function () {
-    function Finalizable() {
+var FileFinalizer = /** @class */ (function () {
+    function FileFinalizer(file) {
         this.selfUnref = false;
+        this._file = file;
     }
-    return Finalizable;
+    FileFinalizer.prototype.unref = function () {
+        if (this._file) {
+            this._file.unref();
+        }
+    };
+    return FileFinalizer;
+}());
+var ObjectFinalizer = /** @class */ (function () {
+    function ObjectFinalizer(finalizableObject) {
+        this._finalizableObject = finalizableObject;
+    }
+    ObjectFinalizer.prototype.unref = function () {
+        this._finalizableObject.unref();
+    };
+    return ObjectFinalizer;
+}());
+var AssetWrapper = /** @class */ (function () {
+    function AssetWrapper() {
+        this.selfUnref = false;
+    }
+    AssetWrapper.prototype.unref = function () { };
+    return AssetWrapper;
 }());
 var ImageWrapper = /** @class */ (function (_super) {
     __extends(ImageWrapper, _super);
@@ -2738,7 +2762,7 @@ var ImageWrapper = /** @class */ (function (_super) {
         }
     };
     return ImageWrapper;
-}(Finalizable));
+}(AssetWrapper));
 var AudioWrapper = /** @class */ (function (_super) {
     __extends(AudioWrapper, _super);
     function AudioWrapper(audio) {
@@ -2759,7 +2783,7 @@ var AudioWrapper = /** @class */ (function (_super) {
         }
     };
     return AudioWrapper;
-}(Finalizable));
+}(AssetWrapper));
 var FontWrapper = /** @class */ (function (_super) {
     __extends(FontWrapper, _super);
     function FontWrapper(font) {
@@ -2780,7 +2804,7 @@ var FontWrapper = /** @class */ (function (_super) {
         }
     };
     return FontWrapper;
-}(Finalizable));
+}(AssetWrapper));
 var CustomFileAssetLoaderWrapper = /** @class */ (function () {
     function CustomFileAssetLoaderWrapper(runtime, loaderCallback) {
         this._assetLoaderCallback = loaderCallback;
@@ -2927,8 +2951,12 @@ var MyFinalizationRegistry = typeof FinalizationRegistry !== "undefined"
     ? FinalizationRegistry
     : FakeFinalizationRegistry;
 var finalizationRegistry = new MyFinalizationRegistry(function (ob) {
-    ob.unref();
+    ob === null || ob === void 0 ? void 0 : ob.unref();
 });
+var createFinalization = function (target, finalizable) {
+    var finalizer = new ObjectFinalizer(finalizable);
+    finalizationRegistry.register(target, finalizer);
+};
 
 
 
@@ -3658,9 +3686,6 @@ var Animator = /** @class */ (function () {
                 if (sm) {
                     var newStateMachine = new StateMachine(sm, this.runtime, playing, this.artboard);
                     this.stateMachines.push(newStateMachine);
-                    if (!playing) {
-                        newStateMachine.advanceAndApply(0);
-                    }
                 }
                 else {
                     console.warn("State Machine with name ".concat(animatables[i], " not found."));
@@ -3679,6 +3704,16 @@ var Animator = /** @class */ (function () {
     Animator.prototype.play = function (animatables) {
         return this.add(animatables, true);
     };
+    /**
+     * Advance state machines if they are paused after initialization
+     */
+    Animator.prototype.advanceIfPaused = function () {
+        this.stateMachines.forEach(function (sm) {
+            if (!sm.playing) {
+                sm.advanceAndApply(0);
+            }
+        });
+    };
     /**
      * Pauses named animations and state machines, or everything if nothing is
      * specified
@@ -4222,6 +4257,7 @@ var RiveFile = /** @class */ (function () {
         this.enableRiveAssetCDN = true;
         this.referenceCount = 0;
         this.destroyed = false;
+        this.selfUnref = false;
         this.src = params.src;
         this.buffer = params.buffer;
         if (params.assetLoader)
@@ -4237,19 +4273,25 @@ var RiveFile = /** @class */ (function () {
         if (params.onLoadError)
             this.on(EventType.LoadError, params.onLoadError);
     }
+    RiveFile.prototype.releaseFile = function () {
+        var _a;
+        if (this.selfUnref) {
+            (_a = this.file) === null || _a === void 0 ? void 0 : _a.unref();
+        }
+        this.file = null;
+    };
     RiveFile.prototype.initData = function () {
         return __awaiter(this, void 0, void 0, function () {
-            var _a, loader, loaderWrapper, _b;
-            var _c;
-            return __generator(this, function (_d) {
-                switch (_d.label) {
+            var _a, loader, loaderWrapper, _b, fileFinalizer;
+            return __generator(this, function (_c) {
+                switch (_c.label) {
                     case 0:
                         if (!this.src) return [3 /*break*/, 2];
                         _a = this;
                         return [4 /*yield*/, loadRiveFile(this.src)];
                     case 1:
-                        _a.buffer = _d.sent();
-                        _d.label = 2;
+                        _a.buffer = _c.sent();
+                        _c.label = 2;
                     case 2:
                         if (this.destroyed) {
                             return [2 /*return*/];
@@ -4263,10 +4305,11 @@ var RiveFile = /** @class */ (function () {
                         return [4 /*yield*/, this.runtime.load(new Uint8Array(this.buffer), loader, this.enableRiveAssetCDN)];
                     case 3:
                         // Load the Rive file
-                        _b.file = _d.sent();
+                        _b.file = _c.sent();
+                        fileFinalizer = new _utils__WEBPACK_IMPORTED_MODULE_3__.FileFinalizer(this.file);
+                        _utils__WEBPACK_IMPORTED_MODULE_3__.finalizationRegistry.register(this, fileFinalizer);
                         if (this.destroyed) {
-                            (_c = this.file) === null || _c === void 0 ? void 0 : _c.delete();
-                            this.file = null;
+                            this.releaseFile();
                             return [2 /*return*/];
                         }
                         if (this.file !== null) {
@@ -4347,12 +4390,10 @@ var RiveFile = /** @class */ (function () {
         });
     };
     RiveFile.prototype.cleanup = function () {
-        var _a;
         this.referenceCount -= 1;
         if (this.referenceCount <= 0) {
             this.removeAllRiveEventListeners();
-            (_a = this.file) === null || _a === void 0 ? void 0 : _a.delete();
-            this.file = null;
+            this.releaseFile();
             this.destroyed = true;
         }
     };
@@ -4704,6 +4745,9 @@ var Rive = /** @class */ (function () {
                             type: EventType.Load,
                             data: (_a = this.src) !== null && _a !== void 0 ? _a : "buffer",
                         });
+                        // Only initialize paused state machines after the load event has been fired 
+                        // to allow users to initialize inputs and view models before the first advance
+                        this.animator.advanceIfPaused();
                         // Flag ready for playback commands and clear the task queue; this order
                         // is important or it may infinitely recurse
                         this.readyForPlaying = true;
@@ -4739,12 +4783,6 @@ var Rive = /** @class */ (function () {
         }
         this.artboard = rootArtboard;
         rootArtboard.volume = this._volume * audioManager.systemVolume;
-        // Check that the artboard has at least 1 animation
-        if (this.artboard.animationCount() < 1) {
-            var msg = "Artboard has no animations";
-            this.eventManager.fire({ type: EventType.LoadError, data: msg });
-            throw msg;
-        }
         // Initialize the animator
         this.animator = new Animator(this.runtime, this.artboard, this.eventManager);
         // Initialize the animations; as loaded hasn't happened yet, we need to