@rc-component/select 1.6.3 → 1.6.5

package/es/BaseSelect/index.js

@@ -135,7 +135,7 @@ const BaseSelect = /*#__PURE__*/React.forwardRef((props, ref) => {
   // ============================== Open ==============================
   // Not trigger `open` when `notFoundContent` is empty
   const emptyListContent = !notFoundContent && emptyOptions;
-  const [mergedOpen, triggerOpen, lockOptions] = useOpen(defaultOpen || false, open, onPopupVisibleChange, nextOpen => disabled || emptyListContent ? false : nextOpen);
+  const [rawOpen, mergedOpen, triggerOpen, lockOptions] = useOpen(defaultOpen || false, open, onPopupVisibleChange, nextOpen => disabled || emptyListContent ? false : nextOpen);
 
   // ============================= Search =============================
   const tokenWithEnter = React.useMemo(() => (tokenSeparators || []).some(tokenSeparator => ['\n', '\r\n'].includes(tokenSeparator)), [tokenSeparators]);
@@ -188,12 +188,15 @@ const BaseSelect = /*#__PURE__*/React.forwardRef((props, ref) => {
     });
   };
 
-  // Close will clean up single mode search text
+  // Clean up search value when the dropdown is closed.
+  // We use `rawOpen` here to avoid clearing the search input when the dropdown is
+  // programmatically closed due to `notFoundContent={null}` and no matching options.
+  // This allows the user to continue typing their search query.
   React.useEffect(() => {
-    if (!mergedOpen && !multiple && mode !== 'combobox') {
+    if (!rawOpen && !multiple && mode !== 'combobox') {
       onInternalSearch('', false, false);
     }
-  }, [mergedOpen]);
+  }, [rawOpen]);
 
   // ============================ Disabled ============================
   // Close dropdown & remove focus state when disabled change
@@ -376,6 +379,7 @@ const BaseSelect = /*#__PURE__*/React.forwardRef((props, ref) => {
     notFoundContent,
     open: mergedOpen,
     triggerOpen: mergedOpen,
+    rawOpen,
     id,
     showSearch,
     multiple,
@@ -384,7 +388,7 @@ const BaseSelect = /*#__PURE__*/React.forwardRef((props, ref) => {
     styles,
     classNames,
     lockOptions
-  }), [props, notFoundContent, triggerOpen, id, showSearch, multiple, mergedOpen, showScrollBar, styles, classNames, lockOptions]);
+  }), [props, notFoundContent, triggerOpen, id, showSearch, multiple, mergedOpen, rawOpen, showScrollBar, styles, classNames, lockOptions]);
 
   // ==================================================================
   // ==                            Render                            ==

package/es/SelectInput/Content/MultipleContent.js

