@skrillex1224/playwright-toolkit 2.1.28 → 2.1.30

package/dist/index.cjs

@@ -686,46 +686,19 @@ var Humanize = {
   async humanScroll(page, target, options = {}) {
     const { maxSteps = 25, minStep = 80, maxStep = 220 } = options;
     const targetDesc = typeof target === "string" ? target : "ElementHandle";
-    logger4.debug("humanScroll", `target=${targetDesc}`);
+    logger4.debug(`humanScroll| target=${targetDesc}`);
     let element;
     if (typeof target === "string") {
       element = await page.$(target);
       if (!element) {
-        logger4.warn("humanScroll", `Element not found: ${target}`);
+        logger4.warn(`humanScroll| Element not found: ${target}`);
         return { element: null, didScroll: false, restore: async () => {
         } };
       }
     } else {
       element = target;
     }
-    const needsScroll = await element.evaluate((el) => {
-      const isScrollable = (node) => {
-        if (!node || node === document.body) return false;
-        const style = window.getComputedStyle(node);
-        const overflowY = style.overflowY || style.overflow;
-        return (overflowY === "auto" || overflowY === "scroll" || overflowY === "overlay") && node.scrollHeight > node.clientHeight + 1;
-      };
-      const rect = el.getBoundingClientRect();
-      if (!rect || rect.width === 0 || rect.height === 0) return true;
-      const inViewport = rect.top >= 0 && rect.bottom <= window.innerHeight;
-      if (!inViewport) return true;
-      let current = el.parentElement;
-      while (current) {
-        if (isScrollable(current)) {
-          const crect = current.getBoundingClientRect();
-          if (rect.top < crect.top || rect.bottom > crect.bottom) {
-            return true;
-          }
-        }
-        current = current.parentElement;
-      }
-      return false;
-    });
-    if (!needsScroll) {
-      logger4.debug("humanScroll", "Element already in view");
-      return { element, didScroll: false, restore: async () => {
-      } };
-    }
+    let didScroll = false;
     const scrollStateHandle = await element.evaluateHandle((el) => {
       const isScrollable = (node) => {
         if (!node || node === document.body) return false;
@@ -771,9 +744,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 +767,40 @@ 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.moved) didScroll = true;
       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 () => {
@@ -833,7 +832,7 @@ var Humanize = {
       }
     };
     logger4.success("humanScroll", "Scroll completed");
-    return { element, didScroll: true, restore };
+    return { element, didScroll, restore };
   },
   /**
    * 人类化点击 - 使用 ghost-cursor 模拟人类鼠标移动轨迹并点击