mirror of
https://github.com/puppeteer/puppeteer
synced 2024-06-14 14:02:48 +00:00
fix(page.click): teach puppeteer click wrapped links (#2822)
This patch teaches Puppeteer to click elements that are part of inline layout and that wrap on multiple lines. Fixes #2798.
This commit is contained in:
parent
59e7f7ebb6
commit
5955affab0
@ -15,7 +15,7 @@
|
||||
*/
|
||||
const path = require('path');
|
||||
const {JSHandle} = require('./ExecutionContext');
|
||||
const {helper, debugError} = require('./helper');
|
||||
const {helper, assert, debugError} = require('./helper');
|
||||
|
||||
class ElementHandle extends JSHandle {
|
||||
/**
|
||||
@ -76,13 +76,29 @@ class ElementHandle extends JSHandle {
|
||||
}
|
||||
|
||||
/**
|
||||
* @return {!Promise<{x: number, y: number}>}
|
||||
* @return {!Promise<!{x: number, y: number}>}
|
||||
*/
|
||||
async _boundingBoxCenter() {
|
||||
const box = await this._assertBoundingBox();
|
||||
async _clickablePoint() {
|
||||
const result = await this._client.send('DOM.getContentQuads', {
|
||||
objectId: this._remoteObject.objectId
|
||||
}).catch(debugError);
|
||||
if (!result || !result.quads.length)
|
||||
throw new Error('Node is either not visible or not an HTMLElement');
|
||||
// Filter out quads that have too small area to click into.
|
||||
const quads = result.quads.map(quad => this._fromProtocolQuad(quad)).filter(quad => computeQuadArea(quad) > 1);
|
||||
if (!quads.length)
|
||||
throw new Error('Node is either not visible or not an HTMLElement');
|
||||
// Return the middle point of the first quad.
|
||||
const quad = quads[0];
|
||||
let x = 0;
|
||||
let y = 0;
|
||||
for (const point of quad) {
|
||||
x += point.x;
|
||||
y += point.y;
|
||||
}
|
||||
return {
|
||||
x: box.x + box.width / 2,
|
||||
y: box.y + box.height / 2
|
||||
x: x / 4,
|
||||
y: y / 4
|
||||
};
|
||||
}
|
||||
|
||||
@ -110,7 +126,7 @@ class ElementHandle extends JSHandle {
|
||||
|
||||
async hover() {
|
||||
await this._scrollIntoViewIfNeeded();
|
||||
const {x, y} = await this._boundingBoxCenter();
|
||||
const {x, y} = await this._clickablePoint();
|
||||
await this._page.mouse.move(x, y);
|
||||
}
|
||||
|
||||
@ -119,7 +135,7 @@ class ElementHandle extends JSHandle {
|
||||
*/
|
||||
async click(options = {}) {
|
||||
await this._scrollIntoViewIfNeeded();
|
||||
const {x, y} = await this._boundingBoxCenter();
|
||||
const {x, y} = await this._clickablePoint();
|
||||
await this._page.mouse.click(x, y, options);
|
||||
}
|
||||
|
||||
@ -135,7 +151,7 @@ class ElementHandle extends JSHandle {
|
||||
|
||||
async tap() {
|
||||
await this._scrollIntoViewIfNeeded();
|
||||
const {x, y} = await this._boundingBoxCenter();
|
||||
const {x, y} = await this._clickablePoint();
|
||||
await this._page.touchscreen.tap(x, y);
|
||||
}
|
||||
|
||||
@ -199,17 +215,6 @@ class ElementHandle extends JSHandle {
|
||||
};
|
||||
}
|
||||
|
||||
/**
|
||||
* @return {!Promise<?{x: number, y: number, width: number, height: number}>}
|
||||
*/
|
||||
async _assertBoundingBox() {
|
||||
const boundingBox = await this.boundingBox();
|
||||
if (boundingBox)
|
||||
return boundingBox;
|
||||
|
||||
throw new Error('Node is either not visible or not an HTMLElement');
|
||||
}
|
||||
|
||||
/**
|
||||
*
|
||||
* @param {!Object=} options
|
||||
@ -218,7 +223,8 @@ class ElementHandle extends JSHandle {
|
||||
async screenshot(options = {}) {
|
||||
let needsViewportReset = false;
|
||||
|
||||
let boundingBox = await this._assertBoundingBox();
|
||||
let boundingBox = await this.boundingBox();
|
||||
assert(boundingBox, 'Node is either not visible or not an HTMLElement');
|
||||
|
||||
const viewport = this._page.viewport();
|
||||
|
||||
@ -234,7 +240,8 @@ class ElementHandle extends JSHandle {
|
||||
|
||||
await this._scrollIntoViewIfNeeded();
|
||||
|
||||
boundingBox = await this._assertBoundingBox();
|
||||
boundingBox = await this.boundingBox();
|
||||
assert(boundingBox, 'Node is either not visible or not an HTMLElement');
|
||||
|
||||
const { layoutViewport: { pageX, pageY } } = await this._client.send('Page.getLayoutMetrics');
|
||||
|
||||
@ -349,5 +356,17 @@ class ElementHandle extends JSHandle {
|
||||
}
|
||||
}
|
||||
|
||||
function computeQuadArea(quad) {
|
||||
// Compute sum of all directed areas of adjacent triangles
|
||||
// https://en.wikipedia.org/wiki/Polygon#Simple_polygons
|
||||
let area = 0;
|
||||
for (let i = 0; i < quad.length; ++i) {
|
||||
const p1 = quad[i];
|
||||
const p2 = quad[(i + 1) % quad.length];
|
||||
area += (p1.x * p2.y - p2.x * p1.y) / 2;
|
||||
}
|
||||
return area;
|
||||
}
|
||||
|
||||
module.exports = ElementHandle;
|
||||
helper.tracePublicAPI(ElementHandle);
|
||||
|
29
test/assets/wrappedlink.html
Normal file
29
test/assets/wrappedlink.html
Normal file
@ -0,0 +1,29 @@
|
||||
<style>
|
||||
:root {
|
||||
font-family: monospace;
|
||||
}
|
||||
|
||||
body {
|
||||
display: flex;
|
||||
align-items: center;
|
||||
justify-content: center;
|
||||
}
|
||||
|
||||
div {
|
||||
width: 10ch;
|
||||
word-wrap: break-word;
|
||||
border: 1px solid blue;
|
||||
transform: rotate(33deg);
|
||||
line-height: 8ch;
|
||||
padding: 2ch;
|
||||
}
|
||||
|
||||
a {
|
||||
margin-left: 7ch;
|
||||
}
|
||||
</style>
|
||||
<div>
|
||||
<a href='#clicked'>123321</a>
|
||||
</div>
|
||||
<script>
|
||||
</script>
|
@ -52,6 +52,15 @@ module.exports.addTests = function({testRunner, expect, DeviceDescriptors}) {
|
||||
]);
|
||||
});
|
||||
|
||||
it('should click wrapped links', async({page, server}) => {
|
||||
await page.goto(server.PREFIX + '/wrappedlink.html');
|
||||
await Promise.all([
|
||||
page.click('a'),
|
||||
page.waitForNavigation()
|
||||
]);
|
||||
expect(page.url()).toBe(server.PREFIX + '/wrappedlink.html#clicked');
|
||||
});
|
||||
|
||||
it('should click on checkbox input and toggle', async({page, server}) => {
|
||||
await page.goto(server.PREFIX + '/input/checkbox.html');
|
||||
expect(await page.evaluate(() => result.check)).toBe(null);
|
||||
|
Loading…
Reference in New Issue
Block a user