From aceb6581608932cc58db63a28825eec7a089ed95 Mon Sep 17 00:00:00 2001 From: Michal Date: Thu, 11 Apr 2024 22:52:49 +0000 Subject: [PATCH] fix: handling of selectAll toggle when disabled elements are present --- src/components/DropdownSelect.vue | 5 +- .../__tests__/DropdownSelect.spec.ts | 51 ++++++++++++++++++- src/stories/Composables/useMultiselect.ts | 15 ++++-- 3 files changed, 63 insertions(+), 8 deletions(-) diff --git a/src/components/DropdownSelect.vue b/src/components/DropdownSelect.vue index 616df7d..f524662 100644 --- a/src/components/DropdownSelect.vue +++ b/src/components/DropdownSelect.vue @@ -159,6 +159,7 @@ const emit = defineEmits<{ const { normalisedOptions, + selecteableOptions, getLabel, isOptionSelected, toggleAllOptions, @@ -199,7 +200,7 @@ const showSelectAll = computed(() => { if (!props.multiple) return false; // If we are in search, we don't show it because we don't want to confuse the user user about what is being selected if (props.search) return false; - if (!normalisedOptions.value) return false; + if (!selecteableOptions.value) return false; return true; }); @@ -328,7 +329,7 @@ watch(