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

CSS: :focus selector effects on shadow hosts #17493

Merged
merged 6 commits into from
Sep 24, 2019
Merged

CSS: :focus selector effects on shadow hosts #17493

Show file tree
Hide file tree
Changes from 5 commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
2e153c5
CSS: :focus selector effects on shadow host with delegatesFocus
rakina Jun 25, 2019
bf72444
Move to shadow-dom, factor out stuff
rakina Jun 27, 2019
b87fd44
Update last test to not apply :focus to host
rakina Jun 26, 2019
d21e77b
Move to shadow-dom, factor out stuff
rakina Jun 27, 2019
bfdf9b8
Update tests so delegatesFocus=false also matches :focus
rakina Sep 20, 2019
42557ba
remove resetFocusOnRoot
rakina Sep 24, 2019
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
72 changes: 72 additions & 0 deletions shadow-dom/focus/focus-selector-delegatesFocus.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,72 @@
<!DOCTYPE html>
<html>
<head>
<meta charset="utf-8" />
<title>CSS Test (Selectors): :focus behavior with shadow hosts & delegatesFocus </title>
<link rel="author" title="Rakina Zata Amni" href="[email protected]" />
<link rel="help" href="https://html.spec.whatwg.org/multipage/semantics-other.html#selector-focus" />
<script src="/resources/testharness.js"></script>
<script src="/resources/testharnessreport.js"></script>
<script src="/resources/testdriver.js"></script>
<script src="/resources/testdriver-vendor.js"></script>
<script src="resources/shadow-utils.js"></script>
</head>

<body>
<script>
function createFocusableDiv() {
const div = document.createElement("div");
div.innerText = "foo";
div.tabIndex = 0;
return div;
}

function createShadowHost(delegatesFocus, container) {
const host = document.createElement("div");
host.attachShadow({ mode: "open", delegatesFocus: delegatesFocus });
container.appendChild(host);
return host;
}

const delegatesFocusValues = [true, false];

for (const delegatesFocus of delegatesFocusValues) {
test(() => {
resetFocus();
const host = createShadowHost(delegatesFocus, document.body);
const shadowChild = createFocusableDiv();
host.shadowRoot.appendChild(shadowChild);

shadowChild.focus();
assert_true(shadowChild.matches(":focus"), "element in shadow tree matches :focus");
assert_true(host.matches(":focus"), "host matches :focus");
}, `:focus applies to host with delegatesFocus=${delegatesFocus} when the shadow root's descendant has focus`);

test(() => {
resetFocus();
const host = createShadowHost(delegatesFocus, document.body);
const slotted = createFocusableDiv();
host.shadowRoot.appendChild(document.createElement("slot"));
host.appendChild(slotted);

slotted.focus();
assert_true(slotted.matches(":focus"), "slotted element matches :focus");
assert_true(host.matches(":focus"), "host matches :focus");
}, `:focus applies to host with delegatesFocus=${delegatesFocus} when slotted element has focus`);
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This is wrong. If a slotted element has a focus, then the shadow host is its parent (or ancestor). If :focus shouldn't match both the slotted element and the host of the shadow tree to which it was assigned.

I'm fixing this in #19530


for (const nestedDelegatesFocus of delegatesFocusValues) {
test(() => {
resetFocus();
const host = createShadowHost(delegatesFocus, document.body);
const nestedHost = createShadowHost(nestedDelegatesFocus, host.shadowRoot);
const nestedShadowChild = createFocusableDiv();
nestedHost.shadowRoot.appendChild(nestedShadowChild);
nestedShadowChild.focus();
assert_true(nestedShadowChild.matches(":focus"), "element in nested shadow tree matches :focus");
assert_true(nestedHost.matches(":focus"), "host of nested shadow tree matches focus");
assert_true(host.matches(":focus"), "topmost host matches focus");
}, `:focus applies to host with delegatesFocus=${delegatesFocus} when an element in a nested shadow tree with delegatesFocus=${nestedDelegatesFocus} is focused`);
}
}
</script>
</body>
7 changes: 6 additions & 1 deletion shadow-dom/focus/resources/shadow-utils.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -60,8 +60,13 @@ function removeTabIndex(elements) {
}
}

function resetFocusOnRoot(root) {
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Can we just have one function, instead of two?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

resetFocus() is already used by the sequential focus navigation tests so we still need it (unless we change it too I guess?), and we need to give the root here because we don't know the tree structure?

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I see, I think I misread things. I'm OK with merging this as-is. However it could be clearer to just have function resetFocus(root = document) { /* contents of current resetFocusOnRoot */ } and update all tests to use that.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Oh yeah sorry the non-document one is not actually used in this WPT, oops (but will be used in other ones so I think it's OK to have the general version here). Also changed it to your suggested version. Thanks!

if (root.activeElement)
root.activeElement.blur();
}

function resetFocus() {
document.body.focus();
resetFocusOnRoot(document);
}

function navigateFocusForward() {
Expand Down