@rive-app/webgl2 2.30.0 → 2.30.2

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@rive-app/webgl2",
-  "version": "2.30.0",
+  "version": "2.30.2",
   "description": "Rive's webgl2 based web api.",
   "main": "rive.js",
   "homepage": "https://rive.app",

package/rive.d.ts

@@ -112,6 +112,10 @@ export declare enum RiveEventType {
     General = 128,
     OpenUrl = 131
 }
+declare class Artboard {
+    nativeArtboard: rc.Artboard;
+    constructor(artboard: rc.Artboard);
+}
 /**
  * Supported event types triggered in Rive
  */
@@ -339,6 +343,8 @@ export declare class RiveFile {
      */
     removeAllRiveEventListeners(type?: EventType): void;
     getInstance(): rc.File;
+    destroyIfUnused(): void;
+    getArtboard(name: string): Artboard | null;
 }
 export declare class Rive {
     private readonly canvas;
@@ -724,6 +730,7 @@ export declare class Rive {
     viewModelByName(name: string): ViewModel | null;
     enums(): DataEnum[];
     defaultViewModel(): ViewModel | null;
+    getArtboard(name: string): Artboard | null;
 }
 export declare class ViewModel {
     private _viewModel;
@@ -812,6 +819,12 @@ export declare class ViewModelInstance {
      * @param path - path to the image property
      */
     image(path: string): ViewModelInstanceAssetImage | null;
+    /**
+     * method to access an artboard property instance belonging
+     * to the view model instance or to a nested view model instance
+     * @param path - path to the image property
+     */
+    artboard(path: string): ViewModelInstanceArtboard | null;
     /**
      * method to access a view model property instance belonging
      * to the view model instance or to a nested view model instance
@@ -903,6 +916,11 @@ export declare class ViewModelInstanceAssetImage extends ViewModelInstanceValue
     set value(image: rc.Image | null);
     internalHandleCallback(callback: Function): void;
 }
+export declare class ViewModelInstanceArtboard extends ViewModelInstanceValue {
+    constructor(instance: rc.ViewModelInstanceArtboard, root: ViewModelInstance);
+    set value(artboard: Artboard | null);
+    internalHandleCallback(callback: Function): void;
+}
 /**
  * Contents of a state machine input
  */

package/rive.js

@@ -442,7 +442,7 @@ function Oa(a, b) {
     return Na(c, a, b);
   }));
 }
