DGNum/demarches-normaliennes
14
1
Fork 0
Code Issues 1 Pull requests Projects Releases Packages Wiki Activity

correctif(dsfr.burger-menu): le burger menu du DSFR n'aime pas le double dans le header

Browse source
This commit is contained in:
Martin 2023-09-12 16:09:35 +02:00
parent c9bde31ef2
commit 6046c9802b
1 changed files with 30 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

30
patches/@gouvfr+dsfr+1.10.1.patch
View file

@ -124,3 +124,33 @@ index 19921b7..29f207d 100644
COLLAPSE_LEGACY: `${ITEM} ${COLLAPSE}`, COLLAPSE_LEGACY: `${ITEM} ${COLLAPSE}`,
ITEM: api.internals.ns.selector('sidemenu__item'), ITEM: api.internals.ns.selector('sidemenu__item'),
BUTTON: api.internals.ns.selector('sidemenu__btn') BUTTON: api.internals.ns.selector('sidemenu__btn')
diff --git a/node_modules/@gouvfr/dsfr/dist/dsfr.module.js b/node_modules/@gouvfr/dsfr/dist/dsfr.module.js
index 1ddc56c..bee3c5a 100644
--- a/node_modules/@gouvfr/dsfr/dist/dsfr.module.js
+++ b/node_modules/@gouvfr/dsfr/dist/dsfr.module.js
@@ -5506,12 +5506,6 @@ class HeaderLinks extends api.core.Instance {
const copySuffix = '-mobile';
const toolsHtml = this.toolsLinks.innerHTML.replace(/ +/g, ' ');
- const menuHtml = this.menuLinks.innerHTML.replace(/ +/g, ' ');
- // Pour éviter de dupliquer des id, on ajoute un suffixe aux id et aria-controls duppliqués.
- let toolsHtmlDuplicateId = toolsHtml.replace(/id="(.*?)"/gm, 'id="$1' + copySuffix + '"');
- toolsHtmlDuplicateId = toolsHtmlDuplicateId.replace(/(<nav[.\s\S]*-translate [.\s\S]*) aria-controls="(.*?)"([.\s\S]*<\/nav>)/gm, '$1 aria-controls="$2' + copySuffix + '"$3');
-
- if (toolsHtmlDuplicateId === menuHtml) return;
switch (api.mode) {
case api.Modes.ANGULAR:
@@ -5523,7 +5517,11 @@ ${api.header.doc}`);
break;
default:
- this.menuLinks.innerHTML = toolsHtmlDuplicateId;
+ this.menuLinks.innerHTML = toolsHtml;
+ for (const element of this.menuLinks.querySelectorAll('[id]')) element.id = `${element.id}${copySuffix}`;
+ for (const element of this.menuLinks.querySelectorAll('[aria-controls]')) {
+ element.setAttribute('aria-controls', `${element.getAttribute('aria-controls')}${copySuffix}`);
+ }
}
}
}