Skip to content

Commit 889cf8f

Browse files
authored
fix(input): climb dom for pointer-events:none targets (#1666)
1 parent 3dc14ed commit 889cf8f

File tree

4 files changed

+23
-4
lines changed

4 files changed

+23
-4
lines changed

README.md

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -61,8 +61,7 @@ const iPhone11 = devices['iPhone 11 Pro'];
6161
(async () => {
6262
const browser = await webkit.launch();
6363
const context = await browser.newContext({
64-
viewport: iPhone11.viewport,
65-
userAgent: iPhone11.userAgent,
64+
...iPhone11,
6665
geolocation: { longitude: 12.492507, latitude: 41.889938 },
6766
permissions: ['geolocation']
6867
});

src/dom.ts

Lines changed: 15 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,7 @@
1414
* limitations under the License.
1515
*/
1616

17+
import * as debug from 'debug';
1718
import * as fs from 'fs';
1819
import * as mime from 'mime';
1920
import * as path from 'path';
@@ -36,6 +37,8 @@ export type ClickOptions = PointerActionOptions & input.MouseClickOptions;
3637

3738
export type MultiClickOptions = PointerActionOptions & input.MouseMultiClickOptions;
3839

40+
const debugInput = debug('pw:input');
41+
3942
export class FrameExecutionContext extends js.ExecutionContext {
4043
readonly frame: frames.Frame;
4144
private _injectedPromise?: Promise<js.JSHandle>;
@@ -112,7 +115,9 @@ export class ElementHandle<T extends Node = Node> extends js.JSHandle<T> {
112115
}
113116

114117
async _scrollRectIntoViewIfNeeded(rect?: types.Rect): Promise<void> {
118+
debugInput('scrolling into veiw if needed...');
115119
await this._page._delegate.scrollRectIntoViewIfNeeded(this, rect);
120+
debugInput('...done');
116121
}
117122

118123
async scrollIntoViewIfNeeded() {
@@ -186,11 +191,16 @@ export class ElementHandle<T extends Node = Node> extends js.JSHandle<T> {
186191
if (!force)
187192
await this._waitForHitTargetAt(point, options);
188193

194+
point.x = (point.x * 100 | 0) / 100;
195+
point.y = (point.y * 100 | 0) / 100;
196+
189197
await this._page._frameManager.waitForNavigationsCreatedBy(async () => {
190198
let restoreModifiers: input.Modifier[] | undefined;
191199
if (options && options.modifiers)
192200
restoreModifiers = await this._page.keyboard._ensureModifiers(options.modifiers);
201+
debugInput('performing input action...');
193202
await action(point);
203+
debugInput('...done');
194204
if (restoreModifiers)
195205
await this._page.keyboard._ensureModifiers(restoreModifiers);
196206
}, options, true);
@@ -356,13 +366,16 @@ export class ElementHandle<T extends Node = Node> extends js.JSHandle<T> {
356366
}
357367

358368
async _waitForDisplayedAtStablePosition(options: types.TimeoutOptions = {}): Promise<void> {
369+
debugInput('waiting for element to be displayed and not moving...');
359370
const stablePromise = this._evaluateInUtility(({ injected, node }, timeout) => {
360371
return injected.waitForDisplayedAtStablePosition(node, timeout);
361372
}, options.timeout || 0);
362373
await helper.waitWithTimeout(stablePromise, 'element to be displayed and not moving', options.timeout || 0);
374+
debugInput('...done');
363375
}
364376

365377
async _waitForHitTargetAt(point: types.Point, options: types.TimeoutOptions = {}): Promise<void> {
378+
debugInput(`waiting for element to receive pointer events at (${point.x},${point.y}) ...`);
366379
const frame = await this.ownerFrame();
367380
if (frame && frame.parentFrame()) {
368381
const element = await frame.frameElement();
@@ -375,7 +388,8 @@ export class ElementHandle<T extends Node = Node> extends js.JSHandle<T> {
375388
const hitTargetPromise = this._evaluateInUtility(({ injected, node }, { timeout, point }) => {
376389
return injected.waitForHitTargetAt(node, timeout, point);
377390
}, { timeout: options.timeout || 0, point });
378-
await helper.waitWithTimeout(hitTargetPromise, 'element to receive mouse events', options.timeout || 0);
391+
await helper.waitWithTimeout(hitTargetPromise, 'element to receive pointer events', options.timeout || 0);
392+
debugInput('...done');
379393
}
380394
}
381395

src/injected/injected.ts

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -247,7 +247,9 @@ class Injected {
247247
}
248248

249249
async waitForHitTargetAt(node: Node, timeout: number, point: types.Point) {
250-
const element = node.nodeType === Node.ELEMENT_NODE ? (node as Element) : node.parentElement;
250+
let element = node.nodeType === Node.ELEMENT_NODE ? (node as Element) : node.parentElement;
251+
while (element && window.getComputedStyle(element).pointerEvents === 'none')
252+
element = element.parentElement;
251253
if (!element)
252254
throw new Error('Element is not attached to the DOM');
253255
const result = await this.poll('raf', timeout, () => {

test/click.spec.js

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -483,6 +483,10 @@ module.exports.describe = function({testRunner, expect, playwright, FFOX, CHROMI
483483
expect(await page.evaluate(() => window.result)).toBe('Was not clicked');
484484
});
485485

486+
it('should climb dom for pointer-events:none targets', async({page, server}) => {
487+
await page.setContent('<button><label style="pointer-events:none">Click target</label></button>')
488+
await page.click('text=Click target');
489+
});
486490
it('should update modifiers correctly', async({page, server}) => {
487491
await page.goto(server.PREFIX + '/input/button.html');
488492
await page.click('button', { modifiers: ['Shift'] });

0 commit comments

Comments
 (0)