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

MDL-77957 theme_boost: Fix drawer not closing on mobile if it has focus

Browse Source
This commit is contained in:
Bastian Schmidt-Kuhl 2024-10-02 11:36:36 +02:00 committed by Shamim Rezaie
parent 505a85eb9a
commit a202f297f1
3 changed files with 12 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

File diff suppressed because one or more lines are too long

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

File diff suppressed because one or more lines are too long

11
theme/boost/amd/src/drawers.js
View File

@ -778,7 +778,10 @@ const registerListeners = () => {
drawerMap.forEach(drawerInstance => {
disableDrawerTooltips(drawerInstance.drawerNode);
if (drawerInstance.isOpen) {
if (drawerInstance.closeOnResize) {
const currentFocus = document.activeElement;
const drawerContent = drawerInstance.drawerNode.querySelector(SELECTORS.DRAWERCONTENT);
const shouldClose = drawerInstance.closeOnResize && (!drawerContent || !drawerContent.contains(currentFocus));
if (shouldClose) {
drawerInstance.closeDrawer();
} else {
anyOpen = true;
@ -798,6 +801,12 @@ const registerListeners = () => {
};
document.addEventListener('scroll', () => {
const currentFocus = document.activeElement;
const drawerContentElements = document.querySelectorAll(SELECTORS.DRAWERCONTENT);
// Check if the current focus is within any drawer content.
if (Array.from(drawerContentElements).some(drawer => drawer.contains(currentFocus))) {
return;
}
const body = document.querySelector('body');
if (window.scrollY >= window.innerHeight) {
body.classList.add(CLASSES.SCROLLED);