mirror of
https://github.com/puppeteer/puppeteer
synced 2024-06-14 14:02:48 +00:00
fix: correctly compute clickable points for elements inside OOPIFs (#7900)
Issues: #7849
This commit is contained in:
parent
59578d9cd5
commit
486bbe010d
@ -73,7 +73,6 @@ export class FrameManager extends EventEmitter {
|
|||||||
private _contextIdToContext = new Map<string, ExecutionContext>();
|
private _contextIdToContext = new Map<string, ExecutionContext>();
|
||||||
private _isolatedWorlds = new Set<string>();
|
private _isolatedWorlds = new Set<string>();
|
||||||
private _mainFrame: Frame;
|
private _mainFrame: Frame;
|
||||||
private _disconnectPromise?: Promise<Error>;
|
|
||||||
|
|
||||||
constructor(
|
constructor(
|
||||||
client: CDPSession,
|
client: CDPSession,
|
||||||
|
@ -80,6 +80,7 @@ export function createJSHandle(
|
|||||||
context,
|
context,
|
||||||
context._client,
|
context._client,
|
||||||
remoteObject,
|
remoteObject,
|
||||||
|
frame,
|
||||||
frameManager.page(),
|
frameManager.page(),
|
||||||
frameManager
|
frameManager
|
||||||
);
|
);
|
||||||
@ -331,6 +332,7 @@ export class JSHandle<HandleObjectType = unknown> {
|
|||||||
export class ElementHandle<
|
export class ElementHandle<
|
||||||
ElementType extends Element = Element
|
ElementType extends Element = Element
|
||||||
> extends JSHandle<ElementType> {
|
> extends JSHandle<ElementType> {
|
||||||
|
private _frame: Frame;
|
||||||
private _page: Page;
|
private _page: Page;
|
||||||
private _frameManager: FrameManager;
|
private _frameManager: FrameManager;
|
||||||
|
|
||||||
@ -341,12 +343,14 @@ export class ElementHandle<
|
|||||||
context: ExecutionContext,
|
context: ExecutionContext,
|
||||||
client: CDPSession,
|
client: CDPSession,
|
||||||
remoteObject: Protocol.Runtime.RemoteObject,
|
remoteObject: Protocol.Runtime.RemoteObject,
|
||||||
|
frame: Frame,
|
||||||
page: Page,
|
page: Page,
|
||||||
frameManager: FrameManager
|
frameManager: FrameManager
|
||||||
) {
|
) {
|
||||||
super(context, client, remoteObject);
|
super(context, client, remoteObject);
|
||||||
this._client = client;
|
this._client = client;
|
||||||
this._remoteObject = remoteObject;
|
this._remoteObject = remoteObject;
|
||||||
|
this._frame = frame;
|
||||||
this._page = page;
|
this._page = page;
|
||||||
this._frameManager = frameManager;
|
this._frameManager = frameManager;
|
||||||
}
|
}
|
||||||
@ -475,7 +479,7 @@ export class ElementHandle<
|
|||||||
objectId: this._remoteObject.objectId,
|
objectId: this._remoteObject.objectId,
|
||||||
})
|
})
|
||||||
.catch(debugError),
|
.catch(debugError),
|
||||||
this._client.send('Page.getLayoutMetrics'),
|
this._page.client().send('Page.getLayoutMetrics'),
|
||||||
]);
|
]);
|
||||||
if (!result || !result.quads.length)
|
if (!result || !result.quads.length)
|
||||||
throw new Error('Node is either not clickable or not an HTMLElement');
|
throw new Error('Node is either not clickable or not an HTMLElement');
|
||||||
@ -483,8 +487,35 @@ export class ElementHandle<
|
|||||||
// Fallback to `layoutViewport` in case of using Firefox.
|
// Fallback to `layoutViewport` in case of using Firefox.
|
||||||
const { clientWidth, clientHeight } =
|
const { clientWidth, clientHeight } =
|
||||||
layoutMetrics.cssLayoutViewport || layoutMetrics.layoutViewport;
|
layoutMetrics.cssLayoutViewport || layoutMetrics.layoutViewport;
|
||||||
|
let offsetX = 0;
|
||||||
|
let offsetY = 0;
|
||||||
|
let frame = this._frame;
|
||||||
|
while (frame.parentFrame()) {
|
||||||
|
const parent = frame.parentFrame();
|
||||||
|
if (!frame.isOOPFrame()) {
|
||||||
|
frame = parent;
|
||||||
|
continue;
|
||||||
|
}
|
||||||
|
const { backendNodeId } = await parent._client.send('DOM.getFrameOwner', {
|
||||||
|
frameId: frame._id,
|
||||||
|
});
|
||||||
|
const { quads } = await parent._client.send('DOM.getContentQuads', {
|
||||||
|
backendNodeId: backendNodeId,
|
||||||
|
});
|
||||||
|
if (!quads || !quads.length) {
|
||||||
|
break;
|
||||||
|
}
|
||||||
|
const protocolQuads = quads.map((quad) => this._fromProtocolQuad(quad));
|
||||||
|
const topLeftCorner = protocolQuads[0][0];
|
||||||
|
offsetX += topLeftCorner.x;
|
||||||
|
offsetY += topLeftCorner.y;
|
||||||
|
frame = parent;
|
||||||
|
}
|
||||||
const quads = result.quads
|
const quads = result.quads
|
||||||
.map((quad) => this._fromProtocolQuad(quad))
|
.map((quad) => this._fromProtocolQuad(quad))
|
||||||
|
.map((quad) =>
|
||||||
|
quad.map((part) => ({ x: part.x + offsetX, y: part.y + offsetY }))
|
||||||
|
)
|
||||||
.map((quad) =>
|
.map((quad) =>
|
||||||
this._intersectQuadWithViewport(quad, clientWidth, clientHeight)
|
this._intersectQuadWithViewport(quad, clientWidth, clientHeight)
|
||||||
)
|
)
|
||||||
|
@ -210,10 +210,20 @@ describeChromeOnly('OOPIF', function () {
|
|||||||
await frame.evaluate(() => {
|
await frame.evaluate(() => {
|
||||||
const button = document.createElement('button');
|
const button = document.createElement('button');
|
||||||
button.id = 'test-button';
|
button.id = 'test-button';
|
||||||
|
button.innerText = 'click';
|
||||||
|
button.onclick = () => {
|
||||||
|
button.id = 'clicked';
|
||||||
|
};
|
||||||
document.body.appendChild(button);
|
document.body.appendChild(button);
|
||||||
});
|
});
|
||||||
|
await page.evaluate(() => {
|
||||||
|
document.body.style.border = '150px solid black';
|
||||||
|
document.body.style.margin = '250px';
|
||||||
|
document.body.style.padding = '50px';
|
||||||
|
});
|
||||||
|
await frame.waitForSelector('#test-button', { visible: true });
|
||||||
await frame.click('#test-button');
|
await frame.click('#test-button');
|
||||||
|
await frame.waitForSelector('#clicked');
|
||||||
});
|
});
|
||||||
it('should report oopif frames', async () => {
|
it('should report oopif frames', async () => {
|
||||||
const { server } = getTestState();
|
const { server } = getTestState();
|
||||||
@ -268,6 +278,37 @@ describeChromeOnly('OOPIF', function () {
|
|||||||
await utils.detachFrame(oopIframe, 'frame1');
|
await utils.detachFrame(oopIframe, 'frame1');
|
||||||
expect(oopIframe.childFrames()).toHaveLength(0);
|
expect(oopIframe.childFrames()).toHaveLength(0);
|
||||||
});
|
});
|
||||||
|
|
||||||
|
it('clickablePoint should work for elements inside OOPIFs', async () => {
|
||||||
|
const { server } = getTestState();
|
||||||
|
await page.goto(server.EMPTY_PAGE);
|
||||||
|
const framePromise = page.waitForFrame((frame) => {
|
||||||
|
return page.frames().indexOf(frame) === 1;
|
||||||
|
});
|
||||||
|
await utils.attachFrame(
|
||||||
|
page,
|
||||||
|
'frame1',
|
||||||
|
server.CROSS_PROCESS_PREFIX + '/empty.html'
|
||||||
|
);
|
||||||
|
const frame = await framePromise;
|
||||||
|
await page.evaluate(() => {
|
||||||
|
document.body.style.border = '50px solid black';
|
||||||
|
document.body.style.margin = '50px';
|
||||||
|
document.body.style.padding = '50px';
|
||||||
|
});
|
||||||
|
await frame.evaluate(() => {
|
||||||
|
const button = document.createElement('button');
|
||||||
|
button.id = 'test-button';
|
||||||
|
button.innerText = 'click';
|
||||||
|
document.body.appendChild(button);
|
||||||
|
});
|
||||||
|
const button = await frame.waitForSelector('#test-button', {
|
||||||
|
visible: true,
|
||||||
|
});
|
||||||
|
const result = await button.clickablePoint();
|
||||||
|
expect(result.x).toBeGreaterThan(150); // padding + margin + border left
|
||||||
|
expect(result.y).toBeGreaterThan(150); // padding + margin + border top
|
||||||
|
});
|
||||||
});
|
});
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
Loading…
Reference in New Issue
Block a user