@rc-component/select 1.6.12 → 1.6.14

package/es/SelectInput/index.js

@@ -100,7 +100,8 @@ export default /*#__PURE__*/React.forwardRef(function SelectInput(props, ref) {
       blur: () => {
         (inputRef.current || rootRef.current).blur?.();
       },
-      nativeElement: rootRef.current
+      // Use getDOM to handle nested nativeElement structure (e.g., when RootComponent is antd Input)
+      nativeElement: getDOM(rootRef.current)
     };
   });
 
@@ -114,13 +115,18 @@ export default /*#__PURE__*/React.forwardRef(function SelectInput(props, ref) {
       // When icon is dynamic render, the parentNode will miss
       // so we need to mark the event directly
       event.nativeEvent._ori_target = inputDOM;
-      if (inputDOM && event.target !== inputDOM && !inputDOM.contains(event.target)) {
+      const isClickOnInput = inputDOM === event.target || inputDOM?.contains(event.target);
+      if (inputDOM && !isClickOnInput) {
         event.preventDefault();
       }
 
       // Check if we should prevent closing when clicking on selector
       // Don't close if: open && not multiple && (combobox mode || showSearch)
-      const shouldPreventClose = triggerOpen && !multiple && (mode === 'combobox' || showSearch);
+      const shouldPreventCloseOnSingle = triggerOpen && !multiple && (mode === 'combobox' || showSearch);
+
+      // Don't close if: open && multiple && click on input
+      const shouldPreventCloseOnMultipleInput = triggerOpen && multiple && isClickOnInput;
+      const shouldPreventClose = shouldPreventCloseOnSingle || shouldPreventCloseOnMultipleInput;
       if (!event.nativeEvent._select_lazy) {
         inputRef.current?.focus();
 
@@ -154,13 +160,28 @@ export default /*#__PURE__*/React.forwardRef(function SelectInput(props, ref) {
     onInputKeyDown: onInternalInputKeyDown
   };
   if (RootComponent) {
+    const originProps = RootComponent.props || {};
+    const mergedProps = {
+      ...originProps,
+      ...domProps
+    };
+    Object.keys(originProps).forEach(key => {
+      const originVal = originProps[key];
+      const domVal = domProps[key];
+      if (typeof originVal === 'function' && typeof domVal === 'function') {
+        mergedProps[key] = (...args) => {
+          domVal(...args);
+          originVal(...args);
+        };
+      }
+    });
     if ( /*#__PURE__*/React.isValidElement(RootComponent)) {
       return /*#__PURE__*/React.cloneElement(RootComponent, {
-        ...domProps,
+        ...mergedProps,
         ref: composeRef(RootComponent.ref, rootRef)
       });
     }
-    return /*#__PURE__*/React.createElement(RootComponent, _extends({}, domProps, {
+    return /*#__PURE__*/React.createElement(RootComponent, _extends({}, mergedProps, {
       ref: rootRef
     }));
   }

package/lib/SelectInput/index.js

@@ -109,7 +109,8 @@ var _default = exports.default = /*#__PURE__*/React.forwardRef(function SelectIn
       blur: () => {
         (inputRef.current || rootRef.current).blur?.();
       },
-      nativeElement: rootRef.current
+      // Use getDOM to handle nested nativeElement structure (e.g., when RootComponent is antd Input)
+      nativeElement: (0, _findDOMNode.getDOM)(rootRef.current)
     };
   });
 
@@ -123,13 +124,18 @@ var _default = exports.default = /*#__PURE__*/React.forwardRef(function SelectIn
       // When icon is dynamic render, the parentNode will miss
       // so we need to mark the event directly
       event.nativeEvent._ori_target = inputDOM;
-      if (inputDOM && event.target !== inputDOM && !inputDOM.contains(event.target)) {
+      const isClickOnInput = inputDOM === event.target || inputDOM?.contains(event.target);
+      if (inputDOM && !isClickOnInput) {
         event.preventDefault();
       }
 
       // Check if we should prevent closing when clicking on selector
       // Don't close if: open && not multiple && (combobox mode || showSearch)
-      const shouldPreventClose = triggerOpen && !multiple && (mode === 'combobox' || showSearch);
+      const shouldPreventCloseOnSingle = triggerOpen && !multiple && (mode === 'combobox' || showSearch);
+
+      // Don't close if: open && multiple && click on input
+      const shouldPreventCloseOnMultipleInput = triggerOpen && multiple && isClickOnInput;
+      const shouldPreventClose = shouldPreventCloseOnSingle || shouldPreventCloseOnMultipleInput;
       if (!event.nativeEvent._select_lazy) {
         inputRef.current?.focus();
 
@@ -163,13 +169,28 @@ var _default = exports.default = /*#__PURE__*/React.forwardRef(function SelectIn
     onInputKeyDown: onInternalInputKeyDown
   };
   if (RootComponent) {
+    const originProps = RootComponent.props || {};
+    const mergedProps = {
+      ...originProps,
+      ...domProps
+    };
+    Object.keys(originProps).forEach(key => {
+      const originVal = originProps[key];
+      const domVal = domProps[key];
+      if (typeof originVal === 'function' && typeof domVal === 'function') {
+        mergedProps[key] = (...args) => {
+          domVal(...args);
+          originVal(...args);
+        };
+      }
+    });
     if ( /*#__PURE__*/React.isValidElement(RootComponent)) {
       return /*#__PURE__*/React.cloneElement(RootComponent, {
-        ...domProps,
+        ...mergedProps,
         ref: (0, _ref.composeRef)(RootComponent.ref, rootRef)
       });
     }
-    return /*#__PURE__*/React.createElement(RootComponent, _extends({}, domProps, {
+    return /*#__PURE__*/React.createElement(RootComponent, _extends({}, mergedProps, {
       ref: rootRef
     }));
   }

package/package.json

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