@skrillex1224/playwright-toolkit 2.1.245 → 2.1.247

package/dist/index.js

@@ -3408,56 +3408,6 @@ var initializedPages = /* @__PURE__ */ new WeakSet();
 var DEFAULT_TAP_TIMEOUT_MS = 2500;
 var DEFAULT_MOUSE_TAP_FALLBACK_TIMEOUT_MS = 1200;
 var DEFAULT_ACTIVATE_FALLBACK_TIMEOUT_MS = 900;
-var INTERACTIVE_SELECTOR = [
-  "button",
-  '[role="button"]',
-  '[role="link"]',
-  '[role="menuitem"]',
-  '[role="tab"]',
-  '[role="switch"]',
-  '[role="checkbox"]',
-  "a[href]",
-  "label",
-  "input",
-  "textarea",
-  "select",
-  "summary",
-  '[contenteditable="true"]',
-  '[tabindex]:not([tabindex="-1"])'
-].join(",");
-var EDITABLE_SELECTOR = [
-  "input",
-  "textarea",
-  '[contenteditable="true"]'
-].join(",");
-var INTERACTIVE_HINT_PATTERN = [
-  "btn",
-  "button",
-  "send",
-  "submit",
-  "confirm",
-  "cancel",
-  "retry",
-  "reload",
-  "search",
-  "copy",
-  "share",
-  "close",
-  "more",
-  "\u53D1\u9001",
-  "\u63D0\u4EA4",
-  "\u786E\u5B9A",
-  "\u786E\u8BA4",
-  "\u53D6\u6D88",
-  "\u91CD\u8BD5",
-  "\u641C\u7D22",
-  "\u590D\u5236",
-  "\u5206\u4EAB",
-  "\u5173\u95ED",
-  "\u66F4\u591A",
-  "\u5C55\u5F00",
-  "\u6536\u8D77"
-].join("|");
 var clamp = (value, min, max) => Math.min(max, Math.max(min, value));
 var resolveViewport = (page) => page?.viewportSize?.() || { width: 390, height: 844 };
 var describeTarget = (target) => {
@@ -3497,47 +3447,7 @@ var withTimeout = async (operation, timeoutMs, label) => {
   }
 };
 var checkElementVisibility = async (element) => {
-  return element.evaluate((el, { interactiveSelector, interactiveHintPattern }) => {
-    const interactiveHintRe = new RegExp(interactiveHintPattern, "i");
-    const nodeClassName = (node) => {
-      if (!node) return "";
-      if (typeof node.className === "string") return node.className;
-      if (node.className && typeof node.className.baseVal === "string") return node.className.baseVal;
-      return "";
-    };
-    const interactiveScore = (node) => {
-      if (!node || node.nodeType !== Node.ELEMENT_NODE) return 0;
-      let score = 0;
-      if (typeof node.matches === "function" && node.matches(interactiveSelector)) score += 8;
-      const hints = [
-        node.id || "",
-        nodeClassName(node),
-        node.getAttribute?.("aria-label") || "",
-        node.getAttribute?.("title") || "",
-        node.getAttribute?.("data-testid") || "",
-        node.getAttribute?.("data-test") || "",
-        node.getAttribute?.("data-click") || "",
-        node.getAttribute?.("data-action") || "",
-        node.getAttribute?.("onclick") || "",
-        String(node.textContent || "").trim().slice(0, 24)
-      ].join(" ");
-      if (interactiveHintRe.test(hints)) score += 4;
-      const style = window.getComputedStyle(node);
-      if (style?.cursor === "pointer") score += 2;
-      return score;
-    };
-    const closestInteractive = (node) => {
-      let best = null;
-      let bestScore = 0;
-      for (let current = node; current && current !== document.body; current = current.parentElement) {
-        const score = interactiveScore(current);
-        if (score > bestScore || score > 0 && score === bestScore) {
-          best = current;
-          bestScore = score;
-        }
-      }
-      return best;
-    };
+  return element.evaluate((el) => {
     const targetStyle = window.getComputedStyle(el);
     if (!targetStyle || targetStyle.display === "none" || targetStyle.visibility === "hidden" || targetStyle.visibility === "collapse") {
       return { code: "NOT_INTERACTABLE", reason: "\u5143\u7D20\u4E0D\u53EF\u89C1", direction: "down" };
@@ -3599,13 +3509,30 @@ var checkElementVisibility = async (element) => {
         positioning
       };
     }
-    const targetInteractive = closestInteractive(el);
-    const sameInteractiveTarget = (pointElement) => {
+    const isRootNode = (node) => !node || node === document || node === document.body || node === document.documentElement;
+    const commonAncestor = (a, b) => {
+      for (let current = a; current && !isRootNode(current); current = current.parentElement) {
+        if (current.contains(b)) return current;
+      }
+      return null;
+    };
+    const sameTapTarget = (pointElement) => {
       if (!pointElement) return false;
       if (pointElement === el || el.contains(pointElement) || pointElement.contains(el)) {
         return true;
       }
-      return Boolean(targetInteractive && closestInteractive(pointElement) === targetInteractive);
+      const common = commonAncestor(el, pointElement);
+      if (!common) return false;
+      const commonRect = common.getBoundingClientRect?.();
+      if (!commonRect || commonRect.width <= 0 || commonRect.height <= 0) return false;
+      const commonArea = commonRect.width * commonRect.height;
+      const targetArea = Math.max(1, rect.width * rect.height);
+      const maxSharedRegionArea = Math.max(targetArea * 12, 4096);
+      if (commonArea > maxSharedRegionArea) return false;
+      if (commonRect.width > Math.max(rect.width * 8, 120) || commonRect.height > Math.max(rect.height * 8, 120)) {
+        return false;
+      }
+      return common.contains(el) && common.contains(pointElement);
     };
     const describeElement = (node) => {
       if (!node) return null;
@@ -3634,7 +3561,7 @@ var checkElementVisibility = async (element) => {
     let obstruction = null;
     for (const point of samplePoints) {
       const pointElement = document.elementFromPoint(point.x, point.y);
-      if (sameInteractiveTarget(pointElement)) {
+      if (sameTapTarget(pointElement)) {
         return { code: "VISIBLE", isFixed, positioning };
       }
       obstruction = obstruction || describeElement(pointElement);
@@ -3652,53 +3579,10 @@ var checkElementVisibility = async (element) => {
       };
     }
     return { code: "VISIBLE", isFixed, positioning };
-  }, {
-    interactiveSelector: INTERACTIVE_SELECTOR,
-    interactiveHintPattern: INTERACTIVE_HINT_PATTERN
   });
 };
 var resolveSafeTapPoint = async (element) => {
-  return element.evaluate((el, { interactiveSelector, interactiveHintPattern }) => {
-    const interactiveHintRe = new RegExp(interactiveHintPattern, "i");
-    const nodeClassName = (node) => {
-      if (!node) return "";
-      if (typeof node.className === "string") return node.className;
-      if (node.className && typeof node.className.baseVal === "string") return node.className.baseVal;
-      return "";
-    };
-    const interactiveScore = (node) => {
-      if (!node || node.nodeType !== Node.ELEMENT_NODE) return 0;
-      let score = 0;
-      if (typeof node.matches === "function" && node.matches(interactiveSelector)) score += 8;
-      const hints = [
-        node.id || "",
-        nodeClassName(node),
-        node.getAttribute?.("aria-label") || "",
-        node.getAttribute?.("title") || "",
-        node.getAttribute?.("data-testid") || "",
-        node.getAttribute?.("data-test") || "",
-        node.getAttribute?.("data-click") || "",
-        node.getAttribute?.("data-action") || "",
-        node.getAttribute?.("onclick") || "",
-        String(node.textContent || "").trim().slice(0, 24)
-      ].join(" ");
-      if (interactiveHintRe.test(hints)) score += 4;
-      const style = window.getComputedStyle(node);
-      if (style?.cursor === "pointer") score += 2;
-      return score;
-    };
-    const closestInteractive = (node) => {
-      let best = null;
-      let bestScore = 0;
-      for (let current = node; current && current !== document.body; current = current.parentElement) {
-        const score = interactiveScore(current);
-        if (score > bestScore || score > 0 && score === bestScore) {
-          best = current;
-          bestScore = score;
-        }
-      }
-      return best;
-    };
+  return element.evaluate((el) => {
     const rect = el.getBoundingClientRect();
     if (!rect || rect.width <= 0 || rect.height <= 0) {
       return null;
@@ -3735,13 +3619,30 @@ var resolveSafeTapPoint = async (element) => {
     if (visibleWidth <= 1 || visibleHeight <= 1) {
       return null;
     }
-    const targetInteractive = closestInteractive(el);
-    const sameInteractiveTarget = (pointElement) => {
+    const isRootNode = (node) => !node || node === document || node === document.body || node === document.documentElement;
+    const commonAncestor = (a, b) => {
+      for (let current = a; current && !isRootNode(current); current = current.parentElement) {
+        if (current.contains(b)) return current;
+      }
+      return null;
+    };
+    const sameTapTarget = (pointElement) => {
       if (!pointElement) return false;
       if (pointElement === el || el.contains(pointElement) || pointElement.contains(el)) {
         return true;
       }
-      return Boolean(targetInteractive && closestInteractive(pointElement) === targetInteractive);
+      const common = commonAncestor(el, pointElement);
+      if (!common) return false;
+      const commonRect = common.getBoundingClientRect?.();
+      if (!commonRect || commonRect.width <= 0 || commonRect.height <= 0) return false;
+      const commonArea = commonRect.width * commonRect.height;
+      const targetArea = Math.max(1, rect.width * rect.height);
+      const maxSharedRegionArea = Math.max(targetArea * 12, 4096);
+      if (commonArea > maxSharedRegionArea) return false;
+      if (commonRect.width > Math.max(rect.width * 8, 120) || commonRect.height > Math.max(rect.height * 8, 120)) {
+        return false;
+      }
+      return common.contains(el) && common.contains(pointElement);
     };
     const cx = visibleLeft + visibleWidth / 2;
     const cy = visibleTop + visibleHeight / 2;
@@ -3760,7 +3661,7 @@ var resolveSafeTapPoint = async (element) => {
     ];
     const safePoints = points.filter((point) => {
       const pointElement = document.elementFromPoint(point.x, point.y);
-      return sameInteractiveTarget(pointElement);
+      return sameTapTarget(pointElement);
     });
     const candidates = safePoints.length ? safePoints : points;
     const chosen = candidates[Math.floor(Math.random() * candidates.length)];
@@ -3769,86 +3670,57 @@ var resolveSafeTapPoint = async (element) => {
       x: chosen.x,
       y: chosen.y
     };
-  }, {
-    interactiveSelector: INTERACTIVE_SELECTOR,
-    interactiveHintPattern: INTERACTIVE_HINT_PATTERN
   });
 };
 var activateElementFallback = async (element, point = null, options = {}) => {
-  return element.evaluate((el, { innerPoint, innerOptions, interactiveSelector, editableSelector, interactiveHintPattern }) => {
-    const interactiveHintRe = new RegExp(interactiveHintPattern, "i");
-    const nodeClassName = (node) => {
-      if (!node) return "";
-      if (typeof node.className === "string") return node.className;
-      if (node.className && typeof node.className.baseVal === "string") return node.className.baseVal;
-      return "";
-    };
-    const interactiveScore = (node) => {
-      if (!node || node.nodeType !== Node.ELEMENT_NODE) return 0;
-      let score = 0;
-      if (typeof node.matches === "function" && node.matches(interactiveSelector)) score += 8;
-      const hints = [
-        node.id || "",
-        nodeClassName(node),
-        node.getAttribute?.("aria-label") || "",
-        node.getAttribute?.("title") || "",
-        node.getAttribute?.("data-testid") || "",
-        node.getAttribute?.("data-test") || "",
-        node.getAttribute?.("data-click") || "",
-        node.getAttribute?.("data-action") || "",
-        node.getAttribute?.("onclick") || "",
-        String(node.textContent || "").trim().slice(0, 24)
-      ].join(" ");
-      if (interactiveHintRe.test(hints)) score += 4;
-      const style = window.getComputedStyle(node);
-      if (style?.cursor === "pointer") score += 2;
-      return score;
+  return element.evaluate((el, { innerOptions }) => {
+    const isEditable = (node) => {
+      if (!node || node.nodeType !== Node.ELEMENT_NODE) return false;
+      if (node.isContentEditable) return true;
+      if (node instanceof HTMLTextAreaElement) return !node.disabled && !node.readOnly;
+      if (node instanceof HTMLInputElement) {
+        return !node.disabled && !node.readOnly && typeof node.select === "function";
+      }
+      return false;
     };
-    const pointElement = innerPoint ? document.elementFromPoint(innerPoint.x, innerPoint.y) : null;
-    const nearestInteractive = (node) => {
-      let best = null;
-      let bestScore = 0;
+    const findEditable = (node) => {
       for (let current = node; current && current !== document.body; current = current.parentElement) {
-        const score = interactiveScore(current);
-        if (score > bestScore || score > 0 && score === bestScore) {
-          best = current;
-          bestScore = score;
-        }
+        if (isEditable(current)) return current;
       }
-      return best;
+      return null;
     };
-    const targetInteractive = nearestInteractive(el);
-    const pointInteractive = nearestInteractive(pointElement);
-    let target = null;
-    if (pointInteractive && (pointInteractive === targetInteractive || pointInteractive === el || pointInteractive.contains(el) || el.contains(pointInteractive))) {
-      target = pointInteractive;
-    }
-    target = target || targetInteractive || el;
-    const editable = typeof target.closest === "function" ? target.closest(editableSelector) : null;
+    const editable = findEditable(el);
     if (editable && typeof editable.focus === "function") {
       editable.focus({ preventScroll: true });
       if (innerOptions.editableOnly) {
         return { activated: true, method: "focus", tag: editable.tagName || "" };
       }
     }
-    if (typeof target.focus === "function") {
-      target.focus({ preventScroll: true });
+    if (innerOptions.editableOnly) {
+      return { activated: false, method: "none", tag: el?.tagName || "" };
     }
-    if (!innerOptions.editableOnly && typeof target.click === "function") {
-      target.click();
-      return { activated: true, method: "dom-click", tag: target.tagName || "" };
+    if (typeof el.focus === "function") {
+      el.focus({ preventScroll: true });
+    }
+    if (typeof el.click === "function") {
+      el.click();
+      return { activated: true, method: "dom-click", tag: el.tagName || "" };
+    }
+    if (typeof el.dispatchEvent === "function") {
+      el.dispatchEvent(new MouseEvent("click", {
+        bubbles: true,
+        cancelable: true,
+        view: window
+      }));
+      return { activated: true, method: "dispatch-click", tag: el.tagName || "" };
     }
     return {
       activated: Boolean(editable),
       method: editable ? "focus" : "none",
-      tag: target?.tagName || ""
+      tag: el?.tagName || ""
     };
   }, {
-    innerPoint: point,
-    innerOptions: options || {},
-    interactiveSelector: INTERACTIVE_SELECTOR,
-    editableSelector: EDITABLE_SELECTOR,
-    interactiveHintPattern: INTERACTIVE_HINT_PATTERN
+    innerOptions: options || {}
   });
 };
 var getScrollableRect = async (element) => {