targetj 1.0.260 → 1.1.1

package/build/LocationManager.js

@@ -28,7 +28,7 @@ import { TargetData } from "./TargetData.js";
 import { TModelUtil } from "./TModelUtil.js";
 import { ScheduleUtil } from "./ScheduleUtil.js";
 import { TargetExecutor } from "./TargetExecutor.js";
-import { getTargetManager, tRoot, getEvents, getAnimationManager } from "./App.js";
+import { getTargetManager, getRunScheduler, tRoot, getEvents, getAnimationManager, getManager } from "./App.js";
 
 /*
  * It calculates the locations and dimensions of all objects and triggers the calculation of all targets. 
@@ -85,6 +85,7 @@ var LocationManager = /*#__PURE__*/function () {
     value: function () {
       var _calculateAll = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee() {
         var budgetMs,
+          continueCalculation,
           calcEpoch,
           stack,
           ctx,
@@ -93,18 +94,21 @@ var LocationManager = /*#__PURE__*/function () {
           while (1) switch (_context.prev = _context.next) {
             case 0:
               budgetMs = _args.length > 0 && _args[0] !== undefined ? _args[0] : 8;
+              continueCalculation = _args.length > 1 && _args[1] !== undefined ? _args[1] : false;
               calcEpoch = this.calcEpoch;
               if (!this.calcBusy) {
-                _context.next = 5;
+                _context.next = 6;
                 break;
               }
               this.calcQueued = true;
               return _context.abrupt("return");
-            case 5:
+            case 6:
               this.calcBusy = true;
-              this.hasLocationList.length = 0;
-              this.hasLocationMap = {};
-              this.locationListStats = [];
+              if (!continueCalculation) {
+                this.hasLocationList.length = 0;
+                this.hasLocationMap = {};
+                this.locationListStats = [];
+              }
               stack = [{
                 container: tRoot(),
                 stage: 'init',
@@ -117,24 +121,24 @@ var LocationManager = /*#__PURE__*/function () {
                 sliceStart: TUtil.now(),
                 calcEpoch: calcEpoch
               };
-              _context.next = 13;
+              _context.next = 12;
               return this.processStack(stack, ctx);
-            case 13:
+            case 12:
               if (!(ctx.calcEpoch !== this.calcEpoch)) {
-                _context.next = 15;
+                _context.next = 14;
                 break;
               }
               return _context.abrupt("return");
-            case 15:
+            case 14:
               this.processAfterStack();
               this.calcBusy = false;
-              if (!this.calcQueued) {
-                _context.next = 20;
-                break;
+              if (this.calcQueued) {
+                this.calcQueued = false;
+                getRunScheduler().schedule(1, "queuedLocationCalculation");
               }
-              this.calcQueued = false;
-              return _context.abrupt("return", this.calculateAll(budgetMs));
-            case 20:
+
+              //console.log(this.locationListStats.length);
+            case 17:
             case "end":
               return _context.stop();
           }
@@ -167,15 +171,17 @@ var LocationManager = /*#__PURE__*/function () {
                 container.adjustViewport();
                 container.calcContentWidthHeight();
                 (_container$markLayout = container.markLayoutComplete) === null || _container$markLayout === void 0 || _container$markLayout.call(container, job.layoutEpoch);
+                _this.retryPendingTargets(container);
                 (_container$requestPar = container.requestParticleRender) === null || _container$requestPar === void 0 || _container$requestPar.call(container);
+                container.visibilityDirty = false;
               };
               resetDirtyLayout = function resetDirtyLayout(job) {
                 var children = job.children,
                   index = job.index;
                 var child = children[index];
                 if (child) {
-                  if (child.getDirtyLayout() && child.isComplete() && !child.hasChildren()) {
-                    child.removeLayoutDirty(child, child.dirtyLayout.oids ? Object.keys(child.dirtyLayout.oids) : undefined);
+                  if (child.getDirtyLayout() && child.isComplete()) {
+                    child.removeLayoutDirty(child);
                   }
                 }
                 job.stage = 'afterChild';
@@ -239,23 +245,53 @@ var LocationManager = /*#__PURE__*/function () {
                   }
                 }
                 viewport.setCurrentChild(child);
-                if (!child.getDirtyLayout() && !child.currentStatus && child.activeTargetList.length === 0) {
+                if (child.isLightweightChild) {
+                  _this.calcNextLightweightLocation(child, container, viewport);
+                  job.index++;
+                  return;
+                }
+                if (!child.getDirtyLayout() && !child.visibilityDirty && !container.visibilityDirty && !child.hasEventDirty() && !child.currentStatus && child.activeTargetList.length === 0) {
+                  var previousAbsX = child.absX;
+                  var previousAbsY = child.absY;
                   _this.calcNextLocation(child, container, viewport);
+                  if (child.isIncluded() && child.activateChangedPassiveTargets()) {
+                    _this.calcQueued = true;
+                  }
+                  var positionChanged = child.absX !== previousAbsX || child.absY !== previousAbsY;
+                  var needsRefresh = child.visibilityDirty || child.hasChildren() && child.isVisible() && positionChanged;
+                  if (child.getDirtyLayout()) {
+                    _this.calcQueued = true;
+                  }
                   job.index++;
+                  if (needsRefresh && child.hasChildren()) {
+                    child.visibilityDirty = true;
+                    stack.push({
+                      container: child,
+                      stage: 'init',
+                      children: [],
+                      viewport: undefined,
+                      index: 0
+                    });
+                  }
                   return;
                 }
                 if (child.isDomIsland()) {
                   _this.domIslandSet.add(child);
                 }
+                var previousLayoutX = child.x;
+                var previousLayoutY = child.y;
                 viewport.setLocation();
                 if (viewport.isOverflow()) {
                   viewport.overflow();
                   viewport.setLocation();
-                  child.markLayoutDirty('overflow');
+                  if (child.x !== previousLayoutX || child.y !== previousLayoutY) {
+                    child.markLayoutDirty('overflow');
+                  }
                 }
                 var prevX = Math.floor(child.actualValues.x);
                 var prevY = Math.floor(child.actualValues.y);
                 if (child.isIncluded()) {
+                  child.activateChangedPassiveTargets();
                   _this.calculateTargets(child);
                 }
                 if (child.isIncluded()) {
@@ -273,13 +309,18 @@ var LocationManager = /*#__PURE__*/function () {
                 if (!TModelUtil.isYDefined(child)) {
                   child.actualValues.y = child.y;
                 }
+                _this.catchupNoDomLayoutTargets(child);
                 if (!child.isDomIsland()) {
                   child.calcAbsolutePosition(child.getX(), child.getY());
                 }
                 if (!child.excludeDefaultStyling()) {
                   _this.fixLocation(child, prevX, prevY);
                 }
+                var wasVisible = child.isVisible();
                 _this.calculateVisibility(child);
+                if (container.visibilityDirty && child.hasChildren() && (wasVisible || child.isVisible())) {
+                  child.visibilityDirty = true;
+                }
                 if (((_child$getDirtyLayout = child.getDirtyLayout()) === null || _child$getDirtyLayout === void 0 ? void 0 : _child$getDirtyLayout.count) > 0) {
                   var _child$getDirtyLayout2, _child$getDirtyLayout3;
                   _this.locationListStats.push("".concat(child.oid, "|").concat((_child$getDirtyLayout2 = child.getDirtyLayout()) === null || _child$getDirtyLayout2 === void 0 ? void 0 : _child$getDirtyLayout2.count, "|").concat((_child$getDirtyLayout3 = child.getDirtyLayout()) === null || _child$getDirtyLayout3 === void 0 ? void 0 : _child$getDirtyLayout3.lastKey));
@@ -421,10 +462,16 @@ var LocationManager = /*#__PURE__*/function () {
         this.calcNextLightweightLocation(child, container, viewport);
         return;
       }
+      var previousX = child.x;
+      var previousY = child.y;
       viewport.setLocation();
+      var overflowed = false;
       if (viewport.isOverflow()) {
+        overflowed = true;
         viewport.overflow();
         viewport.setLocation();
+      }
+      if (overflowed && (child.x !== previousX || child.y !== previousY)) {
         child.markLayoutDirty('overflow');
       }
       if (child.isIncluded()) {
@@ -441,6 +488,7 @@ var LocationManager = /*#__PURE__*/function () {
       if (!TModelUtil.isYDefined(child)) {
         child.actualValues.y = child.y;
       }
+      this.catchupNoDomLayoutTargets(child);
       if (!child.isDomIsland()) {
         child.calcAbsolutePosition(child.getX(), child.getY());
       }
@@ -452,6 +500,11 @@ var LocationManager = /*#__PURE__*/function () {
         this.addToLocationList(child);
       }
       this.calculateVisibility(child);
+      var registered = getManager().visibleOidMap[child.oid];
+      var shouldBeRegistered = child.isVisible() && child.isIncluded();
+      if (shouldBeRegistered ? registered !== child : registered !== undefined) {
+        this.addToLocationList(child);
+      }
       if (child.isInFlow()) {
         if (TUtil.isNumber(child.val('appendNewLine'))) {
           viewport.appendNewLine();
@@ -469,6 +522,13 @@ var LocationManager = /*#__PURE__*/function () {
         viewport.overflow();
         viewport.setLocation();
       }
+      if (!TModelUtil.isXDefined(child)) {
+        child.actualValues.x = child.x;
+      }
+      if (!TModelUtil.isYDefined(child)) {
+        child.actualValues.y = child.y;
+      }
+      this.catchupNoDomLayoutTargets(child);
       child.calcAbsolutePosition(child.getX(), child.getY());
       var visible = child.calcVisibility();
       child.actualValues.isVisible = visible;
@@ -476,11 +536,12 @@ var LocationManager = /*#__PURE__*/function () {
         container.visibleChildren.push(child);
       }
       if (child.isInFlow()) {
-        if (TUtil.isNumber(child.val('appendNewLine'))) {
+        if (TUtil.isNumber(child.val("appendNewLine"))) {
           viewport.appendNewLine();
         } else {
           viewport.nextLocation();
         }
+        container.calcContentWidthHeight();
       }
     }
   }, {
@@ -511,10 +572,13 @@ var LocationManager = /*#__PURE__*/function () {
         tmodel.actualValues.isVisible = nowVisible;
       }
       if (tmodel.isNowVisible || tmodel.isNowInvisible) {
+        var _tmodel$onVisibilityC;
         tmodel.markLayoutDirty('isNowVisible');
-      }
-      if (tmodel.isNowInvisible) {
         this.addToLocationList(tmodel);
+        (_tmodel$onVisibilityC = tmodel.onVisibilityChange) === null || _tmodel$onVisibilityC === void 0 || _tmodel$onVisibilityC.call(tmodel, nowVisible);
+      }
+      if (tmodel.isNowVisible && tmodel.hasChildren()) {
+        tmodel.visibilityDirty = true;
       }
       ScheduleUtil.pauseResumeSchedule(tmodel);
       if (tmodel.type !== 'BI' && tmodel.isVisible() && tmodel.isInFlow() && tmodel.getParent()) {
@@ -524,6 +588,9 @@ var LocationManager = /*#__PURE__*/function () {
   }, {
     key: "calculateTargets",
     value: function calculateTargets(tmodel) {
+      if (tmodel.hasDomNow) {
+        this.retryDomTargets(tmodel);
+      }
       this.checkInternalEvents(tmodel);
       var guard = 0;
       while (tmodel.activatedTargets.length && guard++ < 50) {
@@ -543,7 +610,6 @@ var LocationManager = /*#__PURE__*/function () {
         }
       }
       ScheduleUtil.pauseResumeSchedule(tmodel);
-      tmodel.activateChangedPassiveTargets();
       getTargetManager().applyTargetValues(tmodel);
       if (tmodel.updatingTargetList.length > 0) {
         getTargetManager().setActualValues(tmodel, tmodel.updatingTargetList);
@@ -563,19 +629,58 @@ var LocationManager = /*#__PURE__*/function () {
         }
       }
       if (tmodel.isNowVisible || tmodel.hasDomNow) {
-        var pending = tmodel.pendingTargets;
-        if (pending) {
-          for (var _i = 0, _arr = _toConsumableArray(pending); _i < _arr.length; _i++) {
-            var _key2 = _arr[_i];
-            TargetUtil.cleanupTarget(tmodel, _key2);
-            TargetUtil.shouldActivateNextTarget(tmodel, _key2);
-          }
-        }
+        this.retryPendingTargets(tmodel);
       }
       tmodel.isNowVisible = false;
       tmodel.hasDomNow = false;
       tmodel.targetExecutionCount++;
     }
+  }, {
+    key: "retryPendingTargets",
+    value: function retryPendingTargets(tmodel) {
+      var pending = tmodel.pendingTargets;
+      if (!(pending !== null && pending !== void 0 && pending.size)) {
+        return;
+      }
+      for (var _i = 0, _arr = _toConsumableArray(pending); _i < _arr.length; _i++) {
+        var _tmodel$pendingTarget;
+        var key = _arr[_i];
+        if (!((_tmodel$pendingTarget = tmodel.pendingTargets) !== null && _tmodel$pendingTarget !== void 0 && _tmodel$pendingTarget.has(key))) {
+          continue;
+        }
+        TargetUtil.cleanupTarget(tmodel, key);
+        TargetUtil.shouldActivateNextTarget(tmodel, key);
+      }
+    }
+  }, {
+    key: "catchupNoDomLayoutTargets",
+    value: function catchupNoDomLayoutTargets(tmodel) {
+      var _tmodel$noDomUpdating;
+      if (!((_tmodel$noDomUpdating = tmodel.noDomUpdatingTargets) !== null && _tmodel$noDomUpdating !== void 0 && _tmodel$noDomUpdating.size)) {
+        return;
+      }
+      if (tmodel.isLightweightChild) {
+        tmodel.catchupNoDomLayoutTargets();
+        return;
+      }
+      var _iterator2 = _createForOfIteratorHelper(tmodel.noDomUpdatingTargets),
+        _step2;
+      try {
+        for (_iterator2.s(); !(_step2 = _iterator2.n()).done;) {
+          var key = _step2.value;
+          if (!TargetData.affectsVisibility(key)) {
+            continue;
+          }
+          getTargetManager().catchupTargetByElapsed(tmodel, key, {
+            fireEnd: false
+          });
+        }
+      } catch (err) {
+        _iterator2.e(err);
+      } finally {
+        _iterator2.f();
+      }
+    }
   }, {
     key: "checkExternalEvents",
     value: function checkExternalEvents(tmodel) {
@@ -583,20 +688,20 @@ var LocationManager = /*#__PURE__*/function () {
       if ((externalEventMap === null || externalEventMap === void 0 ? void 0 : externalEventMap.size) > 0) {
         var eventTargets = [];
         var eventMap = TargetData.allEventMap;
-        var _iterator2 = _createForOfIteratorHelper(externalEventMap),
-          _step2;
+        var _iterator3 = _createForOfIteratorHelper(externalEventMap),
+          _step3;
         try {
-          for (_iterator2.s(); !(_step2 = _iterator2.n()).done;) {
-            var _step2$value = _slicedToArray(_step2.value, 1),
-              targetName = _step2$value[0];
+          for (_iterator3.s(); !(_step3 = _iterator3.n()).done;) {
+            var _step3$value = _slicedToArray(_step3.value, 1),
+              targetName = _step3$value[0];
             if (eventMap[targetName](tmodel)) {
               eventTargets.push(tmodel.allTargetMap[targetName]);
             }
           }
         } catch (err) {
-          _iterator2.e(err);
+          _iterator3.e(err);
         } finally {
-          _iterator2.f();
+          _iterator3.f();
         }
         this.runEventTargets(tmodel, eventTargets);
       }
@@ -608,20 +713,20 @@ var LocationManager = /*#__PURE__*/function () {
       var eventMap = TargetData.internalEventMap;
       var internalEventMap = tmodel.internalEventMap;
       if ((internalEventMap === null || internalEventMap === void 0 ? void 0 : internalEventMap.size) > 0) {
-        var _iterator3 = _createForOfIteratorHelper(internalEventMap),
-          _step3;
+        var _iterator4 = _createForOfIteratorHelper(internalEventMap),
+          _step4;
         try {
-          for (_iterator3.s(); !(_step3 = _iterator3.n()).done;) {
-            var _step3$value = _slicedToArray(_step3.value, 1),
-              targetName = _step3$value[0];
+          for (_iterator4.s(); !(_step4 = _iterator4.n()).done;) {
+            var _step4$value = _slicedToArray(_step4.value, 1),
+              targetName = _step4$value[0];
             if (eventMap[targetName](tmodel)) {
               eventTargets.push(tmodel.allTargetMap[targetName]);
             }
           }
         } catch (err) {
-          _iterator3.e(err);
+          _iterator4.e(err);
         } finally {
-          _iterator3.f();
+          _iterator4.f();
         }
       }
       this.runEventTargets(tmodel, eventTargets);
@@ -649,6 +754,22 @@ var LocationManager = /*#__PURE__*/function () {
         }
       });
     }
+  }, {
+    key: "retryDomTargets",
+    value: function retryDomTargets(tmodel) {
+      var _onDomReady$value;
+      var onDomReady = tmodel.targets.onDomReady;
+      var value = (_onDomReady$value = onDomReady === null || onDomReady === void 0 ? void 0 : onDomReady.value) !== null && _onDomReady$value !== void 0 ? _onDomReady$value : onDomReady;
+      if (!value) {
+        return;
+      }
+      var targets = Array.isArray(value) ? value : [value];
+      targets.forEach(function (targetName) {
+        if (!targetName.endsWith("$")) {
+          TargetUtil.activateSingleTarget(tmodel, targetName);
+        }
+      });
+    }
   }, {
     key: "addToLocationList",
     value: function addToLocationList(tmodel) {