Filip/playwright
1
0
Fork 0
Code Issues Pull requests Actions Packages Projects Releases Wiki Activity

fix(keyboard): event order for Escape key (#27711)

Browse source 
This test was failing in Chromium before this change.

Caused by
40d5e3a3c9/packages/playwright-core/src/server/chromium/crInput.ts (L54-L55)

which messes up the order of the protocol calls.

Fixes https://github.com/microsoft/playwright/issues/27709.
This commit is contained in:
Max Schmitt 2023-10-19 18:18:29 +02:00 committed by GitHub
parent 02fe462dda
commit b1325c9208
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 18 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
packages/playwright-core/src/server/input.ts
View file

@ -114,19 +114,15 @@ export class Keyboard {
} }
const tokens = split(key); const tokens = split(key);
const promises = [];
key = tokens[tokens.length - 1]; key = tokens[tokens.length - 1];
for (let i = 0; i < tokens.length - 1; ++i) for (let i = 0; i < tokens.length - 1; ++i)
promises.push(this.down(tokens[i])); await this.down(tokens[i]);
promises.push(this.down(key)); await this.down(key);
if (options.delay) { if (options.delay)
await Promise.all(promises);
await new Promise(f => setTimeout(f, options.delay)); await new Promise(f => setTimeout(f, options.delay));
} await this.up(key);
promises.push(this.up(key));
for (let i = tokens.length - 2; i >= 0; --i) for (let i = tokens.length - 2; i >= 0; --i)
promises.push(this.up(tokens[i])); await this.up(tokens[i]);
await Promise.all(promises);
} }
async _ensureModifiers(modifiers: types.KeyboardModifier[]): Promise<types.KeyboardModifier[]> { async _ensureModifiers(modifiers: types.KeyboardModifier[]): Promise<types.KeyboardModifier[]> {
@ -135,16 +131,14 @@ export class Keyboard {
throw new Error('Unknown modifier ' + modifier); throw new Error('Unknown modifier ' + modifier);
} }
const restore: types.KeyboardModifier[] = Array.from(this._pressedModifiers); const restore: types.KeyboardModifier[] = Array.from(this._pressedModifiers);
const promises: Promise<void>[] = [];
for (const key of kModifiers) { for (const key of kModifiers) {
const needDown = modifiers.includes(key); const needDown = modifiers.includes(key);
const isDown = this._pressedModifiers.has(key); const isDown = this._pressedModifiers.has(key);
if (needDown && !isDown) if (needDown && !isDown)
promises.push(this.down(key)); await this.down(key);
else if (!needDown && isDown) else if (!needDown && isDown)
promises.push(this.up(key)); await this.up(key);
} }
await Promise.all(promises);
return restore; return restore;
} }

11
tests/page/page-keyboard.spec.ts
View file

@ -702,3 +702,14 @@ it('should type after context menu was opened', async ({ server, page, browserNa
await expect.poll(() => page.evaluate('window.keys')).toEqual(['ArrowDown']); await expect.poll(() => page.evaluate('window.keys')).toEqual(['ArrowDown']);
}); });
it('should have correct Keydown/Keyup order when pressing Escape key', async ({ page, server, browserName }) => {
it.info().annotations.push({ type: 'issue', description: 'https://github.com/microsoft/playwright/issues/27709' });
await page.goto(server.PREFIX + '/input/keyboard.html');
await page.keyboard.press('Escape');
expect(await page.evaluate('getResult()')).toBe(`
Keydown: Escape Escape 27 []
Keyup: Escape Escape 27 []
`.trim());
});