From 2abb9f0c144779d555ecbf337a759440d0282cba Mon Sep 17 00:00:00 2001
From: Alex Rudenko <OrKoN@users.noreply.github.com>
Date: Thu, 21 Jul 2022 10:34:18 +0200
Subject: [PATCH] fix: taking a screenshot with null viewport should be
 possible (#8680)

Closes #8673
---
 src/common/ElementHandle.ts |  8 ++++----
 test/src/screenshot.spec.ts | 22 ++++++++++++++++++++++
 2 files changed, 26 insertions(+), 4 deletions(-)

diff --git a/src/common/ElementHandle.ts b/src/common/ElementHandle.ts
index 6e56b7d1ff4ba..dbd7d8ccf9217 100644
--- a/src/common/ElementHandle.ts
+++ b/src/common/ElementHandle.ts
@@ -785,11 +785,11 @@ export class ElementHandle<
     assert(boundingBox, 'Node is either not visible or not an HTMLElement');
 
     const viewport = this.#page.viewport();
-    assert(viewport);
 
     if (
-      boundingBox.width > viewport.width ||
-      boundingBox.height > viewport.height
+      viewport &&
+      (boundingBox.width > viewport.width ||
+        boundingBox.height > viewport.height)
     ) {
       const newViewport = {
         width: Math.max(viewport.width, Math.ceil(boundingBox.width)),
@@ -826,7 +826,7 @@ export class ElementHandle<
       )
     );
 
-    if (needsViewportReset) {
+    if (needsViewportReset && viewport) {
       await this.#page.setViewport(viewport);
     }
 
diff --git a/test/src/screenshot.spec.ts b/test/src/screenshot.spec.ts
index 39c5c9a6b670c..0ef8669ebf1b8 100644
--- a/test/src/screenshot.spec.ts
+++ b/test/src/screenshot.spec.ts
@@ -21,6 +21,7 @@ import {
   setupTestPageAndContextHooks,
   itFailsFirefox,
   itHeadfulOnly,
+  itChromeOnly,
 } from './mocha-utils.js';
 
 describe('Screenshots', function () {
@@ -214,6 +215,27 @@ describe('Screenshots', function () {
       const screenshot = await elementHandle.screenshot();
       expect(screenshot).toBeGolden('screenshot-element-bounding-box.png');
     });
+    itChromeOnly('should work with a null viewport', async () => {
+      const {defaultBrowserOptions, puppeteer, server} = getTestState();
+
+      const browser = await puppeteer.launch({
+        ...defaultBrowserOptions,
+        defaultViewport: null,
+      });
+
+      try {
+        const page = await browser.newPage();
+        await page.goto(server.PREFIX + '/grid.html');
+        await page.evaluate(() => {
+          return window.scrollBy(50, 100);
+        });
+        const elementHandle = (await page.$('.box:nth-of-type(3)'))!;
+        const screenshot = await elementHandle.screenshot();
+        expect(screenshot).toBeTruthy();
+      } finally {
+        await browser.close();
+      }
+    });
     it('should take into account padding and border', async () => {
       const {page} = getTestState();