Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix: support scale for screenshot clips #8908

Merged
merged 1 commit into from Sep 7, 2022
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
13 changes: 7 additions & 6 deletions docs/api/puppeteer.screenshotclip.md
Expand Up @@ -12,9 +12,10 @@ export interface ScreenshotClip

## Properties

| Property | Modifiers | Type | Description |
| ---------------------------------------------- | --------- | ------ | ----------- |
| [height](./puppeteer.screenshotclip.height.md) | | number | |
| [width](./puppeteer.screenshotclip.width.md) | | number | |
| [x](./puppeteer.screenshotclip.x.md) | | number | |
| [y](./puppeteer.screenshotclip.y.md) | | number | |
| Property | Modifiers | Type | Description |
| ---------------------------------------------- | --------- | ------ | ----------------- |
| [height](./puppeteer.screenshotclip.height.md) | | number | |
| [scale?](./puppeteer.screenshotclip.scale.md) | | number | <i>(Optional)</i> |
| [width](./puppeteer.screenshotclip.width.md) | | number | |
| [x](./puppeteer.screenshotclip.x.md) | | number | |
| [y](./puppeteer.screenshotclip.y.md) | | number | |
13 changes: 13 additions & 0 deletions docs/api/puppeteer.screenshotclip.scale.md
@@ -0,0 +1,13 @@
---
sidebar_label: ScreenshotClip.scale
---

# ScreenshotClip.scale property

**Signature:**

```typescript
interface ScreenshotClip {
scale?: number;
}
```
17 changes: 12 additions & 5 deletions src/common/Page.ts
Expand Up @@ -163,6 +163,10 @@ export interface ScreenshotClip {
y: number;
width: number;
height: number;
/**
* @defaultValue 1
*/
scale?: number;
}

/**
Expand Down Expand Up @@ -3012,7 +3016,12 @@ export class Page extends EventEmitter {
const result = await this.#client.send('Page.captureScreenshot', {
format,
quality: options.quality,
clip,
clip: clip
? {
...clip,
scale: clip.scale === undefined ? 1 : clip.scale,
}
: undefined,
captureBeyondViewport,
fromSurface,
});
Expand Down Expand Up @@ -3044,14 +3053,12 @@ export class Page extends EventEmitter {
}
return buffer;

function processClip(
clip: ScreenshotClip
): ScreenshotClip & {scale: number} {
function processClip(clip: ScreenshotClip): ScreenshotClip {
const x = Math.round(clip.x);
const y = Math.round(clip.y);
const width = Math.round(clip.width + clip.x - x);
const height = Math.round(clip.height + clip.y - y);
return {x, y, width, height, scale: 1};
return {x, y, width, height, scale: clip.scale};
}
}

Expand Down
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
16 changes: 16 additions & 0 deletions test/src/screenshot.spec.ts
Expand Up @@ -52,6 +52,22 @@ describe('Screenshots', function () {
});
expect(screenshot).toBeGolden('screenshot-clip-rect.png');
});
itFailsFirefox('should use scale for clip', async () => {
const {page, server} = getTestState();

await page.setViewport({width: 500, height: 500});
await page.goto(server.PREFIX + '/grid.html');
const screenshot = await page.screenshot({
clip: {
x: 50,
y: 100,
width: 150,
height: 100,
scale: 2,
},
});
expect(screenshot).toBeGolden('screenshot-clip-rect-scale2.png');
});
itFailsFirefox(
'should get screenshot bigger than the viewport',
async () => {
Expand Down