@volverjs/ui-vue 0.0.10-beta.44 → 0.0.10-beta.46

package/src/components/VvCombobox/VvCombobox.vue

@@ -146,15 +146,15 @@ const hasTabindex = computed(() => {
 const localModelValue = computed({
     get: () => {
         if (Array.isArray(props.modelValue)) {
-            return new Set(props.modelValue)
+            return props.modelValue
         }
-        return props.modelValue !== undefined && props.modelValue !== null ? new Set([props.modelValue]) : new Set()
+        return props.modelValue !== undefined && props.modelValue !== null ? [props.modelValue] : []
     },
-    set: (value: Set<unknown>) => {
-        emit('update:modelValue', props.multiple || Array.isArray(props.modelValue) ? [...value] : [...value].pop())
+    set: (value: unknown[]) => {
+        emit('update:modelValue', props.multiple || Array.isArray(props.modelValue) ? value : value.pop())
     },
 })
-const sizeOfModelValue = computed(() => localModelValue.value.size)
+const sizeOfModelValue = computed(() => localModelValue.value.length)
 const isDirty = computed(() => sizeOfModelValue.value > 0)
 const hasMaxValues = computed(() => {
     if (!props.multiple) {
@@ -173,7 +173,7 @@ const isUnselectable = computed(() => {
     if (!props.unselectable) {
         return false
     }
-    return sizeOfModelValue.value > Number(props.minValues)
+    return Number(props.minValues) === 0 || (sizeOfModelValue.value > Number(props.minValues))
 })
 const isSelectable = computed(() => {
     if (isDisabledOrReadonly.value) {
@@ -247,7 +247,16 @@ const filteredOptions = computedAsync(async () => {
  * @param {T} option
  */
 function isOptionSelected(option: T) {
-    return localModelValue.value.has(getOptionValue(option))
+    const optionValue = getOptionValue(option)
+    if (typeof optionValue === 'object') {
+        return localModelValue.value.some((item) => {
+            if (typeof item === 'object') {
+                return JSON.stringify(item) === JSON.stringify(optionValue)
+            }
+            return false
+        })
+    }
+    return localModelValue.value.includes(optionValue)
 }
 
 /**
@@ -288,17 +297,21 @@ function onClickInput() {
  */
 function onInput(option: T) {
     const isSelected = isOptionSelected(option)
+    const optionValue = getOptionValue(option)
     if (isSelected && isUnselectable.value) {
-        localModelValue.value.delete(getOptionValue(option))
+        localModelValue.value = localModelValue.value.filter((item) => {
+            if (typeof optionValue === 'object' && typeof item === 'object') {
+                return JSON.stringify(item) !== JSON.stringify(optionValue)
+            }
+            return item !== optionValue
+        })
     }
     else if (!isSelected && isSelectable.value) {
         if (!props.multiple) {
-            localModelValue.value.clear()
+            localModelValue.value = []
         }
-        localModelValue.value.add(getOptionValue(option))
+        localModelValue.value = [...localModelValue.value, optionValue]
     }
-    // force reactivity
-    localModelValue.value = new Set(localModelValue.value)
     if (!props.multiple && !props.keepOpen) {
         collapse()
     }

package/src/components/VvIcon/VvIcon.vue

@@ -61,7 +61,7 @@ function getSvgContent(svg: string): SVGSVGElement | undefined {
     let dom
     if (typeof window === 'undefined') {
         // SSR
-        // eslint-disable-next-line ts/no-var-requires, ts/no-require-imports
+        // eslint-disable-next-line ts/no-require-imports, ts/no-var-requires
         const { JSDOM } = require('jsdom')
         dom = new JSDOM().window
     }

package/src/components/VvInputText/VvInputText.vue

@@ -1,6 +1,7 @@
 <script setup lang="ts">
 import type { InputHTMLAttributes } from 'vue'
 import { useIMask } from 'vue-imask'
+import type { MaskedNumberOptions } from 'imask'
 import HintSlotFactory from '../common/HintSlot'
 import VvIcon from '../VvIcon/VvIcon.vue'
 import { ACTION_ICONS } from '../VvIcon'
@@ -66,10 +67,24 @@ const NEGATIVE_ZERO_REGEX = /^-0?[.,]?[0*]?$/
 const maskReady = ref(false)
 const { el, mask, typed, masked, unmasked } = useIMask(
     computed(
-        () =>
-            props.iMask ?? {
-                mask: /./,
-            },
+        () => {
+            if (!props.iMask) {
+                return {
+                    mask: /./,
+                }
+            }
+            if (props.iMask.mask === Number) {
+                const toReturn = { ...props.iMask } as MaskedNumberOptions
+                if (props.min) {
+                    toReturn.min = Number(props.min)
+                }
+                if (props.max) {
+                    toReturn.max = Number(props.max)
+                }
+                return toReturn
+            }
+            return props.iMask
+        },
     ),
     {
         emit,
@@ -269,7 +284,7 @@ const isNumber = computed(() => props.type === INPUT_TYPES.NUMBER)
 function onStepUp() {
     if (isClickable.value) {
         if (props.iMask) {
-            typed.value = typed.value + Number(step?.value ?? 1)
+            typed.value = Number(typed.value) + Number(step?.value ?? 1)
             return
         }
         inputEl.value.stepUp()
@@ -279,8 +294,7 @@ function onStepUp() {
 function onStepDown() {
     if (isClickable.value) {
         if (props.iMask) {
-            typed.value = typed.value - Number(step?.value ?? 1)
-
+            typed.value = Number(typed.value) - Number(step?.value ?? 1)
             return
         }
         inputEl.value.stepDown()