add accessibility to open and close buttons (#311)
refactor the way to focus apps when the menu is opened (#301)
This commit is contained in:
+12
-24
@@ -16,7 +16,8 @@ if ($_['always-displayed']) {
|
||||
const sideMenuContainer = SMcreateElement('div', {id: 'side-menu-container'})
|
||||
const sideMenuOpener = SMcreateElement('button', {
|
||||
'class': 'side-menu-opener',
|
||||
'arial-label': t('side_menu', 'Toggle menu')
|
||||
'arial-label': t('side_menu', 'Toggle the menu'),
|
||||
'html': `<span>${t('side_menu', 'Toggle the menu')}</span>`
|
||||
})
|
||||
const sideMenu = SMcreateElement('div', {id: 'side-menu'})
|
||||
|
||||
@@ -38,6 +39,15 @@ if ($_['always-displayed']) {
|
||||
sideMenu.setAttribute('data-sidewithcategories', '1')
|
||||
<?php endif; ?>
|
||||
|
||||
const sideMenuFocus = () => {
|
||||
let a = document.querySelector('#side-menu .side-menu-app.active a')
|
||||
|| document.querySelector('#side-menu .side-menu-app a')
|
||||
|
||||
if (a) {
|
||||
a.focus()
|
||||
}
|
||||
}
|
||||
|
||||
document.querySelector('body').addEventListener('side-menu.apps', (e) => {
|
||||
const apps = e.detail.apps;
|
||||
|
||||
@@ -80,22 +90,6 @@ if ($_['always-displayed']) {
|
||||
return
|
||||
}
|
||||
|
||||
sideMenuFocus = () => {
|
||||
let a = document.querySelector('.side-menu-app.active a', sideMenu)
|
||||
|
||||
if (!a) {
|
||||
return
|
||||
}
|
||||
|
||||
if (a.length === 0) {
|
||||
a = sideMenu.querySelector('.side-menu-app:first-child a')
|
||||
}
|
||||
|
||||
if (a.length > 0) {
|
||||
a.focus()
|
||||
}
|
||||
}
|
||||
|
||||
<?php if ($_['opener-hover']): ?>
|
||||
const sideMenuMouseLeave = () => {
|
||||
sideMenu.classList.remove('open')
|
||||
@@ -127,14 +121,8 @@ if ($_['always-displayed']) {
|
||||
|
||||
headerMenuOpener.addEventListener('click', () => {
|
||||
sideMenu.classList.add('open')
|
||||
|
||||
const a = sideMenu.querySelector('.side-menu-app.active a')
|
||||
|
||||
if (a !== null) {
|
||||
a.focus()
|
||||
}
|
||||
|
||||
headerMenuOpener.blur()
|
||||
sideMenuFocus()
|
||||
})
|
||||
|
||||
for (let opener of sideMenuOpener) {
|
||||
|
||||
Reference in New Issue
Block a user