From 326da0fc0dd974401dda0d571cf5524b4467d6e0 Mon Sep 17 00:00:00 2001
From: Roman Sandler <roman@groundcover.com>
Date: Fri, 17 Apr 2026 11:39:36 +0300
Subject: [PATCH] fix: preserve multi-select ComboBox selections for custom
 input

---
 .../test/ComboBox.test.js                     | 24 +++++++++++++++++++
 .../src/combobox/useComboBoxState.ts          | 12 +++++++---
 2 files changed, 33 insertions(+), 3 deletions(-)

diff --git a/packages/react-aria-components/test/ComboBox.test.js b/packages/react-aria-components/test/ComboBox.test.js
index af75cba5644..a6bc8bdd5ac 100644
--- a/packages/react-aria-components/test/ComboBox.test.js
+++ b/packages/react-aria-components/test/ComboBox.test.js
@@ -798,6 +798,30 @@ describe('ComboBox', () => {
     expect(comboboxTester.combobox).toHaveValue('Test');
   });
 
+  it.each(['{Escape}', '{Enter}', '{Tab}'])('should preserve multi-select value with custom input on %s', async (key) => {
+    let {container, queryByRole} = render(
+      <TestComboBox
+        selectionMode="multiple"
+        allowsCustomValue
+        defaultValue={['1', '2']}
+        defaultInputValue="" />
+    );
+    let comboboxTester = testUtilUser.createTester('ComboBox', {root: container});
+    let value = container.querySelector('.react-aria-ComboBoxValue');
+
+    expect(value).toHaveTextContent('Cat and Dog');
+
+    await user.tab();
+    await user.keyboard('Den');
+    expect(comboboxTester.combobox).toHaveValue('Den');
+
+    await user.keyboard(key);
+
+    expect(queryByRole('listbox')).toBeNull();
+    expect(comboboxTester.combobox).toHaveValue('Den');
+    expect(value).toHaveTextContent('Cat and Dog');
+  });
+
   it('should allow the user to deselect items with keyboard when multiselect (uncontrolled)', async () => {
     let onChange = jest.fn();
     let {container} = render(<TestComboBox defaultValue={['1', '2']} selectionMode="multiple" onChange={onChange} />);
diff --git a/packages/react-stately/src/combobox/useComboBoxState.ts b/packages/react-stately/src/combobox/useComboBoxState.ts
index 02f6bd0116c..28c04389591 100644
--- a/packages/react-stately/src/combobox/useComboBoxState.ts
+++ b/packages/react-stately/src/combobox/useComboBoxState.ts
@@ -147,8 +147,6 @@ export interface ComboBoxStateOptions<T, M extends SelectionMode = 'single'> ext
   shouldCloseOnBlur?: boolean
 }
 
-const EMPTY_VALUE: Key[] = [];
-
 /**
  * Provides state management for a combo box component. Handles building a collection
  * of items from props and manages the option selection state of the combo box. In addition, it tracks the input value,
@@ -426,7 +424,15 @@ export function useComboBoxState<T extends object, M extends SelectionMode = 'si
   };
 
   let commitCustomValue = () => {
-    let value = selectionMode === 'multiple' ? EMPTY_VALUE : null;
+    if (selectionMode === 'multiple') {
+      // In multi-select mode, the input's custom text is independent from the selected items.
+      // Closing or committing the field should not clear the existing selection.
+      setLastValue(inputValue);
+      closeMenu();
+      return;
+    }
+
+    let value = null;
     lastValueRef.current = value as any;
     setValue(value);
     closeMenu();