@rive-app/webgl2 2.27.5 → 2.28.1

package/package.json

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

package/rive.d.ts

@@ -317,6 +317,7 @@ export declare class RiveFile {
     constructor(params: RiveFileParameters);
     private initData;
     init(): Promise<void>;
+    private fireLoadError;
     /**
      * Subscribe to Rive-generated events
      * @param type the type of event to subscribe to
@@ -882,6 +883,7 @@ export declare class ViewModelInstanceList extends ViewModelInstanceValue {
     removeInstance(instance: ViewModelInstance): void;
     removeInstanceAt(index: number): void;
     instanceAt(index: number): ViewModelInstance | null;
+    swap(a: number, b: number): void;
     internalHandleCallback(callback: Function): void;
 }
 export declare class ViewModelInstanceColor extends ViewModelInstanceValue {

package/rive.js

@@ -442,7 +442,7 @@ function Oa(a, b) {
     return Na(c, a, b);
   }));
 }
-var Pa, Qa, Ua = {517895:(a, b, c, d, e) => {
+var Pa, Qa, Ua = {522327:(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 = {517895:(a, b, c, d, e) => {
   }
   window.h.Da += 1;
   return 1;
-}, 520073:() => {
+}, 524505:() => {
   "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);
-}, 520377:() => void 0 !== navigator.mediaDevices && void 0 !== navigator.mediaDevices.getUserMedia, 520481:() => {
+}, 524809:() => void 0 !== navigator.mediaDevices && void 0 !== navigator.mediaDevices.getUserMedia, 524913:() => {
   try {
     var a = new (window.AudioContext || window.webkitAudioContext)(), b = a.sampleRate;
     a.close();
@@ -517,7 +517,7 @@ var Pa, Qa, Ua = {517895:(a, b, c, d, e) => {
   } catch (c) {
     return 0;
   }
-}, 520652:(a, b, c, d, e, f) => {
+}, 525084:(a, b, c, d, e, f) => {
   if ("undefined" === typeof window.h) {
     return -1;
   }
@@ -563,7 +563,7 @@ var Pa, Qa, Ua = {517895:(a, b, c, d, e) => {
   a == window.h.I.Ba && g.Z.connect(g.J.destination);
   g.mb = f;
   return window.h.oc(g);
-}, 523529:a => window.h.va(a).J.sampleRate, 523602:a => {
+}, 527961:a => window.h.va(a).J.sampleRate, 528034: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 = {517895:(a, b, c, d, e) => {
   a.J.close();
   a.J = void 0;
   a.mb = void 0;
-}, 524002:a => {
+}, 528434:a => {
   window.h.yb(a);
-}, 524052:a => {
+}, 528484:a => {
   a = window.h.va(a);
   a.J.resume();
   a.state = window.h.ja.ub;
-}, 524191:a => {
+}, 528623: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 = 515140;
-k.___stop_em_js = 517895;
+k.___start_em_js = 519572;
+k.___stop_em_js = 522327;
 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.27.5","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.28.1","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 */
@@ -5559,11 +5559,7 @@ var RiveFile = /** @class */ (function () {
                             });
                         }
                         else {
-                            this.eventManager.fire({
-                                type: EventType.LoadError,
-                                data: null,
-                            });
-                            throw new Error(RiveFile.fileLoadErrorMessage);
+                            this.fireLoadError(RiveFile.fileLoadErrorMessage);
                         }
                         return [2 /*return*/];
                 }
