@skrillex1224/playwright-toolkit 2.1.28 → 2.1.29

package/dist/index.cjs

@@ -713,16 +713,26 @@ var Humanize = {
       while (current) {
         if (isScrollable(current)) {
           const crect = current.getBoundingClientRect();
-          if (rect.top < crect.top || rect.bottom > crect.bottom) {
+          if (rect.top < crect.top + 2 || rect.bottom > crect.bottom - 2) {
             return true;
           }
         }
         current = current.parentElement;
       }
+      const cx = rect.left + rect.width / 2;
+      const cy = rect.top + rect.height / 2;
+      if (cx < 0 || cx > window.innerWidth || cy < 0 || cy > window.innerHeight) return true;
+      const pointElement = document.elementFromPoint(cx, cy);
+      if (pointElement) {
+        if (el.contains(pointElement) || pointElement.contains(el)) {
+          return false;
+        }
+        return true;
+      }
       return false;
     });
     if (!needsScroll) {
-      logger4.debug("humanScroll", "Element already in view");
+      logger4.debug("humanScroll", "Element already in view (and unobstructed)");
       return { element, didScroll: false, restore: async () => {
       } };
     }
@@ -771,9 +781,21 @@ var Humanize = {
         }
         const scrollingElement = document.scrollingElement || document.documentElement;
         if (scrollingElement) scrollables.push(scrollingElement);
+        const cx = rect.left + rect.width / 2;
+        const cy = rect.top + rect.height / 2;
+        const viewH = window.innerHeight;
+        let isObstructed = false;
+        if (cy < 0 || cy > viewH) {
+          isObstructed = true;
+        } else {
+          const pointElement = document.elementFromPoint(cx, cy);
+          if (pointElement && !el.contains(pointElement) && !pointElement.contains(el)) {
+            isObstructed = true;
+          }
+        }
         let target2 = null;
         for (const container of scrollables) {
-          const crect = container === scrollingElement ? { top: 0, bottom: window.innerHeight } : container.getBoundingClientRect();
+          const crect = container === scrollingElement ? { top: 0, bottom: viewH } : container.getBoundingClientRect();
           if (rect.top < crect.top + 2) {
             target2 = { container, direction: -1 };
             break;
@@ -782,26 +804,39 @@ var Humanize = {
             target2 = { container, direction: 1 };
             break;
           }
+          if (isObstructed) {
+            const containerCenter = (crect.top + crect.bottom) / 2;
+            const elementCenter = (rect.top + rect.bottom) / 2;
+            const forceDirection = elementCenter > containerCenter ? 1 : -1;
+            const canScroll = forceDirection === 1 ? container.scrollTop < container.scrollHeight - container.clientHeight : container.scrollTop > 0;
+            if (canScroll) {
+              target2 = { container, direction: forceDirection };
+              break;
+            }
+          }
         }
         if (!target2) {
-          return { moved: false, inView: true };
+          return { moved: false, inView: !isObstructed };
         }
         const maxScroll = target2.container.scrollHeight - target2.container.clientHeight;
         if (maxScroll <= 0) {
-          return { moved: false, inView: false };
+          return { moved: false, inView: !isObstructed };
         }
         const before = target2.container.scrollTop;
         let next = before + target2.direction * stepPx;
         if (next < 0) next = 0;
         if (next > maxScroll) next = maxScroll;
-        if (next === before) {
-          return { moved: false, inView: false };
+        if (Math.abs(next - before) < 1) {
+          return { moved: false, inView: !isObstructed };
         }
         target2.container.scrollTop = next;
         return { moved: true, inView: false };
       }, step);
       if (result.inView) break;
-      if (!result.moved) break;
+      if (!result.moved && !result.inView) {
+        logger4.warn("humanScroll", "Stuck: cannot scroll further but element still obstructed/hidden");
+        break;
+      }
       await (0, import_delay2.default)(this.jitterMs(120, 0.4));
     }
     const restore = async () => {