@@ -30,6 +30,7 @@ export default /*#__PURE__*/React.forwardRef(function MultipleContent({
     disabled,
     showSearch,
     triggerOpen,
+    rawOpen,
     toggleOpen,
     autoClearSearchValue,
     tagRender: tagRenderFromContext,
@@ -43,8 +44,9 @@ export default /*#__PURE__*/React.forwardRef(function MultipleContent({
 
   // ===================== Search ======================
   // Apply autoClearSearchValue logic: when dropdown is closed and autoClearSearchValue is not false (default true), clear search value
+  // Use rawOpen to avoid clearing search when emptyListContent blocks open
   let computedSearchValue = searchValue;
-  if (!triggerOpen && mode === 'multiple' && autoClearSearchValue !== false) {
+  if (!rawOpen && mode === 'multiple' && autoClearSearchValue !== false) {
     computedSearchValue = '';
   }
   const inputValue = showSearch ? computedSearchValue || '' : '';

package/es/hooks/useBaseProps.d.ts

@@ -6,6 +6,7 @@ import * as React from 'react';
 import type { BaseSelectProps } from '../BaseSelect';
 export interface BaseSelectContextProps extends BaseSelectProps {
     triggerOpen: boolean;
+    rawOpen: boolean;
     multiple: boolean;
     toggleOpen: (open?: boolean) => void;
     lockOptions: boolean;

package/es/hooks/useOpen.d.ts

@@ -15,4 +15,4 @@ export type TriggerOpenType = (nextOpen?: boolean, config?: {
  * SSR handling: During SSR, `open` is always false to avoid Portal issues.
  * On client-side hydration, it syncs with the actual open state.
  */
-export default function useOpen(defaultOpen: boolean, propOpen: boolean, onOpen: (nextOpen: boolean) => void, postOpen: (nextOpen: boolean) => boolean): [open: boolean, toggleOpen: TriggerOpenType, lockOptions: boolean];
+export default function useOpen(defaultOpen: boolean, propOpen: boolean, onOpen: (nextOpen: boolean) => void, postOpen: (nextOpen: boolean) => boolean): [rawOpen: boolean, open: boolean, toggleOpen: TriggerOpenType, lockOptions: boolean];

package/es/hooks/useOpen.js

@@ -78,5 +78,5 @@ export default function useOpen(defaultOpen, propOpen, onOpen, postOpen) {
       });
     }
   });
-  return [mergedOpen, toggleOpen, lock];
+  return [ssrSafeOpen, mergedOpen, toggleOpen, lock];
 }

package/lib/BaseSelect/index.js

@@ -144,7 +144,7 @@ const BaseSelect = /*#__PURE__*/React.forwardRef((props, ref) => {
   // ============================== Open ==============================
   // Not trigger `open` when `notFoundContent` is empty
   const emptyListContent = !notFoundContent && emptyOptions;
-  const [mergedOpen, triggerOpen, lockOptions] = (0, _useOpen.default)(defaultOpen || false, open, onPopupVisibleChange, nextOpen => disabled || emptyListContent ? false : nextOpen);
+  const [rawOpen, mergedOpen, triggerOpen, lockOptions] = (0, _useOpen.default)(defaultOpen || false, open, onPopupVisibleChange, nextOpen => disabled || emptyListContent ? false : nextOpen);
 
   // ============================= Search =============================
   const tokenWithEnter = React.useMemo(() => (tokenSeparators || []).some(tokenSeparator => ['\n', '\r\n'].includes(tokenSeparator)), [tokenSeparators]);
@@ -197,12 +197,15 @@ const BaseSelect = /*#__PURE__*/React.forwardRef((props, ref) => {
     });
   };
 
-  // Close will clean up single mode search text
+  // Clean up search value when the dropdown is closed.
+  // We use `rawOpen` here to avoid clearing the search input when the dropdown is
+  // programmatically closed due to `notFoundContent={null}` and no matching options.
+  // This allows the user to continue typing their search query.
   React.useEffect(() => {
-    if (!mergedOpen && !multiple && mode !== 'combobox') {
+    if (!rawOpen && !multiple && mode !== 'combobox') {
       onInternalSearch('', false, false);
     }
-  }, [mergedOpen]);
+  }, [rawOpen]);
 
   // ============================ Disabled ============================
   // Close dropdown & remove focus state when disabled change
@@ -385,6 +388,7 @@ const BaseSelect = /*#__PURE__*/React.forwardRef((props, ref) => {
     notFoundContent,
     open: mergedOpen,
     triggerOpen: mergedOpen,
+    rawOpen,
     id,
     showSearch,
     multiple,
@@ -393,7 +397,7 @@ const BaseSelect = /*#__PURE__*/React.forwardRef((props, ref) => {
     styles,
     classNames,
     lockOptions
-  }), [props, notFoundContent, triggerOpen, id, showSearch, multiple, mergedOpen, showScrollBar, styles, classNames, lockOptions]);
+  }), [props, notFoundContent, triggerOpen, id, showSearch, multiple, mergedOpen, rawOpen, showScrollBar, styles, classNames, lockOptions]);
 
   // ==================================================================
   // ==                            Render                            ==

package/lib/SelectInput/Content/MultipleContent.js

@@ -39,6 +39,7 @@ var _default = exports.default = /*#__PURE__*/React.forwardRef(function Multiple
     disabled,
     showSearch,
     triggerOpen,
+    rawOpen,
     toggleOpen,
     autoClearSearchValue,
     tagRender: tagRenderFromContext,
@@ -52,8 +53,9 @@ var _default = exports.default = /*#__PURE__*/React.forwardRef(function Multiple
 
   // ===================== Search ======================
   // Apply autoClearSearchValue logic: when dropdown is closed and autoClearSearchValue is not false (default true), clear search value
+  // Use rawOpen to avoid clearing search when emptyListContent blocks open
   let computedSearchValue = searchValue;
-  if (!triggerOpen && mode === 'multiple' && autoClearSearchValue !== false) {
+  if (!rawOpen && mode === 'multiple' && autoClearSearchValue !== false) {
     computedSearchValue = '';
   }
   const inputValue = showSearch ? computedSearchValue || '' : '';

package/lib/hooks/useBaseProps.d.ts

@@ -6,6 +6,7 @@ import * as React from 'react';
 import type { BaseSelectProps } from '../BaseSelect';
 export interface BaseSelectContextProps extends BaseSelectProps {
     triggerOpen: boolean;
+    rawOpen: boolean;
     multiple: boolean;
     toggleOpen: (open?: boolean) => void;
     lockOptions: boolean;

package/lib/hooks/useOpen.d.ts

@@ -15,4 +15,4 @@ export type TriggerOpenType = (nextOpen?: boolean, config?: {
  * SSR handling: During SSR, `open` is always false to avoid Portal issues.
  * On client-side hydration, it syncs with the actual open state.
  */
-export default function useOpen(defaultOpen: boolean, propOpen: boolean, onOpen: (nextOpen: boolean) => void, postOpen: (nextOpen: boolean) => boolean): [open: boolean, toggleOpen: TriggerOpenType, lockOptions: boolean];
+export default function useOpen(defaultOpen: boolean, propOpen: boolean, onOpen: (nextOpen: boolean) => void, postOpen: (nextOpen: boolean) => boolean): [rawOpen: boolean, open: boolean, toggleOpen: TriggerOpenType, lockOptions: boolean];

package/lib/hooks/useOpen.js

@@ -85,5 +85,5 @@ function useOpen(defaultOpen, propOpen, onOpen, postOpen) {
       });
     }
   });
-  return [mergedOpen, toggleOpen, lock];
+  return [ssrSafeOpen, mergedOpen, toggleOpen, lock];
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@rc-component/select",
-  "version": "1.6.3",
+  "version": "1.6.5",
   "description": "React Select",
   "engines": {
     "node": ">=8.x"