-var Pa, Qa, Ua = {522615:(a, b, c, d, e) => {
+var Pa, Qa, Ua = {526071:(a, b, c, d, e) => {
   if ("undefined" === typeof window || void 0 === (window.AudioContext || window.webkitAudioContext)) {
     return 0;
   }
@@ -505,11 +505,11 @@ var Pa, Qa, Ua = {522615:(a, b, c, d, e) => {
   }
   window.h.Da += 1;
   return 1;
-}, 524793:() => {
+}, 528249:() => {
   "undefined" !== typeof window.h && (window.h.Va.map(function(a) {
     document.removeEventListener(a, window.h.unlock, !0);
   }), --window.h.Da, 0 === window.h.Da && delete window.h);
-}, 525097:() => void 0 !== navigator.mediaDevices && void 0 !== navigator.mediaDevices.getUserMedia, 525201:() => {
+}, 528553:() => void 0 !== navigator.mediaDevices && void 0 !== navigator.mediaDevices.getUserMedia, 528657:() => {
   try {
     var a = new (window.AudioContext || window.webkitAudioContext)(), b = a.sampleRate;
     a.close();
@@ -517,7 +517,7 @@ var Pa, Qa, Ua = {522615:(a, b, c, d, e) => {
   } catch (c) {
     return 0;
   }
-}, 525372:(a, b, c, d, e, f) => {
+}, 528828:(a, b, c, d, e, f) => {
   if ("undefined" === typeof window.h) {
     return -1;
   }
@@ -563,7 +563,7 @@ var Pa, Qa, Ua = {522615:(a, b, c, d, e) => {
   a == window.h.I.Ba && g.Z.connect(g.J.destination);
   g.mb = f;
   return window.h.oc(g);
-}, 528249:a => window.h.va(a).J.sampleRate, 528322:a => {
+}, 531705:a => window.h.va(a).J.sampleRate, 531778:a => {
   a = window.h.va(a);
   void 0 !== a.Z && (a.Z.onaudioprocess = function() {
   }, a.Z.disconnect(), a.Z = void 0);
@@ -571,13 +571,13 @@ var Pa, Qa, Ua = {522615:(a, b, c, d, e) => {
   a.J.close();
   a.J = void 0;
   a.mb = void 0;
-}, 528722:a => {
+}, 532178:a => {
   window.h.yb(a);
-}, 528772:a => {
+}, 532228:a => {
   a = window.h.va(a);
   a.J.resume();
   a.state = window.h.ja.ub;
-}, 528911:a => {
+}, 532367:a => {
   a = window.h.va(a);
   a.J.suspend();
   a.state = window.h.ja.stopped;
@@ -3501,8 +3501,8 @@ k.dynCall_viijii = (a, b, c, d, e, f, g) => (k.dynCall_viijii = C.dynCall_viijii
 k.dynCall_iiiiij = (a, b, c, d, e, f, g) => (k.dynCall_iiiiij = C.dynCall_iiiiij)(a, b, c, d, e, f, g);
 k.dynCall_iiiiijj = (a, b, c, d, e, f, g, l, p) => (k.dynCall_iiiiijj = C.dynCall_iiiiijj)(a, b, c, d, e, f, g, l, p);
 k.dynCall_iiiiiijj = (a, b, c, d, e, f, g, l, p, m) => (k.dynCall_iiiiiijj = C.dynCall_iiiiiijj)(a, b, c, d, e, f, g, l, p, m);
-k.___start_em_js = 519860;
-k.___stop_em_js = 522615;
+k.___start_em_js = 523316;
+k.___stop_em_js = 526071;
 var Zd;
 Ha = function $d() {
   Zd || ae();
@@ -3562,7 +3562,7 @@ ae();
 /* 2 */
 /***/ ((module) => {
 
-module.exports = /*#__PURE__*/JSON.parse('{"name":"@rive-app/webgl2","version":"2.30.0","description":"Rive\'s webgl2 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)","Chris Dalton <chris@rive.app> (https://rive.app)"],"license":"MIT","files":["rive.js","rive.wasm","rive.js.map","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/webgl2","version":"2.30.2","description":"Rive\'s webgl2 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)","Chris Dalton <chris@rive.app> (https://rive.app)"],"license":"MIT","files":["rive.js","rive.wasm","rive.js.map","rive.d.ts","rive_advanced.mjs.d.ts"],"typings":"rive.d.ts","dependencies":{},"browser":{"fs":false,"path":false}}');
 
 /***/ }),
 /* 3 */
@@ -4204,18 +4204,18 @@ var FontAssetWrapper = /** @class */ (function (_super) {
     };
     return FontAssetWrapper;
 }(FileAssetWrapper));
-var FakeFinalizationRegistry = /** @class */ (function (_super) {
-    __extends(FakeFinalizationRegistry, _super);
-    function FakeFinalizationRegistry(fn) {
-        return _super.call(this, fn) || this;
+var FakeFinalizationRegistry = /** @class */ (function () {
+    function FakeFinalizationRegistry(_) {
     }
     FakeFinalizationRegistry.prototype.register = function (object) {
         object.selfUnref = true;
     };
     FakeFinalizationRegistry.prototype.unregister = function (_) { };
     return FakeFinalizationRegistry;
-}(FinalizationRegistry));
-var MyFinalizationRegistry = FinalizationRegistry || FakeFinalizationRegistry;
+}());
+var MyFinalizationRegistry = typeof FinalizationRegistry !== "undefined"
+    ? FinalizationRegistry
+    : FakeFinalizationRegistry;
 var finalizationRegistry = new MyFinalizationRegistry(function (ob) {
     ob.unref();
 });
@@ -4299,6 +4299,7 @@ __webpack_require__.r(__webpack_exports__);
 /* harmony export */   Testing: () => (/* binding */ Testing),
 /* harmony export */   ViewModel: () => (/* binding */ ViewModel),
 /* harmony export */   ViewModelInstance: () => (/* binding */ ViewModelInstance),
+/* harmony export */   ViewModelInstanceArtboard: () => (/* binding */ ViewModelInstanceArtboard),
 /* harmony export */   ViewModelInstanceAssetImage: () => (/* binding */ ViewModelInstanceAssetImage),
 /* harmony export */   ViewModelInstanceBoolean: () => (/* binding */ ViewModelInstanceBoolean),
 /* harmony export */   ViewModelInstanceColor: () => (/* binding */ ViewModelInstanceColor),
@@ -4681,6 +4682,12 @@ var RiveEventType;
     RiveEventType[RiveEventType["General"] = 128] = "General";
     RiveEventType[RiveEventType["OpenUrl"] = 131] = "OpenUrl";
 })(RiveEventType || (RiveEventType = {}));
+var Artboard = /** @class */ (function () {
+    function Artboard(artboard) {
+        this.nativeArtboard = artboard;
+    }
+    return Artboard;
+}());
 var StateMachine = /** @class */ (function () {
     /**
      * @constructor
@@ -5654,6 +5661,18 @@ var RiveFile = /** @class */ (function () {
             return this.file;
         }
     };
+    RiveFile.prototype.destroyIfUnused = function () {
+        if (this.referenceCount <= 0) {
+            this.cleanup();
+        }
+    };
+    RiveFile.prototype.getArtboard = function (name) {
+        var nativeArtboard = this.file.artboardByName(name);
+        if (nativeArtboard != null) {
+            return new Artboard(nativeArtboard);
+        }
+        return null;
+    };
     // Error message for missing source or buffer
     RiveFile.missingErrorMessage = "Rive source file or data buffer required";
     // Error message for file load error
@@ -5937,28 +5956,31 @@ var Rive = /** @class */ (function () {
     // Returns true for successful initialization.
     Rive.prototype.initData = function (artboardName, animationNames, stateMachineNames, autoplay, autoBind) {
         return __awaiter(this, void 0, void 0, function () {
-            var error_2, msg;
+            var riveFile, error_2, msg;
             var _a;
             return __generator(this, function (_b) {
                 switch (_b.label) {
                     case 0:
                         _b.trys.push([0, 3, , 4]);
                         if (!(this.riveFile == null)) return [3 /*break*/, 2];
-                        this.riveFile = new RiveFile({
+                        riveFile = new RiveFile({
                             src: this.src,
                             buffer: this.buffer,
                             enableRiveAssetCDN: this.enableRiveAssetCDN,
                             assetLoader: this.assetLoader,
                         });
-                        return [4 /*yield*/, this.riveFile.init()];
+                        this.riveFile = riveFile;
+                        return [4 /*yield*/, riveFile.init()];
                     case 1:
                         _b.sent();
-                        _b.label = 2;
-                    case 2:
-                        // Check for riveFile in case it has been cleaned up while initializing;
-                        if (!this.riveFile) {
+                        if (this.destroyed) {
+                            // In the very unlikely scenario where the rive file created by this Rive is shared by
+                            // another rive file, we only want to destroy it if this file is the only owner.
+                            riveFile.destroyIfUnused();
                             return [2 /*return*/, false];
                         }
+                        _b.label = 2;
+                    case 2:
                         this.file = this.riveFile.getInstance();
                         // Initialize and draw frame
                         this.initArtboard(artboardName, animationNames, stateMachineNames, autoplay, autoBind);
@@ -7095,6 +7117,10 @@ var Rive = /** @class */ (function () {
         }
         return null;
     };
+    Rive.prototype.getArtboard = function (name) {
+        var _a, _b;
+        return (_b = (_a = this.riveFile) === null || _a === void 0 ? void 0 : _a.getArtboard(name)) !== null && _b !== void 0 ? _b : null;
+    };
     // Error message for missing source or buffer
     Rive.missingErrorMessage = "Rive source file or data buffer required";
     // Error message for removed rive file
@@ -7196,6 +7222,7 @@ var PropertyType;
     PropertyType["Enum"] = "enum";
     PropertyType["List"] = "list";
     PropertyType["Image"] = "image";
+    PropertyType["Artboard"] = "artboard";
 })(PropertyType || (PropertyType = {}));
 var ViewModelInstance = /** @class */ (function () {
     function ViewModelInstance(runtimeInstance, parent) {
@@ -7322,7 +7349,7 @@ var ViewModelInstance = /** @class */ (function () {
         return null;
     };
     ViewModelInstance.prototype.propertyFromPathSegments = function (pathSegments, index, type) {
-        var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m, _o, _p, _q, _r;
+        var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m, _o, _p, _q, _r, _s, _t;
         if (index < pathSegments.length - 1) {
             var viewModelInstance = this.internalViewModelInstance(pathSegments[index]);
             if (viewModelInstance !== null) {
@@ -7382,6 +7409,12 @@ var ViewModelInstance = /** @class */ (function () {
                     return new ViewModelInstanceAssetImage(instance, this);
                 }
                 break;
+            case PropertyType.Artboard:
+                instance = (_t = (_s = this._runtimeInstance) === null || _s === void 0 ? void 0 : _s.artboard(pathSegments[index])) !== null && _t !== void 0 ? _t : null;
+                if (instance !== null) {
+                    return new ViewModelInstanceArtboard(instance, this);
+                }
+                break;
         }
         return null;
     };
@@ -7471,6 +7504,15 @@ var ViewModelInstance = /** @class */ (function () {
         var viewmodelInstanceValue = this.propertyFromPath(path, PropertyType.Image);
         return viewmodelInstanceValue;
     };
+    /**
+     * method to access an artboard property instance belonging
+     * to the view model instance or to a nested view model instance
+     * @param path - path to the image property
+     */
+    ViewModelInstance.prototype.artboard = function (path) {
+        var viewmodelInstanceValue = this.propertyFromPath(path, PropertyType.Artboard);
+        return viewmodelInstanceValue;
+    };
     /**
      * method to access a view model property instance belonging
      * to the view model instance or to a nested view model instance
@@ -7855,6 +7897,24 @@ var ViewModelInstanceAssetImage = /** @class */ (function (_super) {
     return ViewModelInstanceAssetImage;
 }(ViewModelInstanceValue));
 
+var ViewModelInstanceArtboard = /** @class */ (function (_super) {
+    __extends(ViewModelInstanceArtboard, _super);
+    function ViewModelInstanceArtboard(instance, root) {
+        return _super.call(this, instance, root) || this;
+    }
+    Object.defineProperty(ViewModelInstanceArtboard.prototype, "value", {
+        set: function (artboard) {
+            this._viewModelInstanceValue.value(artboard.nativeArtboard);
+        },
+        enumerable: false,
+        configurable: true
+    });
+    ViewModelInstanceArtboard.prototype.internalHandleCallback = function (callback) {
+        callback();
+    };
+    return ViewModelInstanceArtboard;
+}(ViewModelInstanceValue));
+
 // Loads Rive data from a URI via fetch.
 var loadRiveFile = function (src) { return __awaiter(void 0, void 0, void 0, function () {
     var req, res, buffer;