chore: update

Author: zombieJ

src/BaseSelect/index.tsx

@@ -462,7 +462,6 @@ const BaseSelect = React.forwardRef<BaseSelectRef, BaseSelectProps>((props, ref)
       onSearchSplit?.(patchLabels);
 
       // Should close when paste finish
-      // onToggleOpen(false);
       triggerOpen(false);
 
       // Tell Selector that break next actions
@@ -476,7 +475,7 @@ const BaseSelect = React.forwardRef<BaseSelectRef, BaseSelectProps>((props, ref)
     }
 
     // Open if from typing
-    if (searchText && fromTyping) {
+    if (searchText && fromTyping && ret) {
       triggerOpen(true);
     }
 
@@ -941,6 +940,8 @@ const BaseSelect = React.forwardRef<BaseSelectRef, BaseSelectProps>((props, ref)
       onKeyDown={onInternalKeyDown}
       onKeyUp={onInternalKeyUp}
       onSelectorRemove={onSelectorRemove}
+      // Token handling
+      tokenWithEnter={tokenWithEnter}
       // Open
       onMouseDown={onInternalMouseDown}
     />

src/SelectInput/Input.tsx

@@ -34,7 +34,7 @@ const Input = React.forwardRef<HTMLInputElement, InputProps>((props, ref) => {
     autoComplete,
     ...restProps
   } = props;
-  const { prefixCls, mode, onSearch, onSearchSubmit, onInputBlur, autoFocus } =
+  const { prefixCls, mode, onSearch, onSearchSubmit, onInputBlur, autoFocus, tokenWithEnter } =
     useSelectInputContext();
   const { id, classNames, styles, open, activeDescendantId, role, disabled } = useBaseProps() || {};
 
@@ -43,6 +43,9 @@ const Input = React.forwardRef<HTMLInputElement, InputProps>((props, ref) => {
   // Used to handle input method composition status
   const compositionStatusRef = React.useRef<boolean>(false);
 
+  // Used to handle paste content, similar to original Selector implementation
+  const pastedTextRef = React.useRef<string | null>(null);
+
   // ============================== Refs ==============================
   const inputRef = React.useRef<HTMLInputElement>(null);
 
@@ -51,7 +54,20 @@ const Input = React.forwardRef<HTMLInputElement, InputProps>((props, ref) => {
   // ============================== Data ==============================
   // Handle input changes
   const handleChange: React.ChangeEventHandler<HTMLInputElement> = (event) => {
-    const { value: nextVal } = event.target;
+    let { value: nextVal } = event.target;
+
+    // Handle pasted text with tokenWithEnter, similar to original Selector implementation
+    if (tokenWithEnter && pastedTextRef.current && /[\r\n]/.test(pastedTextRef.current)) {
+      // CRLF will be treated as a single space for input element
+      const replacedText = pastedTextRef.current
+        .replace(/[\r\n]+$/, '')
+        .replace(/\r\n/g, ' ')
+        .replace(/[\r\n]/g, ' ');
+      nextVal = nextVal.replace(replacedText, pastedTextRef.current);
+    }
+
+    // Reset pasted text reference
+    pastedTextRef.current = null;
 
     // Call onSearch callback
     if (onSearch) {
@@ -95,9 +111,18 @@ const Input = React.forwardRef<HTMLInputElement, InputProps>((props, ref) => {
   const handleCompositionEnd: React.CompositionEventHandler<HTMLInputElement> = (event) => {
     compositionStatusRef.current = false;
 
-    // Trigger search when input method composition ends
-    const { value: nextVal } = event.currentTarget;
-    onSearch?.(nextVal, true, false);
+    // Trigger search when input method composition ends, similar to original Selector
+    if (mode !== 'combobox') {
+      const { value: nextVal } = event.currentTarget;
+      onSearch?.(nextVal, true, false);
+    }
+  };
+
+  // Handle paste events to track pasted content
+  const handlePaste: React.ClipboardEventHandler<HTMLInputElement> = (event) => {
+    const { clipboardData } = event;
+    const pastedValue = clipboardData?.getData('text');
+    pastedTextRef.current = pastedValue || '';
   };
 
   // ============================= Width ==============================
@@ -139,6 +164,7 @@ const Input = React.forwardRef<HTMLInputElement, InputProps>((props, ref) => {
       onChange={handleChange}
       onKeyDown={handleKeyDown}
       onBlur={handleBlur}
+      onPaste={handlePaste}
       onCompositionStart={handleCompositionStart}
       onCompositionEnd={handleCompositionEnd}
       // Accessibility attributes

src/SelectInput/index.tsx

@@ -29,6 +29,8 @@ export interface SelectInputProps extends Omit<React.HTMLAttributes<HTMLDivEleme
   onSelectorRemove?: (value: DisplayValueType) => void;
   maxLength?: number;
   autoFocus?: boolean;
+  /** Check if `tokenSeparators` contains `\n` or `\r\n` */
+  tokenWithEnter?: boolean;
   // Add other props that need to be passed through
   className?: string;
   style?: React.CSSProperties;
@@ -96,6 +98,9 @@ export default React.forwardRef<SelectInputRef, SelectInputProps>(function Selec
     onInputKeyDown,
     onSelectorRemove,
 
+    // Token handling
+    tokenWithEnter,
+
     ...restProps
   } = props;
 

tests/Tags.test.tsx

@@ -1,4 +1,4 @@
-import { createEvent, fireEvent, render } from '@testing-library/react';
+import { act, createEvent, fireEvent, render } from '@testing-library/react';
 import KeyCode from '@rc-component/util/lib/KeyCode';
 import { clsx } from 'clsx';
 import * as React from 'react';
@@ -62,11 +62,10 @@ describe('Select.Tags', () => {
   it('tokenize input', () => {
     const handleChange = jest.fn();
     const handleSelect = jest.fn();
-    const option2 = <Option value="2">2</Option>;
     const { container } = render(
       <Select mode="tags" tokenSeparators={[',']} onChange={handleChange} onSelect={handleSelect}>
         <Option value="1">1</Option>
-        {option2}
+        <Option value="2">2</Option>
       </Select>,
     );
 
@@ -79,6 +78,7 @@ describe('Select.Tags', () => {
     expect(findSelection(container, 1).textContent).toEqual('3');
     expect(findSelection(container, 2).textContent).toEqual('4');
     expect(container.querySelector('input').value).toBe('');
+
     expectOpen(container, false);
   });
 
@@ -513,9 +513,7 @@ describe('Select.Tags', () => {
     const { container } = render(<Select mode="tags" tabIndex={0} />);
     expect(container.querySelector('.rc-select').getAttribute('tabindex')).toBeFalsy();
 
-    expect(
-      container.querySelector('input.rc-select-selection-search-input').getAttribute('tabindex'),
-    ).toBe('0');
+    expect(container.querySelector('input').getAttribute('tabindex')).toBe('0');
   });
 
   it('press enter should not submit form', () => {