Skip to content

[Gecko Bug 2035573] Revert "Bug 2035573 - Start focus navigation from selection if it is a descendant of focused element. " for causing wpt failures @sequential-focus-navigation-starting-point.tentative.html. #60417

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

Merged
moz-wptsync-bot merged 1 commit into from
Jun 5, 2026
+3 −31
Merged

[Gecko Bug 2035573] Revert "Bug 2035573 - Start focus navigation from selection if it is a descendant of focused element. " for causing wpt failures @sequential-focus-navigation-starting-point.tentative.html. #60417

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
34 changes: 3 additions & 31 deletions ...-navigation-starting-point.tentative.html → ...tial-focus-navigation-starting-point.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -118,28 +118,6 @@
<button data-next slot="d">button 4</button>
</div>
</template>
<template data-description="Focus navigation starting point should be used when it's a descendant of the focused element.">
<div tabindex="0" data-focus>
<button data-prev id="button1">button 1</button>
<span data-click>in between</span>
<button data-next id="button2">button 2</button>
</div>
</template>
<template data-description="Backwards focus navigation should not be stuck when starting point is inside focused element but before any other focusable areas.">
<button data-prev id="button1">button 1</button>
<div tabindex="0" id="focusable" data-focus>
<span data-click>in between</span>
<button data-next id="button2">button 2</button>
</div>
</template>
<template data-description="Should start from focused element if it was focused after the selection was set.">
<button id="button1">button 1</button>
<span data-click>in between</span>
<button id="button2">button 2</button>
<button id="button3" data-prev>button 3</button>
<div tabindex="0" id="focusable" data-focus2>focusable</div>
<button id="button4" data-next>button 4</button>
</template>

<script>
"use strict";
Expand All @@ -148,15 +126,13 @@
const kTab = "\uE004";

// Runs callback on each element matching selector, descending into open shadow roots.
async function forEachMatching(selector, callback, root) {
function forEachMatching(selector, callback, root) {
if (!root) { root = container; }
for (let element of root.querySelectorAll(selector)) {
await callback(element);
callback(element);
}
for (let element of root.querySelectorAll("[data-shadow]")) {
if (element.shadowRoot) {
await forEachMatching(selector, callback, element.shadowRoot);
}
forEachMatching(selector, callback, element.shadowRoot);
}
}

Expand All @@ -173,7 +149,6 @@
forEachMatching("[data-focus]", element => {
element.focus();
});
await forEachMatching("[data-click]", test_driver.click);
forEachMatching("[data-blur]", element => {
element.blur();
});
Expand Down Expand Up @@ -201,9 +176,6 @@
forEachMatching("[data-reenable]", element => {
element.disabled = false;
});
forEachMatching("[data-focus2]", element => {
element.focus();
});

let actions = new test_driver.Actions();
if (backwards) {
Expand Down
Loading