@skrillex1224/playwright-toolkit 2.1.243 → 2.1.244

package/dist/index.cjs

@@ -3830,6 +3830,47 @@ var scrollAwayFromObstruction = async (element, status) => {
     };
   }, status);
 };
+var getElementViewportSnapshot = async (element) => {
+  return element.evaluate((el) => {
+    const rect = el.getBoundingClientRect();
+    return {
+      top: rect.top,
+      bottom: rect.bottom,
+      left: rect.left,
+      right: rect.right,
+      width: rect.width,
+      height: rect.height,
+      scrollX: window.scrollX,
+      scrollY: window.scrollY
+    };
+  });
+};
+var isTargetImmobileAfterScroll = (before, after) => {
+  if (!before || !after) return false;
+  const rectDeltaY = Number(after.top || 0) - Number(before.top || 0);
+  const rectDeltaX = Number(after.left || 0) - Number(before.left || 0);
+  const scrollDeltaY = Number(after.scrollY || 0) - Number(before.scrollY || 0);
+  const scrollDeltaX = Number(after.scrollX || 0) - Number(before.scrollX || 0);
+  const rectMoved = Math.abs(rectDeltaY) > 3 || Math.abs(rectDeltaX) > 3;
+  const pageMoved = Math.abs(scrollDeltaY) > 3 || Math.abs(scrollDeltaX) > 3;
+  if (!rectMoved && !pageMoved) return true;
+  if (pageMoved && !rectMoved) return true;
+  if (Math.abs(scrollDeltaY) > 12 && Math.abs(rectDeltaY) < Math.min(12, Math.abs(scrollDeltaY) * 0.2)) {
+    return true;
+  }
+  return false;
+};
+var restoreWindowFromSnapshot = async (page, before, after) => {
+  if (!before || !after) return;
+  if (Math.abs(Number(after.scrollX || 0) - Number(before.scrollX || 0)) <= 2 && Math.abs(Number(after.scrollY || 0) - Number(before.scrollY || 0)) <= 2) {
+    return;
+  }
+  await page.evaluate(
+    (state) => window.scrollTo(state.x, state.y),
+    { x: Number(before.scrollX || 0), y: Number(before.scrollY || 0) }
+  ).catch(() => {
+  });
+};
 var dispatchTouchSwipe = async (page, deltaY, options = {}) => {
   const viewport = resolveViewport(page);
   const rawRect = options.rect || null;
@@ -4010,11 +4051,11 @@ var MobileHumanize = {
       const scrollRect = await getScrollableRect(element);
       if (!scrollRect && status.isFixed && status.code === "OUT_OF_VIEWPORT") {
         logger7.warn(`humanScroll | fixed/sticky \u76EE\u6807\u4E0D\u5728\u89C6\u53E3\u5185\uFF0C\u9875\u9762\u6EDA\u52A8\u65E0\u6CD5\u6539\u53D8\u5176\u4F4D\u7F6E (direction=${status.direction || "unknown"})`);
-        return { element, didScroll, restore: null };
+        return { element, didScroll, restore: null, unscrollable: true };
       }
       if (!scrollRect && status.isFixed && status.code === "OBSTRUCTED") {
         logger7.warn(`humanScroll | fixed/sticky \u76EE\u6807\u88AB\u906E\u6321\uFF0C\u6EDA\u52A8\u65E0\u6CD5\u89E3\u9664 (${status.obstruction?.tag || "unknown"})`);
-        return { element, didScroll, restore: null };
+        return { element, didScroll, restore: null, unscrollable: true };
       }
       if (scrollRect && status.code === "OBSTRUCTED" && status.obstruction?.isFixed) {
         const moved = await scrollAwayFromObstruction(element, status);
@@ -4045,6 +4086,7 @@ var MobileHumanize = {
         }
       }
       const beforeWindowState = scrollRect ? await page.evaluate(() => ({ x: window.scrollX, y: window.scrollY })) : null;
+      const beforeElementSnapshot = await getElementViewportSnapshot(element).catch(() => null);
       const beforeState = scrollRect ? await element.evaluate((el) => {
         const isScrollable = (node) => {
           const style = window.getComputedStyle(node);
@@ -4074,6 +4116,21 @@ var MobileHumanize = {
           logger7.debug(`humanScroll | \u7A97\u53E3\u6EDA\u52A8\u56DE\u6536 from=${Math.round(afterWindowState.y)} to=${Math.round(beforeWindowState.y)}`);
         }
       }
+      let afterElementSnapshot = null;
+      const readAfterElementSnapshot = async () => {
+        if (!afterElementSnapshot) {
+          afterElementSnapshot = await getElementViewportSnapshot(element).catch(() => null);
+        }
+        return afterElementSnapshot;
+      };
+      if (!scrollRect && beforeElementSnapshot) {
+        const afterSnapshot = await readAfterElementSnapshot();
+        if (isTargetImmobileAfterScroll(beforeElementSnapshot, afterSnapshot)) {
+          await restoreWindowFromSnapshot(page, beforeElementSnapshot, afterSnapshot);
+          logger7.warn(`humanScroll | \u76EE\u6807\u4E0D\u968F\u9875\u9762\u6EDA\u52A8\u79FB\u52A8\uFF0C\u9875\u9762\u6EDA\u52A8\u65E0\u6CD5\u6539\u53D8\u5176\u4F4D\u7F6E (status=${status.code}, direction=${status.direction || "unknown"})`);
+          return { element, didScroll, restore: null, unscrollable: true };
+        }
+      }
       if (scrollRect && beforeState) {
         const afterState = await element.evaluate((el) => {
           const isScrollable = (node) => {
@@ -4111,6 +4168,14 @@ var MobileHumanize = {
           }
         }
       }
+      if (scrollRect && beforeElementSnapshot) {
+        const afterSnapshot = await getElementViewportSnapshot(element).catch(() => null);
+        if (isTargetImmobileAfterScroll(beforeElementSnapshot, afterSnapshot)) {
+          await restoreWindowFromSnapshot(page, beforeElementSnapshot, afterSnapshot);
+          logger7.warn(`humanScroll | \u76EE\u6807\u4E0D\u968F\u6EDA\u52A8\u5BB9\u5668\u79FB\u52A8\uFF0C\u6EDA\u52A8\u65E0\u6CD5\u6539\u53D8\u5176\u4F4D\u7F6E (status=${status.code}, direction=${status.direction || "unknown"})`);
+          return { element, didScroll, restore: null, unscrollable: true };
+        }
+      }
       didScroll = true;
     }
     try {
@@ -4160,21 +4225,28 @@ var MobileHumanize = {
         logger7.warn(`humanClick: \u5143\u7D20\u4E0D\u5B58\u5728\uFF0C\u8DF3\u8FC7\u70B9\u51FB ${targetDesc}`);
         return false;
       }
-      if (scrollIfNeeded) {
-        await MobileHumanize.humanScroll(page, element, { throwOnMissing });
-      }
+      const scrollResult = scrollIfNeeded ? await MobileHumanize.humanScroll(page, element, { throwOnMissing }) : null;
       const status = await checkElementVisibility(element).catch(() => null);
       if (status && status.code !== "VISIBLE") {
-        if (fallbackDomClick && status.isFixed && status.code === "OUT_OF_VIEWPORT") {
-          const fallback = await withTimeout(
+        if (fallbackDomClick && (status.code === "OUT_OF_VIEWPORT" || status.code === "OBSTRUCTED") && (status.isFixed || scrollResult?.unscrollable)) {
+          let fallback = await withTimeout(
             () => activateElementFallback(element, null, {
               editableOnly: true
             }),
             activateFallbackTimeoutMs,
             "focus fallback"
           ).catch(() => null);
+          if (!fallback?.activated) {
+            fallback = await withTimeout(
+              () => activateElementFallback(element, null, {
+                editableOnly: false
+              }),
+              activateFallbackTimeoutMs,
+              "activation fallback"
+            ).catch(() => null);
+          }
           if (fallback?.activated) {
-            logger7.warn(`humanClick: fixed/sticky \u76EE\u6807\u4E0D\u5728\u89C6\u53E3\u5185\uFF0C\u5DF2\u7528 ${fallback.method} \u6FC0\u6D3B`);
+            logger7.warn(`humanClick: \u4E0D\u53EF\u6EDA\u52A8\u76EE\u6807\u4E0D\u53EF\u7269\u7406\u70B9\u51FB\uFF0C\u5DF2\u7528 ${fallback.method} \u6FC0\u6D3B`);
             return true;
           }
         }