From f88516f8aa39243c408bd39dea902e876ff39988 Mon Sep 17 00:00:00 2001
From: Duncan McClean <duncan@duncanmcclean.com>
Date: Tue, 16 Sep 2025 10:05:08 +0100
Subject: [PATCH 1/3] Don't trap the focus

---
 packages/ui/src/Combobox.vue | 1 -
 1 file changed, 1 deletion(-)

diff --git a/packages/ui/src/Combobox.vue b/packages/ui/src/Combobox.vue
index b7a3612aa91..fafa92e3acb 100644
--- a/packages/ui/src/Combobox.vue
+++ b/packages/ui/src/Combobox.vue
@@ -335,7 +335,6 @@ defineExpose({
                         data-ui-combobox-content
                     >
                         <FocusScope
-                            trapped
                             @mount-auto-focus.prevent
                             @unmount-auto-focus="(event) => {
                                 if (event.defaultPrevented) return;

From 79598edc1b9f5c0824e19ba7a51d70d696ec7b5e Mon Sep 17 00:00:00 2001
From: Duncan McClean <duncan@duncanmcclean.com>
Date: Tue, 16 Sep 2025 10:11:45 +0100
Subject: [PATCH 2/3] Hitting enter on trigger should open dropdown

---
 packages/ui/src/Combobox.vue | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/packages/ui/src/Combobox.vue b/packages/ui/src/Combobox.vue
index fafa92e3acb..e8779a20b89 100644
--- a/packages/ui/src/Combobox.vue
+++ b/packages/ui/src/Combobox.vue
@@ -232,7 +232,7 @@ function pushTaggableOption(e) {
     }
 }
 
-function openOnSpace(e) {
+function openDropdown(e) {
 	const target = e && e.target ? e.target : null;
 	const tag = (target && target.tagName ? target.tagName : '').toLowerCase();
 	const isEditable = target && (tag === 'input' || tag === 'textarea' || target.isContentEditable);
@@ -284,7 +284,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))"
@@ -298,15 +298,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)" />

From a7013d5d656d96f7be2e9487d2b388bfd795b55b Mon Sep 17 00:00:00 2001
From: Duncan McClean <duncan@duncanmcclean.com>
Date: Tue, 16 Sep 2025 14:58:52 +0100
Subject: [PATCH 3/3] pls fix all my problems

---
 packages/ui/src/Combobox.vue | 1 +
 1 file changed, 1 insertion(+)

diff --git a/packages/ui/src/Combobox.vue b/packages/ui/src/Combobox.vue
index e8779a20b89..6a7911169c5 100644
--- a/packages/ui/src/Combobox.vue
+++ b/packages/ui/src/Combobox.vue
@@ -335,6 +335,7 @@ defineExpose({
                         data-ui-combobox-content
                     >
                         <FocusScope
+                            :trapped="!searchable"
                             @mount-auto-focus.prevent
                             @unmount-auto-focus="(event) => {
                                 if (event.defaultPrevented) return;