@skrillex1224/playwright-toolkit 2.1.229 → 2.1.231

package/README.md

@@ -219,6 +219,7 @@ await page.context().addCookies(cookies);
 
 // 全页面滚动截图 (自动检测所有滚动元素，强制展开后截图，默认会执行 watermarkify)
 // 默认会将返回的 base64 压缩到 5MiB 以内，避免 Apify/Crawlee dataset 单条 item 超限
+// 默认会额外保留一小段安全 buffer；如需精确贴边可传 { buffer: 0 }
 const base64Image = await Share.captureScreen(page);
 
 // 截图只使用当前页面运行时 viewport；移动端请通过 ActorInfo.device 切换，不再通过截图参数覆盖

package/dist/index.cjs

@@ -505,6 +505,9 @@ var SUPPORTED_TYPES = /* @__PURE__ */ new Set(["png", "jpeg", "webp"]);
 var EXPANDED_SCROLLABLE_CLASS = "__pk_expanded__";
 var DEFAULT_MAX_HEIGHT = 8e3;
 var DEFAULT_SETTLE_MS = 1e3;
+var DEFAULT_BUFFER_RATIO = 0.25;
+var DEFAULT_BUFFER_MIN = 120;
+var DEFAULT_BUFFER_MAX = 320;
 var toPositiveNumber = (value, fallback = 0) => {
   const n = Number(value);
   if (!Number.isFinite(n) || n <= 0) return fallback;
@@ -514,6 +517,10 @@ var toPositiveInteger = (value, fallback = 0) => {
   const number = Math.round(Number(value) || 0);
   return number > 0 ? number : fallback;
 };
+var resolveDefaultBuffer = (viewport = {}) => {
+  const height = Math.max(1, Number(viewport.height) || 0);
+  return Math.round(Math.min(DEFAULT_BUFFER_MAX, Math.max(DEFAULT_BUFFER_MIN, height * DEFAULT_BUFFER_RATIO)));
+};
 var normalizeType = (value) => {
   const raw = String(value || "png").trim().toLowerCase();
   if (!SUPPORTED_TYPES.has(raw)) return "png";
@@ -568,7 +575,21 @@ var expandScrollableContent = async (page, options = {}) => {
       if (Number(style.opacity) === 0) return false;
       return rect.width > 0 && rect.height > 0;
     };
-    const isScrollableY = (el, style) => {
+    const rememberOriginalBoxStyles = (el) => {
+      if (!el || isDocumentElement(el) || el.classList.contains(className)) {
+        return;
+      }
+      el.dataset.pkOrigOverflow = el.style.overflow;
+      el.dataset.pkOrigOverflowPriority = el.style.getPropertyPriority("overflow") || "";
+      el.dataset.pkOrigHeight = el.style.height;
+      el.dataset.pkOrigHeightPriority = el.style.getPropertyPriority("height") || "";
+      el.dataset.pkOrigMinHeight = el.style.minHeight;
+      el.dataset.pkOrigMinHeightPriority = el.style.getPropertyPriority("min-height") || "";
+      el.dataset.pkOrigMaxHeight = el.style.maxHeight;
+      el.dataset.pkOrigMaxHeightPriority = el.style.getPropertyPriority("max-height") || "";
+      el.classList.add(className);
+    };
+    const isScrollableY = (el, style, rect) => {
       if (!el || el.scrollHeight <= el.clientHeight + 1) {
         return false;
       }
@@ -578,7 +599,60 @@ var expandScrollableContent = async (page, options = {}) => {
       const overflowY = String(style.overflowY || "").toLowerCase();
       const overflow = String(style.overflow || "").toLowerCase();
       const scrollableOverflow = /* @__PURE__ */ new Set(["auto", "scroll", "overlay"]);
-      return scrollableOverflow.has(overflowY) || scrollableOverflow.has(overflow);
+      if (scrollableOverflow.has(overflowY) || scrollableOverflow.has(overflow)) {
+        return true;
+      }
+      const clippingOverflow = /* @__PURE__ */ new Set(["hidden", "clip"]);
+      const clipsY = clippingOverflow.has(overflowY) || clippingOverflow.has(overflow);
+      if (!clipsY || !rect) {
+        return false;
+      }
+      const viewportHeight = window.innerHeight || 0;
+      return rect.height >= viewportHeight * 0.25 || el.scrollHeight >= viewportHeight * 0.75;
+    };
+    const measureNeededHeight = (el) => {
+      if (!el) return 0;
+      const scrollHeight = Math.ceil(el.scrollHeight || 0);
+      if (scrollHeight <= 0) return 0;
+      if (isDocumentElement(el)) {
+        return scrollHeight;
+      }
+      const rect = el.getBoundingClientRect();
+      if (!rect || rect.width <= 0 || rect.height <= 0) {
+        return 0;
+      }
+      const documentTop = Math.max(0, Math.ceil(rect.top + (window.scrollY || window.pageYOffset || 0)));
+      return documentTop + scrollHeight;
+    };
+    const scrollableElements = [];
+    const expandElementToScrollHeight = (el) => {
+      if (!el || isDocumentElement(el)) return;
+      const scrollHeight = Math.ceil(el.scrollHeight || 0);
+      if (scrollHeight <= 0) return;
+      rememberOriginalBoxStyles(el);
+      el.style.setProperty("overflow", "visible", "important");
+      el.style.setProperty("height", `${scrollHeight}px`, "important");
+      el.style.setProperty("min-height", `${scrollHeight}px`, "important");
+      el.style.setProperty("max-height", "none", "important");
+    };
+    const expandClippingAncestors = (el) => {
+      for (let node = el?.parentElement; node && !isDocumentElement(node); node = node.parentElement) {
+        const style = window.getComputedStyle(node);
+        const rect = node.getBoundingClientRect();
+        if (!isVisible(node, style, rect)) continue;
+        const overflowY = String(style.overflowY || "").toLowerCase();
+        const overflow = String(style.overflow || "").toLowerCase();
+        const clipsContent = ["hidden", "clip", "auto", "scroll", "overlay"].includes(overflowY) || ["hidden", "clip", "auto", "scroll", "overlay"].includes(overflow);
+        if (!clipsContent) continue;
+        rememberOriginalBoxStyles(node);
+        node.style.setProperty("overflow", "visible", "important");
+        node.style.setProperty("max-height", "none", "important");
+        if (node.scrollHeight > node.clientHeight + 1) {
+          const scrollHeight = Math.ceil(node.scrollHeight || 0);
+          node.style.setProperty("height", `${scrollHeight}px`, "important");
+          node.style.setProperty("min-height", `${scrollHeight}px`, "important");
+        }
+      }
     };
     candidates.forEach((el) => {
       const style = window.getComputedStyle(el);
@@ -586,51 +660,46 @@ var expandScrollableContent = async (page, options = {}) => {
       if (visibleOnly && !isVisible(el, style, rect)) {
         return;
       }
-      if (!isScrollableY(el, style)) {
+      if (!isScrollableY(el, style, rect)) {
         return;
       }
-      const scrollHeight = Math.ceil(el.scrollHeight || 0);
-      if (scrollHeight <= 0) {
+      const neededHeight = measureNeededHeight(el);
+      if (neededHeight <= 0) {
         return;
       }
-      if (scrollHeight > maxHeight) {
-        maxHeight = scrollHeight;
+      if (neededHeight > maxHeight) {
+        maxHeight = neededHeight;
       }
+      scrollableElements.push(el);
       if (isDocumentElement(el)) {
         return;
       }
-      if (!el.classList.contains(className)) {
-        el.dataset.pkOrigOverflow = el.style.overflow;
-        el.dataset.pkOrigOverflowPriority = el.style.getPropertyPriority("overflow") || "";
-        el.dataset.pkOrigHeight = el.style.height;
-        el.dataset.pkOrigHeightPriority = el.style.getPropertyPriority("height") || "";
-        el.dataset.pkOrigMinHeight = el.style.minHeight;
-        el.dataset.pkOrigMinHeightPriority = el.style.getPropertyPriority("min-height") || "";
-        el.dataset.pkOrigMaxHeight = el.style.maxHeight;
-        el.dataset.pkOrigMaxHeightPriority = el.style.getPropertyPriority("max-height") || "";
-        el.classList.add(className);
-      }
+      expandClippingAncestors(el);
       if (forceScrollableHeight) {
-        el.style.setProperty("overflow", "visible", "important");
-        el.style.setProperty("height", `${scrollHeight}px`, "important");
-        el.style.setProperty("min-height", `${scrollHeight}px`, "important");
-        el.style.setProperty("max-height", "none", "important");
+        expandElementToScrollHeight(el);
         return;
       }
+      rememberOriginalBoxStyles(el);
       el.style.overflow = "visible";
       el.style.height = "auto";
       el.style.maxHeight = "none";
     });
+    scrollableElements.forEach((el) => {
+      const neededHeight = measureNeededHeight(el);
+      if (neededHeight > maxHeight) {
+        maxHeight = neededHeight;
+      }
+    });
     return maxHeight;
   }, {
     className: EXPANDED_SCROLLABLE_CLASS,
-    forceScrollableHeight: Boolean(options.forceScrollableHeight),
+    forceScrollableHeight: options.forceScrollableHeight !== false,
     visibleOnly: options.visibleOnly !== false
   });
 };
 var prepareExpandedFullPageScreenshot = async (page, options = {}) => {
   const originalViewport = await resolveCurrentViewportSize(page);
-  const defaultBuffer = Math.round((originalViewport.height || 1080) / 2);
+  const defaultBuffer = resolveDefaultBuffer(originalViewport);
   const buffer = options.buffer ?? defaultBuffer;
   const maxHeight = toPositiveInteger(options.maxHeight, DEFAULT_MAX_HEIGHT);
   const settleMs = Math.max(0, Number(options.settleMs ?? DEFAULT_SETTLE_MS) || 0);
@@ -8302,7 +8371,7 @@ var Share = {
    *
    * @param {import('playwright').Page} page
    * @param {Object} [options]
-   * @param {number} [options.buffer]
+   * @param {number} [options.buffer] 额外缓冲高度；默认按视口高度自动计算，传 0 可关闭
    * @param {boolean} [options.restore]
    * @param {number} [options.maxHeight]
    * @param {number} [options.maxBytes] 默认 5MiB，返回 base64 超过后会压缩
@@ -8315,7 +8384,7 @@ var Share = {
     const screenshotWatermarkify = resolveCaptureScreenWatermarkify(page, options.watermarkify);
     const compression = resolveImageCompression(options);
     const captureOptions = {
-      buffer: options.buffer ?? 0,
+      ...Object.prototype.hasOwnProperty.call(options, "buffer") ? { buffer: options.buffer } : {},
       restore,
       maxHeight: options.maxHeight,
       type: "png",