@@ -5572,29 +5568,45 @@ var RiveFile = /** @class */ (function () {
     };
     RiveFile.prototype.init = function () {
         return __awaiter(this, void 0, void 0, function () {
-            var _a;
+            var _a, error_1;
             return __generator(this, function (_b) {
                 switch (_b.label) {
                     case 0:
                         // If no source file url specified, it's a bust
                         if (!this.src && !this.buffer) {
-                            throw new Error(RiveFile.missingErrorMessage);
+                            this.fireLoadError(RiveFile.missingErrorMessage);
+                            return [2 /*return*/];
                         }
+                        _b.label = 1;
+                    case 1:
+                        _b.trys.push([1, 4, , 5]);
                         _a = this;
                         return [4 /*yield*/, RuntimeLoader.awaitInstance()];
-                    case 1:
+                    case 2:
                         _a.runtime = _b.sent();
                         if (this.destroyed) {
                             return [2 /*return*/];
                         }
                         return [4 /*yield*/, this.initData()];
-                    case 2:
+                    case 3:
                         _b.sent();
-                        return [2 /*return*/];
+                        return [3 /*break*/, 5];
+                    case 4:
+                        error_1 = _b.sent();
+                        this.fireLoadError(error_1 instanceof Error ? error_1.message : RiveFile.fileLoadErrorMessage);
+                        return [3 /*break*/, 5];
+                    case 5: return [2 /*return*/];
                 }
             });
         });
     };
+    RiveFile.prototype.fireLoadError = function (message) {
+        this.eventManager.fire({
+            type: EventType.LoadError,
+            data: message,
+        });
+        throw new Error(message);
+    };
     /**
      * Subscribe to Rive-generated events
      * @param type the type of event to subscribe to
@@ -5925,7 +5937,7 @@ 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_1, msg;
+            var error_2, msg;
             var _a;
             return __generator(this, function (_b) {
                 switch (_b.label) {
@@ -5967,8 +5979,8 @@ var Rive = /** @class */ (function () {
                         this.drawFrame();
                         return [2 /*return*/, true];
                     case 3:
-                        error_1 = _b.sent();
-                        msg = resolveErrorMessage(error_1);
+                        error_2 = _b.sent();
+                        msg = resolveErrorMessage(error_2);
                         console.warn(msg);
                         this.eventManager.fire({ type: EventType.LoadError, data: msg });
                         return [2 /*return*/, Promise.reject(msg)];
@@ -7216,9 +7228,12 @@ var ViewModelInstance = /** @class */ (function () {
         this._children.forEach(function (child) { return child.handleCallbacks(); });
     };
     ViewModelInstance.prototype.addParent = function (parent) {
-        this._parents.push(parent);
-        if (this._propertiesWithCallbacks.length > 0 || this._children.length > 0) {
-            parent.addToViewModelCallbacks(this);
+        if (!this._parents.includes(parent)) {
+            this._parents.push(parent);
+            if (this._propertiesWithCallbacks.length > 0 ||
+                this._children.length > 0) {
+                parent.addToViewModelCallbacks(this);
+            }
         }
     };
     ViewModelInstance.prototype.removeParent = function (parent) {
@@ -7745,11 +7760,13 @@ var ViewModelInstanceList = /** @class */ (function (_super) {
     ViewModelInstanceList.prototype.addInstance = function (instance) {
         if (instance.runtimeInstance != null) {
             this._viewModelInstanceValue.addInstance(instance.runtimeInstance);
+            instance.addParent(this._parentViewModel);
         }
     };
     ViewModelInstanceList.prototype.removeInstance = function (instance) {
         if (instance.runtimeInstance != null) {
             this._viewModelInstanceValue.removeInstance(instance.runtimeInstance);
+            instance.removeParent(this._parentViewModel);
         }
     };
     ViewModelInstanceList.prototype.removeInstanceAt = function (index) {
@@ -7758,11 +7775,14 @@ var ViewModelInstanceList = /** @class */ (function (_super) {
     ViewModelInstanceList.prototype.instanceAt = function (index) {
         var runtimeInstance = this._viewModelInstanceValue.instanceAt(index);
         if (runtimeInstance != null) {
-            var viewModelInstance = new ViewModelInstance(runtimeInstance, null);
+            var viewModelInstance = new ViewModelInstance(runtimeInstance, this._parentViewModel);
             return viewModelInstance;
         }
         return null;
     };
+    ViewModelInstanceList.prototype.swap = function (a, b) {
+        this._viewModelInstanceValue.swap(a, b);
+    };
     ViewModelInstanceList.prototype.internalHandleCallback = function (callback) {
         callback();
     };