targetj 1.1.0 → 1.1.2

package/build/ParticleUtil.js

@@ -124,7 +124,13 @@ var ParticleUtil = /*#__PURE__*/function () {
       if (!TargetParser.isTargetSpecObject(target)) {
         return false;
       }
-      return typeof target.value === "function" || typeof target.steps === "function" || TUtil.isDefined(target.interval) || TUtil.isDefined(target.easing) || TUtil.isDefined(target.cycles) || TUtil.isDefined(target.loop) || TUtil.isDefined(target.pauseOn);
+      var value = target.value;
+      var steps = target.steps;
+      var hasValues = Array.isArray(value) && value.length > 1;
+      var hasSteps = Array.isArray(steps) ? steps.some(function (step) {
+        return Number(step) > 0;
+      }) : Number(steps) > 0;
+      return hasValues || hasSteps || typeof value === "function" || typeof steps === "function" || TUtil.isDefined(target.interval) || TUtil.isDefined(target.easing) || TUtil.isDefined(target.cycles) || TUtil.isDefined(target.loop) || TUtil.isDefined(target.pauseOn);
     }
   }, {
     key: "compileChildDefinition",
@@ -256,10 +262,10 @@ var ParticleUtil = /*#__PURE__*/function () {
     }
   }]);
 }();
-_defineProperty(ParticleUtil, "gpuRenderTargets", new Set(["x", "y", "width", "height", "borderRadius", "backgroundColor", "rotate", "opacity", "scale"]));
+_defineProperty(ParticleUtil, "gpuRenderTargets", new Set(["x", "y", "width", "height", "borderRadius", "backgroundColor", "rotate", "opacity", "scale", "image"]));
 _defineProperty(ParticleUtil, "gpuRenderAliases", {
   background: "backgroundColor"
 });
 _defineProperty(ParticleUtil, "childrenTargets", new Set(["addChildren", "children"]));
-_defineProperty(ParticleUtil, "transientRuntimeFields", new Set(["particleRenderer", "childHandles", "particleValuesDirty", "particleRenderRequested", "pendingGpuChildren", "layoutEpoch", "completeLayoutEpoch", "completeChildrenLayoutState", "layoutCompleteWaiters", "particleSyncPromise", "restoringParticleRuntime"]));
+_defineProperty(ParticleUtil, "transientRuntimeFields", new Set(["particleRenderer", "childHandles", "particleValuesDirty", "particleRenderRequested", "pendingGpuChildren", "explodeCapturePromise", "layoutEpoch", "completeLayoutEpoch", "completeLayoutState", "layoutCompleteWaiters", "particleSyncPromise", "restoringParticleRuntime"]));
 export { ParticleUtil };

package/build/RunScheduler.js

