@skrillex1224/playwright-toolkit 2.1.229 → 2.1.230

package/dist/index.js

@@ -553,6 +553,21 @@ var expandScrollableContent = async (page, options = {}) => {
       const scrollableOverflow = /* @__PURE__ */ new Set(["auto", "scroll", "overlay"]);
       return scrollableOverflow.has(overflowY) || scrollableOverflow.has(overflow);
     };
+    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 = [];
     candidates.forEach((el) => {
       const style = window.getComputedStyle(el);
       const rect = el.getBoundingClientRect();
@@ -562,13 +577,14 @@ var expandScrollableContent = async (page, options = {}) => {
       if (!isScrollableY(el, style)) {
         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;
       }
@@ -584,6 +600,7 @@ var expandScrollableContent = async (page, options = {}) => {
         el.classList.add(className);
       }
       if (forceScrollableHeight) {
+        const scrollHeight = Math.ceil(el.scrollHeight || 0);
         el.style.setProperty("overflow", "visible", "important");
         el.style.setProperty("height", `${scrollHeight}px`, "important");
         el.style.setProperty("min-height", `${scrollHeight}px`, "important");
@@ -594,10 +611,16 @@ var expandScrollableContent = async (page, options = {}) => {
       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
   });
 };