Skip to content

[6.x] Combobox: Fix search input focus #12471

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
jasonvarga merged 4 commits into from
Sep 16, 2025
Merged

[6.x] Combobox: Fix search input focus #12471

Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
f88516f
Don't trap the focus
duncanmcclean Sep 16, 2025
79598ed
Hitting enter on trigger should open dropdown
duncanmcclean Sep 16, 2025
a7013d5
pls fix all my problems
duncanmcclean Sep 16, 2025
0de97b9
Merge branch 'master' into combobox-focus
jasonvarga Sep 16, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 6 additions & 6 deletions packages/ui/src/Combobox.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -232,7 +232,7 @@ function pushTaggableOption(e) {
}
}

function openOnSpace(e) {
function openDropdown(e) {
if (dropdownOpen.value) return;
if (typeof e.preventDefault === 'function') e.preventDefault();

Expand Down Expand Up @@ -265,7 +265,7 @@ defineExpose({
v-bind="attrs"
>
<ComboboxAnchor :class="[$attrs.class]" data-ui-combobox-anchor>
<ComboboxTrigger as="div" ref="trigger" :class="triggerClasses" @keydown.space="openOnSpace" data-ui-combobox-trigger>
<ComboboxTrigger as="div" ref="trigger" :class="triggerClasses" @keydown.enter="openDropdown" @keydown.space="openDropdown" data-ui-combobox-trigger>
<div class="flex-1 min-w-0">
<ComboboxInput
v-if="searchable && (dropdownOpen || !modelValue || (multiple && placeholder))"
Expand All @@ -279,15 +279,15 @@ defineExpose({
@paste.prevent="onPaste"
@keydown.enter.prevent="pushTaggableOption"
@blur="pushTaggableOption"
@keydown.space="openOnSpace"
@keydown.space="openDropdown"
/>

<button type="button" class="w-full text-start truncate flex items-center gap-2 bg-transparent cursor-pointer focus:outline-none" v-else-if="!searchable && (dropdownOpen || !modelValue)" @keydown.space="openOnSpace" data-ui-combobox-placeholder>
<button type="button" class="w-full text-start truncate flex items-center gap-2 bg-transparent cursor-pointer focus:outline-none" v-else-if="!searchable && (dropdownOpen || !modelValue)" @keydown.space="openDropdown" data-ui-combobox-placeholder>
<Icon v-if="icon" :name="icon" class="text-gray-400 dark:text-white dark:opacity-50" />
<span class="text-gray-400 dark:text-gray-500" v-text="placeholder" />
</button>

<button type="button" v-else class="w-full text-start bg-transparent truncate flex items-center gap-2 cursor-pointer focus:outline-none" @keydown.space="openOnSpace" data-ui-combobox-selected-option>
<button type="button" v-else class="w-full text-start bg-transparent truncate flex items-center gap-2 cursor-pointer focus:outline-none" @keydown.space="openDropdown" data-ui-combobox-selected-option>
<slot name="selected-option" v-bind="{ option: selectedOption }">
<Icon v-if="icon" :name="icon" class="text-white/85 dark:text-white dark:opacity-50" />
<span v-if="labelHtml" v-html="getOptionLabel(selectedOption)" />
Expand Down Expand Up @@ -316,7 +316,7 @@ defineExpose({
data-ui-combobox-content
>
<FocusScope
trapped
:trapped="!searchable"
@mount-auto-focus.prevent
@unmount-auto-focus="(event) => {
if (event.defaultPrevented) return;
Expand Down
Loading