@@ -77,10 +77,15 @@ var RunScheduler = /*#__PURE__*/function () {
   }, {
     key: "scheduleOnlyIfEarlier",
     value: function scheduleOnlyIfEarlier(delay, runId) {
-      var _this$runStartTime;
-      var base = this.runningFlag ? (_this$runStartTime = this.runStartTime) !== null && _this$runStartTime !== void 0 ? _this$runStartTime : TUtil.now() : TUtil.now();
-      var runTime = base + (delay !== null && delay !== void 0 ? delay : 0);
-      if (this.delayProcess && runTime >= this.delayProcess.runTime) {
+      var _this$delayProcess$ru, _this$delayProcess;
+      if (!tApp.isRunning() || this.resetting) {
+        return;
+      }
+      var effectiveDelay = tApp.throttle === 0 ? Math.max(0, delay !== null && delay !== void 0 ? delay : 0) : tApp.throttle;
+      var requestedTime = TUtil.now() + effectiveDelay;
+      var activeTime = (_this$delayProcess$ru = (_this$delayProcess = this.delayProcess) === null || _this$delayProcess === void 0 ? void 0 : _this$delayProcess.runTime) !== null && _this$delayProcess$ru !== void 0 ? _this$delayProcess$ru : Infinity;
+      var queuedTime = this.nextRuns.length ? this.nextRuns[0].insertTime + this.nextRuns[0].delay : Infinity;
+      if (Math.min(activeTime, queuedTime) <= requestedTime) {
         return;
       }
       this.schedule(delay, runId);
@@ -99,7 +104,7 @@ var RunScheduler = /*#__PURE__*/function () {
     key: "run",
     value: function () {
       var _run = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee2(delay, runId) {
-        var handedOff, _this$delayProcess, capturedEvent, type, activatedStep;
+        var handedOff, _this$delayProcess2, capturedEvent, type, activatedStep;
         return _regeneratorRuntime().wrap(function _callee2$(_context2) {
           while (1) switch (_context2.prev = _context2.next) {
             case 0:
@@ -124,7 +129,7 @@ var RunScheduler = /*#__PURE__*/function () {
               this.runStartTime = TUtil.now();
               handedOff = false;
               if (tApp.debugLevel === 1) {
-                TUtil.log(true)("Request from: ".concat(runId, " delay: ").concat(delay, " runningStep:").concat(this.runningStep, " dom:").concat(this.domProcessing, " runs:").concat(this.nextRuns.length, " D:").concat((_this$delayProcess = this.delayProcess) === null || _this$delayProcess === void 0 ? void 0 : _this$delayProcess.delay, " events:").concat(getEvents().eventQueue.length));
+                TUtil.log(true)("Request from: ".concat(runId, " delay: ").concat(delay, " runningStep:").concat(this.runningStep, " dom:").concat(this.domProcessing, " runs:").concat(this.nextRuns.length, " D:").concat((_this$delayProcess2 = this.delayProcess) === null || _this$delayProcess2 === void 0 ? void 0 : _this$delayProcess2.delay, " events:").concat(getEvents().eventQueue.length));
               }
               _context2.prev = 11;
               if (!(this.phase === 0)) {
@@ -321,8 +326,8 @@ var RunScheduler = /*#__PURE__*/function () {
   }, {
     key: "clearDelayProcess",
     value: function clearDelayProcess() {
-      var _this$delayProcess2;
-      if ((_this$delayProcess2 = this.delayProcess) !== null && _this$delayProcess2 !== void 0 && _this$delayProcess2.timeoutId) {
+      var _this$delayProcess3;
+      if ((_this$delayProcess3 = this.delayProcess) !== null && _this$delayProcess3 !== void 0 && _this$delayProcess3.timeoutId) {
         clearTimeout(this.delayProcess.timeoutId);
         this.delayProcess.timeoutId = undefined;
       }

package/build/StateManager.js

@@ -29,6 +29,7 @@ import { $Dom } from "./$Dom.js";
 import { TargetUtil } from "./TargetUtil.js";
 import { TModelUtil } from "./TModelUtil.js";
 import { TModel } from "./TModel.js";
+import { ParticleTModel } from "./ParticleTModel.js";
 import { StateUtil } from "./StateUtil.js";
 /**
  * It enables storing and restoring state.
@@ -37,6 +38,7 @@ var StateManager = /*#__PURE__*/function () {
   function StateManager() {
     _classCallCheck(this, StateManager);
     this.stateCheckpoints = {};
+    this.restoreQueue = Promise.resolve();
   }
   return _createClass(StateManager, [{
     key: "store",
@@ -46,6 +48,7 @@ var StateManager = /*#__PURE__*/function () {
           runSnapshot,
           $pageDom,
           checkpoint,
+          template,
           _args = arguments;
         return _regeneratorRuntime().wrap(function _callee$(_context) {
           while (1) switch (_context.prev = _context.next) {
@@ -69,6 +72,10 @@ var StateManager = /*#__PURE__*/function () {
               return this.captureGpuVisuals();
             case 17:
               _context.t11 = _context.sent;
+              _context.next = 20;
+              return this.captureExplodeSources();
+            case 20:
+              _context.t12 = _context.sent;
               checkpoint = {
                 key: _context.t0,
                 capturedAt: _context.t1,
@@ -81,12 +88,16 @@ var StateManager = /*#__PURE__*/function () {
                 scrollLeft: _context.t8,
                 scrollTop: _context.t9,
                 runSnapshot: _context.t10,
-                gpuVisuals: _context.t11
+                gpuVisuals: _context.t11,
+                explodeSources: _context.t12
               };
-              this.releaseGpuVisuals(this.stateCheckpoints[key]);
+              template = document.createElement("template");
+              template.innerHTML = checkpoint.html;
+              checkpoint.domTemplate = template;
+              this.releaseGpuResources(this.stateCheckpoints[key]);
               this.stateCheckpoints[key] = checkpoint;
               return _context.abrupt("return", checkpoint);
-            case 22:
+            case 28:
             case "end":
               return _context.stop();
           }
@@ -99,8 +110,21 @@ var StateManager = /*#__PURE__*/function () {
     }()
   }, {
     key: "restore",
+    value: function restore() {
+      var _this = this;
+      var key = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : "default";
+      var promise = this.restoreQueue.then(function () {
+        return _this.restoreCheckpoint(key);
+      });
+      this.restoreQueue = promise.catch(function (error) {
+        console.error("State restoration failed:", error);
+      });
+      return promise;
+    }
+  }, {
+    key: "restoreCheckpoint",
     value: function () {
-      var _restore = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee2() {
+      var _restoreCheckpoint = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee2() {
         var key,
           checkpoint,
           timeOffset,
@@ -109,9 +133,12 @@ var StateManager = /*#__PURE__*/function () {
           tmodelIdMap,
           models,
           $pageDom,
+          fragment,
           visibleModels,
           restoredWithDom,
           $restoredPageDom,
+          gpuModels,
+          index,
           _args2 = arguments;
         return _regeneratorRuntime().wrap(function _callee2$(_context2) {
           while (1) switch (_context2.prev = _context2.next) {
@@ -128,11 +155,16 @@ var StateManager = /*#__PURE__*/function () {
             case 6:
               getLoader().clear();
               _context2.next = 9;
-              return tApp.stop();
+              return tApp.stop({
+                discardState: true
+              });
             case 9:
               getLocationManager().cancelCurrentCalculation();
               _context2.next = 12;
-              return tApp.reset();
+              return tApp.reset({
+                discardState: true,
+                skipSchedulerReset: true
+              });
             case 12:
               App.oids = {};
               App.tmodelIdMap = {};
@@ -145,7 +177,8 @@ var StateManager = /*#__PURE__*/function () {
               App.tmodelIdMap = tmodelIdMap;
               getLoader().restoreRuntimeSnapshot(checkpoint.loaderSnapshot, tmodelIdMap);
               $pageDom = TModelUtil.getPageDom();
-              $pageDom.innerHTML(checkpoint.html);
+              fragment = checkpoint.domTemplate.content.cloneNode(true);
+              $pageDom.getElement().replaceChildren(fragment);
               TModelUtil.restoreMountedDom($pageDom, checkpoint.domState);
               this.showGpuRestoreVisuals(checkpoint.gpuVisuals);
               tApp.tRoot.$dom = TModelUtil.getRootDom();
@@ -157,36 +190,43 @@ var StateManager = /*#__PURE__*/function () {
                 restoredDoneTargets: true
               });
               tApp.tRoot.markLayoutDirty("checkpointRestore");
-              _context2.next = 31;
-              return tApp.start();
-            case 31:
+              _context2.next = 32;
+              return tApp.start({
+                skipSchedulerReset: true
+              });
+            case 32:
               $restoredPageDom = TModelUtil.getPageDom();
               TModelUtil.restoreMountedDom($restoredPageDom, checkpoint.domState);
-              _context2.next = 35;
+              _context2.next = 36;
               return TModelUtil.restoreScroll(checkpoint);
-            case 35:
-              _context2.next = 37;
+            case 36:
+              _context2.next = 38;
               return TModelUtil.restoreDomInteractionState($restoredPageDom, checkpoint.domState);
-            case 37:
-              _context2.next = 39;
-              return Promise.all(models.map(function (tmodel) {
-                var _tmodel$restoreRuntim;
-                return (_tmodel$restoreRuntim = tmodel.restoreRuntimeDomDerivedState) === null || _tmodel$restoreRuntim === void 0 ? void 0 : _tmodel$restoreRuntim.call(tmodel);
+            case 38:
+              gpuModels = models.filter(function (tmodel) {
+                return tmodel instanceof ParticleTModel;
+              });
+              _context2.next = 41;
+              return Promise.all(gpuModels.map(function (tmodel) {
+                return tmodel.restoreRuntimeDomDerivedState(checkpoint.explodeSources[tmodel.oid]);
               }));
-            case 39:
+            case 41:
+              for (index = 0; index < gpuModels.length; index++) {
+                gpuModels[index].particleRuntime.resumeRestored();
+              }
               this.hideGpuRestoreVisuals();
               getRunScheduler().restoreSnapshot(checkpoint.runSnapshot);
               return _context2.abrupt("return", true);
-            case 42:
+            case 45:
             case "end":
               return _context2.stop();
           }
         }, _callee2, this);
       }));
-      function restore() {
-        return _restore.apply(this, arguments);
+      function restoreCheckpoint() {
+        return _restoreCheckpoint.apply(this, arguments);
       }
-      return restore;
+      return restoreCheckpoint;
     }()
   }, {
     key: "syncAnimationsForCheckpoint",
@@ -388,6 +428,53 @@ var StateManager = /*#__PURE__*/function () {
       }
       return captureGpuVisuals;
     }()
+  }, {
+    key: "captureExplodeSources",
+    value: function () {
+      var _captureExplodeSources = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee4() {
+        var sources, _i2, _Object$values2, _renderer$captureExpl, tmodel, renderer, source;
+        return _regeneratorRuntime().wrap(function _callee4$(_context4) {
+          while (1) switch (_context4.prev = _context4.next) {
+            case 0:
+              sources = {};
+              _i2 = 0, _Object$values2 = Object.values(App.tmodelIdMap);
+            case 2:
+              if (!(_i2 < _Object$values2.length)) {
+                _context4.next = 14;
+                break;
+              }
+              tmodel = _Object$values2[_i2];
+              renderer = tmodel.particleRenderer;
+              if (!(!renderer || !tmodel.explodeChildrenState)) {
+                _context4.next = 7;
+                break;
+              }
+              return _context4.abrupt("continue", 11);
+            case 7:
+              _context4.next = 9;
+              return (_renderer$captureExpl = renderer.captureExplodeSourceBitmap) === null || _renderer$captureExpl === void 0 ? void 0 : _renderer$captureExpl.call(renderer);
+            case 9:
+              source = _context4.sent;
+              if (source) {
+                sources[tmodel.oid] = source;
+              }
+            case 11:
+              _i2++;
+              _context4.next = 2;
+              break;
+            case 14:
+              return _context4.abrupt("return", sources);
+            case 15:
+            case "end":
+              return _context4.stop();
+          }
+        }, _callee4);
+      }));
+      function captureExplodeSources() {
+        return _captureExplodeSources.apply(this, arguments);
+      }
+      return captureExplodeSources;
+    }()
   }, {
     key: "showGpuRestoreVisuals",
     value: function showGpuRestoreVisuals(visuals) {
@@ -406,8 +493,8 @@ var StateManager = /*#__PURE__*/function () {
         pointerEvents: "none",
         zIndex: "2147483647"
       });
-      for (var _i2 = 0, _Object$values2 = Object.values(visuals); _i2 < _Object$values2.length; _i2++) {
-        var visual = _Object$values2[_i2];
+      for (var _i3 = 0, _Object$values3 = Object.values(visuals); _i3 < _Object$values3.length; _i3++) {
+        var visual = _Object$values3[_i3];
         if (!(visual !== null && visual !== void 0 && visual.bitmap) || visual.clipWidth <= 0 || visual.clipHeight <= 0) {
           continue;
         }
@@ -445,13 +532,18 @@ var StateManager = /*#__PURE__*/function () {
       (_document$querySelect = document.querySelector('[data-targetjs-gpu-restore-overlay="true"]')) === null || _document$querySelect === void 0 || _document$querySelect.remove();
     }
   }, {
-    key: "releaseGpuVisuals",
-    value: function releaseGpuVisuals(checkpoint) {
-      for (var _i3 = 0, _Object$values3 = Object.values((checkpoint === null || checkpoint === void 0 ? void 0 : checkpoint.gpuVisuals) || {}); _i3 < _Object$values3.length; _i3++) {
+    key: "releaseGpuResources",
+    value: function releaseGpuResources(checkpoint) {
+      for (var _i4 = 0, _Object$values4 = Object.values((checkpoint === null || checkpoint === void 0 ? void 0 : checkpoint.gpuVisuals) || {}); _i4 < _Object$values4.length; _i4++) {
         var _visual$bitmap, _visual$bitmap$close, _visual$bitmap2;
-        var visual = _Object$values3[_i3];
+        var visual = _Object$values4[_i4];
         visual === null || visual === void 0 || (_visual$bitmap = visual.bitmap) === null || _visual$bitmap === void 0 || (_visual$bitmap$close = (_visual$bitmap2 = _visual$bitmap).close) === null || _visual$bitmap$close === void 0 || _visual$bitmap$close.call(_visual$bitmap2);
       }
+      for (var _i5 = 0, _Object$values5 = Object.values((checkpoint === null || checkpoint === void 0 ? void 0 : checkpoint.explodeSources) || {}); _i5 < _Object$values5.length; _i5++) {
+        var _source$close;
+        var source = _Object$values5[_i5];
+        source === null || source === void 0 || (_source$close = source.close) === null || _source$close === void 0 || _source$close.call(source);
+      }
     }
   }, {
     key: "has",
@@ -479,16 +571,16 @@ var StateManager = /*#__PURE__*/function () {
       if (!checkpoint) {
         return false;
       }
-      this.releaseGpuVisuals(checkpoint);
+      this.releaseGpuResources(checkpoint);
       delete this.stateCheckpoints[key];
       return true;
     }
   }, {
     key: "clearAll",
     value: function clearAll() {
-      for (var _i4 = 0, _Object$values4 = Object.values(this.stateCheckpoints); _i4 < _Object$values4.length; _i4++) {
-        var checkpoint = _Object$values4[_i4];
-        this.releaseGpuVisuals(checkpoint);
+      for (var _i6 = 0, _Object$values6 = Object.values(this.stateCheckpoints); _i6 < _Object$values6.length; _i6++) {
+        var checkpoint = _Object$values6[_i6];
+        this.releaseGpuResources(checkpoint);
       }
       this.stateCheckpoints = {};
     }