targetj 1.1.0 → 1.1.2

package/build/App.js

@@ -96,12 +96,25 @@ var AppFn = function AppFn() {
     return my;
   };
   my.start = /*#__PURE__*/_asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee() {
+    var _ref2,
+      _ref2$skipSchedulerRe,
+      skipSchedulerReset,
+      _args = arguments;
     return _regeneratorRuntime().wrap(function _callee$(_context) {
       while (1) switch (_context.prev = _context.next) {
         case 0:
+          _ref2 = _args.length > 0 && _args[0] !== undefined ? _args[0] : {}, _ref2$skipSchedulerRe = _ref2.skipSchedulerReset, skipSchedulerReset = _ref2$skipSchedulerRe === void 0 ? false : _ref2$skipSchedulerRe;
           my.runningFlag = false;
-          TargetExecutor.executeDeclarativeTarget(my.tRoot, 'screenWidth');
-          TargetExecutor.executeDeclarativeTarget(my.tRoot, 'screenHeight');
+          if (skipSchedulerReset) {
+            _context.next = 5;
+            break;
+          }
+          _context.next = 5;
+          return my.runScheduler.resetRuns();
+        case 5:
+          my.animationManager.isShuttingDown = false;
+          TargetExecutor.executeDeclarativeTarget(my.tRoot, "screenWidth");
+          TargetExecutor.executeDeclarativeTarget(my.tRoot, "screenHeight");
           my.events.detachAll();
           my.events.detachWindowEvents();
           my.events.attachWindowEvents();
@@ -109,80 +122,107 @@ var AppFn = function AppFn() {
           my.events.attachEvents(Object.values(App.tmodelIdMap).filter(function (tmodel) {
             return tmodel.hasDom() && tmodel.$dom.element.isConnected;
           }));
-          _context.next = 10;
-          return my.runScheduler.resetRuns();
-        case 10:
           my.runningFlag = true;
           my.runScheduler.schedule(0, "appStart");
           return _context.abrupt("return", my);
-        case 13:
+        case 16:
         case "end":
           return _context.stop();
       }
     }, _callee);
   }));
   my.stop = /*#__PURE__*/_asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee2() {
+    var _ref4,
+      _ref4$discardState,
+      discardState,
+      _args2 = arguments;
     return _regeneratorRuntime().wrap(function _callee2$(_context2) {
       while (1) switch (_context2.prev = _context2.next) {
         case 0:
+          _ref4 = _args2.length > 0 && _args2[0] !== undefined ? _args2[0] : {}, _ref4$discardState = _ref4.discardState, discardState = _ref4$discardState === void 0 ? false : _ref4$discardState;
           my.runningFlag = false;
           my.events.detachAll();
           my.events.detachWindowEvents();
           my.events.clearAll();
-          _context2.next = 6;
-          return my.animationManager.deleteAll();
-        case 6:
-          _context2.next = 8;
-          return my.animationManager.flushOneFrame();
-        case 8:
+          _context2.next = 7;
+          return my.animationManager.deleteAll({
+            discardState: discardState
+          });
+        case 7:
+          if (discardState) {
+            _context2.next = 10;
+            break;
+          }
           _context2.next = 10;
-          return my.runScheduler.resetRuns();
+          return my.animationManager.flushOneFrame();
         case 10:
+          _context2.next = 12;
+          return my.runScheduler.resetRuns();
+        case 12:
           return _context2.abrupt("return", my);
-        case 11:
+        case 13:
         case "end":
           return _context2.stop();
       }
     }, _callee2);
   }));
   my.reset = /*#__PURE__*/_asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee3() {
-    var _i, _Object$values, _tmodel$particleRunti, _tmodel$particleRende, tmodel;
+    var _ref6,
+      _ref6$discardState,
+      discardState,
+      _ref6$skipSchedulerRe,
+      skipSchedulerReset,
+      _ref6$preserveCachedM,
+      preserveCachedModels,
+      _i,
+      _Object$values,
+      _tmodel$disposeRuntim,
+      tmodel,
+      _args3 = arguments;
     return _regeneratorRuntime().wrap(function _callee3$(_context3) {
       while (1) switch (_context3.prev = _context3.next) {
         case 0:
-          my.manager.getVisibles().forEach(function (tmodel) {
-            var _tmodel$allStyleTarge;
-            if ((_tmodel$allStyleTarge = tmodel.allStyleTargetMap) !== null && _tmodel$allStyleTarge !== void 0 && _tmodel$allStyleTarge.size) {
-              var _iterator = _createForOfIteratorHelper(tmodel.allStyleTargetMap),
-                _step;
-              try {
-                for (_iterator.s(); !(_step = _iterator.n()).done;) {
-                  var _step$value = _slicedToArray(_step.value, 1),
-                    key = _step$value[0];
-                  if (TUtil.isDefined(tmodel.val(key))) {
-                    tmodel.addToStyleTargetList(key);
+          _ref6 = _args3.length > 0 && _args3[0] !== undefined ? _args3[0] : {}, _ref6$discardState = _ref6.discardState, discardState = _ref6$discardState === void 0 ? false : _ref6$discardState, _ref6$skipSchedulerRe = _ref6.skipSchedulerReset, skipSchedulerReset = _ref6$skipSchedulerRe === void 0 ? false : _ref6$skipSchedulerRe, _ref6$preserveCachedM = _ref6.preserveCachedModels, preserveCachedModels = _ref6$preserveCachedM === void 0 ? false : _ref6$preserveCachedM;
+          if (!discardState) {
+            my.manager.getVisibles().forEach(function (tmodel) {
+              var _tmodel$allStyleTarge;
+              if ((_tmodel$allStyleTarge = tmodel.allStyleTargetMap) !== null && _tmodel$allStyleTarge !== void 0 && _tmodel$allStyleTarge.size) {
+                var _iterator = _createForOfIteratorHelper(tmodel.allStyleTargetMap),
+                  _step;
+                try {
+                  for (_iterator.s(); !(_step = _iterator.n()).done;) {
+                    var _step$value = _slicedToArray(_step.value, 1),
+                      key = _step$value[0];
+                    if (TUtil.isDefined(tmodel.val(key))) {
+                      tmodel.addToStyleTargetList(key);
+                    }
                   }
+                } catch (err) {
+                  _iterator.e(err);
+                } finally {
+                  _iterator.f();
                 }
-              } catch (err) {
-                _iterator.e(err);
-              } finally {
-                _iterator.f();
               }
+            });
+          }
+          if (!preserveCachedModels) {
+            for (_i = 0, _Object$values = Object.values(App.tmodelIdMap); _i < _Object$values.length; _i++) {
+              tmodel = _Object$values[_i];
+              (_tmodel$disposeRuntim = tmodel.disposeRuntimeDerivedState) === null || _tmodel$disposeRuntim === void 0 || _tmodel$disposeRuntim.call(tmodel);
             }
-          });
-          _context3.next = 3;
-          return my.runScheduler.resetRuns();
-        case 3:
-          for (_i = 0, _Object$values = Object.values(App.tmodelIdMap); _i < _Object$values.length; _i++) {
-            tmodel = _Object$values[_i];
-            (_tmodel$particleRunti = tmodel.particleRuntime) === null || _tmodel$particleRunti === void 0 || _tmodel$particleRunti.dispose();
-            (_tmodel$particleRende = tmodel.particleRenderer) === null || _tmodel$particleRende === void 0 || _tmodel$particleRende.destroy();
           }
+          if (skipSchedulerReset) {
+            _context3.next = 6;
+            break;
+          }
+          _context3.next = 6;
+          return my.runScheduler.resetRuns();
+        case 6:
           my.manager.clearAll();
           my.locationManager.clear();
           my.loader.clear();
           SearchUtil.clear();
-        case 8:
+        case 10:
         case "end":
           return _context3.stop();
       }

package/build/BaseModel.js

@@ -23,6 +23,7 @@ import { TargetParser } from "./TargetParser.js";
 import { TargetUtil } from "./TargetUtil.js";
 import { TargetData } from "./TargetData.js";
 import { $Dom } from "./$Dom.js";
+import { Easing } from "./Easing.js";
 
 /**
  * It provides the target state and associated logic to the TModel.
@@ -328,6 +329,10 @@ var BaseModel = /*#__PURE__*/function () {
       if (isInactiveKey) {
         this.targets[key].active = false;
       }
+      if (TargetData.requiresDom(cleanKey)) {
+        this.addOnDomTarget(key);
+        this.targets[key].active = false;
+      }
       if (TargetData.bypassInitialProcessingTargetMap[cleanKey]) {
         return;
       }
@@ -377,15 +382,34 @@ var BaseModel = /*#__PURE__*/function () {
   }, {
     key: "canTargetBeActivated",
     value: function canTargetBeActivated(key) {
-      var onDomEvent = this.targets.onDomEvent;
-      if (onDomEvent) {
-        var included = Array.isArray(onDomEvent) ? onDomEvent.includes(key) : onDomEvent === key;
+      var onDomReady = this.targets.onDomReady;
+      if (onDomReady) {
+        var _onDomReady$value;
+        var value = (_onDomReady$value = onDomReady.value) !== null && _onDomReady$value !== void 0 ? _onDomReady$value : onDomReady;
+        var included = Array.isArray(value) ? value.includes(key) : value === key;
         if (included && !this.hasDom()) {
           return false;
         }
       }
       return !this.activeTargetMap[key];
     }
+  }, {
+    key: "addOnDomTarget",
+    value: function addOnDomTarget(key) {
+      var onDomReady = this.targets.onDomReady;
+      if (!onDomReady) {
+        this.targets.onDomReady = {
+          value: [key],
+          active: false
+        };
+        this.processNewTarget('onDomReady');
+        return;
+      }
+      var values = Array.isArray(onDomReady) ? onDomReady : onDomReady.value;
+      if (Array.isArray(values) && !values.includes(key)) {
+        values.push(key);
+      }
+    }
   }, {
     key: "addToStyleTargetList",
     value: function addToStyleTargetList(key, enforce) {
@@ -649,12 +673,12 @@ var BaseModel = /*#__PURE__*/function () {
       if (!TUtil.isDefined(target)) {
         return false;
       }
-      if (typeof target.enabledOn === 'function') {
-        this.setTargetMethodName(key, 'enabledOn');
-        return target.enabledOn.call(this);
-      } else {
-        return true;
+      var enabledOn = target.enabledOn;
+      if (typeof enabledOn === "function") {
+        this.setTargetMethodName(key, "enabledOn");
+        return !!enabledOn.call(this);
       }
+      return enabledOn !== false;
     }
   }, {
     key: "doesTargetEqualActual",
@@ -804,9 +828,10 @@ var BaseModel = /*#__PURE__*/function () {
           if (this.isTargetUpdating(key) || (_this$animatingMap = this.animatingMap) !== null && _this$animatingMap !== void 0 && _this$animatingMap.has(key)) {
             continue;
           }
-          if (!this.shouldScheduleRun(key)) {
+          if (!this.shouldScheduleRun(key) || !this.canTargetBeActivated(key)) {
             continue;
           }
+          this.resetTargetStep(key);
           this.addToActiveTargets(key);
           activated = true;
         }
@@ -956,19 +981,26 @@ var BaseModel = /*#__PURE__*/function () {
     key: "setTarget",
     value: function setTarget(key, value, steps, interval, easing) {
       if (_typeof(key) === 'object' && key !== null) {
-        var _ref3 = [key, value, steps, interval, easing];
+        var _ref3 = [key, value, steps, interval];
         value = _ref3[0];
         steps = _ref3[1];
         interval = _ref3[2];
         easing = _ref3[3];
         key = '';
       }
+      if (easing === undefined && Easing.isEasing(interval)) {
+        easing = interval;
+        interval = undefined;
+      }
       if (typeof key === 'string') {
         key = !key.endsWith('+') ? key + "+" : key;
       }
       var originalTargetName = TargetUtil.currentTargetName;
       var originalTModel = TargetUtil.currentTModel;
-      if (this.getParent() === originalTModel) {
+      if (originalTargetName === 'swell') {
+        console.log("setTarget: " + this.oid + ", " + originalTModel.oid + ", " + originalTargetName);
+      }
+      if (originalTModel && originalTargetName && originalTModel !== this) {
         TargetUtil.markChildAction(originalTModel, originalTargetName, this);
       }
       this.markLayoutDirty(key);

package/build/Easing.js

@@ -14,6 +14,11 @@ var Easing = /*#__PURE__*/function () {
     _classCallCheck(this, Easing);
   }
   return _createClass(Easing, null, [{
+    key: "isEasing",
+    value: function isEasing(value) {
+      return Easing.easeMap.has(value);
+    }
+  }, {
     key: "easingFunction",
     value: function easingFunction(easingStr) {
       if (!easingStr) {

package/build/EventListener.js

@@ -137,15 +137,24 @@ var EventListener = /*#__PURE__*/function () {
   }, {
     key: "attachEvents",
     value: function attachEvents(tmodels) {
+      var isScrollable = function isScrollable(value) {
+        return typeof value === 'string' && value.split(/\s+/).some(function (mode) {
+          return mode === 'scroll' || mode === 'auto';
+        });
+      };
       var _iterator = _createForOfIteratorHelper(tmodels),
         _step;
       try {
         for (_iterator.s(); !(_step = _iterator.n()).done;) {
+          var _tmodel$externalEvent;
           var tmodel = _step.value;
-          if (!tmodel.externalEventMap) {
-            continue;
+          var overflow = tmodel.val('overflow');
+          var overflowX = tmodel.val('overflowX');
+          var overflowY = tmodel.val('overflowY');
+          if (tmodel.hasDom() && (isScrollable(overflow) || isScrollable(overflowX) || isScrollable(overflowY))) {
+            this.attachTargetEvents(tmodel, 'onWindowScroll', true);
           }
-          var _iterator2 = _createForOfIteratorHelper(tmodel.externalEventMap),
+          var _iterator2 = _createForOfIteratorHelper((_tmodel$externalEvent = tmodel.externalEventMap) !== null && _tmodel$externalEvent !== void 0 ? _tmodel$externalEvent : []),
             _step2;
           try {
             for (_iterator2.s(); !(_step2 = _iterator2.n()).done;) {
@@ -379,9 +388,9 @@ var EventListener = /*#__PURE__*/function () {
           break;
         case "popstate":
           for (var _i2 = 0, _Object$values = Object.values(getManager().visibleOidMap); _i2 < _Object$values.length; _i2++) {
-            var _tmodel$externalEvent;
+            var _tmodel$externalEvent2;
             var tmodel = _Object$values[_i2];
-            if ((_tmodel$externalEvent = tmodel.externalEventMap) !== null && _tmodel$externalEvent !== void 0 && _tmodel$externalEvent.has("onPopState")) {
+            if ((_tmodel$externalEvent2 = tmodel.externalEventMap) !== null && _tmodel$externalEvent2 !== void 0 && _tmodel$externalEvent2.has("onPopState")) {
               mark(tmodel, "popstate-event");
             }
           }
@@ -411,7 +420,8 @@ var EventListener = /*#__PURE__*/function () {
         _this$currentHandlers6,
         _this$currentHandlers7,
         _this7 = this,
-        _tmodel3;
+        _tmodel3,
+        _tmodel4;
       if (!event) {
         return;
       }
@@ -448,7 +458,8 @@ var EventListener = /*#__PURE__*/function () {
           lastTimeStamp = _this$lastEvent2.timeStamp;
         var rate = now - lastTimeStamp;
         var isTerminal = eventType === 'end' || eventType === 'cancel' || eventType === 'start';
-        if (!isTerminal && inputType && lastEventItem.inputType && lastEventItem.inputType !== inputType && eventOrder > lastEventItem.order) {
+        var isDuplicateInput = eventType === lastEventItem.eventType && now - lastTimeStamp < 60 && inputType && lastEventItem.inputType && lastEventItem.inputType !== inputType && eventOrder > lastEventItem.order;
+        if (!isTerminal && isDuplicateInput) {
           return;
         }
         if (this.eventQueue.length > EventListener.MAX_EVENT_QUEUE_SIZE && rateLimit > 0 && rate < rateLimit) {
@@ -625,12 +636,21 @@ var EventListener = /*#__PURE__*/function () {
             getLocationManager().domIslandSet.forEach(function (t) {
               t.markLayoutDirty('window-scroll-event');
             });
-          } else {
+          } else if ((_tmodel3 = tmodel) !== null && _tmodel3 !== void 0 && _tmodel3.hasDom()) {
+            var scrollTop = tmodel.$dom.getScrollTop();
+            var scrollLeft = tmodel.$dom.getScrollLeft();
+            if (tmodel.getScrollTop() !== scrollTop) {
+              tmodel.val('scrollTop', scrollTop);
+            }
+            if (tmodel.getScrollLeft() !== scrollLeft) {
+              tmodel.val('scrollLeft', scrollLeft);
+            }
+            tmodel.visibilityDirty = true;
             tmodel.markLayoutDirty('container-scroll-event');
           }
           break;
       }
-      getRunScheduler().schedule(0, "".concat((_tmodel3 = tmodel) === null || _tmodel3 === void 0 ? void 0 : _tmodel3.oid, "-").concat(originalName, "-").concat(eventName, "-").concat((event.target.tagName || '').toUpperCase()));
+      getRunScheduler().schedule(0, "".concat((_tmodel4 = tmodel) === null || _tmodel4 === void 0 ? void 0 : _tmodel4.oid, "-").concat(originalName, "-").concat(eventName, "-").concat((event.target.tagName || '').toUpperCase()));
     }
   }, {
     key: "queueScrollEndEvent",