@rc-component/select - npm Package Compare versions

Comparing version 1.6.12 to 1.6.13

es/SelectInput/index.js

@@ -117,3 +117,4 @@ function _extends() { _extends = Object.assign ? Object.assign.bind() : function (target) { for (var i = 1; i < arguments.length; i++) { var source = arguments[i]; for (var key in source) { if (Object.prototype.hasOwnProperty.call(source, key)) { target[key] = source[key]; } } } return target; }; return _extends.apply(this, arguments); }
       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();
@@ -124,3 +125,7 @@ }
       // 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) {
@@ -159,9 +164,24 @@ inputRef.current?.focus();
   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
@@ -168,0 +188,0 @@ }));

lib/SelectInput/index.js

@@ -126,3 +126,4 @@ "use strict";
       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();
@@ -133,3 +134,7 @@ }
       // 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) {
@@ -168,9 +173,24 @@ inputRef.current?.focus();
   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
@@ -177,0 +197,0 @@ }));

package.json

 {
   "name": "@rc-component/select",
-  "version": "1.6.12",
+  "version": "1.6.13",
   "description": "React Select",
@@ -5,0 +5,0 @@ "engines": {

New alerts

Environment variable access

Supply chain risk

Package accesses environment variables, which may be a sign of credential stuffing or data theft.

Found 1 instance in 1 package

Long strings

Supply chain risk

Contains long string literals, which may be a sign of obfuscated or packed code.

Found 1 instance in 1 package

Fixed alerts

Environment variable access

Supply chain risk

Package accesses environment variables, which may be a sign of credential stuffing or data theft.

Found 1 instance in 1 package

Long strings

Supply chain risk

Contains long string literals, which may be a sign of obfuscated or packed code.

Found 1 instance in 1 package

Improved metrics

Total package byte prevSize

329736

0.46%

Lines of code

7962

0.48%

No dependency changes