[dsfr-ui] fix dsfr-select-multiple count & selection

vertigo-io · Jan 21, 2025 · d1b2e88 · d1b2e88
1 parent f02c76f
commit d1b2e88
Show file tree

Hide file tree

Showing 6 changed files with 136 additions and 132 deletions.
diff --git a/vertigo-ui-dsfr/src/components/DsfrSelectMultiple/DsfrSelectMultiple.vue b/vertigo-ui-dsfr/src/components/DsfrSelectMultiple/DsfrSelectMultiple.vue
@@ -75,7 +75,8 @@ const selectAllText = computed(() => {
 })
 
 const selectionDisplay = computed(() => {
-  let result = `${props.modelValue.length} options séléctionnées`
+  const count = props.options.filter(o => props.modelValue.includes(o.value)).length;
+  let result = `${count} options séléctionnées`
   if (props.modelValue.length > 2) {
     return result;
   } else {
@@ -92,7 +93,8 @@ let selectAll = function () {
   if (props.modelValue.length >= localOptions.value.length) {
     props.modelValue.length = 0;
   } else {
-    for (let opt of localOptions.value) {
+    const unduplicatedOptions = localOptions.value.filter(o => !props.modelValue.includes(o.value));
+    for (let opt of unduplicatedOptions) {
       props.modelValue.push(opt.value)
     }
   }