From b50f9cf0e25580b0e93a21b7b997e8c8f3966bea Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=88=98=E6=AC=A2?= <lh01217311@antgroup.com>
Date: Wed, 24 Jun 2026 15:28:08 +0800
Subject: [PATCH 1/4] fix: should not create tag when input matches disabled
 option in tags mode

fix #30878
---
 src/Select.tsx      |  7 +++++++
 tests/Tags.test.tsx | 22 ++++++++++++++++++++++
 2 files changed, 29 insertions(+)

diff --git a/src/Select.tsx b/src/Select.tsx
index 26fbbd000..2deb48f13 100644
--- a/src/Select.tsx
+++ b/src/Select.tsx
@@ -630,6 +630,13 @@ const Select = React.forwardRef<BaseSelectRef, SelectProps<any, DefaultOptionTyp
         const formatted = (searchText || '').trim();
         // prevent empty tags from appearing when you click the Enter button
         if (formatted) {
+          // Skip disabled options in tags mode
+          const option = valueOptions.get(formatted);
+          if (option?.disabled) {
+            setSearchValue('');
+            return;
+          }
+
           const newRawValues = Array.from(new Set<RawValueType>([...rawValues, formatted]));
           triggerChange(newRawValues);
           triggerSelect(formatted, true);
diff --git a/tests/Tags.test.tsx b/tests/Tags.test.tsx
index 74da89955..5114434df 100644
--- a/tests/Tags.test.tsx
+++ b/tests/Tags.test.tsx
@@ -59,6 +59,28 @@ describe('Select.Tags', () => {
     expect(onChange).toHaveBeenCalledWith(['foo'], [{}]);
   });
 
+  // https://github.com/ant-design/ant-design/issues/30878
+  it('should not create tag when input matches disabled option on blur', () => {
+    const onChange = jest.fn();
+    const { container } = render(
+      <Select
+        mode="tags"
+        onChange={onChange}
+        options={[
+          { value: 'apple', label: 'Apple' },
+          { value: 'orange', label: 'Orange', disabled: true },
+        ]}
+      />,
+    );
+
+    fireEvent.change(container.querySelector('input'), { target: { value: 'orange' } });
+    fireEvent.blur(container.querySelector('input'));
+
+    jest.runAllTimers();
+    expect(findSelection(container).textContent).toBe('');
+    expect(onChange).not.toHaveBeenCalled();
+  });
+
   it('tokenize input', () => {
     const handleChange = jest.fn();
     const handleSelect = jest.fn();

From 1ea55128f20b6649fdba5fa45bce35aec1f6a769 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=88=98=E6=AC=A2?= <lh01217311@antgroup.com>
Date: Wed, 24 Jun 2026 17:02:07 +0800
Subject: [PATCH 2/4] fix: prevent tag creation for input matching disabled
 options in tags mode

---
 src/Select.tsx      | 18 +++++++++++++++--
 tests/Tags.test.tsx | 48 +++++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 64 insertions(+), 2 deletions(-)

diff --git a/src/Select.tsx b/src/Select.tsx
index 2deb48f13..152a439b4 100644
--- a/src/Select.tsx
+++ b/src/Select.tsx
@@ -442,6 +442,12 @@ const Select = React.forwardRef<BaseSelectRef, SelectProps<any, DefaultOptionTyp
       normalizedOptionFilterProp,
     );
 
+    // Check if value is a disabled option
+    const isDisabledOptionValue = React.useCallback(
+      (val: RawValueType) => !!valueOptions.get(val)?.disabled,
+      [valueOptions],
+    );
+
     // Fill options with search value if needed
     const filledSearchOptions = React.useMemo(() => {
       const hasItemMatchingSearch = (item: DefaultOptionType) => {
@@ -461,6 +467,10 @@ const Select = React.forwardRef<BaseSelectRef, SelectProps<any, DefaultOptionTyp
       if (filteredOptions.some((item) => item[mergedFieldNames.value] === mergedSearchValue)) {
         return filteredOptions;
       }
+      // Skip creating temp tag option if it matches a disabled option value
+      if (isDisabledOptionValue(mergedSearchValue)) {
+        return filteredOptions;
+      }
       // Fill search value as option
       return [createTagOption(mergedSearchValue), ...filteredOptions];
     }, [
@@ -631,8 +641,7 @@ const Select = React.forwardRef<BaseSelectRef, SelectProps<any, DefaultOptionTyp
         // prevent empty tags from appearing when you click the Enter button
         if (formatted) {
           // Skip disabled options in tags mode
-          const option = valueOptions.get(formatted);
-          if (option?.disabled) {
+          if (isDisabledOptionValue(formatted)) {
             setSearchValue('');
             return;
           }
@@ -667,6 +676,11 @@ const Select = React.forwardRef<BaseSelectRef, SelectProps<any, DefaultOptionTyp
           .filter((val) => val !== undefined);
       }
 
+      // Filter out disabled option values in tags mode
+      if (mode === 'tags') {
+        patchValues = patchValues.filter((val) => !isDisabledOptionValue(val));
+      }
+
       const newRawValues = Array.from(new Set<RawValueType>([...rawValues, ...patchValues]));
       triggerChange(newRawValues);
       newRawValues.forEach((newRawValue) => {
diff --git a/tests/Tags.test.tsx b/tests/Tags.test.tsx
index 5114434df..88367afc6 100644
--- a/tests/Tags.test.tsx
+++ b/tests/Tags.test.tsx
@@ -81,6 +81,32 @@ describe('Select.Tags', () => {
     expect(onChange).not.toHaveBeenCalled();
   });
 
+  // https://github.com/ant-design/ant-design/issues/30878
+  it('should not create tag when input matches disabled option even with custom filterOption', () => {
+    const onChange = jest.fn();
+    const { container } = render(
+      <Select
+        mode="tags"
+        onChange={onChange}
+        open
+        options={[
+          { value: 'apple', label: 'Apple' },
+          { value: 'orange', label: 'Orange', disabled: true },
+        ]}
+        // Custom filterOption that hides the disabled option from dropdown
+        filterOption={() => false}
+      />,
+    );
+
+    fireEvent.change(container.querySelector('input'), { target: { value: 'orange' } });
+    fireEvent.keyDown(container.querySelector('input'), { key: 'Enter' });
+
+    jest.runAllTimers();
+    // Should not create tag or show temp option in dropdown
+    expect(findSelection(container).textContent).toBe('');
+    expect(onChange).not.toHaveBeenCalled();
+  });
+
   it('tokenize input', () => {
     const handleChange = jest.fn();
     const handleSelect = jest.fn();
@@ -104,6 +130,28 @@ describe('Select.Tags', () => {
     expectOpen(container, false);
   });
 
+  // https://github.com/ant-design/ant-design/issues/30878
+  it('should not create tag when token matches disabled option with tokenSeparators', () => {
+    const handleChange = jest.fn();
+    const { container } = render(
+      <Select
+        mode="tags"
+        tokenSeparators={[',']}
+        onChange={handleChange}
+        options={[
+          { value: 'apple', label: 'Apple' },
+          { value: 'orange', label: 'Orange', disabled: true },
+        ]}
+      />,
+    );
+
+    fireEvent.change(container.querySelector('input'), { target: { value: 'apple,orange' } });
+
+    // Only 'apple' should be created, 'orange' is disabled and should be skipped
+    expect(handleChange).toHaveBeenCalledWith(['apple'], expect.anything());
+    expect(container.querySelector('input').value).toBe('');
+  });
+
   it('should not separate words when compositing but trigger after composition end', () => {
     const handleChange = jest.fn();
     const handleSelect = jest.fn();

From 9d99c27b34520500dff735892a63aee94a68de88 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=88=98=E6=AC=A2?= <lh01217311@antgroup.com>
Date: Wed, 24 Jun 2026 17:28:11 +0800
Subject: [PATCH 3/4] fix: support numeric disabled options in tag creation
 logic

---
 src/Select.tsx      |  5 +++--
 tests/Tags.test.tsx | 10 ++++++++++
 2 files changed, 13 insertions(+), 2 deletions(-)

diff --git a/src/Select.tsx b/src/Select.tsx
index 9292e64b6..c763dd84e 100644
--- a/src/Select.tsx
+++ b/src/Select.tsx
@@ -440,9 +440,10 @@ const Select = React.forwardRef<BaseSelectRef, SelectProps<any, DefaultOptionTyp
       normalizedOptionFilterProp,
     );
 
-    // Check if value is a disabled option
+    // Check if value is a disabled option (compare string and numeric to support numeric option values)
     const isDisabledOptionValue = React.useCallback(
-      (val: RawValueType) => !!valueOptions.get(val)?.disabled,
+      (val: RawValueType) =>
+        valueOptions.get(String(val))?.disabled || valueOptions.get(Number(val))?.disabled,
       [valueOptions],
     );
 
diff --git a/tests/Tags.test.tsx b/tests/Tags.test.tsx
index 5a4ad6e69..e2de0bb3c 100644
--- a/tests/Tags.test.tsx
+++ b/tests/Tags.test.tsx
@@ -69,16 +69,26 @@ describe('Select.Tags', () => {
         options={[
           { value: 'apple', label: 'Apple' },
           { value: 'orange', label: 'Orange', disabled: true },
+          { value: 123, label: '123', disabled: true },
         ]}
       />,
     );
 
+    // Test string disabled option
     fireEvent.change(container.querySelector('input'), { target: { value: 'orange' } });
     fireEvent.blur(container.querySelector('input'));
 
     jest.runAllTimers();
     expect(findSelection(container).textContent).toBe('');
     expect(onChange).not.toHaveBeenCalled();
+
+    // Test numeric disabled option (input as string "123")
+    fireEvent.change(container.querySelector('input'), { target: { value: '123' } });
+    fireEvent.blur(container.querySelector('input'));
+
+    jest.runAllTimers();
+    expect(findSelection(container).textContent).toBe('');
+    expect(onChange).not.toHaveBeenCalled();
   });
 
   // https://github.com/ant-design/ant-design/issues/30878

From 44e19fa446e651177aeabd963cffd3059b73b2ab Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=88=98=E6=AC=A2?= <lh01217311@antgroup.com>
Date: Thu, 25 Jun 2026 09:46:37 +0800
Subject: [PATCH 4/4] fix: simplify disabled option check in tag creation logic

---
 src/Select.tsx      | 14 ++++----------
 tests/Tags.test.tsx | 10 ----------
 2 files changed, 4 insertions(+), 20 deletions(-)

diff --git a/src/Select.tsx b/src/Select.tsx
index c763dd84e..41bd66ccc 100644
--- a/src/Select.tsx
+++ b/src/Select.tsx
@@ -440,13 +440,6 @@ const Select = React.forwardRef<BaseSelectRef, SelectProps<any, DefaultOptionTyp
       normalizedOptionFilterProp,
     );
 
-    // Check if value is a disabled option (compare string and numeric to support numeric option values)
-    const isDisabledOptionValue = React.useCallback(
-      (val: RawValueType) =>
-        valueOptions.get(String(val))?.disabled || valueOptions.get(Number(val))?.disabled,
-      [valueOptions],
-    );
-
     // Fill options with search value if needed
     const filledSearchOptions = React.useMemo(() => {
       const hasItemMatchingSearch = (item: DefaultOptionType) => {
@@ -467,7 +460,7 @@ const Select = React.forwardRef<BaseSelectRef, SelectProps<any, DefaultOptionTyp
         return filteredOptions;
       }
       // Skip creating temp tag option if it matches a disabled option value
-      if (isDisabledOptionValue(mergedSearchValue)) {
+      if (valueOptions.get(mergedSearchValue)?.disabled) {
         return filteredOptions;
       }
       // Fill search value as option
@@ -479,6 +472,7 @@ const Select = React.forwardRef<BaseSelectRef, SelectProps<any, DefaultOptionTyp
       filteredOptions,
       mergedSearchValue,
       mergedFieldNames,
+      valueOptions,
     ]);
     const sorter = (inputOptions: DefaultOptionType[]) => {
       const sortedOptions = [...inputOptions].sort((a, b) =>
@@ -640,7 +634,7 @@ const Select = React.forwardRef<BaseSelectRef, SelectProps<any, DefaultOptionTyp
         // prevent empty tags from appearing when you click the Enter button
         if (formatted) {
           // Skip disabled options in tags mode
-          if (isDisabledOptionValue(formatted)) {
+          if (valueOptions.get(formatted)?.disabled) {
             setSearchValue('');
             return;
           }
@@ -677,7 +671,7 @@ const Select = React.forwardRef<BaseSelectRef, SelectProps<any, DefaultOptionTyp
 
       // Filter out disabled option values in tags mode
       if (mode === 'tags') {
-        patchValues = patchValues.filter((val) => !isDisabledOptionValue(val));
+        patchValues = patchValues.filter((val) => !valueOptions.get(val)?.disabled);
       }
 
       const newRawValues = Array.from(new Set<RawValueType>([...rawValues, ...patchValues]));
diff --git a/tests/Tags.test.tsx b/tests/Tags.test.tsx
index e2de0bb3c..5a4ad6e69 100644
--- a/tests/Tags.test.tsx
+++ b/tests/Tags.test.tsx
@@ -69,26 +69,16 @@ describe('Select.Tags', () => {
         options={[
           { value: 'apple', label: 'Apple' },
           { value: 'orange', label: 'Orange', disabled: true },
-          { value: 123, label: '123', disabled: true },
         ]}
       />,
     );
 
-    // Test string disabled option
     fireEvent.change(container.querySelector('input'), { target: { value: 'orange' } });
     fireEvent.blur(container.querySelector('input'));
 
     jest.runAllTimers();
     expect(findSelection(container).textContent).toBe('');
     expect(onChange).not.toHaveBeenCalled();
-
-    // Test numeric disabled option (input as string "123")
-    fireEvent.change(container.querySelector('input'), { target: { value: '123' } });
-    fireEvent.blur(container.querySelector('input'));
-
-    jest.runAllTimers();
-    expect(findSelection(container).textContent).toBe('');
-    expect(onChange).not.toHaveBeenCalled();
   });
 
   // https://github.com/ant-design/ant-design/issues/30878