From d948676351f6b4a35a6adf6df04497f89389e3a5 Mon Sep 17 00:00:00 2001
From: Nazar Koval <n.kovaldev@gmail.com>
Date: Mon, 23 Feb 2026 10:21:48 +0200
Subject: [PATCH 1/3] fix: clear focused key on input value change

---
 packages/@react-stately/combobox/src/useComboBoxState.ts | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/packages/@react-stately/combobox/src/useComboBoxState.ts b/packages/@react-stately/combobox/src/useComboBoxState.ts
index 54838afb8d9..dbea05fcbb9 100644
--- a/packages/@react-stately/combobox/src/useComboBoxState.ts
+++ b/packages/@react-stately/combobox/src/useComboBoxState.ts
@@ -310,7 +310,8 @@ export function useComboBoxState<T extends object, M extends SelectionMode = 'si
 
     // Clear focused key when input value changes and display filtered collection again.
     if (inputValue !== lastValue) {
-      selectionManager.setFocusedKey(null);
+      const firstKey = filteredCollection.getFirstKey();
+      if(firstKey) selectionManager.setFocusedKey(firstKey);
       setShowAllItems(false);
 
       // Set value to null when the user clears the input.

From bfc1950707297e80c3a8e0c9c18165f20973b676 Mon Sep 17 00:00:00 2001
From: Nazar Koval <n.kovaldev@gmail.com>
Date: Mon, 23 Feb 2026 10:23:38 +0200
Subject: [PATCH 2/3] feat: Implement keyboard delegate with autoFocus option

---
 packages/@react-aria/combobox/src/useComboBox.ts | 1 +
 1 file changed, 1 insertion(+)

diff --git a/packages/@react-aria/combobox/src/useComboBox.ts b/packages/@react-aria/combobox/src/useComboBox.ts
index ba165958ced..d2ab7f1bf4e 100644
--- a/packages/@react-aria/combobox/src/useComboBox.ts
+++ b/packages/@react-aria/combobox/src/useComboBox.ts
@@ -119,6 +119,7 @@ export function useComboBox<T, M extends SelectionMode = 'single'>(props: AriaCo
     keyboardDelegate: delegate,
     disallowTypeAhead: true,
     disallowEmptySelection: true,
+    autoFocus: 'first',
     shouldFocusWrap,
     ref: inputRef,
     // Prevent item scroll behavior from being applied here, should be handled in the user's Popover + ListBox component

From cd534aeb418638481cc5167dd6346b7ff875beb1 Mon Sep 17 00:00:00 2001
From: Nazar Koval <n.kovaldev@gmail.com>
Date: Mon, 23 Feb 2026 10:24:30 +0200
Subject: [PATCH 3/3] ref: update combobox context to include autofocus setting

---
 packages/react-aria-components/src/ComboBox.tsx | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/react-aria-components/src/ComboBox.tsx b/packages/react-aria-components/src/ComboBox.tsx
index 36e3be2bb50..1b683209cd2 100644
--- a/packages/react-aria-components/src/ComboBox.tsx
+++ b/packages/react-aria-components/src/ComboBox.tsx
@@ -236,7 +236,7 @@ function ComboBoxInner<T extends object>({props, collection, comboBoxRef: ref}:
           style: {'--trigger-width': menuWidth} as React.CSSProperties,
           clearContexts: CLEAR_CONTEXTS
         }],
-        [ListBoxContext, {...listBoxProps, ref: listBoxRef}],
+        [ListBoxContext, {...listBoxProps, autoFocus: 'first', ref: listBoxRef}],
         [ListStateContext, state],
         [TextContext, {
           slots: {