From 534a25ead22b82e331589d742f617c4b0c947471 Mon Sep 17 00:00:00 2001
From: lijianan <574980606@qq.com>
Date: Fri, 29 Dec 2023 23:55:50 +0800
Subject: [PATCH 1/2] chore: code optimization

---
 docs/examples/auto-tokenization.tsx |  1 +
 src/BaseSelect.tsx                  | 13 +++++++------
 src/OptionList.tsx                  |  8 +++-----
 src/Selector/index.tsx              |  5 ++---
 src/utils/valueUtil.ts              |  2 +-
 5 files changed, 14 insertions(+), 15 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..517c7086 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';
@@ -388,7 +389,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],
   );
@@ -513,8 +514,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);
@@ -522,8 +523,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);
@@ -649,7 +650,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/OptionList.tsx b/src/OptionList.tsx
index 8c8b8329..ee7e3cd8 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) => {
@@ -81,9 +81,7 @@ const OptionList: React.ForwardRefRenderFunction<RefOptionListProps, {}> = (_, r
   };
 
   const scrollIntoView = (args: number | ScrollConfig) => {
-    if (listRef.current) {
-      listRef.current.scrollTo(typeof args === 'number' ? { index: args } : args);
-    }
+    listRef.current?.scrollTo(typeof args === 'number' ? { index: args } : args);
   };
 
   // ========================== Active ==========================
diff --git a/src/Selector/index.tsx b/src/Selector/index.tsx
index 239ae88b..711bf276 100644
--- a/src/Selector/index.tsx
+++ b/src/Selector/index.tsx
@@ -207,9 +207,8 @@ 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');
+    pastedTextRef.current = value || '';
   };
 
   const onClick = ({ target }) => {
diff --git a/src/utils/valueUtil.ts b/src/utils/valueUtil.ts
index 9a20a955..df884c7a 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[]): string[] => {
   if (!tokens || !tokens.length) {
     return null;
   }

From ecba16d3d80afc127b67b02b462a261caf3bf821 Mon Sep 17 00:00:00 2001
From: lijianan <574980606@qq.com>
Date: Sat, 30 Dec 2023 00:03:30 +0800
Subject: [PATCH 2/2] demo: update demo

---
 docs/examples/auto-tokenization.tsx | 1 -
 1 file changed, 1 deletion(-)

diff --git a/docs/examples/auto-tokenization.tsx b/docs/examples/auto-tokenization.tsx
index 2393609f..c1901085 100644
--- a/docs/examples/auto-tokenization.tsx
+++ b/docs/examples/auto-tokenization.tsx
@@ -7,7 +7,6 @@ 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() }))}