@skrillex1224/playwright-toolkit 3.0.22 → 3.0.24

package/dist/index.js

@@ -515,6 +515,10 @@ var DEFAULT_STITCH_SETTLE_MS = 120;
 var DEFAULT_STITCH_OVERLAP_PX = 24;
 var MIN_VIRTUALIZED_SCROLL_RATIO = 2.2;
 var MIN_SPARSE_SCROLL_RATIO = 4;
+var MIN_STITCH_VISIBLE_HEIGHT_PX = 120;
+var MIN_STITCH_VISIBLE_HEIGHT_RATIO = 0.22;
+var MIN_STITCH_OUTPUT_HEIGHT_RATIO = 0.35;
+var MIN_STITCH_OUTPUT_VIEWPORT_RATIO = 1.15;
 var MOBILE_VIEWPORT_WIDTH_THRESHOLD = 520;
 var DEFAULT_QUALITY_RETRY_ATTEMPTS = 2;
 var DEFAULT_QUALITY_RETRY_DELAY_MS = 2500;
@@ -1237,12 +1241,20 @@ var resolveVirtualizedScrollTarget = async (page, options = {}) => {
       const scrollHeight = Math.ceil(el2.scrollHeight || 0);
       const clientHeight = Math.ceil(el2.clientHeight || viewportHeight || 0);
       if (scrollHeight < Math.max(900, clientHeight * config.minScrollRatio)) return;
+      const visibleTop = Math.max(0, Math.round(rect.top || 0));
+      const visibleBottom = Math.min(viewportHeight, Math.round(rect.bottom || viewportHeight));
+      const visibleHeight = Math.max(0, visibleBottom - visibleTop);
+      const minVisibleHeight = Math.max(
+        config.minVisibleHeightPx,
+        Math.floor(viewportHeight * config.minVisibleHeightRatio)
+      );
+      if (!config.force && !isDocumentElement(el2) && visibleHeight < minVisibleHeight) return;
       const { textHeight, textNodes } = textHeightFor(el2);
       const sparseRatio = scrollHeight / Math.max(1, textHeight);
       const sparse = config.force || textNodes > 0 && sparseRatio >= config.minSparseRatio && scrollHeight - textHeight > clientHeight;
       if (!sparse) return;
       const visibleWidth = Math.max(1, Math.ceil(rect.width || viewportWidth || 1));
-      const score2 = scrollHeight * Math.min(visibleWidth, viewportWidth || visibleWidth);
+      const score2 = scrollHeight * Math.min(visibleWidth, viewportWidth || visibleWidth) * Math.min(1, visibleHeight / Math.max(1, viewportHeight));
       if (!best || score2 > best.score) {
         best = {
           el: el2,
@@ -1258,6 +1270,7 @@ var resolveVirtualizedScrollTarget = async (page, options = {}) => {
             width: Math.max(1, Math.round(rect.width || viewportWidth || 1)),
             height: Math.max(1, Math.round(rect.height || viewportHeight || 1))
           },
+          visibleHeight,
           textHeight,
           textNodes,
           sparseRatio
@@ -1284,7 +1297,9 @@ var resolveVirtualizedScrollTarget = async (page, options = {}) => {
     attrName: STITCH_SCROLL_TARGET_ATTR,
     force: stitchMode === "force",
     minScrollRatio: MIN_VIRTUALIZED_SCROLL_RATIO,
-    minSparseRatio: MIN_SPARSE_SCROLL_RATIO
+    minSparseRatio: MIN_SPARSE_SCROLL_RATIO,
+    minVisibleHeightPx: MIN_STITCH_VISIBLE_HEIGHT_PX,
+    minVisibleHeightRatio: MIN_STITCH_VISIBLE_HEIGHT_RATIO
   }).catch((error) => {
     logger.warning(`\u865A\u62DF\u6EDA\u52A8\u622A\u56FE\u63A2\u6D4B\u5931\u8D25: ${error?.message || error}`);
     return null;
@@ -1397,6 +1412,17 @@ var captureStitchedScrollableScreenshot = async (page, target, options = {}) =>
     logger.info(
       `\u865A\u62DF\u6EDA\u52A8\u5206\u6BB5\u622A\u56FE: segments=${segments.length}, height=${totalHeight}, scrollHeight=${target.scrollHeight}, textNodes=${target.textNodes}, sparseRatio=${Number(target.sparseRatio || 0).toFixed(2)}`
     );
+    const expectedHeight = Math.min(maxHeight, Math.max(target.scrollHeight || 0, viewport.height || 0));
+    const minPlausibleHeight = Math.max(
+      Math.floor((viewport.height || rect.height || 0) * MIN_STITCH_OUTPUT_VIEWPORT_RATIO),
+      Math.floor(expectedHeight * MIN_STITCH_OUTPUT_HEIGHT_RATIO)
+    );
+    if (positions.length > 1 && expectedHeight > (viewport.height || rect.height || 0) * 1.3 && totalHeight < minPlausibleHeight) {
+      logger.warning(
+        `\u865A\u62DF\u6EDA\u52A8\u5206\u6BB5\u622A\u56FE\u7ED3\u679C\u8FC7\u77ED\uFF0C\u964D\u7EA7\u666E\u901A\u957F\u622A\u56FE: segments=${segments.length}, height=${totalHeight}, expectedMin=${minPlausibleHeight}, scrollHeight=${target.scrollHeight}, rect=${rect.width}x${rect.height}@${rect.top}`
+      );
+      return null;
+    }
     return await canvas.getBuffer(JimpMime.png);
   } finally {
     await setStitchScrollTop(page, target, target.scrollTop || 0).catch(() => {
@@ -1513,7 +1539,10 @@ var cropBufferToContentBounds = async (buffer, bounds, options = {}) => {
 var captureExpandedFullPageScreenshotOnce = async (page, options = {}) => {
   const stitchedTarget = await resolveVirtualizedScrollTarget(page, options);
   if (stitchedTarget) {
-    return await captureStitchedScrollableScreenshot(page, stitchedTarget, options);
+    const buffer = await captureStitchedScrollableScreenshot(page, stitchedTarget, options);
+    if (buffer) {
+      return buffer;
+    }
   }
   const state2 = await prepareExpandedFullPageScreenshot(page, options);
   try {