feat(accordion): ajoute un attribut group pour dissocier le disclose-…

…group
GouvernementFR · Jan 30, 2024 · 9a6ab02 · 9a6ab02
1 parent b92cf6e
commit 9a6ab02
Show file tree

Hide file tree

Showing 4 changed files with 20 additions and 7 deletions.
diff --git a/src/component/accordion/example/index.ejs b/src/component/accordion/example/index.ejs
@@ -4,4 +4,4 @@
 
 <%- sample('Groupe d‘accordéons', './sample/accordions-group', {}, true); %>
 
-<%- sample('Groupe d‘accordéons dissociés', './sample/accordions-group', {accordionsGroup: {dissociate: true}}, true); %>
+<%- sample('Groupe d‘accordéons dissociés', './sample/accordions-group', {accordionsGroup: {attributes: {group: false}}}, true); %>
diff --git a/src/component/accordion/script/accordion/accordion-selector.js b/src/component/accordion/script/accordion/accordion-selector.js
@@ -4,7 +4,7 @@ const ACCORDION = api.internals.ns.selector('accordion');
 const COLLAPSE = api.internals.ns.selector('collapse');
 
 export const AccordionSelector = {
-  GROUP: `${api.internals.ns.selector('accordions-group')}:not(${api.internals.ns.selector('accordions-group--dissociate')})`,
+  GROUP: api.internals.ns.selector('accordions-group'),
   ACCORDION: ACCORDION,
   COLLAPSE: `${ACCORDION} > ${COLLAPSE}, ${ACCORDION} > *:not(${ACCORDION}):not(${COLLAPSE}) > ${COLLAPSE}, ${ACCORDION} > *:not(${ACCORDION}):not(${COLLAPSE}) > *:not(${ACCORDION}):not(${COLLAPSE}) > ${COLLAPSE}`,
   COLLAPSE_LEGACY: `${ACCORDION} ${COLLAPSE}`,

diff --git a/src/component/accordion/template/ejs/accordions-group.ejs b/src/component/accordion/template/ejs/accordions-group.ejs
@@ -8,12 +8,10 @@
 
 <% 
 let accordionsGroup = locals.accordionsGroup || {accordions: []}
-let classes = accordionsGroup.classes || [];
-classes.push(prefix + '-accordions-group');
-if (accordionsGroup.dissociate) classes.push(prefix + '-accordions-group--dissociate');
+let attributes = accordionsGroup.attributes || {};
 %>
 
-<div <%- includeClasses(classes); %>>
+<div <%- includeAttrs(attributes); %> class="<%= prefix %>-accordions-group">
 <%
   for (let i = 0; i < accordionsGroup.accordions.length; i++) {
 %>

diff --git a/src/core/script/disclosure/disclosures-group.js b/src/core/script/disclosure/disclosures-group.js
@@ -96,6 +96,7 @@ class DisclosuresGroup extends Instance {
   }
 
   update () {
+    this._isGrouped = this.isGrouped;
     this.getMembers();
     if (this._hasRetrieved) this.getIndex();
   }
@@ -134,7 +135,7 @@ class DisclosuresGroup extends Instance {
       if (value === i) {
         if (!member.isDisclosed) member.disclose(true);
       } else {
-        if (member.isDisclosed) member.conceal(true);
+        if (this.isGrouped !== 'false' && member.isDisclosed) member.conceal(true);
       }
     }
     this.apply();
@@ -155,13 +156,27 @@ class DisclosuresGroup extends Instance {
     return false;
   }
 
+  get isGrouped () {
+    return this.getAttribute('group');
+  }
+
+  set isGrouped (value) {
+    this._isGrouped = value;
+  }
+
   apply () {}
 
   dispose () {
     super.dispose();
     this.descend(DisclosureEmission.UNGROUP);
     this._members = null;
   }
+
+  mutate (attributesNames) {
+    if (attributesNames.includes('group')) {
+      this.update();
+    }
+  }
 }
 
 export { DisclosuresGroup };