From 218bb6025414adaa1e2a2ae45c1d271e3c0e68a6 Mon Sep 17 00:00:00 2001
From: lijianan <574980606@qq.com>
Date: Fri, 29 Dec 2023 01:48:58 +0800
Subject: [PATCH 01/18] fix: Select support maxCount

---
 docs/examples/auto-tokenization.tsx |  1 +
 src/BaseSelect.tsx                  | 16 +++++++++++++++-
 src/utils/valueUtil.ts              |  8 ++++++--
 3 files changed, 22 insertions(+), 3 deletions(-)

diff --git a/docs/examples/auto-tokenization.tsx b/docs/examples/auto-tokenization.tsx
index c1901085..2393609f 100644
--- a/docs/examples/auto-tokenization.tsx
+++ b/docs/examples/auto-tokenization.tsx
@@ -7,6 +7,7 @@ const Demo: React.FC = () => (
     <h2>自动分词</h2>
     <Select
       mode="tags"
+      maxCount={3}
       style={{ width: '100%' }}
       tokenSeparators={[',']}
       options={Array.from({ length: 20 }, (_, i) => ({ label: i.toString(), value: i.toString() }))}
diff --git a/src/BaseSelect.tsx b/src/BaseSelect.tsx
index d05d321a..7a2769e5 100644
--- a/src/BaseSelect.tsx
+++ b/src/BaseSelect.tsx
@@ -27,6 +27,8 @@ import type { RefTriggerProps } from './SelectTrigger';
 import SelectTrigger from './SelectTrigger';
 import TransBtn from './TransBtn';
 import { getSeparatedContent } from './utils/valueUtil';
+import SelectContext from './SelectContext';
+import type { SelectContextProps } from './SelectContext';
 
 export type {
   DisplayInfoType,
@@ -393,12 +395,24 @@ const BaseSelect = React.forwardRef<BaseSelectRef, BaseSelectProps>((props, ref)
     [tokenSeparators],
   );
 
+  const { maxCount, rawValues } = React.useContext<SelectContextProps>(SelectContext);
+
+  const isValidMaxCount = multiple && typeof maxCount !== 'undefined';
+
+  const overMaxCount = rawValues.size >= maxCount;
+
   const onInternalSearch = (searchText: string, fromTyping: boolean, isCompositing: boolean) => {
+    if (isValidMaxCount && overMaxCount) {
+      return;
+    }
     let ret = true;
     let newSearchText = searchText;
     onActiveValueChange?.(null);
 
-    const separatedList = getSeparatedContent(searchText, tokenSeparators);
+    const separatedList =
+      isValidMaxCount && !overMaxCount
+        ? getSeparatedContent(searchText, tokenSeparators, maxCount - rawValues.size)
+        : getSeparatedContent(searchText, tokenSeparators);
 
     // Check if match the `tokenSeparators`
     const patchLabels: string[] = isCompositing ? null : separatedList;
diff --git a/src/utils/valueUtil.ts b/src/utils/valueUtil.ts
index 9a20a955..920078f9 100644
--- a/src/utils/valueUtil.ts
+++ b/src/utils/valueUtil.ts
@@ -111,7 +111,7 @@ export function injectPropsWithOption<T extends object>(option: T): T {
   return newOption;
 }
 
-export const getSeparatedContent = (text: string, tokens: string[]): string[] | null => {
+export const getSeparatedContent = (text: string, tokens: string[], end?: number): string[] => {
   if (!tokens || !tokens.length) {
     return null;
   }
@@ -127,5 +127,9 @@ export const getSeparatedContent = (text: string, tokens: string[]): string[] |
       .filter(Boolean);
   };
   const list = separate(text, tokens);
-  return match ? list : null;
+  if (match) {
+    return typeof end !== 'undefined' ? list.slice(0, end) : list;
+  } else {
+    return null;
+  }
 };

From 26eef1ca186340c10ae28e83d346332e17adcbe5 Mon Sep 17 00:00:00 2001
From: lijianan <574980606@qq.com>
Date: Fri, 29 Dec 2023 01:53:49 +0800
Subject: [PATCH 02/18] fix: fix error

---
 src/BaseSelect.tsx | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/BaseSelect.tsx b/src/BaseSelect.tsx
index 7a2769e5..bb5e32d3 100644
--- a/src/BaseSelect.tsx
+++ b/src/BaseSelect.tsx
@@ -395,11 +395,11 @@ const BaseSelect = React.forwardRef<BaseSelectRef, BaseSelectProps>((props, ref)
     [tokenSeparators],
   );
 
-  const { maxCount, rawValues } = React.useContext<SelectContextProps>(SelectContext);
+  const { maxCount, rawValues } = React.useContext<SelectContextProps>(SelectContext) || {};
 
   const isValidMaxCount = multiple && typeof maxCount !== 'undefined';
 
-  const overMaxCount = rawValues.size >= maxCount;
+  const overMaxCount = rawValues?.size >= maxCount;
 
   const onInternalSearch = (searchText: string, fromTyping: boolean, isCompositing: boolean) => {
     if (isValidMaxCount && overMaxCount) {

From 9f65aeee6c661686ec43ebd7a9f13c56f4a874e9 Mon Sep 17 00:00:00 2001
From: lijianan <574980606@qq.com>
Date: Fri, 29 Dec 2023 02:18:38 +0800
Subject: [PATCH 03/18] test: add test case

---
 src/BaseSelect.tsx     | 13 +++++++------
 src/Selector/index.tsx |  7 ++++---
 tests/Tags.test.tsx    | 27 ++++++++++++++++++++++++++-
 3 files changed, 37 insertions(+), 10 deletions(-)

diff --git a/src/BaseSelect.tsx b/src/BaseSelect.tsx
index bb5e32d3..ca256aee 100644
--- a/src/BaseSelect.tsx
+++ b/src/BaseSelect.tsx
@@ -9,6 +9,7 @@ import type { ScrollConfig, ScrollTo } from 'rc-virtual-list/lib/List';
 import * as React from 'react';
 import { useAllowClear } from './hooks/useAllowClear';
 import { BaseSelectContext } from './hooks/useBaseProps';
+import type { BaseSelectContextProps } from './hooks/useBaseProps';
 import useDelayReset from './hooks/useDelayReset';
 import useLock from './hooks/useLock';
 import useSelectTriggerControl from './hooks/useSelectTriggerControl';
@@ -390,7 +391,7 @@ const BaseSelect = React.forwardRef<BaseSelectRef, BaseSelectProps>((props, ref)
   );
 
   // ============================= Search =============================
-  const tokenWithEnter = React.useMemo(
+  const tokenWithEnter = React.useMemo<boolean>(
     () => (tokenSeparators || []).some((tokenSeparator) => ['\n', '\r\n'].includes(tokenSeparator)),
     [tokenSeparators],
   );
@@ -527,8 +528,8 @@ const BaseSelect = React.forwardRef<BaseSelectRef, BaseSelectProps>((props, ref)
       }
     }
 
-    if (mergedOpen && listRef.current) {
-      listRef.current.onKeyDown(event, ...rest);
+    if (mergedOpen) {
+      listRef.current?.onKeyDown(event, ...rest);
     }
 
     onKeyDown?.(event, ...rest);
@@ -536,8 +537,8 @@ const BaseSelect = React.forwardRef<BaseSelectRef, BaseSelectProps>((props, ref)
 
   // KeyUp
   const onInternalKeyUp: React.KeyboardEventHandler<HTMLDivElement> = (event, ...rest) => {
-    if (mergedOpen && listRef.current) {
-      listRef.current.onKeyUp(event, ...rest);
+    if (mergedOpen) {
+      listRef.current?.onKeyUp(event, ...rest);
     }
 
     onKeyUp?.(event, ...rest);
@@ -663,7 +664,7 @@ const BaseSelect = React.forwardRef<BaseSelectRef, BaseSelectProps>((props, ref)
   );
 
   // ============================ Context =============================
-  const baseSelectContext = React.useMemo(
+  const baseSelectContext = React.useMemo<BaseSelectContextProps>(
     () => ({
       ...props,
       notFoundContent,
diff --git a/src/Selector/index.tsx b/src/Selector/index.tsx
index 239ae88b..970ca8c0 100644
--- a/src/Selector/index.tsx
+++ b/src/Selector/index.tsx
@@ -207,9 +207,10 @@ const Selector: React.ForwardRefRenderFunction<RefSelectorProps, SelectorProps>
 
   const onInputPaste: React.ClipboardEventHandler = (e) => {
     const { clipboardData } = e;
-    const value = clipboardData.getData('text');
-
-    pastedTextRef.current = value;
+    const value = clipboardData?.getData('text');
+    if (value) {
+      pastedTextRef.current = value;
+    }
   };
 
   const onClick = ({ target }) => {
diff --git a/tests/Tags.test.tsx b/tests/Tags.test.tsx
index 86e1a6d8..0b46d9ce 100644
--- a/tests/Tags.test.tsx
+++ b/tests/Tags.test.tsx
@@ -1,5 +1,5 @@
 import { mount } from 'enzyme';
-import { render } from '@testing-library/react';
+import { fireEvent, render } from '@testing-library/react';
 import KeyCode from 'rc-util/lib/KeyCode';
 import classNames from 'classnames';
 import * as React from 'react';
@@ -505,4 +505,29 @@ describe('Select.Tags', () => {
     expect(wrapper.find('.rc-select-item-option').length).toBe(1);
     expect(errSpy).not.toHaveBeenCalled();
   });
+
+  it(`paste content to split`, () => {
+    const onChange = jest.fn();
+    const { container } = render(
+      <Select
+        mode="tags"
+        maxCount={3}
+        onChange={onChange}
+        tokenSeparators={[',']}
+        value={['1', '2', '3']}
+      />,
+    );
+
+    const input = container.querySelector<HTMLInputElement>('input');
+
+    fireEvent.paste(input, {
+      clipboardData: { getData: () => 'test' },
+    });
+
+    fireEvent.change(input, {
+      target: { value: 'test' },
+    });
+
+    expect(onChange).not.toBeCalled();
+  });
 });

From f1c2ee752c4824d0e3258c7c2db42bcfd112bf2a Mon Sep 17 00:00:00 2001
From: lijianan <574980606@qq.com>
Date: Fri, 29 Dec 2023 02:32:05 +0800
Subject: [PATCH 04/18] test: add test case

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

diff --git a/tests/Tags.test.tsx b/tests/Tags.test.tsx
index 0b46d9ce..07863472 100644
--- a/tests/Tags.test.tsx
+++ b/tests/Tags.test.tsx
@@ -506,7 +506,7 @@ describe('Select.Tags', () => {
     expect(errSpy).not.toHaveBeenCalled();
   });
 
-  it(`paste content to split`, () => {
+  it(`paste content to split when count >= maxCount`, () => {
     const onChange = jest.fn();
     const { container } = render(
       <Select
@@ -517,17 +517,34 @@ describe('Select.Tags', () => {
         value={['1', '2', '3']}
       />,
     );
-
     const input = container.querySelector<HTMLInputElement>('input');
-
     fireEvent.paste(input, {
       clipboardData: { getData: () => 'test' },
     });
-
     fireEvent.change(input, {
       target: { value: 'test' },
     });
+    expect(onChange).not.toBeCalled();
+  });
 
+  it(`paste content to split when count < maxCount`, () => {
+    const onChange = jest.fn();
+    const { container } = render(
+      <Select
+        mode="tags"
+        maxCount={3}
+        onChange={onChange}
+        tokenSeparators={[',']}
+        value={['1', '2']}
+      />,
+    );
+    const input = container.querySelector<HTMLInputElement>('input');
+    fireEvent.paste(input, {
+      clipboardData: { getData: () => 'test' },
+    });
+    fireEvent.change(input, {
+      target: { value: 'test' },
+    });
     expect(onChange).not.toBeCalled();
   });
 });

From b60f81508c68f905d2587f0363de8dad7b0d0c2d Mon Sep 17 00:00:00 2001
From: lijianan <574980606@qq.com>
Date: Fri, 29 Dec 2023 14:22:21 +0800
Subject: [PATCH 05/18] Update src/BaseSelect.tsx

Co-authored-by: MadCcc <1075746765@qq.com>
---
 src/BaseSelect.tsx | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/src/BaseSelect.tsx b/src/BaseSelect.tsx
index ca256aee..1f165ab1 100644
--- a/src/BaseSelect.tsx
+++ b/src/BaseSelect.tsx
@@ -410,10 +410,7 @@ const BaseSelect = React.forwardRef<BaseSelectRef, BaseSelectProps>((props, ref)
     let newSearchText = searchText;
     onActiveValueChange?.(null);
 
-    const separatedList =
-      isValidMaxCount && !overMaxCount
-        ? getSeparatedContent(searchText, tokenSeparators, maxCount - rawValues.size)
-        : getSeparatedContent(searchText, tokenSeparators);
+    const separatedList = getSeparatedContent(searchText, tokenSeparators, isValidMaxCount && !overMaxCount ? maxCount - rawValues.size : undefined);
 
     // Check if match the `tokenSeparators`
     const patchLabels: string[] = isCompositing ? null : separatedList;

From db084af998df88d68911c418595872baabd059bb Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=A0=97=E5=98=89=E7=94=B7?= <574980606@qq.com>
Date: Fri, 29 Dec 2023 14:31:08 +0800
Subject: [PATCH 06/18] fix: fix

---
 src/BaseSelect.tsx     | 6 +++++-
 src/OptionList.tsx     | 4 ++--
 src/Selector/index.tsx | 4 +---
 3 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/src/BaseSelect.tsx b/src/BaseSelect.tsx
index 1f165ab1..96dcb63c 100644
--- a/src/BaseSelect.tsx
+++ b/src/BaseSelect.tsx
@@ -410,7 +410,11 @@ const BaseSelect = React.forwardRef<BaseSelectRef, BaseSelectProps>((props, ref)
     let newSearchText = searchText;
     onActiveValueChange?.(null);
 
-    const separatedList = getSeparatedContent(searchText, tokenSeparators, isValidMaxCount && !overMaxCount ? maxCount - rawValues.size : undefined);
+    const separatedList = getSeparatedContent(
+      searchText,
+      tokenSeparators,
+      isValidMaxCount && !overMaxCount ? maxCount - rawValues.size : undefined,
+    );
 
     // Check if match the `tokenSeparators`
     const patchLabels: string[] = isCompositing ? null : separatedList;
diff --git a/src/OptionList.tsx b/src/OptionList.tsx
index 8c8b8329..50792c7f 100644
--- a/src/OptionList.tsx
+++ b/src/OptionList.tsx
@@ -72,8 +72,8 @@ const OptionList: React.ForwardRefRenderFunction<RefOptionListProps, {}> = (_, r
   const listRef = React.useRef<ListRef>(null);
 
   const overMaxCount = React.useMemo<boolean>(
-    () => multiple && typeof maxCount !== 'undefined' && rawValues.size >= maxCount,
-    [multiple, maxCount, rawValues.size],
+    () => multiple && typeof maxCount !== 'undefined' && rawValues?.size >= maxCount,
+    [multiple, maxCount, rawValues?.size],
   );
 
   const onListMouseDown: React.MouseEventHandler<HTMLDivElement> = (event) => {
diff --git a/src/Selector/index.tsx b/src/Selector/index.tsx
index 970ca8c0..711bf276 100644
--- a/src/Selector/index.tsx
+++ b/src/Selector/index.tsx
@@ -208,9 +208,7 @@ const Selector: React.ForwardRefRenderFunction<RefSelectorProps, SelectorProps>
   const onInputPaste: React.ClipboardEventHandler = (e) => {
     const { clipboardData } = e;
     const value = clipboardData?.getData('text');
-    if (value) {
-      pastedTextRef.current = value;
-    }
+    pastedTextRef.current = value || '';
   };
 
   const onClick = ({ target }) => {

From 0b23ba14cae5e67f07ff3d7ea806f9b8038d3a61 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=A0=97=E5=98=89=E7=94=B7?= <574980606@qq.com>
Date: Fri, 29 Dec 2023 14:43:33 +0800
Subject: [PATCH 07/18] fix: fix

---
 src/BaseSelect.tsx           | 11 +++--------
 src/OptionList.tsx           | 15 +++++++--------
 src/hooks/useOverMaxCount.ts | 19 +++++++++++++++++++
 3 files changed, 29 insertions(+), 16 deletions(-)
 create mode 100644 src/hooks/useOverMaxCount.ts

diff --git a/src/BaseSelect.tsx b/src/BaseSelect.tsx
index 96dcb63c..04ce97d1 100644
--- a/src/BaseSelect.tsx
+++ b/src/BaseSelect.tsx
@@ -28,8 +28,7 @@ import type { RefTriggerProps } from './SelectTrigger';
 import SelectTrigger from './SelectTrigger';
 import TransBtn from './TransBtn';
 import { getSeparatedContent } from './utils/valueUtil';
-import SelectContext from './SelectContext';
-import type { SelectContextProps } from './SelectContext';
+import useOverMaxCount from './hooks/useOverMaxCount';
 
 export type {
   DisplayInfoType,
@@ -396,11 +395,7 @@ const BaseSelect = React.forwardRef<BaseSelectRef, BaseSelectProps>((props, ref)
     [tokenSeparators],
   );
 
-  const { maxCount, rawValues } = React.useContext<SelectContextProps>(SelectContext) || {};
-
-  const isValidMaxCount = multiple && typeof maxCount !== 'undefined';
-
-  const overMaxCount = rawValues?.size >= maxCount;
+  const { isValidMaxCount, overMaxCount, diff } = useOverMaxCount();
 
   const onInternalSearch = (searchText: string, fromTyping: boolean, isCompositing: boolean) => {
     if (isValidMaxCount && overMaxCount) {
@@ -413,7 +408,7 @@ const BaseSelect = React.forwardRef<BaseSelectRef, BaseSelectProps>((props, ref)
     const separatedList = getSeparatedContent(
       searchText,
       tokenSeparators,
-      isValidMaxCount && !overMaxCount ? maxCount - rawValues.size : undefined,
+      isValidMaxCount && !overMaxCount ? diff : undefined,
     );
 
     // Check if match the `tokenSeparators`
diff --git a/src/OptionList.tsx b/src/OptionList.tsx
index 50792c7f..1caca42d 100644
--- a/src/OptionList.tsx
+++ b/src/OptionList.tsx
@@ -14,6 +14,7 @@ import TransBtn from './TransBtn';
 import useBaseProps from './hooks/useBaseProps';
 import type { FlattenOptionData } from './interface';
 import { isPlatformMac } from './utils/platformUtil';
+import useOverMaxCount from './hooks/useOverMaxCount';
 
 // export interface OptionListProps<OptionsType extends object[]> {
 export type OptionListProps = Record<string, never>;
@@ -45,7 +46,6 @@ const OptionList: React.ForwardRefRenderFunction<RefOptionListProps, {}> = (_, r
     onPopupScroll,
   } = useBaseProps();
   const {
-    maxCount,
     flattenOptions,
     onActiveValue,
     defaultActiveFirstOption,
@@ -71,10 +71,9 @@ const OptionList: React.ForwardRefRenderFunction<RefOptionListProps, {}> = (_, r
   // =========================== List ===========================
   const listRef = React.useRef<ListRef>(null);
 
-  const overMaxCount = React.useMemo<boolean>(
-    () => multiple && typeof maxCount !== 'undefined' && rawValues?.size >= maxCount,
-    [multiple, maxCount, rawValues?.size],
-  );
+  const { isValidMaxCount, overMaxCount } = useOverMaxCount();
+
+  const mergedOverMaxCount = isValidMaxCount && overMaxCount;
 
   const onListMouseDown: React.MouseEventHandler<HTMLDivElement> = (event) => {
     event.preventDefault();
@@ -95,7 +94,7 @@ const OptionList: React.ForwardRefRenderFunction<RefOptionListProps, {}> = (_, r
 
       const { group, data } = memoFlattenOptions[current] || {};
 
-      if (!group && !data?.disabled && !overMaxCount) {
+      if (!group && !data?.disabled && !mergedOverMaxCount) {
         return current;
       }
     }
@@ -204,7 +203,7 @@ const OptionList: React.ForwardRefRenderFunction<RefOptionListProps, {}> = (_, r
         case KeyCode.ENTER: {
           // value
           const item = memoFlattenOptions[activeIndex];
-          if (item && !item?.data?.disabled && !overMaxCount) {
+          if (item && !item?.data?.disabled && !mergedOverMaxCount) {
             onSelectValue(item.value);
           } else {
             onSelectValue(undefined);
@@ -334,7 +333,7 @@ const OptionList: React.ForwardRefRenderFunction<RefOptionListProps, {}> = (_, r
           // Option
           const selected = isSelected(value);
 
-          const mergedDisabled = disabled || (!selected && overMaxCount);
+          const mergedDisabled = disabled || (!selected && mergedOverMaxCount);
 
           const optionPrefixCls = `${itemPrefixCls}-option`;
           const optionClassName = classNames(itemPrefixCls, optionPrefixCls, className, {
diff --git a/src/hooks/useOverMaxCount.ts b/src/hooks/useOverMaxCount.ts
new file mode 100644
index 00000000..5d4d203b
--- /dev/null
+++ b/src/hooks/useOverMaxCount.ts
@@ -0,0 +1,19 @@
+import React from 'react';
+import useBaseProps from './useBaseProps';
+import SelectContext from '../SelectContext';
+import type { SelectContextProps } from '../SelectContext';
+
+const useOverMaxCount = () => {
+  const { multiple } = useBaseProps();
+  const { maxCount, rawValues } = React.useContext<SelectContextProps>(SelectContext) || {};
+  return React.useMemo(
+    () => ({
+      isValidMaxCount: multiple && typeof maxCount !== 'undefined',
+      overMaxCount: rawValues?.size >= maxCount,
+      diff: maxCount - rawValues?.size,
+    }),
+    [maxCount, multiple, rawValues?.size],
+  );
+};
+
+export default useOverMaxCount;

From 561b4c6a67ee69507e2600156af6ec1fe4a63e9e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=A0=97=E5=98=89=E7=94=B7?= <574980606@qq.com>
Date: Fri, 29 Dec 2023 14:45:05 +0800
Subject: [PATCH 08/18] fix: fix

---
 src/hooks/useOverMaxCount.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/hooks/useOverMaxCount.ts b/src/hooks/useOverMaxCount.ts
index 5d4d203b..80907afe 100644
--- a/src/hooks/useOverMaxCount.ts
+++ b/src/hooks/useOverMaxCount.ts
@@ -4,7 +4,7 @@ import SelectContext from '../SelectContext';
 import type { SelectContextProps } from '../SelectContext';
 
 const useOverMaxCount = () => {
-  const { multiple } = useBaseProps();
+  const { multiple } = useBaseProps() || {};
   const { maxCount, rawValues } = React.useContext<SelectContextProps>(SelectContext) || {};
   return React.useMemo(
     () => ({

From 95ad2dce6335b0573d42cb51d0d24c01542d1d3b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=A0=97=E5=98=89=E7=94=B7?= <574980606@qq.com>
Date: Fri, 29 Dec 2023 14:50:41 +0800
Subject: [PATCH 09/18] fix: fix

---
 src/BaseSelect.tsx           | 2 +-
 src/OptionList.tsx           | 2 +-
 src/hooks/useOverMaxCount.ts | 6 ++----
 3 files changed, 4 insertions(+), 6 deletions(-)

diff --git a/src/BaseSelect.tsx b/src/BaseSelect.tsx
index 04ce97d1..337ca2c1 100644
--- a/src/BaseSelect.tsx
+++ b/src/BaseSelect.tsx
@@ -395,7 +395,7 @@ const BaseSelect = React.forwardRef<BaseSelectRef, BaseSelectProps>((props, ref)
     [tokenSeparators],
   );
 
-  const { isValidMaxCount, overMaxCount, diff } = useOverMaxCount();
+  const { isValidMaxCount, overMaxCount, diff } = useOverMaxCount(multiple);
 
   const onInternalSearch = (searchText: string, fromTyping: boolean, isCompositing: boolean) => {
     if (isValidMaxCount && overMaxCount) {
diff --git a/src/OptionList.tsx b/src/OptionList.tsx
index 1caca42d..3256e4b0 100644
--- a/src/OptionList.tsx
+++ b/src/OptionList.tsx
@@ -71,7 +71,7 @@ const OptionList: React.ForwardRefRenderFunction<RefOptionListProps, {}> = (_, r
   // =========================== List ===========================
   const listRef = React.useRef<ListRef>(null);
 
-  const { isValidMaxCount, overMaxCount } = useOverMaxCount();
+  const { isValidMaxCount, overMaxCount } = useOverMaxCount(multiple);
 
   const mergedOverMaxCount = isValidMaxCount && overMaxCount;
 
diff --git a/src/hooks/useOverMaxCount.ts b/src/hooks/useOverMaxCount.ts
index 80907afe..b160f682 100644
--- a/src/hooks/useOverMaxCount.ts
+++ b/src/hooks/useOverMaxCount.ts
@@ -1,10 +1,8 @@
 import React from 'react';
-import useBaseProps from './useBaseProps';
 import SelectContext from '../SelectContext';
 import type { SelectContextProps } from '../SelectContext';
 
-const useOverMaxCount = () => {
-  const { multiple } = useBaseProps() || {};
+const useOverMaxCount = (multiple: boolean) => {
   const { maxCount, rawValues } = React.useContext<SelectContextProps>(SelectContext) || {};
   return React.useMemo(
     () => ({
@@ -12,7 +10,7 @@ const useOverMaxCount = () => {
       overMaxCount: rawValues?.size >= maxCount,
       diff: maxCount - rawValues?.size,
     }),
-    [maxCount, multiple, rawValues?.size],
+    [multiple, maxCount, rawValues?.size],
   );
 };
 

From a524f36dd77558c0f3a0f548ad6ec935ad9161b5 Mon Sep 17 00:00:00 2001
From: lijianan <574980606@qq.com>
Date: Fri, 29 Dec 2023 16:14:17 +0800
Subject: [PATCH 10/18] Update src/hooks/useOverMaxCount.ts

Co-authored-by: MadCcc <1075746765@qq.com>
---
 src/hooks/useOverMaxCount.ts | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/hooks/useOverMaxCount.ts b/src/hooks/useOverMaxCount.ts
index b160f682..0edcbd77 100644
--- a/src/hooks/useOverMaxCount.ts
+++ b/src/hooks/useOverMaxCount.ts
@@ -2,7 +2,8 @@ import React from 'react';
 import SelectContext from '../SelectContext';
 import type { SelectContextProps } from '../SelectContext';
 
-const useOverMaxCount = (multiple: boolean) => {
+const useMaxCount = (multiple: boolean) => {
+
   const { maxCount, rawValues } = React.useContext<SelectContextProps>(SelectContext) || {};
   return React.useMemo(
     () => ({

From 3b2eef92406a50effe68fbbaddaf56495b052db1 Mon Sep 17 00:00:00 2001
From: lijianan <574980606@qq.com>
Date: Fri, 29 Dec 2023 16:21:40 +0800
Subject: [PATCH 11/18] fix: fix

---
 src/BaseSelect.tsx                               | 4 ++--
 src/OptionList.tsx                               | 4 ++--
 src/hooks/{useOverMaxCount.ts => useMaxCount.ts} | 3 +--
 3 files changed, 5 insertions(+), 6 deletions(-)
 rename src/hooks/{useOverMaxCount.ts => useMaxCount.ts} (91%)

diff --git a/src/BaseSelect.tsx b/src/BaseSelect.tsx
index 337ca2c1..ee4be622 100644
--- a/src/BaseSelect.tsx
+++ b/src/BaseSelect.tsx
@@ -28,7 +28,7 @@ import type { RefTriggerProps } from './SelectTrigger';
 import SelectTrigger from './SelectTrigger';
 import TransBtn from './TransBtn';
 import { getSeparatedContent } from './utils/valueUtil';
-import useOverMaxCount from './hooks/useOverMaxCount';
+import useMaxCount from './hooks/useMaxCount';
 
 export type {
   DisplayInfoType,
@@ -395,7 +395,7 @@ const BaseSelect = React.forwardRef<BaseSelectRef, BaseSelectProps>((props, ref)
     [tokenSeparators],
   );
 
-  const { isValidMaxCount, overMaxCount, diff } = useOverMaxCount(multiple);
+  const { isValidMaxCount, overMaxCount, diff } = useMaxCount(multiple);
 
   const onInternalSearch = (searchText: string, fromTyping: boolean, isCompositing: boolean) => {
     if (isValidMaxCount && overMaxCount) {
diff --git a/src/OptionList.tsx b/src/OptionList.tsx
index 3256e4b0..bc0bd27b 100644
--- a/src/OptionList.tsx
+++ b/src/OptionList.tsx
@@ -14,7 +14,7 @@ import TransBtn from './TransBtn';
 import useBaseProps from './hooks/useBaseProps';
 import type { FlattenOptionData } from './interface';
 import { isPlatformMac } from './utils/platformUtil';
-import useOverMaxCount from './hooks/useOverMaxCount';
+import useMaxCount from './hooks/useMaxCount';
 
 // export interface OptionListProps<OptionsType extends object[]> {
 export type OptionListProps = Record<string, never>;
@@ -71,7 +71,7 @@ const OptionList: React.ForwardRefRenderFunction<RefOptionListProps, {}> = (_, r
   // =========================== List ===========================
   const listRef = React.useRef<ListRef>(null);
 
-  const { isValidMaxCount, overMaxCount } = useOverMaxCount(multiple);
+  const { isValidMaxCount, overMaxCount } = useMaxCount(multiple);
 
   const mergedOverMaxCount = isValidMaxCount && overMaxCount;
 
diff --git a/src/hooks/useOverMaxCount.ts b/src/hooks/useMaxCount.ts
similarity index 91%
rename from src/hooks/useOverMaxCount.ts
rename to src/hooks/useMaxCount.ts
index 0edcbd77..4f671a77 100644
--- a/src/hooks/useOverMaxCount.ts
+++ b/src/hooks/useMaxCount.ts
@@ -3,7 +3,6 @@ import SelectContext from '../SelectContext';
 import type { SelectContextProps } from '../SelectContext';
 
 const useMaxCount = (multiple: boolean) => {
-
   const { maxCount, rawValues } = React.useContext<SelectContextProps>(SelectContext) || {};
   return React.useMemo(
     () => ({
@@ -15,4 +14,4 @@ const useMaxCount = (multiple: boolean) => {
   );
 };
 
-export default useOverMaxCount;
+export default useMaxCount;

From 7bea46bbb73fa8fd40d69d2ac111659fb916508c Mon Sep 17 00:00:00 2001
From: lijianan <574980606@qq.com>
Date: Fri, 29 Dec 2023 23:46:16 +0800
Subject: [PATCH 12/18] fix: fix

---
 src/BaseSelect.tsx       | 11 ++++++++---
 src/OptionList.tsx       | 15 ++++++++-------
 src/hooks/useMaxCount.ts | 17 -----------------
 tests/Tags.test.tsx      | 21 ---------------------
 4 files changed, 16 insertions(+), 48 deletions(-)
 delete mode 100644 src/hooks/useMaxCount.ts

diff --git a/src/BaseSelect.tsx b/src/BaseSelect.tsx
index ee4be622..e8d82c45 100644
--- a/src/BaseSelect.tsx
+++ b/src/BaseSelect.tsx
@@ -28,7 +28,8 @@ import type { RefTriggerProps } from './SelectTrigger';
 import SelectTrigger from './SelectTrigger';
 import TransBtn from './TransBtn';
 import { getSeparatedContent } from './utils/valueUtil';
-import useMaxCount from './hooks/useMaxCount';
+import SelectContext from './SelectContext';
+import type { SelectContextProps } from './SelectContext';
 
 export type {
   DisplayInfoType,
@@ -395,7 +396,11 @@ const BaseSelect = React.forwardRef<BaseSelectRef, BaseSelectProps>((props, ref)
     [tokenSeparators],
   );
 
-  const { isValidMaxCount, overMaxCount, diff } = useMaxCount(multiple);
+  const { maxCount, rawValues } = React.useContext<SelectContextProps>(SelectContext) || {};
+
+  const isValidMaxCount = multiple && typeof maxCount !== 'undefined';
+
+  const overMaxCount = rawValues?.size >= maxCount;
 
   const onInternalSearch = (searchText: string, fromTyping: boolean, isCompositing: boolean) => {
     if (isValidMaxCount && overMaxCount) {
@@ -408,7 +413,7 @@ const BaseSelect = React.forwardRef<BaseSelectRef, BaseSelectProps>((props, ref)
     const separatedList = getSeparatedContent(
       searchText,
       tokenSeparators,
-      isValidMaxCount && !overMaxCount ? diff : undefined,
+      isValidMaxCount && !overMaxCount ? maxCount - rawValues?.size : undefined,
     );
 
     // Check if match the `tokenSeparators`
diff --git a/src/OptionList.tsx b/src/OptionList.tsx
index bc0bd27b..50792c7f 100644
--- a/src/OptionList.tsx
+++ b/src/OptionList.tsx
@@ -14,7 +14,6 @@ import TransBtn from './TransBtn';
 import useBaseProps from './hooks/useBaseProps';
 import type { FlattenOptionData } from './interface';
 import { isPlatformMac } from './utils/platformUtil';
-import useMaxCount from './hooks/useMaxCount';
 
 // export interface OptionListProps<OptionsType extends object[]> {
 export type OptionListProps = Record<string, never>;
@@ -46,6 +45,7 @@ const OptionList: React.ForwardRefRenderFunction<RefOptionListProps, {}> = (_, r
     onPopupScroll,
   } = useBaseProps();
   const {
+    maxCount,
     flattenOptions,
     onActiveValue,
     defaultActiveFirstOption,
@@ -71,9 +71,10 @@ const OptionList: React.ForwardRefRenderFunction<RefOptionListProps, {}> = (_, r
   // =========================== List ===========================
   const listRef = React.useRef<ListRef>(null);
 
-  const { isValidMaxCount, overMaxCount } = useMaxCount(multiple);
-
-  const mergedOverMaxCount = isValidMaxCount && overMaxCount;
+  const overMaxCount = React.useMemo<boolean>(
+    () => multiple && typeof maxCount !== 'undefined' && rawValues?.size >= maxCount,
+    [multiple, maxCount, rawValues?.size],
+  );
 
   const onListMouseDown: React.MouseEventHandler<HTMLDivElement> = (event) => {
     event.preventDefault();
@@ -94,7 +95,7 @@ const OptionList: React.ForwardRefRenderFunction<RefOptionListProps, {}> = (_, r
 
       const { group, data } = memoFlattenOptions[current] || {};
 
-      if (!group && !data?.disabled && !mergedOverMaxCount) {
+      if (!group && !data?.disabled && !overMaxCount) {
         return current;
       }
     }
@@ -203,7 +204,7 @@ const OptionList: React.ForwardRefRenderFunction<RefOptionListProps, {}> = (_, r
         case KeyCode.ENTER: {
           // value
           const item = memoFlattenOptions[activeIndex];
-          if (item && !item?.data?.disabled && !mergedOverMaxCount) {
+          if (item && !item?.data?.disabled && !overMaxCount) {
             onSelectValue(item.value);
           } else {
             onSelectValue(undefined);
@@ -333,7 +334,7 @@ const OptionList: React.ForwardRefRenderFunction<RefOptionListProps, {}> = (_, r
           // Option
           const selected = isSelected(value);
 
-          const mergedDisabled = disabled || (!selected && mergedOverMaxCount);
+          const mergedDisabled = disabled || (!selected && overMaxCount);
 
           const optionPrefixCls = `${itemPrefixCls}-option`;
           const optionClassName = classNames(itemPrefixCls, optionPrefixCls, className, {
diff --git a/src/hooks/useMaxCount.ts b/src/hooks/useMaxCount.ts
deleted file mode 100644
index 4f671a77..00000000
--- a/src/hooks/useMaxCount.ts
+++ /dev/null
@@ -1,17 +0,0 @@
-import React from 'react';
-import SelectContext from '../SelectContext';
-import type { SelectContextProps } from '../SelectContext';
-
-const useMaxCount = (multiple: boolean) => {
-  const { maxCount, rawValues } = React.useContext<SelectContextProps>(SelectContext) || {};
-  return React.useMemo(
-    () => ({
-      isValidMaxCount: multiple && typeof maxCount !== 'undefined',
-      overMaxCount: rawValues?.size >= maxCount,
-      diff: maxCount - rawValues?.size,
-    }),
-    [multiple, maxCount, rawValues?.size],
-  );
-};
-
-export default useMaxCount;
diff --git a/tests/Tags.test.tsx b/tests/Tags.test.tsx
index 07863472..8eaa5cc4 100644
--- a/tests/Tags.test.tsx
+++ b/tests/Tags.test.tsx
@@ -526,25 +526,4 @@ describe('Select.Tags', () => {
     });
     expect(onChange).not.toBeCalled();
   });
-
-  it(`paste content to split when count < maxCount`, () => {
-    const onChange = jest.fn();
-    const { container } = render(
-      <Select
-        mode="tags"
-        maxCount={3}
-        onChange={onChange}
-        tokenSeparators={[',']}
-        value={['1', '2']}
-      />,
-    );
-    const input = container.querySelector<HTMLInputElement>('input');
-    fireEvent.paste(input, {
-      clipboardData: { getData: () => 'test' },
-    });
-    fireEvent.change(input, {
-      target: { value: 'test' },
-    });
-    expect(onChange).not.toBeCalled();
-  });
 });

From faa4b41de6c2e8e945ca5810810b494aa354e2a0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=A0=97=E5=98=89=E7=94=B7?= <574980606@qq.com>
Date: Sun, 31 Dec 2023 05:06:25 +0800
Subject: [PATCH 13/18] fix: fix

---
 src/BaseSelect.tsx       | 13 ++++---------
 src/OptionList.tsx       |  9 ++++-----
 src/hooks/useMaxCount.ts | 25 +++++++++++++++++++++++++
 3 files changed, 33 insertions(+), 14 deletions(-)
 create mode 100644 src/hooks/useMaxCount.ts

diff --git a/src/BaseSelect.tsx b/src/BaseSelect.tsx
index e8d82c45..bc49404d 100644
--- a/src/BaseSelect.tsx
+++ b/src/BaseSelect.tsx
@@ -28,8 +28,7 @@ import type { RefTriggerProps } from './SelectTrigger';
 import SelectTrigger from './SelectTrigger';
 import TransBtn from './TransBtn';
 import { getSeparatedContent } from './utils/valueUtil';
-import SelectContext from './SelectContext';
-import type { SelectContextProps } from './SelectContext';
+import useMaxCount from './hooks/useMaxCount';
 
 export type {
   DisplayInfoType,
@@ -396,14 +395,10 @@ const BaseSelect = React.forwardRef<BaseSelectRef, BaseSelectProps>((props, ref)
     [tokenSeparators],
   );
 
-  const { maxCount, rawValues } = React.useContext<SelectContextProps>(SelectContext) || {};
-
-  const isValidMaxCount = multiple && typeof maxCount !== 'undefined';
-
-  const overMaxCount = rawValues?.size >= maxCount;
+  const { truncateLength, shouldTruncate } = useMaxCount(multiple);
 
   const onInternalSearch = (searchText: string, fromTyping: boolean, isCompositing: boolean) => {
-    if (isValidMaxCount && overMaxCount) {
+    if (shouldTruncate()) {
       return;
     }
     let ret = true;
@@ -413,7 +408,7 @@ const BaseSelect = React.forwardRef<BaseSelectRef, BaseSelectProps>((props, ref)
     const separatedList = getSeparatedContent(
       searchText,
       tokenSeparators,
-      isValidMaxCount && !overMaxCount ? maxCount - rawValues?.size : undefined,
+      shouldTruncate(false) ? truncateLength : undefined,
     );
 
     // Check if match the `tokenSeparators`
diff --git a/src/OptionList.tsx b/src/OptionList.tsx
index ee7e3cd8..9b490810 100644
--- a/src/OptionList.tsx
+++ b/src/OptionList.tsx
@@ -14,6 +14,7 @@ import TransBtn from './TransBtn';
 import useBaseProps from './hooks/useBaseProps';
 import type { FlattenOptionData } from './interface';
 import { isPlatformMac } from './utils/platformUtil';
+import useMaxCount from './hooks/useMaxCount';
 
 // export interface OptionListProps<OptionsType extends object[]> {
 export type OptionListProps = Record<string, never>;
@@ -45,7 +46,6 @@ const OptionList: React.ForwardRefRenderFunction<RefOptionListProps, {}> = (_, r
     onPopupScroll,
   } = useBaseProps();
   const {
-    maxCount,
     flattenOptions,
     onActiveValue,
     defaultActiveFirstOption,
@@ -71,10 +71,9 @@ const OptionList: React.ForwardRefRenderFunction<RefOptionListProps, {}> = (_, r
   // =========================== List ===========================
   const listRef = React.useRef<ListRef>(null);
 
-  const overMaxCount = React.useMemo<boolean>(
-    () => multiple && typeof maxCount !== 'undefined' && rawValues?.size >= maxCount,
-    [multiple, maxCount, rawValues?.size],
-  );
+  const { shouldTruncate } = useMaxCount(multiple);
+
+  const overMaxCount = shouldTruncate();
 
   const onListMouseDown: React.MouseEventHandler<HTMLDivElement> = (event) => {
     event.preventDefault();
diff --git a/src/hooks/useMaxCount.ts b/src/hooks/useMaxCount.ts
new file mode 100644
index 00000000..870c6be6
--- /dev/null
+++ b/src/hooks/useMaxCount.ts
@@ -0,0 +1,25 @@
+import React from 'react';
+import SelectContext from '../SelectContext';
+import type { SelectContextProps } from '../SelectContext';
+
+const useMaxCount = (multiple: boolean) => {
+  const { maxCount, rawValues } = React.useContext<SelectContextProps>(SelectContext);
+  return {
+    shouldTruncate: React.useCallback(
+      (overCount = true) => {
+        if (!multiple || typeof maxCount === 'undefined') {
+          return false;
+        }
+        const overMaxCount = rawValues?.size >= maxCount;
+        return overCount ? overMaxCount : !overMaxCount;
+      },
+      [multiple, maxCount, rawValues?.size],
+    ),
+    truncateLength: React.useMemo<number>(
+      () => maxCount - rawValues?.size,
+      [maxCount, rawValues?.size],
+    ),
+  };
+};
+
+export default useMaxCount;

From 7c4f99cdbc99c3e775b9d5688e0549ab0ac7ee43 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=A0=97=E5=98=89=E7=94=B7?= <574980606@qq.com>
Date: Sun, 31 Dec 2023 05:17:37 +0800
Subject: [PATCH 14/18] fix: fix

---
 src/hooks/useMaxCount.ts | 32 +++++++++++++++-----------------
 1 file changed, 15 insertions(+), 17 deletions(-)

diff --git a/src/hooks/useMaxCount.ts b/src/hooks/useMaxCount.ts
index 870c6be6..1d369e25 100644
--- a/src/hooks/useMaxCount.ts
+++ b/src/hooks/useMaxCount.ts
@@ -3,23 +3,21 @@ import SelectContext from '../SelectContext';
 import type { SelectContextProps } from '../SelectContext';
 
 const useMaxCount = (multiple: boolean) => {
-  const { maxCount, rawValues } = React.useContext<SelectContextProps>(SelectContext);
-  return {
-    shouldTruncate: React.useCallback(
-      (overCount = true) => {
-        if (!multiple || typeof maxCount === 'undefined') {
-          return false;
-        }
-        const overMaxCount = rawValues?.size >= maxCount;
-        return overCount ? overMaxCount : !overMaxCount;
-      },
-      [multiple, maxCount, rawValues?.size],
-    ),
-    truncateLength: React.useMemo<number>(
-      () => maxCount - rawValues?.size,
-      [maxCount, rawValues?.size],
-    ),
-  };
+  const { maxCount, rawValues } = React.useContext<SelectContextProps>(SelectContext) || {};
+  const truncateLength = React.useMemo<number>(
+    () => maxCount - rawValues?.size,
+    [maxCount, rawValues?.size],
+  );
+  const shouldTruncate = React.useCallback(
+    (overCount = true) => {
+      if (!multiple || typeof maxCount === 'undefined') {
+        return false;
+      }
+      return overCount ? truncateLength < 0 : truncateLength >= 0;
+    },
+    [multiple, maxCount, truncateLength],
+  );
+  return { shouldTruncate, truncateLength };
 };
 
 export default useMaxCount;

From c06df9ce5af2687301c726853d10cab8b73d5c5d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=A0=97=E5=98=89=E7=94=B7?= <574980606@qq.com>
Date: Sun, 31 Dec 2023 05:18:32 +0800
Subject: [PATCH 15/18] fix: fix

---
 src/hooks/useMaxCount.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/hooks/useMaxCount.ts b/src/hooks/useMaxCount.ts
index 1d369e25..c3a35f7c 100644
--- a/src/hooks/useMaxCount.ts
+++ b/src/hooks/useMaxCount.ts
@@ -17,7 +17,7 @@ const useMaxCount = (multiple: boolean) => {
     },
     [multiple, maxCount, truncateLength],
   );
-  return { shouldTruncate, truncateLength };
+  return { truncateLength, shouldTruncate };
 };
 
 export default useMaxCount;

From af885527b6461e7dc6ea8c19fca0e0c00bf417cb Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=A0=97=E5=98=89=E7=94=B7?= <574980606@qq.com>
Date: Sun, 31 Dec 2023 05:22:20 +0800
Subject: [PATCH 16/18] fix: fix

---
 src/hooks/useMaxCount.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/hooks/useMaxCount.ts b/src/hooks/useMaxCount.ts
index c3a35f7c..21a6927d 100644
--- a/src/hooks/useMaxCount.ts
+++ b/src/hooks/useMaxCount.ts
@@ -13,7 +13,7 @@ const useMaxCount = (multiple: boolean) => {
       if (!multiple || typeof maxCount === 'undefined') {
         return false;
       }
-      return overCount ? truncateLength < 0 : truncateLength >= 0;
+      return overCount ? truncateLength <= 0 : truncateLength > 0;
     },
     [multiple, maxCount, truncateLength],
   );

From 96b20ab18af8a696ee490724292146dceefbdbef Mon Sep 17 00:00:00 2001
From: lijianan <574980606@qq.com>
Date: Tue, 2 Jan 2024 09:58:53 +0800
Subject: [PATCH 17/18] Update src/BaseSelect.tsx

Co-authored-by: MadCcc <1075746765@qq.com>
---
 src/BaseSelect.tsx | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/BaseSelect.tsx b/src/BaseSelect.tsx
index bc49404d..1c2851c2 100644
--- a/src/BaseSelect.tsx
+++ b/src/BaseSelect.tsx
@@ -408,7 +408,7 @@ const BaseSelect = React.forwardRef<BaseSelectRef, BaseSelectProps>((props, ref)
     const separatedList = getSeparatedContent(
       searchText,
       tokenSeparators,
-      shouldTruncate(false) ? truncateLength : undefined,
+      maxCount && maxCount - rawValues.size,
     );
 
     // Check if match the `tokenSeparators`

From 85e853774b93f96d3f43ad8e6bc71474363a7cdc Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=A0=97=E5=98=89=E7=94=B7?= <574980606@qq.com>
Date: Tue, 2 Jan 2024 10:04:17 +0800
Subject: [PATCH 18/18] fix: fix

---
 src/BaseSelect.tsx       |  7 ++++---
 src/OptionList.tsx       |  9 +++++----
 src/hooks/useMaxCount.ts | 23 -----------------------
 3 files changed, 9 insertions(+), 30 deletions(-)
 delete mode 100644 src/hooks/useMaxCount.ts

diff --git a/src/BaseSelect.tsx b/src/BaseSelect.tsx
index 1c2851c2..db09169b 100644
--- a/src/BaseSelect.tsx
+++ b/src/BaseSelect.tsx
@@ -28,7 +28,8 @@ import type { RefTriggerProps } from './SelectTrigger';
 import SelectTrigger from './SelectTrigger';
 import TransBtn from './TransBtn';
 import { getSeparatedContent } from './utils/valueUtil';
-import useMaxCount from './hooks/useMaxCount';
+import SelectContext from './SelectContext';
+import type { SelectContextProps } from './SelectContext';
 
 export type {
   DisplayInfoType,
@@ -395,10 +396,10 @@ const BaseSelect = React.forwardRef<BaseSelectRef, BaseSelectProps>((props, ref)
     [tokenSeparators],
   );
 
-  const { truncateLength, shouldTruncate } = useMaxCount(multiple);
+  const { maxCount, rawValues } = React.useContext<SelectContextProps>(SelectContext) || {};
 
   const onInternalSearch = (searchText: string, fromTyping: boolean, isCompositing: boolean) => {
-    if (shouldTruncate()) {
+    if (rawValues?.size >= maxCount) {
       return;
     }
     let ret = true;
diff --git a/src/OptionList.tsx b/src/OptionList.tsx
index 9b490810..ee7e3cd8 100644
--- a/src/OptionList.tsx
+++ b/src/OptionList.tsx
@@ -14,7 +14,6 @@ import TransBtn from './TransBtn';
 import useBaseProps from './hooks/useBaseProps';
 import type { FlattenOptionData } from './interface';
 import { isPlatformMac } from './utils/platformUtil';
-import useMaxCount from './hooks/useMaxCount';
 
 // export interface OptionListProps<OptionsType extends object[]> {
 export type OptionListProps = Record<string, never>;
@@ -46,6 +45,7 @@ const OptionList: React.ForwardRefRenderFunction<RefOptionListProps, {}> = (_, r
     onPopupScroll,
   } = useBaseProps();
   const {
+    maxCount,
     flattenOptions,
     onActiveValue,
     defaultActiveFirstOption,
@@ -71,9 +71,10 @@ const OptionList: React.ForwardRefRenderFunction<RefOptionListProps, {}> = (_, r
   // =========================== List ===========================
   const listRef = React.useRef<ListRef>(null);
 
-  const { shouldTruncate } = useMaxCount(multiple);
-
-  const overMaxCount = shouldTruncate();
+  const overMaxCount = React.useMemo<boolean>(
+    () => multiple && typeof maxCount !== 'undefined' && rawValues?.size >= maxCount,
+    [multiple, maxCount, rawValues?.size],
+  );
 
   const onListMouseDown: React.MouseEventHandler<HTMLDivElement> = (event) => {
     event.preventDefault();
diff --git a/src/hooks/useMaxCount.ts b/src/hooks/useMaxCount.ts
deleted file mode 100644
index 21a6927d..00000000
--- a/src/hooks/useMaxCount.ts
+++ /dev/null
@@ -1,23 +0,0 @@
-import React from 'react';
-import SelectContext from '../SelectContext';
-import type { SelectContextProps } from '../SelectContext';
-
-const useMaxCount = (multiple: boolean) => {
-  const { maxCount, rawValues } = React.useContext<SelectContextProps>(SelectContext) || {};
-  const truncateLength = React.useMemo<number>(
-    () => maxCount - rawValues?.size,
-    [maxCount, rawValues?.size],
-  );
-  const shouldTruncate = React.useCallback(
-    (overCount = true) => {
-      if (!multiple || typeof maxCount === 'undefined') {
-        return false;
-      }
-      return overCount ? truncateLength <= 0 : truncateLength > 0;
-    },
-    [multiple, maxCount, truncateLength],
-  );
-  return { truncateLength, shouldTruncate };
-};
-
-export default useMaxCount;