fix: onBlur should trigger blur when mode is null

react-component · Nov 12, 2024 · c4fd947 · c4fd947
1 parent a47fa76
commit c4fd947
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 7 deletions.
diff --git a/src/BaseSelect/index.tsx b/src/BaseSelect/index.tsx
@@ -435,7 +435,7 @@ const BaseSelect = React.forwardRef<BaseSelectRef, BaseSelectProps>((props, ref)
 
     if (onSearch && mergedSearchValue !== newSearchText) {
       onSearch(newSearchText, {
-        source: fromTyping ? 'typing' : mergedShowSearch ? 'blur' : 'effect',
+        source: fromTyping ? 'typing' : 'effect',
       });
     }
 
@@ -455,7 +455,7 @@ const BaseSelect = React.forwardRef<BaseSelectRef, BaseSelectProps>((props, ref)
 
   // Close will clean up single mode search text
   React.useEffect(() => {
-    if (!mergedOpen && !multiple && mode !== 'combobox') {
+    if (!mergedOpen && !multiple && mode && mode !== 'combobox') {
       onInternalSearch('', false, false);
     }
   }, [mergedOpen]);
@@ -603,7 +603,7 @@ const BaseSelect = React.forwardRef<BaseSelectRef, BaseSelectProps>((props, ref)
       // `tags` mode should move `searchValue` into values
       if (mode === 'tags') {
         onSearch(mergedSearchValue, { source: 'submit' });
-      } else if (mode === 'multiple') {
+      } else if (!mode || mode === 'multiple') {
         // `multiple` mode only clean the search value but not trigger event
         onSearch('', {
           source: 'blur',

diff --git a/tests/BaseSelect.test.tsx b/tests/BaseSelect.test.tsx
@@ -125,7 +125,7 @@ describe('BaseSelect', () => {
   });
 
   describe("Testing BaseSelect component's onContainerBlur params", () => {
-    it('mode with null, onContainerBlur params is blur', () => {
+    it('mode with null, onBlur source is blur', () => {
       const onSearch = jest.fn();
       const { container } = render(
         <BaseSelect
@@ -135,7 +135,6 @@ describe('BaseSelect', () => {
           onDisplayValuesChange={() => {}}
           searchValue="1"
           showSearch
-          open
           onSearch={onSearch}
           OptionList={OptionList}
           emptyOptions
@@ -148,7 +147,7 @@ describe('BaseSelect', () => {
       expect(onSearch).toHaveBeenCalledWith('', { source: 'blur' });
     });
 
-    it('mode with multiple, onContainerBlur params is blur', () => {
+    it('mode with multiple, onBlur source is blur', () => {
       const onSearch = jest.fn();
       const { container } = render(
         <BaseSelect
@@ -159,7 +158,6 @@ describe('BaseSelect', () => {
           onDisplayValuesChange={() => {}}
           searchValue="1"
           showSearch
-          open
           onSearch={onSearch}
           OptionList={OptionList}
           emptyOptions

diff --git a/tests/Select.test.tsx b/tests/Select.test.tsx
@@ -595,6 +595,13 @@ describe('Select.Basic', () => {
     selectItem(container);
     expect(handleSearch).toHaveBeenCalledTimes(1);
 
+    // Should not trigger onBlur
+    fireEvent.change(container.querySelector('input'), { target: { value: '3' } });
+    expect(handleSearch).toHaveBeenCalledTimes(2);
+    fireEvent.blur(container.querySelector('input'));
+    jest.runAllTimers();
+    expect(handleSearch).toHaveBeenCalledTimes(2);
+
     jest.useRealTimers();
   });