mirror_php/moodle
1
0
Fork 0
mirror of https://github.com/moodle/moodle.git synced 2025-04-13 12:32:08 +02:00
Code Issues Projects Releases Wiki Activity

MDL-78885 aria: Improve focus back

Browse Source 
To support the case when a combobox is inside another dropdown
This commit is contained in:
Shamim Rezaie 2023-10-30 17:12:48 +11:00
parent 50eeafeb7d
commit 7fa36e6bf0
3 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
theme/boost/amd/build/aria.min.js vendored
View File

File diff suppressed because one or more lines are too long

2
theme/boost/amd/build/aria.min.js.map
View File

File diff suppressed because one or more lines are too long

4
theme/boost/amd/src/aria.js
View File

@ -211,7 +211,8 @@ const dropdownFix = () => {
// We need to focus on the menu trigger.
const trigger = e.target.querySelector('[data-toggle="dropdown"]');
const focused = document.activeElement != document.body ? document.activeElement : null;
// If it's a click event, then no element is focused because the clicked element is inside a closed dropdown.
const focused = e.clickEvent?.target || (document.activeElement !== document.body ? document.activeElement : null);
if (trigger && focused && e.target.contains(focused)) {
shiftFocus(trigger, () => {
if (document.activeElement === document.body) {
@ -348,7 +349,6 @@ const comboboxFix = () => {
const listbox = option.closest('[role="listbox"]');
const combobox = document.querySelector(`[role="combobox"][aria-controls="${listbox.id}"]`);
if (combobox) {
combobox.focus();
selectOption(combobox, option);
}
}