@antify/ui 3.1.9 → 3.1.11

package/dist/components/inputs/AntMultiSelect.vue

@@ -78,6 +78,8 @@ const isOpen = ref(false);
 const _modelValue = computed<string[]>(() => [
   ...props.modelValue || [],
 ]);
+let actuallyValueLength = ref<number>(0);
+
 const hasInputState = computed(() => props.skeleton || props.readonly || props.disabled);
 const inputClasses = computed(() => {
   const variants: Record<InputState, string> = {
@@ -148,15 +150,15 @@ const valueLabel = computed(() => {
     return;
   }
 
-  if (_modelValue.value.length === 0) {
+  if (actuallyValueLength.value === 0) {
     return props.label || props.placeholder;
   }
 
-  if (_modelValue.value.length === 1) {
-    return `${_modelValue.value.length} ${props.singularValueLabel}`;
+  if (actuallyValueLength.value === 1) {
+    return `${actuallyValueLength.value} ${props.singularValueLabel}`;
   }
 
-  return `${_modelValue.value.length} ${props.pluralValueLabel}`;
+  return `${actuallyValueLength.value} ${props.pluralValueLabel}`;
 });
 const iconSize = computed(() => {
   if (props.size === Size.lg || props.size === Size.md || props.size === Size.sm) {
@@ -165,21 +167,11 @@ const iconSize = computed(() => {
 
   return IconSize.xs;
 });
-const selectedCheckboxes = ref<string[]>( [
+const selectedCheckboxes = ref<string[]>([
   ..._modelValue.value,
 ]);
 const inputRef = ref<HTMLElement | null>(null);
 
-onMounted(() => {
-  handleEnumValidation(props.size, Size, 'size');
-  handleEnumValidation(props.state, InputState, 'state');
-  handleEnumValidation(props.grouped, Grouped, 'grouped');
-
-  if (!props.skeleton && props.modelValue !== null) {
-    emit('validate', props.modelValue);
-  }
-});
-
 watch(isOpen, (val) => {
   if (!val) {
     emit('update:modelValue', selectedCheckboxes.value);
@@ -199,6 +191,8 @@ watch(() => props.skeleton, (val) => {
   }
 });
 watch(_modelValue, () => {
+  getActuallySelectedItems();
+
   if (props.messages.length > 0) {
     emit('validate', props.modelValue);
   }
@@ -222,6 +216,36 @@ function onClickSelectInput(e: MouseEvent) {
 
   isOpen.value = !isOpen.value;
 }
+
+function onClickClear() {
+  const optionValues = props.options.map(option => option.value);
+  const clearedValue = _modelValue.value.filter((value) => !optionValues.includes(value));
+
+  emit('update:modelValue', clearedValue);
+}
+
+function getActuallySelectedItems() {
+  actuallyValueLength.value = 0;
+
+  _modelValue.value.forEach((value) => {
+    props.options.forEach((option) => {
+      if (value === option.value) {
+        actuallyValueLength.value++;
+      }
+    });
+  });
+}
+
+onMounted(() => {
+  getActuallySelectedItems();
+  handleEnumValidation(props.size, Size, 'size');
+  handleEnumValidation(props.state, InputState, 'state');
+  handleEnumValidation(props.grouped, Grouped, 'grouped');
+
+  if (!props.skeleton && props.modelValue !== null) {
+    emit('validate', props.modelValue);
+  }
+});
 </script>
 
 <template>
@@ -263,14 +287,14 @@ function onClickSelectInput(e: MouseEvent) {
             <slot name="icon" />
 
             <div
-              v-if="(_modelValue === null || _modelValue.length === 0) && placeholder !== undefined"
+              v-if="(_modelValue === null || actuallyValueLength === 0) && placeholder !== undefined"
               :class="placeholderClasses"
             >
               {{ placeholder }}
             </div>
 
             <div
-              v-else-if="(_modelValue === null || _modelValue.length === 0) && label !== undefined"
+              v-else-if="(_modelValue === null || actuallyValueLength === 0) && label !== undefined"
               :class="placeholderClasses"
             >
               {{ label }}
@@ -307,10 +331,11 @@ function onClickSelectInput(e: MouseEvent) {
 
           <AntButton
             v-if="props.nullable && props.modelValue && props.modelValue.length > 0"
+            data-e2e="clear-button"
             :icon-left="faMultiply"
             :grouped="Grouped.right"
             :size="size"
-            @click="emit('update:modelValue', [])"
+            @click="onClickClear"
           />
         </div>
       </AntSkeleton>

package/dist/components/inputs/AntSelect.vue

@@ -367,6 +367,7 @@ function onClickRemoveButton() {
 
       <AntButton
         v-if="nullable && _modelValue !== null"
+        data-e2e="clear-button"
         :icon-left="faMultiply"
         :state="state as unknown as State"
         :grouped="[Grouped.left, Grouped.center].some(item => item === grouped) ? Grouped.center : Grouped.right"

package/dist/components/inputs/__stories/AntMultiSelect.stories.js

@@ -158,7 +158,7 @@ const Docs = exports.Docs = {
       AntMultiSelect: _AntMultiSelect.default
     },
     setup() {
-      const value = (0, _vue.ref)(null);
+      const value = (0, _vue.ref)(["26", "2"]);
       return {
         args,
         value

package/dist/components/inputs/__stories/AntMultiSelect.stories.mjs

@@ -184,7 +184,10 @@ export const Docs = {
       AntMultiSelect
     },
     setup() {
-      const value = ref(null);
+      const value = ref([
+        "26",
+        "2"
+      ]);
       return {
         args,
         value

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@antify/ui",
-  "version": "3.1.9",
+  "version": "3.1.11",
   "private": false,
   "type": "module",
   "exports": {