Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Portals: focus() inside portal should change active element #27461

Merged
merged 1 commit into from
Feb 12, 2021
Merged

Portals: focus() inside portal should change active element #27461

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
48 changes: 48 additions & 0 deletions portals/portals-focus.sub.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,19 @@
}
}, "test that an element inside a portal cannot steal focus");

promise_test(async () => {
let portal = await createPortal(document, new URL("resources/focus-page-with-button.html", location.href));
try {
let activeElementUpdated = new Promise(r => {
portal.onmessage = e => r(e.data.activeElementUpdated)
});
portal.postMessage('focus-update-active-element');
assert_true(await activeElementUpdated);
} finally {
document.body.removeChild(portal);
}
}, "test that activeElement inside a portal is updated after focus() is called");

promise_test(async t => {
let portal = await createPortal(document, new URL("resources/focus-page-with-x-origin-iframe.sub.html", location.href));
try {
Expand All @@ -42,6 +55,19 @@
}
}, "test that an element inside a portal's x-origin subframe cannot steal focus");

promise_test(async () => {
let portal = await createPortal(document, new URL("resources/focus-page-with-x-origin-iframe.sub.html", location.href));
try {
portal.postMessage("focus-update-active-element");
let {activeElementUpdated} = await new Promise(r => {
portal.onmessage = e => r(e.data);
});
assert_true(activeElementUpdated);
} finally {
document.body.removeChild(portal);
}
}, "test that a portal's x-origin subframe becomes active element on focus");

promise_test(async t => {
let win = await openBlankPortalHost();
let doc = win.document;
Expand Down Expand Up @@ -87,6 +113,28 @@
}
}, "test that a x-origin iframe inside an adopted portal cannot steal focus");

promise_test(async () => {
let win = await openBlankPortalHost();
let doc = win.document;
try {
let portal = await createPortal(doc, new URL("resources/focus-page-with-autofocus.html", location.href));
portal.postMessage('check-active-element');
let result = await new Promise(r => {
portal.onmessage = e => r(e.data);
});
assert_true(result, "autofocused element is active element");

await portal.activate();
win.portalHost.postMessage('check-active-element');
result = await new Promise(r => {
win.portalHost.onmessage = e => r(e.data)
});
assert_true(result, "autofocused element is still active element");
} finally {
win.close();
}
}, "test that autofocus inside a portal works");

const TAB = "\ue004"; // https://w3c.github.io/webdriver/#keyboard-actions
const SPACE = " "
const RETURN = "\r";
Expand Down
21 changes: 21 additions & 0 deletions portals/resources/focus-page-with-autofocus.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,21 @@
<!DOCTYPE html>
<body>
<button id="one">one</button>
<button id="two" autofocus>two</button>
<button id="three">three</button>
<script>
function messageHandler(e) {
if (e.data === 'check-active-element') {
let autofocusedButton = document.querySelector('#two');
e.source.postMessage(document.activeElement === autofocusedButton);
}
}

window.portalHost.onmessage = messageHandler;
window.onportalactivate = e => {
let portal = e.adoptPredecessor();
portal.onmessage = messageHandler;
document.body.appendChild(portal);
}
</script>
</body>
6 changes: 6 additions & 0 deletions portals/resources/focus-page-with-button.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,12 @@
button.onfocus = () => e.source.postMessage({focused: true}, {targetOrigin: "*"});
button.focus();
}

if (e.data == "focus-update-active-element") {
let button = document.querySelector("button");
button.focus();
e.source.postMessage({activeElementUpdated: document.activeElement === button}, {targetOrigin: "*"});
}
}

if (window.portalHost)
Expand Down
6 changes: 3 additions & 3 deletions portals/resources/focus-page-with-x-origin-iframe.sub.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
<!DOCTYPE html>
<body>
<script>
function handleMessage(e) {
if (e.data == "focus") {
async function handleMessage(e) {
if (e.data == "focus" || e.data == "focus-update-active-element") {
let iframe = document.querySelector("iframe");
iframe.contentWindow.postMessage("focus", "*");
iframe.contentWindow.postMessage(e.data, "*");
}
}

Expand Down