Fix#4374/allow-more-types-for-select-clear-value (#4375)

* fix(tree-view): react on expanded prop for nested children * fix(#4374): allow more types for clear value prop
epicmaxco · Oct 17, 2024 · de22bc1 · de22bc1
1 parent 8c5d061
commit de22bc1
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 3 deletions.
diff --git a/packages/ui/src/components/va-select/VaSelect.vue b/packages/ui/src/components/va-select/VaSelect.vue
@@ -235,6 +235,9 @@ const props = defineProps({
   ariaClearLabel: useTranslationProp('$t:reset'),
 
   search: { type: String, default: undefined },
+
+  // useClearableProps override
+  clearValue: { type: [String, Number, Array, Object, Boolean] as PropType<SelectOption | SelectOption[]>, default: '' },
 })
 
 const emit = defineEmits([

diff --git a/packages/ui/src/components/va-select/hooks/useStringValue.ts b/packages/ui/src/components/va-select/hooks/useStringValue.ts
@@ -6,7 +6,7 @@ export const useStringValueProps = {
   separator: { type: String, default: ', ' },
 }
 
-type UseStringValueProps = ExtractPropTypes<typeof useStringValueProps> & { clearValue: string }
+type UseStringValueProps = ExtractPropTypes<typeof useStringValueProps>
 
 export const useStringValue = (
   props: UseStringValueProps,
@@ -15,9 +15,9 @@ export const useStringValue = (
 ) => {
   return computed<string>(() => {
     if (!visibleSelectedOptions.value?.length) {
-      return props.clearValue
+      return ''
     }
 
-    return visibleSelectedOptions.value.map(getText).join(props.separator) || props.clearValue
+    return visibleSelectedOptions.value.map(getText).join(props.separator) ?? ''
   })
 }