kyfx
/
playwright
mirror of https://github.com/microsoft/playwright.git
4
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

cherry-pick(#30800): Revert "fix(highlight): highlight Top Layer elements (#30001)" (#30801) 

This PR cherry-picks the following commits:

- b06c1dfff1

Co-authored-by: github-actions <41898282+github-actions[bot]@users.noreply.github.com>
This commit is contained in:
Playwright Service 2024-05-14 10:00:51 -07:00 committed by GitHub
parent 1b2de3f7a7
commit 01bf93cda4
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 0 additions and 41 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
packages/playwright-core/src/server/injected/highlight.ts
View File

@ -55,7 +55,6 @@ export class Highlight {
const document = injectedScript.document; const document = injectedScript.document;
this._isUnderTest = injectedScript.isUnderTest; this._isUnderTest = injectedScript.isUnderTest;
this._glassPaneElement = document.createElement('x-pw-glass'); this._glassPaneElement = document.createElement('x-pw-glass');
this._glassPaneElement.popover = 'manual';
this._glassPaneElement.style.position = 'fixed'; this._glassPaneElement.style.position = 'fixed';
this._glassPaneElement.style.top = '0'; this._glassPaneElement.style.top = '0';
this._glassPaneElement.style.right = '0'; this._glassPaneElement.style.right = '0';
@ -65,12 +64,6 @@ export class Highlight {
this._glassPaneElement.style.pointerEvents = 'none'; this._glassPaneElement.style.pointerEvents = 'none';
this._glassPaneElement.style.display = 'flex'; this._glassPaneElement.style.display = 'flex';
this._glassPaneElement.style.backgroundColor = 'transparent'; this._glassPaneElement.style.backgroundColor = 'transparent';
this._glassPaneElement.style.width = 'inherit';
this._glassPaneElement.style.height = 'inherit';
this._glassPaneElement.style.padding = '0';
this._glassPaneElement.style.margin = '0';
this._glassPaneElement.style.border = 'none';
this._glassPaneElement.style.overflow = 'hidden';
for (const eventName of ['click', 'auxclick', 'dragstart', 'input', 'keydown', 'keyup', 'pointerdown', 'pointerup', 'mousedown', 'mouseup', 'mouseleave', 'focus', 'scroll']) { for (const eventName of ['click', 'auxclick', 'dragstart', 'input', 'keydown', 'keyup', 'pointerdown', 'pointerup', 'mousedown', 'mouseup', 'mouseleave', 'focus', 'scroll']) {
this._glassPaneElement.addEventListener(eventName, e => { this._glassPaneElement.addEventListener(eventName, e => {
e.stopPropagation(); e.stopPropagation();
@ -98,8 +91,6 @@ export class Highlight {
install() { install() {
this._injectedScript.document.documentElement.appendChild(this._glassPaneElement); this._injectedScript.document.documentElement.appendChild(this._glassPaneElement);
// Popover is not supported in WebKit-macOS < 14.0
this._glassPaneElement.showPopover?.();
} }
setLanguage(language: Language) { setLanguage(language: Language) {
@ -116,8 +107,6 @@ export class Highlight {
uninstall() { uninstall() {
if (this._rafRequest) if (this._rafRequest)
cancelAnimationFrame(this._rafRequest); cancelAnimationFrame(this._rafRequest);
// Popover is not supported in WebKit-macOS < 14.0
this._glassPaneElement.hidePopover?.();
this._glassPaneElement.remove(); this._glassPaneElement.remove();
} }

30
tests/page/page-screenshot.spec.ts
View File

@ -482,36 +482,6 @@ it.describe('page screenshot', () => {
})).toMatchSnapshot('should-mask-inside-iframe.png'); })).toMatchSnapshot('should-mask-inside-iframe.png');
}); });
it('should mask inside <dialog />', async ({ page, server, browserName, isElectron }) => {
it.info().annotations.push({ type: 'issue', description: 'https://github.com/microsoft/playwright/issues/29878' });
it.skip(browserName === 'webkit' && process.platform === 'darwin' && parseInt(os.release().split('.')[0], 10) < 23, 'SDKAlignedBehavior::PopoverAttributeEnabled is only enabled in macOS 14.0+');
it.fixme(isElectron, 'Requires a more recent Electron version');
await page.setViewportSize({ width: 500, height: 500 });
await page.goto(server.PREFIX + '/grid.html');
await page.evaluate(() => {
const elements = document.body.innerHTML;
document.body.innerHTML = '';
// Move all the elements of the body (grid elements) into a <dialog /> which lives on the Top-Layer.
const dialog = document.createElement('dialog');
dialog.style.padding = '0';
dialog.style.margin = '0';
dialog.style.border = 'none';
dialog.style.maxWidth = 'inherit';
dialog.style.maxHeight = 'inherit';
dialog.style.outline = 'none';
document.body.appendChild(dialog);
dialog.innerHTML = elements;
dialog.showModal();
});
expect(await page.screenshot({
mask: [
page.locator('div').nth(5),
page.frameLocator('#frame1').locator('div').nth(12),
],
})).toMatchSnapshot('should-mask-inside-iframe.png');
});
it('should mask in parallel', async ({ page, server }) => { it('should mask in parallel', async ({ page, server }) => {
await page.setViewportSize({ width: 500, height: 500 }); await page.setViewportSize({ width: 500, height: 500 });
await attachFrame(page, 'frame1', server.PREFIX + '/grid.html'); await attachFrame(page, 'frame1', server.PREFIX + '/grid.html');