diff --git a/resources/js/archive-template-publications.js b/resources/js/archive-template-publications.js index 9cef519..848da14 100644 --- a/resources/js/archive-template-publications.js +++ b/resources/js/archive-template-publications.js @@ -130,7 +130,7 @@ function handleSubmenuToggle() { submenuToggle.addEventListener('click', () => { const isSubmenuOpen = submenuToggle.getAttribute('aria-expanded'); - if (isSubmenuOpen != null) { + if (isSubmenuOpen === 'true') { return closeSubMenuFilters(); } else { return openSubMenuFilters(); @@ -162,8 +162,10 @@ function openSubMenuFilters() { '.filters-toolbar__action-thematiques-filters .action-thematiques-filters-list' ); submenuFilters.removeAttribute('hidden'); + submenuFilters.removeAttribute('aria-hidden'); + submenuToggle.setAttribute('active', ''); - submenuToggle.setAttribute('aria-expanded', ''); + submenuToggle.setAttribute('aria-expanded', 'true'); } function closeSubMenuFilters() { const submenuToggle = document.querySelector( @@ -173,8 +175,11 @@ function closeSubMenuFilters() { '.filters-toolbar__action-thematiques-filters .action-thematiques-filters-list' ); submenuFilters.setAttribute('hidden', ''); + submenuFilters.setAttribute('aria-hidden', ''); + submenuToggle.removeAttribute('active'); - submenuToggle.removeAttribute('aria-expanded'); + submenuToggle.setAttribute('aria-expanded', 'false'); + // submenuToggle.removeAttribute('aria-expanded'); } // ################################################# diff --git a/resources/js/taxonomy-thematique-(faq).js b/resources/js/taxonomy-thematique-(faq).js index 1585261..c5572c5 100644 --- a/resources/js/taxonomy-thematique-(faq).js +++ b/resources/js/taxonomy-thematique-(faq).js @@ -14,7 +14,7 @@ function handleSubmenuToggle() { submenuToggle.addEventListener('click', () => { const isSubmenuOpen = submenuToggle.getAttribute('aria-expanded'); - if (isSubmenuOpen != null) { + if (isSubmenuOpen === 'true') { return closeSubMenuFilters(); } else { return openSubMenuFilters(); @@ -46,8 +46,10 @@ function openSubMenuFilters() { '.filters-toolbar__action-thematiques-filters .action-thematiques-filters-list' ); submenuFilters.removeAttribute('hidden'); + submenuFilters.removeAttribute('aria-hidden'); + submenuToggle.setAttribute('active', ''); - submenuToggle.setAttribute('aria-expanded', ''); + submenuToggle.setAttribute('aria-expanded', 'true'); } function closeSubMenuFilters() { const submenuToggle = document.querySelector( @@ -57,8 +59,10 @@ function closeSubMenuFilters() { '.filters-toolbar__action-thematiques-filters .action-thematiques-filters-list' ); submenuFilters.setAttribute('hidden', ''); + submenuFilters.setAttribute('aria-hidden', ''); + submenuToggle.removeAttribute('active'); - submenuToggle.removeAttribute('aria-expanded'); + submenuToggle.setAttribute('aria-expanded', 'false'); } // ########################### diff --git a/taxonomy-thematiques.php b/taxonomy-thematiques.php index 6e4fe82..536ae4a 100644 --- a/taxonomy-thematiques.php +++ b/taxonomy-thematiques.php @@ -112,8 +112,8 @@ FILTERS