targetj 1.0.240 → 1.0.242

package/build/TargetUtil.js

@@ -1,12 +1,3 @@
-"use strict";
-
-Object.defineProperty(exports, "__esModule", {
-  value: true
-});
-exports.TargetUtil = void 0;
-var _App = require("./App.js");
-var _TUtil = require("./TUtil.js");
-var _TargetData = require("./TargetData.js");
 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 _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 _toConsumableArray(r) { return _arrayWithoutHoles(r) || _iterableToArray(r) || _unsupportedIterableToArray(r) || _nonIterableSpread(); }
@@ -20,10 +11,14 @@ function _defineProperties(e, r) { for (var t = 0; t < r.length; t++) { var o =
 function _createClass(e, r, t) { return r && _defineProperties(e.prototype, r), t && _defineProperties(e, t), Object.defineProperty(e, "prototype", { writable: !1 }), e; }
 function _toPropertyKey(t) { var i = _toPrimitive(t, "string"); return "symbol" == _typeof(i) ? i : i + ""; }
 function _toPrimitive(t, r) { if ("object" != _typeof(t) || !t) return t; var e = t[Symbol.toPrimitive]; if (void 0 !== e) { var i = e.call(t, r || "default"); if ("object" != _typeof(i)) return i; throw new TypeError("@@toPrimitive must return a primitive value."); } return ("string" === r ? String : Number)(t); }
+import { App, getLoader, getLocationManager, getManager } from "./App.js";
+import { TUtil } from "./TUtil.js";
+import { TargetData } from "./TargetData.js";
+
 /**
  * It provides helper functions for target management, such as deriving the values for steps, intervals, and cycles from targets.
  */
-var TargetUtil = exports.TargetUtil = /*#__PURE__*/function () {
+var TargetUtil = /*#__PURE__*/function () {
   function TargetUtil() {
     _classCallCheck(this, TargetUtil);
   }
@@ -52,7 +47,7 @@ var TargetUtil = exports.TargetUtil = /*#__PURE__*/function () {
         isImperative: false,
         originalTargetName: undefined,
         easing: undefined,
-        creationTime: _TUtil.TUtil.now()
+        creationTime: TUtil.now()
       };
     }
   }, {
@@ -77,8 +72,8 @@ var TargetUtil = exports.TargetUtil = /*#__PURE__*/function () {
       var target = tmodel.targets[key];
       var getPrevValue = function getPrevValue() {
         if (prevKey) {
-          if ((0, _App.getLoader)().isLoading(tmodel, prevKey)) {
-            return (0, _App.getLoader)().getLoadingItemValue(tmodel, prevKey, key);
+          if (getLoader().isLoading(tmodel, prevKey)) {
+            return getLoader().getLoadingItemValue(tmodel, prevKey, key);
           } else {
             return tmodel.targetValues[prevKey] ? tmodel.targetValues[prevKey].actual : tmodel.val(prevKey);
           }
@@ -122,14 +117,14 @@ var TargetUtil = exports.TargetUtil = /*#__PURE__*/function () {
       }
       Object.keys(target).forEach(function (method) {
         var originalMethod = target[method];
-        var shouldWrap = method === 'value' || typeof originalMethod === 'function' && _TargetData.TargetData.isLifeCycleMethod(method);
+        var shouldWrap = method === 'value' || typeof originalMethod === 'function' && TargetData.isLifeCycleMethod(method);
         if (shouldWrap) {
           if (originalMethod.__isBoundTargetMethod) {
             return;
           }
           var wrappedMethod = function wrappedMethod() {
             var _getPrevUpdateTime;
-            if (!_TargetData.TargetData.lifecycleCoreSet.has(method)) {
+            if (!TargetData.lifecycleCoreSet.has(method)) {
               TargetUtil.currentTargetName = key;
               TargetUtil.currentTModel = tmodel;
             }
@@ -210,13 +205,13 @@ var TargetUtil = exports.TargetUtil = /*#__PURE__*/function () {
                 TargetUtil.markPendingTargets(tmodel, key);
               }
             } else {
-              while ((0, _App.getLoader)().isNextLoadingItemSuccessful(tmodel, key)) {
+              while (getLoader().isNextLoadingItemSuccessful(tmodel, key)) {
                 if (tmodel.activatedTargets.indexOf(nextTarget) >= 0) {
                   tmodel.activatedTargets.push(nextTarget);
                 } else {
                   TargetUtil.activateTarget(tmodel, nextTarget);
                 }
-                (0, _App.getLoader)().nextActiveItem(tmodel, key);
+                getLoader().nextActiveItem(tmodel, key);
                 nextTargetActivated = true;
               }
             }
@@ -303,7 +298,8 @@ var TargetUtil = exports.TargetUtil = /*#__PURE__*/function () {
     key: "cleanupTarget",
     value: function cleanupTarget(tmodel, key) {
       TargetUtil.cleanupVisibleComplete(tmodel, key);
-      if (tmodel.isTargetComplete(key) || !TargetUtil.isTargetFullyCompleted(tmodel, key)) {
+      var cannotBeCleaned = tmodel.isTargetComplete(key) || !TargetUtil.isTargetFullyCompleted(tmodel, key);
+      if (cannotBeCleaned) {
         return false;
       }
       tmodel.setTargetComplete(key);
@@ -313,7 +309,7 @@ var TargetUtil = exports.TargetUtil = /*#__PURE__*/function () {
         tmodel.setTargetMethodName(key, "onComplete");
       }
       var fetchAction = target === null || target === void 0 ? void 0 : target.fetchAction;
-      if (fetchAction && (0, _App.getLoader)().isLoadingSuccessful(tmodel, key)) {
+      if (fetchAction && getLoader().isLoadingSuccessful(tmodel, key)) {
         var index = tmodel.fetchActionTargetList.indexOf(key);
         if (index >= 0) {
           tmodel.fetchActionTargetList.splice(index, 1);
@@ -417,9 +413,9 @@ var TargetUtil = exports.TargetUtil = /*#__PURE__*/function () {
         if (TargetUtil.shouldIgnoreChildForCompletion(tmodel, "visible")) {
           return true;
         }
-        return !((_state$updatingTarget = state.updatingTargetList) !== null && _state$updatingTarget !== void 0 && _state$updatingTarget.length) && !((_state$activeTargetLi = state.activeTargetList) !== null && _state$activeTargetLi !== void 0 && _state$activeTargetLi.length) && !((_state$activatedTarge = state.activatedTargets) !== null && _state$activatedTarge !== void 0 && _state$activatedTarge.length) && !tmodel.hasAnimatingTargets() && TargetUtil.isFetchingComplete(tmodel) && TargetUtil.getUpdatingChildren(tmodel, undefined, "visible").size === 0 && TargetUtil.getActiveChildren(tmodel, "visible").size === 0 && !((_state$lastChildrenUp = state.lastChildrenUpdate) !== null && _state$lastChildrenUp !== void 0 && (_state$lastChildrenUp = _state$lastChildrenUp.deletions) !== null && _state$lastChildrenUp !== void 0 && _state$lastChildrenUp.length) && !((_state$lastChildrenUp2 = state.lastChildrenUpdate) !== null && _state$lastChildrenUp2 !== void 0 && (_state$lastChildrenUp2 = _state$lastChildrenUp2.additions) !== null && _state$lastChildrenUp2 !== void 0 && _state$lastChildrenUp2.length) && !tmodel.noDomUpdatingTargets && !tmodel.pendingTargets && !(0, _App.getManager)().needsReattach(tmodel);
+        return !((_state$updatingTarget = state.updatingTargetList) !== null && _state$updatingTarget !== void 0 && _state$updatingTarget.length) && !((_state$activeTargetLi = state.activeTargetList) !== null && _state$activeTargetLi !== void 0 && _state$activeTargetLi.length) && !((_state$activatedTarge = state.activatedTargets) !== null && _state$activatedTarge !== void 0 && _state$activatedTarge.length) && !tmodel.hasAnimatingTargets() && TargetUtil.isFetchingComplete(tmodel) && TargetUtil.getUpdatingChildren(tmodel, undefined, "visible").size === 0 && TargetUtil.getActiveChildren(tmodel, "visible").size === 0 && !((_state$lastChildrenUp = state.lastChildrenUpdate) !== null && _state$lastChildrenUp !== void 0 && (_state$lastChildrenUp = _state$lastChildrenUp.deletions) !== null && _state$lastChildrenUp !== void 0 && _state$lastChildrenUp.length) && !((_state$lastChildrenUp2 = state.lastChildrenUpdate) !== null && _state$lastChildrenUp2 !== void 0 && (_state$lastChildrenUp2 = _state$lastChildrenUp2.additions) !== null && _state$lastChildrenUp2 !== void 0 && _state$lastChildrenUp2.length) && !tmodel.noDomUpdatingTargets && !tmodel.pendingTargets && !getManager().needsReattach(tmodel);
       }
-      return !((_state$updatingTarget2 = state.updatingTargetList) !== null && _state$updatingTarget2 !== void 0 && _state$updatingTarget2.length) && !((_state$activeTargetLi2 = state.activeTargetList) !== null && _state$activeTargetLi2 !== void 0 && _state$activeTargetLi2.length) && !((_state$activatedTarge2 = state.activatedTargets) !== null && _state$activatedTarge2 !== void 0 && _state$activatedTarge2.length) && !tmodel.hasAnimatingTargets() && TargetUtil.isFetchingComplete(tmodel) && !tmodel.hasAnimatingChildren() && !tmodel.hasUpdatingChildren() && !tmodel.hasActiveChildren() && !((_state$lastChildrenUp3 = state.lastChildrenUpdate) !== null && _state$lastChildrenUp3 !== void 0 && (_state$lastChildrenUp3 = _state$lastChildrenUp3.deletions) !== null && _state$lastChildrenUp3 !== void 0 && _state$lastChildrenUp3.length) && !((_state$lastChildrenUp4 = state.lastChildrenUpdate) !== null && _state$lastChildrenUp4 !== void 0 && (_state$lastChildrenUp4 = _state$lastChildrenUp4.additions) !== null && _state$lastChildrenUp4 !== void 0 && _state$lastChildrenUp4.length) && !tmodel.noDomUpdatingTargets && !tmodel.pendingTargets && !(0, _App.getManager)().needsReattach(tmodel);
+      return !((_state$updatingTarget2 = state.updatingTargetList) !== null && _state$updatingTarget2 !== void 0 && _state$updatingTarget2.length) && !((_state$activeTargetLi2 = state.activeTargetList) !== null && _state$activeTargetLi2 !== void 0 && _state$activeTargetLi2.length) && !((_state$activatedTarge2 = state.activatedTargets) !== null && _state$activatedTarge2 !== void 0 && _state$activatedTarge2.length) && !tmodel.hasAnimatingTargets() && TargetUtil.isFetchingComplete(tmodel) && !tmodel.hasAnimatingChildren() && !tmodel.hasUpdatingChildren() && !tmodel.hasActiveChildren() && !((_state$lastChildrenUp3 = state.lastChildrenUpdate) !== null && _state$lastChildrenUp3 !== void 0 && (_state$lastChildrenUp3 = _state$lastChildrenUp3.deletions) !== null && _state$lastChildrenUp3 !== void 0 && _state$lastChildrenUp3.length) && !((_state$lastChildrenUp4 = state.lastChildrenUpdate) !== null && _state$lastChildrenUp4 !== void 0 && (_state$lastChildrenUp4 = _state$lastChildrenUp4.additions) !== null && _state$lastChildrenUp4 !== void 0 && _state$lastChildrenUp4.length) && !tmodel.noDomUpdatingTargets && !tmodel.pendingTargets && !getManager().needsReattach(tmodel);
     }
   }, {
     key: "isFetchingComplete",
@@ -434,7 +430,7 @@ var TargetUtil = exports.TargetUtil = /*#__PURE__*/function () {
       try {
         for (_iterator.s(); !(_step = _iterator.n()).done;) {
           var key = _step.value;
-          if (!(0, _App.getLoader)().isLoadingSuccessful(tmodel, key)) {
+          if (!getLoader().isLoadingSuccessful(tmodel, key)) {
             return false;
           }
         }
@@ -476,7 +472,7 @@ var TargetUtil = exports.TargetUtil = /*#__PURE__*/function () {
         }
         if (tmodel.isTargetTreeComplete(targetName) !== true) {
           //const activeChildrenList = [ ...TargetUtil.getActiveChildren(tmodel, tmodel.targets[targetName].completionScope).values() ];
-          //return  tmodel.oid + "." + targetName + " ==> " + tmodel.getTargetStatus(targetName) + ", " + tmodel.isTargetTreeComplete(targetName) + ":: " + activeChildrenList.map(t => t.oid + ':' + t.hasAnyUpdates()) + ", " + [ ...TargetUtil.getUpdatingChildren(tmodel, targetName, tmodel.targets[targetName].completionScope).keys() ]; 
+          //return  tmodel.oid + "." + targetName + " ==> " + tmodel.getTargetStatus(targetName) + ", " + TargetUtil.isTargetTreeComplete(tmodel, targetName) + ":: " + activeChildrenList.map(t => t.oid + ':' + t.hasAnyUpdates()) + ", " + [ ...TargetUtil.getUpdatingChildren(tmodel, targetName, tmodel.targets[targetName].completionScope).keys() ]; 
           return false;
         }
       }
@@ -490,13 +486,13 @@ var TargetUtil = exports.TargetUtil = /*#__PURE__*/function () {
         var _target$childAction, _target$childAction2, _target$childAction3;
         var completionScope = completionScopeOverride !== null && completionScopeOverride !== void 0 ? completionScopeOverride : target.completionScope;
         var targetType = _typeof(target.value);
-        if (_TargetData.TargetData.controlTargetMap[key]) {
+        if (TargetData.controlTargetMap[key]) {
           return true;
         }
         if (!target.fetchAction && (targetType === 'string' || targetType === 'number' || targetType === 'boolean')) {
           return true;
         }
-        if ((0, _App.getManager)().needsReattach(tmodel)) {
+        if (getManager().needsReattach(tmodel)) {
           return "needs Reattach";
         }
         if (tmodel.canHaveDom() && !tmodel.hasDom()) {
@@ -514,7 +510,7 @@ var TargetUtil = exports.TargetUtil = /*#__PURE__*/function () {
         if (((_target$childAction3 = target.childAction) === null || _target$childAction3 === void 0 ? void 0 : _target$childAction3.length) > 0 && TargetUtil.areTargetChildrenComplete(target.childAction, completionScope) !== true) {
           return 'incomplete children';
         }
-        if (target.fetchAction && !(0, _App.getLoader)().isLoadingSuccessful(tmodel, key)) {
+        if (target.fetchAction && !getLoader().isLoadingSuccessful(tmodel, key)) {
           return 'incomplete loading';
         }
       }
@@ -715,7 +711,7 @@ var TargetUtil = exports.TargetUtil = /*#__PURE__*/function () {
   }, {
     key: "wrapTarget",
     value: function wrapTarget(tmodel, target, key) {
-      if (!_TargetData.TargetData.controlTargetMap[key]) {
+      if (!TargetData.controlTargetMap[key]) {
         tmodel.targets[key] = {
           value: target,
           originalTargetName: TargetUtil.currentTargetName,
@@ -735,9 +731,9 @@ var TargetUtil = exports.TargetUtil = /*#__PURE__*/function () {
       tmodel.clearUpdatingChildren();
       tmodel.clearActiveChildren();
       tmodel.clearAnimatingChildren();
-      (0, _App.getLocationManager)().domIslandSet.delete(tmodel);
-      if (_App.App.tmodelIdMap[tmodel.oid] === tmodel) {
-        delete _App.App.tmodelIdMap[tmodel.oid];
+      getLocationManager().domIslandSet.delete(tmodel);
+      if (App.tmodelIdMap[tmodel.oid] === tmodel) {
+        delete App.tmodelIdMap[tmodel.oid];
       }
     }
   }, {
@@ -892,4 +888,5 @@ var TargetUtil = exports.TargetUtil = /*#__PURE__*/function () {
       };
     }
   }]);
-}();
+}();
+export { TargetUtil };

package/build/Viewport.js

@@ -1,20 +1,15 @@
-"use strict";
-
-Object.defineProperty(exports, "__esModule", {
-  value: true
-});
-exports.Viewport = void 0;
-var _TModelUtil = require("./TModelUtil.js");
 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 _classCallCheck(a, n) { if (!(a instanceof n)) throw new TypeError("Cannot call a class as a function"); }
 function _defineProperties(e, r) { for (var t = 0; t < r.length; t++) { var o = r[t]; o.enumerable = o.enumerable || !1, o.configurable = !0, "value" in o && (o.writable = !0), Object.defineProperty(e, _toPropertyKey(o.key), o); } }
 function _createClass(e, r, t) { return r && _defineProperties(e.prototype, r), t && _defineProperties(e, t), Object.defineProperty(e, "prototype", { writable: !1 }), e; }
 function _toPropertyKey(t) { var i = _toPrimitive(t, "string"); return "symbol" == _typeof(i) ? i : i + ""; }
 function _toPrimitive(t, r) { if ("object" != _typeof(t) || !t) return t; var e = t[Symbol.toPrimitive]; if (void 0 !== e) { var i = e.call(t, r || "default"); if ("object" != _typeof(i)) return i; throw new TypeError("@@toPrimitive must return a primitive value."); } return ("string" === r ? String : Number)(t); }
+import { TModelUtil } from "./TModelUtil.js";
+
 /**
  * It calculates the locations and visibility of objects
  */
-var Viewport = exports.Viewport = /*#__PURE__*/function () {
+var Viewport = /*#__PURE__*/function () {
   function Viewport() {
     _classCallCheck(this, Viewport);
     this.xNext = 0;
@@ -37,6 +32,11 @@ var Viewport = exports.Viewport = /*#__PURE__*/function () {
     this.time = 0;
   }
   return _createClass(Viewport, [{
+    key: "setContainer",
+    value: function setContainer(container) {
+      this.container = container;
+    }
+  }, {
     key: "setCurrentChild",
     value: function setCurrentChild(child) {
       this.currentChild = child;
@@ -46,8 +46,8 @@ var Viewport = exports.Viewport = /*#__PURE__*/function () {
     value: function setLocation() {
       var child = this.currentChild;
       if (!child.targets['excludeXYCalc']) {
-        child.x = this.xNext + child.getLeftMargin();
-        child.y = this.yNext + child.getTopMargin();
+        child.x = this.xNext + child.getMarginLeft() + this.container.getPaddingLeft();
+        child.y = this.yNext + child.getMarginTop() + this.container.getPaddingTop();
       }
     }
   }, {
@@ -63,8 +63,9 @@ var Viewport = exports.Viewport = /*#__PURE__*/function () {
   }, {
     key: "checkChildOverflow",
     value: function checkChildOverflow() {
-      var childWidth = this.currentChild.getMinWidth();
-      return this.currentChild.x + childWidth + this.currentChild.getLeftMargin() > this.xOverflowLimit;
+      var child = this.currentChild;
+      var childWidth = child.getMinWidth();
+      return this.xNext + child.getMarginLeft() + childWidth + child.getMarginRight() > this.xOverflowLimit;
     }
   }, {
     key: "overflow",
@@ -77,7 +78,7 @@ var Viewport = exports.Viewport = /*#__PURE__*/function () {
     value: function appendNewLine() {
       var child = this.currentChild;
       var scale = child.getMeasuringScale();
-      var maxHeight = child.getHeight() * scale + this.currentChild.getTopMargin() + this.currentChild.getBottomMargin();
+      var maxHeight = child.getHeight() * scale + this.currentChild.getMarginTop() + this.currentChild.getMarginBottom();
       this.xNext = this.scrollLeft - this.xOverflowReset;
       var ySouth = this.yNext + maxHeight + child.val('appendNewLine');
       this.yEast = this.yNext;
@@ -98,17 +99,17 @@ var Viewport = exports.Viewport = /*#__PURE__*/function () {
       if (space === 'layout') {
         x = child.x;
         y = child.y;
-        left = x - child.getLeftMargin();
-        right = x + width + child.getRightMargin();
-        top = y - child.getTopMargin();
-        bottom = y + height + child.getBottomMargin();
+        left = x - child.getMarginLeft();
+        right = x + width + child.getMarginRight();
+        top = y - child.getMarginTop();
+        bottom = y + height + child.getMarginBottom();
       } else if (space === 'absolute') {
         x = child.absX - this.absX;
         y = child.absY - this.absY;
         left = x;
-        right = x + width + child.getRightMargin();
+        right = x + width + child.getMarginRight();
         top = y;
-        bottom = y + height + child.getBottomMargin();
+        bottom = y + height + child.getMarginBottom();
       } else {
         x = child.getX();
         y = child.getY();
@@ -130,8 +131,8 @@ var Viewport = exports.Viewport = /*#__PURE__*/function () {
       var child = this.currentChild;
       var scale = child.getMeasuringScale();
       var topBaseHeight = child.getTopBaseHeight() * scale;
-      var maxHeight = child.getHeight() * scale + this.currentChild.getTopMargin() + this.currentChild.getBottomMargin();
-      var maxWidth = child.getItemOverflowMode() === 'always' && _TModelUtil.TModelUtil.isWidthDefined(this.container) ? this.container.getWidth() : child.getBaseWidth() * scale + this.currentChild.getLeftMargin() + this.currentChild.getRightMargin();
+      var maxHeight = child.getLayoutHeight() * scale + this.currentChild.getMarginTop() + this.currentChild.getMarginBottom();
+      var maxWidth = child.getItemOverflowMode() === 'always' && TModelUtil.isWidthDefined(this.container) ? this.container.getWidth() : child.getBaseWidth() * scale + this.currentChild.getMarginLeft() + this.currentChild.getMarginRight();
       if (child.type !== 'BI' && this.container.type === 'BI') {
         var layout = this.computeBoundary(child, 'layout');
         var animated = this.computeBoundary(child, 'animated');
@@ -162,4 +163,5 @@ var Viewport = exports.Viewport = /*#__PURE__*/function () {
       }
     }
   }]);
-}();
+}();
+export { Viewport };

package/build/VisibilityUtil.js

@@ -1,22 +1,17 @@
-"use strict";
-
-Object.defineProperty(exports, "__esModule", {
-  value: true
-});
-exports.VisibilityUtil = void 0;
-var _App = require("./App.js");
-var _TUtil = require("./TUtil.js");
 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 _classCallCheck(a, n) { if (!(a instanceof n)) throw new TypeError("Cannot call a class as a function"); }
 function _defineProperties(e, r) { for (var t = 0; t < r.length; t++) { var o = r[t]; o.enumerable = o.enumerable || !1, o.configurable = !0, "value" in o && (o.writable = !0), Object.defineProperty(e, _toPropertyKey(o.key), o); } }
 function _createClass(e, r, t) { return r && _defineProperties(e.prototype, r), t && _defineProperties(e, t), Object.defineProperty(e, "prototype", { writable: !1 }), e; }
 function _toPropertyKey(t) { var i = _toPrimitive(t, "string"); return "symbol" == _typeof(i) ? i : i + ""; }
 function _toPrimitive(t, r) { if ("object" != _typeof(t) || !t) return t; var e = t[Symbol.toPrimitive]; if (void 0 !== e) { var i = e.call(t, r || "default"); if ("object" != _typeof(i)) return i; throw new TypeError("@@toPrimitive must return a primitive value."); } return ("string" === r ? String : Number)(t); }
+import { tRoot, getScreenHeight, getScreenWidth } from "./App.js";
+import { TUtil } from "./TUtil.js";
+
 /**
  * 
  * It provides a variety of helping functions for calculating visibility
  */
-var VisibilityUtil = exports.VisibilityUtil = /*#__PURE__*/function () {
+var VisibilityUtil = /*#__PURE__*/function () {
   function VisibilityUtil() {
     _classCallCheck(this, VisibilityUtil);
   }
@@ -33,59 +28,56 @@ var VisibilityUtil = exports.VisibilityUtil = /*#__PURE__*/function () {
       var scale = (domParent.getMeasuringScale() || 1) * child.getMeasuringScale();
       var x = child.absX;
       var y = child.absY;
-      var width = _TUtil.TUtil.isDefined(child.getWidth()) ? scale * child.getWidth() : 0;
-      var height = _TUtil.TUtil.isDefined(child.getHeight()) ? scale * child.getHeight() : 0;
+      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 clip = VisibilityUtil.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 + child.getBottomMargin() + 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;
-      }
+      var rect = {
+        x: x - visibilityMargin,
+        y: y - visibilityMargin,
+        r: x + width + visibilityMargin,
+        b: y + height + visibilityMargin
+      };
+      var status = VisibilityUtil.checkVisibility(child, rect);
       status.x = x;
       status.y = y;
       status.width = width;
       status.height = height;
+      child.visibilityStatus = status;
       child.actualValues.isVisible = status.isVisible;
       return status.isVisible;
     }
   }, {
-    key: "getVisibilityClipRect",
-    value: function getVisibilityClipRect(container) {
-      var rect = VisibilityUtil.getScreenViewportRect();
-      while (container && container !== (0, _App.tRoot)()) {
-        if (VisibilityUtil.shouldClipByAncestor(container)) {
-          var ancestorRect = VisibilityUtil.getAncestorViewportRect(container);
-          rect = rect && !container.allTargetMap['onWindowScroll'] ? VisibilityUtil.intersectVisibilityRects(rect, ancestorRect) : ancestorRect;
-          if (rect.r <= rect.x || rect.b <= rect.y) {
-            break;
+    key: "checkVisibility",
+    value: function checkVisibility(tmodel, rect) {
+      while (tmodel) {
+        var parent = tmodel.getRealParent();
+        if (!parent || parent === tRoot()) {
+          break;
+        }
+        if (VisibilityUtil.shouldClipByAncestor(parent)) {
+          var _clip = VisibilityUtil.getParentClip(parent);
+          var _isVisible = VisibilityUtil.rectsOverlap(rect, _clip);
+          if (!_isVisible) {
+            return {
+              clip: _clip,
+              isVisible: false
+            };
           }
+          rect = VisibilityUtil.intersectRects(parent, rect, _clip);
         }
-        container = container.getRealParent();
+        tmodel = parent;
       }
-      return rect;
+      var clip = VisibilityUtil.getScreenViewportRect();
+      var isVisible = VisibilityUtil.rectsOverlap(rect, clip);
+      if (!isVisible) {
+        return {
+          clip: clip,
+          isVisible: false
+        };
+      }
+      return {
+        isVisible: true
+      };
     }
   }, {
     key: "getScreenViewportRect",
@@ -93,40 +85,52 @@ var VisibilityUtil = exports.VisibilityUtil = /*#__PURE__*/function () {
       return {
         x: 0,
         y: 0,
-        r: (0, _App.getScreenWidth)(),
-        b: (0, _App.getScreenHeight)(),
+        r: getScreenWidth(),
+        b: getScreenHeight(),
         source: "screen"
       };
     }
   }, {
     key: "shouldClipByAncestor",
     value: function shouldClipByAncestor(ancestor) {
-      return ancestor.managesOwnScroll();
+      var overflow = ancestor.val("overflow");
+      return ancestor.managesOwnScroll() || overflow === "hidden" || overflow === "auto" || overflow === "scroll" || overflow === "clip";
     }
   }, {
-    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;
+    key: "getParentClip",
+    value: function getParentClip(parent) {
+      var _parent$$dom, _parent$$dom2;
+      var domScrollLeft = ((_parent$$dom = parent.$dom) === null || _parent$$dom === void 0 ? void 0 : _parent$$dom.getScrollLeft()) || 0;
+      var domScrollTop = ((_parent$$dom2 = parent.$dom) === null || _parent$$dom2 === void 0 ? void 0 : _parent$$dom2.getScrollTop()) || 0;
+      var height = parent.getHeight();
+      var width = parent.getWidth();
       return {
-        x: ancestor.absX + domScrollLeft,
-        y: ancestor.absY + domScrollTop,
-        r: ancestor.absX + domScrollLeft + ancestor.getWidth(),
-        b: ancestor.absY + domScrollTop + ancestor.getHeight(),
-        source: ancestor
+        x: parent.absX + domScrollLeft,
+        y: parent.absY + domScrollTop,
+        r: parent.absX + width + domScrollLeft,
+        b: parent.absY + height + domScrollTop,
+        source: parent
       };
     }
   }, {
-    key: "intersectVisibilityRects",
-    value: function intersectVisibilityRects(a, b) {
+    key: "rectsOverlap",
+    value: function rectsOverlap(a, b) {
+      return a.x <= b.r && a.r >= b.x && a.y <= b.b && a.b >= b.y;
+    }
+  }, {
+    key: "intersectRects",
+    value: function intersectRects(parent, a, b) {
+      var _parent$$dom3, _parent$$dom4;
+      var domScrollLeft = ((_parent$$dom3 = parent.$dom) === null || _parent$$dom3 === void 0 ? void 0 : _parent$$dom3.getScrollLeft()) || 0;
+      var domScrollTop = ((_parent$$dom4 = parent.$dom) === null || _parent$$dom4 === void 0 ? void 0 : _parent$$dom4.getScrollTop()) || 0;
       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),
+        x: Math.max(a.x - domScrollLeft, b.x - domScrollLeft),
+        y: Math.max(a.y - domScrollTop, b.y - domScrollTop),
+        r: Math.min(a.r - domScrollLeft, b.r - domScrollLeft),
+        b: Math.min(a.b - domScrollTop, b.b - domScrollTop),
         source: b.source
       };
     }
   }]);
-}();
+}();
+export { VisibilityUtil };