targetj 1.0.228 → 1.0.229

package/build/TUtil.js

@@ -7,7 +7,6 @@ exports.TUtil = void 0;
 var _App = require("./App.js");
 var _TargetUtil = require("./TargetUtil.js");
 var _TargetData = require("./TargetData.js");
-var _TargetParser = require("./TargetParser");
 function _createForOfIteratorHelper(r, e) { var t = "undefined" != typeof Symbol && r[Symbol.iterator] || r["@@iterator"]; if (!t) { if (Array.isArray(r) || (t = _unsupportedIterableToArray(r)) || e && r && "number" == typeof r.length) { t && (r = t); var _n = 0, F = function F() {}; return { s: F, n: function n() { return _n >= r.length ? { done: !0 } : { done: !1, value: r[_n++] }; }, e: function e(r) { throw r; }, f: F }; } throw new TypeError("Invalid attempt to iterate non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); } var o, a = !0, u = !1; return { s: function s() { t = t.call(r); }, n: function n() { var r = t.next(); return a = r.done, r; }, e: function e(r) { u = !0, o = r; }, f: function f() { try { a || null == t.return || t.return(); } finally { if (u) throw o; } } }; }
 function _typeof(o) { "@babel/helpers - typeof"; return _typeof = "function" == typeof Symbol && "symbol" == typeof Symbol.iterator ? function (o) { return typeof o; } : function (o) { return o && "function" == typeof Symbol && o.constructor === Symbol && o !== Symbol.prototype ? "symbol" : typeof o; }, _typeof(o); }
 function _toConsumableArray(r) { return _arrayWithoutHoles(r) || _iterableToArray(r) || _unsupportedIterableToArray(r) || _nonIterableSpread(); }
@@ -33,53 +32,112 @@ var TUtil = exports.TUtil = /*#__PURE__*/function () {
     key: "calcVisibility",
     value: function calcVisibility(child) {
       var _parent$targets$onVis;
-      // keep the "x updating" fast-path
-
       var parent = child.getRealParent();
       var onVisibleChildrenChange = (_parent$targets$onVis = parent === null || parent === void 0 ? void 0 : parent.targets['onVisibleChildrenChange']) !== null && _parent$targets$onVis !== void 0 ? _parent$targets$onVis : false;
       if (!onVisibleChildrenChange && child.isVisible() && (child.isTargetUpdating(child.allTargetMap['x']) || child.isTargetUpdating(child.allTargetMap['y']))) {
         return true;
       }
-      var x = child.absX;
-      var y = child.absY;
       var domParent = child.getDomParent();
       var scale = (domParent.getMeasuringScale() || 1) * child.getMeasuringScale();
-      var maxWidth = TUtil.isDefined(child.getWidth()) ? scale * child.getWidth() : 0;
-      var maxHeight = TUtil.isDefined(child.getHeight()) ? scale * child.getHeight() : 0;
+      var x = child.absX;
+      var y = child.absY;
+      var width = TUtil.isDefined(child.getWidth()) ? scale * child.getWidth() : 0;
+      var height = TUtil.isDefined(child.getHeight()) ? scale * child.getHeight() : 0;
+      var visibilityMargin = 20;
       if (!child.visibilityStatus) {
         child.visibilityStatus = {};
       }
       var status = child.visibilityStatus;
-      var validateInParent = child.validateVisibilityInParent() && parent !== (0, _App.tRoot)();
-      var parentX = validateInParent ? Math.max(domParent.absX, parent.absX) : 0;
-      var parentY = validateInParent ? Math.max(domParent.absY, parent.absY) : 0;
-      var parentW = validateInParent ? Math.min(domParent.getWidth(), parent.getWidth()) : (0, _App.getScreenWidth)();
-      var parentH = validateInParent ? Math.min(domParent.getHeight(), parent.getHeight()) : (0, _App.getScreenHeight)();
-      var screenX = 0;
-      var screenY = 0;
-      var screenW = (0, _App.getScreenWidth)();
-      var screenH = (0, _App.getScreenHeight)();
-      var clipX = Math.max(parentX, screenX);
-      var clipY = Math.max(parentY, screenY);
-      var clipR = Math.min(parentX + parentW, screenX + screenW);
-      var clipB = Math.min(parentY + parentH, screenY + screenH);
-      status.right = x <= clipR;
-      status.left = x + maxWidth >= clipX;
-      status.bottom = y - child.getTopMargin() <= clipB;
-      status.top = y + maxHeight >= clipY;
-      status.clipX = clipX;
-      status.clipY = clipY;
-      status.clipR = clipR;
-      status.clipB = clipB;
+      var clip = this.getVisibilityClipRect(child.getParent());
+      if (clip) {
+        status.right = x - visibilityMargin <= clip.r;
+        status.left = x + width + visibilityMargin >= clip.x;
+        status.bottom = y - child.getTopMargin() - visibilityMargin <= clip.b;
+        status.top = y + height + visibilityMargin >= clip.y;
+        status.clipX = clip.x;
+        status.clipY = clip.y;
+        status.clipR = clip.r;
+        status.clipB = clip.b;
+        status.parent = clip.source;
+        status.isVisible = status.left && status.right && status.top && status.bottom;
+      } else {
+        status.right = true;
+        status.left = true;
+        status.bottom = true;
+        status.top = true;
+        status.clipX = undefined;
+        status.clipY = undefined;
+        status.clipR = undefined;
+        status.clipB = undefined;
+        status.parent = "none";
+        status.isVisible = true;
+      }
       status.x = x;
       status.y = y;
-      status.width = maxWidth;
-      status.height = maxHeight;
-      status.parent = validateInParent ? parent : "screen";
-      status.isVisible = status.left && status.right && status.top && status.bottom;
+      status.width = width;
+      status.height = height;
       child.actualValues.isVisible = status.isVisible;
       return status.isVisible;
     }
+  }, {
+    key: "getVisibilityClipRect",
+    value: function getVisibilityClipRect(container) {
+      var rect = null;
+      while (container && container !== (0, _App.tRoot)()) {
+        if (this.shouldClipByAncestor(container)) {
+          var ancestorRect = this.getAncestorViewportRect(container);
+          rect = rect ? this.intersectVisibilityRects(rect, ancestorRect) : ancestorRect;
+          if (rect.r <= rect.x || rect.b <= rect.y) {
+            break;
+          }
+        }
+        container = container.getParent();
+      }
+      return rect;
+    }
+  }, {
+    key: "shouldClipByAncestor",
+    value: function shouldClipByAncestor(ancestor) {
+      return ancestor.managesOwnScroll();
+    }
+  }, {
+    key: "getAncestorViewportRect",
+    value: function getAncestorViewportRect(ancestor) {
+      var _ancestor$$dom, _ancestor$$dom2;
+      var domScrollLeft = ((_ancestor$$dom = ancestor.$dom) === null || _ancestor$$dom === void 0 ? void 0 : _ancestor$$dom.getScrollLeft()) || 0;
+      var domScrollTop = ((_ancestor$$dom2 = ancestor.$dom) === null || _ancestor$$dom2 === void 0 ? void 0 : _ancestor$$dom2.getScrollTop()) || 0;
+      return {
+        x: ancestor.absX + domScrollLeft,
+        y: ancestor.absY + domScrollTop,
+        r: ancestor.absX + domScrollLeft + ancestor.getWidth(),
+        b: ancestor.absY + domScrollTop + ancestor.getHeight(),
+        source: ancestor
+      };
+    }
+  }, {
+    key: "intersectVisibilityRects",
+    value: function intersectVisibilityRects(a, b) {
+      return {
+        x: Math.max(a.x, b.x),
+        y: Math.max(a.y, b.y),
+        r: Math.min(a.r, b.r),
+        b: Math.min(a.b, b.b),
+        source: b.source
+      };
+    }
+  }, {
+    key: "updateClipRect",
+    value: function updateClipRect(tmodel) {
+      var parent = tmodel.getParent();
+      var inheritedClip = (parent === null || parent === void 0 ? void 0 : parent.visibilityClipRect) || null;
+      if (this.shouldClipByAncestor(tmodel)) {
+        var localRect = this.getLocalViewportRect(tmodel);
+        tmodel.visibilityClipRect = inheritedClip ? this.intersectVisibilityRects(inheritedClip, localRect) : localRect;
+      } else {
+        tmodel.visibilityClipRect = inheritedClip;
+      }
+      return tmodel.visibilityClipRect;
+    }
   }, {
     key: "contains",
     value: function contains(container, tmodel) {
@@ -305,9 +363,6 @@ var TUtil = exports.TUtil = /*#__PURE__*/function () {
   }, {
     key: "runTargetValue",
     value: function runTargetValue(tmodel, target, key, cycle, lastValue) {
-      if (_TargetParser.TargetParser.isIntervalTarget(target) && cycle === 1) {
-        return;
-      }
       var cleanKey = _TargetUtil.TargetUtil.getTargetName(key);
       var isExternalEvent = _TargetData.TargetData.allEventMap[cleanKey];
       if (isExternalEvent) {

package/build/TargetData.js

@@ -266,7 +266,9 @@ _defineProperty(TargetData, "mustExecuteTargets", {
   heightFromDom: true,
   widthFromDom: true,
   fetch: true,
-  fetchImage: true
+  fetchImage: true,
+  isVisible: true,
+  canDeleteDom: true
 });
 _defineProperty(TargetData, "ignoreRerun", {
   isVisible: true
@@ -899,5 +901,5 @@ _defineProperty(TargetData, "lifecyclePatterns", {
 });
 _defineProperty(TargetData, "eventSet", new Set([].concat(_toConsumableArray(Object.keys(_TargetData.allEventMap)), _toConsumableArray(Object.keys(_TargetData.internalEventMap)))));
 _defineProperty(TargetData, "styleSet", new Set([].concat(_toConsumableArray(Object.keys(_TargetData.styleTargetMap)), _toConsumableArray(Object.keys(_TargetData.asyncStyleTargetMap)), _toConsumableArray(Object.keys(_TargetData.attributeTargetMap)))));
-_defineProperty(TargetData, "reservedKeywordSet", new Set([].concat(_toConsumableArray(_TargetData.styleSet), _toConsumableArray(Object.keys(_TargetData.defaultActualValues())), _toConsumableArray(Object.keys(_TargetData.allEventMap)), _toConsumableArray(Object.keys(_TargetData.internalEventMap)), ['html', 'isInFlow', 'domHolder', 'domParent', 'gap', 'widthFromDom', 'heightFromDom', 'requiresDom', 'preventDefault', 'canDeleteDom', 'textOnly', 'styling', '$dom', 'defaultStyling', 'reuseDomDefinition', 'canHaveDom', 'excludeXYCalc', 'excludeX', 'excludeY', 'containerOverflowMode', 'itemOverflowMode', 'baseElement', 'element', 'otype', 'calculateChildren', 'domIsland', 'bracketThreshold', 'bracketSize', 'sourceDom'])));
+_defineProperty(TargetData, "reservedKeywordSet", new Set([].concat(_toConsumableArray(_TargetData.styleSet), _toConsumableArray(Object.keys(_TargetData.defaultActualValues())), _toConsumableArray(Object.keys(_TargetData.allEventMap)), _toConsumableArray(Object.keys(_TargetData.internalEventMap)), _toConsumableArray(Object.keys(_TargetData.mustExecuteTargets)), ['html', 'isInFlow', 'domHolder', 'domParent', 'gap', 'widthFromDom', 'heightFromDom', 'requiresDom', 'preventDefault', 'canDeleteDom', 'textOnly', 'styling', '$dom', 'defaultStyling', 'reuseDomDefinition', 'canHaveDom', 'excludeXYCalc', 'excludeX', 'excludeY', 'containerOverflowMode', 'itemOverflowMode', 'baseElement', 'element', 'otype', 'calculateChildren', 'domIsland', 'bracketThreshold', 'bracketSize', 'shouldBeBracketed', 'sourceDom'])));
 _defineProperty(TargetData, "activationKeywordSet", new Set(['originalTModel', 'originalTargetName', 'activateNextTarget']));

package/build/TargetExecutor.js

@@ -90,7 +90,7 @@ var TargetExecutor = exports.TargetExecutor = /*#__PURE__*/function () {
         targetValue = TargetExecutor.assignImperativeTargetValue(tmodel, key, originalTargetName, originalTModel);
         TargetExecutor.assignListTarget(tmodel, key, targetValue, value.list, value.list[0], vSteps, vInterval, vEasing, vCycles);
       } else if (_TargetParser.TargetParser.isTargetSpecObject(value)) {
-        var valueArray = _TargetParser.TargetParser.getValueStepsCycles(tmodel, value, key);
+        var valueArray = _TargetParser.TargetParser.getValueStepsCycles(tmodel, key, value);
         var newValue = valueArray[0];
         var newSteps = valueArray[1];
         var newInterval = valueArray[2];
@@ -111,7 +111,7 @@ var TargetExecutor = exports.TargetExecutor = /*#__PURE__*/function () {
           var newEasing = easing;
           var newCycles = cycles;
           if (_typeof(newValue) === 'object' && !_TargetParser.TargetParser.isListTarget(newValue)) {
-            var _valueArray = _TargetParser.TargetParser.getValueStepsCycles(tmodel, completeValue[objectKey], objectKey);
+            var _valueArray = _TargetParser.TargetParser.getValueStepsCycles(tmodel, objectKey, completeValue[objectKey]);
             newValue = _valueArray[0];
             newSteps = _TUtil.TUtil.isDefined(_valueArray[1]) ? _valueArray[1] : steps;
             newInterval = _TUtil.TUtil.isDefined(_valueArray[2]) ? _valueArray[2] : interval;
@@ -122,7 +122,7 @@ var TargetExecutor = exports.TargetExecutor = /*#__PURE__*/function () {
         });
       } else {
         if (_typeof(value) === 'object' && !_TargetParser.TargetParser.isListTarget(value)) {
-          var _valueArray2 = _TargetParser.TargetParser.getValueStepsCycles(tmodel, value, key);
+          var _valueArray2 = _TargetParser.TargetParser.getValueStepsCycles(tmodel, key, value);
           if (value !== _valueArray2[0]) {
             value = _valueArray2[0];
             steps = _TUtil.TUtil.isDefined(_valueArray2[1]) ? _valueArray2[1] : steps;
@@ -248,8 +248,11 @@ var TargetExecutor = exports.TargetExecutor = /*#__PURE__*/function () {
     key: "resolveTargetValue",
     value: function resolveTargetValue(tmodel, key) {
       var cycle = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : tmodel.getTargetCycle(key);
+      if (_TargetParser.TargetParser.isIntervalTarget(tmodel.targets[key]) && cycle === 1) {
+        return;
+      }
       var targetInitial = !tmodel.targetValues[key] && _TUtil.TUtil.isDefined(tmodel.targets[key].initialValue) ? tmodel.targets[key].initialValue : undefined;
-      var valueArray = _TargetParser.TargetParser.getValueStepsCycles(tmodel, tmodel.targets[key], key, cycle);
+      var valueArray = _TargetParser.TargetParser.getValueStepsCycles(tmodel, key, tmodel.targets[key], cycle);
       var newValue = valueArray[0];
       var newSteps = valueArray[1] || 0;
       var newInterval = valueArray[2] || 0;
@@ -259,7 +262,7 @@ var TargetExecutor = exports.TargetExecutor = /*#__PURE__*/function () {
       tmodel.targetValues[key] = targetValue;
       var easing = _TUtil.TUtil.isDefined(newEasing) ? newEasing : _TUtil.TUtil.isDefined(tmodel.targets[key].easing) ? tmodel.targets[key].easing : undefined;
       if (_TargetParser.TargetParser.isIntervalTarget(newValue)) {
-        TargetExecutor.assignSingleTarget(targetValue, undefined, undefined, 0, 2, newValue.interval, easing);
+        TargetExecutor.assignSingleTarget(targetValue, undefined, targetInitial, 0, 2, newValue.interval, easing);
       } else if (_TargetParser.TargetParser.isChildTarget(key, newValue)) {
         tmodel.addChild(newValue);
         TargetExecutor.assignSingleTarget(targetValue, newValue, undefined, 0, newCycles, newInterval, easing);

package/build/TargetManager.js

@@ -243,7 +243,7 @@ var TargetManager = exports.TargetManager = /*#__PURE__*/function () {
       });
       var isTransform = _TargetData.TargetData.isTransformKey(cleanKey);
       var getFrameAtTime = function getFrameAtTime(t) {
-        var shifted = t + timeShift;
+        var shifted = Math.max(0, t + timeShift);
         for (var i = 0; i < batch.frames.length; i++) {
           var _frame = batch.frames[i];
           if (Math.abs(_frame.keyTime - shifted) < 0.0001) {
@@ -318,7 +318,7 @@ var TargetManager = exports.TargetManager = /*#__PURE__*/function () {
       if (tmodel.getTargetEasing(key)) {
         batch.easing = tmodel.getTargetEasing(key);
       }
-      batch.totalDuration = Math.max(batch.totalDuration, timeShift + keyDuration);
+      batch.totalDuration = Math.max(0, batch.totalDuration, timeShift + keyDuration);
       ((_batch$keyMap = batch.keyMap)[cleanKey] || (_batch$keyMap[cleanKey] = new Set())).add(key);
       tmodel.removeFromUpdatingTargets(key);
       return keyDuration;

package/build/TargetParser.js

@@ -217,7 +217,8 @@ var TargetParser = exports.TargetParser = /*#__PURE__*/function () {
     }
   }, {
     key: "getValueStepsCycles",
-    value: function getValueStepsCycles(tmodel, _target, key) {
+    value: function getValueStepsCycles(tmodel, key) {
+      var _target = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : tmodel.targets[key];
       var cycle = arguments.length > 3 && arguments[3] !== undefined ? arguments[3] : tmodel.getTargetCycle(key);
       var valueOnly = _target && _target.valueOnly;
       var lastValue = tmodel.val(key);

package/build/TargetUtil.js

@@ -182,8 +182,8 @@ var TargetUtil = exports.TargetUtil = /*#__PURE__*/function () {
       if (nextTarget) {
         if (isEndTrigger) {
           var _tmodel$targetValues$2, _tmodel$targetValues$3;
-          var nextCompleteCount = (_tmodel$targetValues$2 = (_tmodel$targetValues$3 = tmodel.targetValues[nextTarget]) === null || _tmodel$targetValues$3 === void 0 ? void 0 : _tmodel$targetValues$3.completeCount) !== null && _tmodel$targetValues$2 !== void 0 ? _tmodel$targetValues$2 : 0;
-          if (targetValue.completeCount > nextCompleteCount) {
+          var triggeredByCompleteCount = (_tmodel$targetValues$2 = (_tmodel$targetValues$3 = tmodel.targetValues[nextTarget]) === null || _tmodel$targetValues$3 === void 0 ? void 0 : _tmodel$targetValues$3.triggeredByCompleteCount) !== null && _tmodel$targetValues$2 !== void 0 ? _tmodel$targetValues$2 : 0;
+          if (targetValue.completeCount > triggeredByCompleteCount) {
             canActivate = true;
           }
         } else {
@@ -199,6 +199,7 @@ var TargetUtil = exports.TargetUtil = /*#__PURE__*/function () {
                 TargetUtil.activateTargetOnce(tmodel, nextTarget);
                 nextTargetActivated = true;
                 TargetUtil.clearPendingTargets(tmodel, key);
+                tmodel.targetValues[nextTarget].triggeredByCompleteCount = targetValue.completeCount;
               } else {
                 TargetUtil.markPendingTargets(tmodel, key);
               }
@@ -219,6 +220,7 @@ var TargetUtil = exports.TargetUtil = /*#__PURE__*/function () {
               TargetUtil.activateTarget(tmodel, nextTarget);
               nextTargetActivated = true;
               TargetUtil.clearPendingTargets(tmodel, key);
+              tmodel.targetValues[nextTarget].triggeredByCompleteCount = targetValue.completeCount;
             } else {
               TargetUtil.markPendingTargets(tmodel, key);
             }
@@ -716,7 +718,10 @@ var TargetUtil = exports.TargetUtil = /*#__PURE__*/function () {
       var targetValue = tmodel.targetValues[key];
       if (targetValue) {
         targetValue.completeCount = 0;
+        targetValue.triggeredByCompleteCount = 0;
+        targetValue.resetFlag = true;
         targetValue.nextTargetUpdateCount = 0;
+        targetValue.status = 'complete';
       }
       tmodel.cancelAnimation();
       tmodel.activatedTargets.length = 0;