From 1daf8814eeb00b09262c0a0dbc88a11ff0456ae5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=AB=98=E8=89=B3=E5=85=B5?= <yanbing.gao@aliyun.com>
Date: Sun, 15 Mar 2026 18:31:26 +0800
Subject: [PATCH 1/3] fix: only submit input as tag on Enter when dropdown
 closed

---
 src/SelectInput/Input.tsx |  8 +++++++-
 tests/Tags.test.tsx       | 32 +++++++++++++++++++++++++++++++-
 2 files changed, 38 insertions(+), 2 deletions(-)

diff --git a/src/SelectInput/Input.tsx b/src/SelectInput/Input.tsx
index e69eace1..8c12606a 100644
--- a/src/SelectInput/Input.tsx
+++ b/src/SelectInput/Input.tsx
@@ -95,7 +95,13 @@ const Input = React.forwardRef<HTMLInputElement, InputProps>((props, ref) => {
     const { value: nextVal } = event.currentTarget;
 
     // Handle Enter key submission - referencing Selector implementation
-    if (key === 'Enter' && mode === 'tags' && !compositionStatusRef.current && onSearchSubmit) {
+    if (
+      key === 'Enter' &&
+      mode === 'tags' &&
+      !open &&
+      !compositionStatusRef.current &&
+      onSearchSubmit
+    ) {
       onSearchSubmit(nextVal);
     }
 
diff --git a/tests/Tags.test.tsx b/tests/Tags.test.tsx
index 99e3d295..30edde45 100644
--- a/tests/Tags.test.tsx
+++ b/tests/Tags.test.tsx
@@ -13,7 +13,14 @@ import openControlledTest from './shared/openControlledTest';
 import removeSelectedTest from './shared/removeSelectedTest';
 import maxTagRenderTest from './shared/maxTagRenderTest';
 import throwOptionValue from './shared/throwOptionValue';
-import { injectRunAllTimers, findSelection, expectOpen, toggleOpen, keyDown } from './utils/common';
+import {
+  injectRunAllTimers,
+  findSelection,
+  expectOpen,
+  toggleOpen,
+  keyDown,
+  keyUp,
+} from './utils/common';
 import type { CustomTagProps } from '@/BaseSelect';
 
 describe('Select.Tags', () => {
@@ -140,6 +147,29 @@ describe('Select.Tags', () => {
     expectOpen(container, false);
   });
 
+  it('should trigger onSelect once when pressing Enter to select option in tags mode (dropdown open)', () => {
+    const handleSelect = jest.fn();
+    const { container } = render(
+      <Select
+        mode="tags"
+        open
+        showSearch
+        onSelect={handleSelect}
+        options={[
+          { label: 'Dacryoadenitis', value: 'opt1' },
+          { label: 'Dacryocystitis', value: 'opt2' },
+        ]}
+      />,
+    );
+    fireEvent.change(container.querySelector('input'), { target: { value: 'da' } });
+    jest.runAllTimers();
+    fireEvent.mouseMove(container.querySelectorAll('.rc-select-item-option')[0]);
+    keyDown(container.querySelector('input'), KeyCode.ENTER);
+    keyUp(container.querySelector('input'), KeyCode.ENTER);
+    jest.runAllTimers();
+    expect(handleSelect).toHaveBeenCalledTimes(1);
+  });
+
   // Paste tests
   [
     {

From 7884696e00c7ff9b2ffef56ed67523fd6ed23018 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=AB=98=E8=89=B3=E5=85=B5?= <yanbing.gao@aliyun.com>
Date: Sun, 15 Mar 2026 18:39:47 +0800
Subject: [PATCH 2/3] fix: remove unuse code

---
 tests/Tags.test.tsx | 12 ++----------
 1 file changed, 2 insertions(+), 10 deletions(-)

diff --git a/tests/Tags.test.tsx b/tests/Tags.test.tsx
index 30edde45..f295b490 100644
--- a/tests/Tags.test.tsx
+++ b/tests/Tags.test.tsx
@@ -13,14 +13,7 @@ import openControlledTest from './shared/openControlledTest';
 import removeSelectedTest from './shared/removeSelectedTest';
 import maxTagRenderTest from './shared/maxTagRenderTest';
 import throwOptionValue from './shared/throwOptionValue';
-import {
-  injectRunAllTimers,
-  findSelection,
-  expectOpen,
-  toggleOpen,
-  keyDown,
-  keyUp,
-} from './utils/common';
+import { injectRunAllTimers, findSelection, expectOpen, toggleOpen, keyDown } from './utils/common';
 import type { CustomTagProps } from '@/BaseSelect';
 
 describe('Select.Tags', () => {
@@ -163,9 +156,8 @@ describe('Select.Tags', () => {
     );
     fireEvent.change(container.querySelector('input'), { target: { value: 'da' } });
     jest.runAllTimers();
-    fireEvent.mouseMove(container.querySelectorAll('.rc-select-item-option')[0]);
+    fireEvent.mouseMove(container.querySelector('.rc-select-item-option'));
     keyDown(container.querySelector('input'), KeyCode.ENTER);
-    keyUp(container.querySelector('input'), KeyCode.ENTER);
     jest.runAllTimers();
     expect(handleSelect).toHaveBeenCalledTimes(1);
   });

From 1cc6349a74c8fce9d2c8a73f39bf0f190a39a460 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=AB=98=E8=89=B3=E5=85=B5?= <yanbing.gao@aliyun.com>
Date: Sun, 15 Mar 2026 18:59:36 +0800
Subject: [PATCH 3/3] test: modify test case

---
 tests/Tags.test.tsx | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/tests/Tags.test.tsx b/tests/Tags.test.tsx
index f295b490..74da8995 100644
--- a/tests/Tags.test.tsx
+++ b/tests/Tags.test.tsx
@@ -149,17 +149,18 @@ describe('Select.Tags', () => {
         showSearch
         onSelect={handleSelect}
         options={[
-          { label: 'Dacryoadenitis', value: 'opt1' },
-          { label: 'Dacryocystitis', value: 'opt2' },
+          { label: 'opt1', value: 'opt1' },
+          { label: 'opt2', value: 'opt2' },
         ]}
       />,
     );
-    fireEvent.change(container.querySelector('input'), { target: { value: 'da' } });
+    fireEvent.change(container.querySelector('input'), { target: { value: 'op' } });
     jest.runAllTimers();
-    fireEvent.mouseMove(container.querySelector('.rc-select-item-option'));
+    keyDown(container.querySelector('input'), KeyCode.DOWN);
     keyDown(container.querySelector('input'), KeyCode.ENTER);
     jest.runAllTimers();
     expect(handleSelect).toHaveBeenCalledTimes(1);
+    expect(handleSelect).toHaveBeenCalledWith('opt1', expect.anything());
   });
 
   // Paste tests