@rive-app/webgl 2.27.5 → 2.28.1

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@rive-app/webgl",
-  "version": "2.27.5",
+  "version": "2.28.1",
   "description": "Rive's webgl 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

@@ -408,7 +408,7 @@ function Qa(a, b) {
     return Pa(c, a, b);
   }));
 }
-var Ra, Sa, Wa = {708524:(a, b, c, d, e) => {
+var Ra, Sa, Wa = {711180:(a, b, c, d, e) => {
   if ("undefined" === typeof window || void 0 === (window.AudioContext || window.webkitAudioContext)) {
     return 0;
   }
@@ -471,11 +471,11 @@ var Ra, Sa, Wa = {708524:(a, b, c, d, e) => {
   }
   window.h.Ea += 1;
   return 1;
-}, 710702:() => {
+}, 713358:() => {
   "undefined" !== typeof window.h && (window.h.Ta.map(function(a) {
     document.removeEventListener(a, window.h.unlock, !0);
   }), --window.h.Ea, 0 === window.h.Ea && delete window.h);
-}, 711006:() => void 0 !== navigator.mediaDevices && void 0 !== navigator.mediaDevices.getUserMedia, 711110:() => {
+}, 713662:() => void 0 !== navigator.mediaDevices && void 0 !== navigator.mediaDevices.getUserMedia, 713766:() => {
   try {
     var a = new (window.AudioContext || window.webkitAudioContext)(), b = a.sampleRate;
     a.close();
@@ -483,7 +483,7 @@ var Ra, Sa, Wa = {708524:(a, b, c, d, e) => {
   } catch (c) {
     return 0;
   }
-}, 711281:(a, b, c, d, e, f) => {
+}, 713937:(a, b, c, d, e, f) => {
   if ("undefined" === typeof window.h) {
     return -1;
   }
@@ -529,7 +529,7 @@ var Ra, Sa, Wa = {708524:(a, b, c, d, e) => {
   a == window.h.H.Ca && g.X.connect(g.I.destination);
   g.mb = f;
   return window.h.nc(g);
-}, 714158:a => window.h.ta(a).I.sampleRate, 714231:a => {
+}, 716814:a => window.h.ta(a).I.sampleRate, 716887:a => {
   a = window.h.ta(a);
   void 0 !== a.X && (a.X.onaudioprocess = function() {
   }, a.X.disconnect(), a.X = void 0);
@@ -537,13 +537,13 @@ var Ra, Sa, Wa = {708524:(a, b, c, d, e) => {
   a.I.close();
   a.I = void 0;
   a.mb = void 0;
-}, 714631:a => {
+}, 717287:a => {
   window.h.xb(a);
-}, 714681:a => {
+}, 717337:a => {
   a = window.h.ta(a);
   a.I.resume();
   a.state = window.h.ha.tb;
-}, 714820:a => {
+}, 717476:a => {
   a = window.h.ta(a);
   a.I.suspend();
   a.state = window.h.ha.stopped;
@@ -4065,7 +4065,7 @@ Je();
 /* 2 */
 /***/ ((module) => {
 
-module.exports = /*#__PURE__*/JSON.parse('{"name":"@rive-app/webgl","version":"2.27.5","description":"Rive\'s webgl 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.wasm","rive_fallback.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/webgl","version":"2.28.1","description":"Rive\'s webgl 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.wasm","rive_fallback.wasm","rive.js.map","rive.d.ts","rive_advanced.mjs.d.ts"],"typings":"rive.d.ts","dependencies":{},"browser":{"fs":false,"path":false}}');
 
 /***/ }),
 /* 3 */
@@ -6062,11 +6062,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*/];
                 }
@@ -6075,29 +6071,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
@@ -6428,7 +6440,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) {
@@ -6470,8 +6482,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)];
@@ -7719,9 +7731,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) {
@@ -8248,11 +8263,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) {
@@ -8261,11 +8278,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();
     };