diff --git a/packages/ui/src/components/base/Combobox.vue b/packages/ui/src/components/base/Combobox.vue index 8b8230e3eb..17821812a4 100644 --- a/packages/ui/src/components/base/Combobox.vue +++ b/packages/ui/src/components/base/Combobox.vue @@ -76,8 +76,14 @@ v-if="showIconInSelected && selectedOption?.icon" class="h-5 w-5 shrink-0" /> - - {{ triggerText }} + + {{ selectedTriggerText }} + + + {{ placeholderText }}
@@ -391,9 +397,13 @@ const searchableInputClass = computed(() => { return parts.join(' ') }) -const triggerText = computed(() => { +const selectedTriggerText = computed(() => { + if (props.displayValue !== undefined) return props.displayValue + return selectedOption.value?.label ?? '' +}) + +const placeholderText = computed(() => { if (props.displayValue !== undefined) return props.displayValue - if (selectedOption.value) return selectedOption.value.label return props.placeholder })