targetj 1.0.241 → 1.0.243

package/build/VisibilityUtil.js

@@ -31,56 +31,53 @@ var VisibilityUtil = /*#__PURE__*/function () {
       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 !== 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;
+      }
+      var clip = VisibilityUtil.getScreenViewportRect();
+      var isVisible = VisibilityUtil.rectsOverlap(rect, clip);
+      if (!isVisible) {
+        return {
+          clip: clip,
+          isVisible: false
+        };
       }
-      return rect;
+      return {
+        isVisible: true
+      };
     }
   }, {
     key: "getScreenViewportRect",
@@ -96,30 +93,41 @@ var VisibilityUtil = /*#__PURE__*/function () {
   }, {
     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
       };
     }