dtable-ui-component 6.0.110-sam.1 → 6.0.110-sam.13

package/lib/DTableGroupSelect/select-option-group.js

@@ -232,7 +232,11 @@ class SelectOptionGroup extends _react.Component {
             ClearIndicator: props => {
               return /*#__PURE__*/(0, _jsxRuntime.jsx)("i", {
                 className: (0, _classnames.default)('select-search-text-clear input-icon-addon seatable-icon dtable-font dtable-icon-x'),
-                onClick: this.clearValue
+                onClick: e => {
+                  e.stopPropagation();
+                  e.nativeEvent.stopImmediatePropagation();
+                  props.clearValue();
+                }
               });
             }
           }

package/lib/DTableSelect/index.js

@@ -33,9 +33,10 @@ class DTableSelect extends _react.default.Component {
     const processedOptions = (0, _utils.processOptionsWithClear)(options, isClearable);
     return /*#__PURE__*/(0, _jsxRuntime.jsx)(_reactSelect.default, {
       value: value,
-      onChange: (0, _utils.createHandleChange)(onChange),
+      onChange: (0, _utils.createHandleChange)(onChange, isMulti),
       options: processedOptions,
       isMulti: isMulti,
+      isClearable: false,
       className: className,
       classNamePrefix: classNamePrefix,
       styles: style || _utils.MenuSelectStyle,

package/lib/DTableSelect/utils.js

@@ -239,20 +239,29 @@ const processOptionsWithClear = (options, isClearable) => {
   return options;
 };
 exports.processOptionsWithClear = processOptionsWithClear;
-const handleSelectChange = (selectedOption, actionMeta, onChangeCallback) => {
-  if (selectedOption && selectedOption.value === '__clear__') {
+const handleSelectChange = (selectedOption, actionMeta, onChangeCallback, isMulti) => {
+  if (isMulti && Array.isArray(selectedOption)) {
+    const hasClear = selectedOption && selectedOption.some(opt => opt && opt.value === '__clear__');
+    if (hasClear) {
+      onChangeCallback([], {
+        ...actionMeta,
+        action: 'clear'
+      });
+      return;
+    }
+  } else if (selectedOption && selectedOption.value === '__clear__') {
     onChangeCallback(null, {
       ...actionMeta,
       action: 'clear'
     });
-  } else {
-    onChangeCallback(selectedOption, actionMeta);
+    return;
   }
+  onChangeCallback(selectedOption, actionMeta);
 };
 exports.handleSelectChange = handleSelectChange;
-const createHandleChange = onChange => {
+const createHandleChange = (onChange, isMulti) => {
   return (selectedOption, actionMeta) => {
-    handleSelectChange(selectedOption, actionMeta, onChange);
+    handleSelectChange(selectedOption, actionMeta, onChange, isMulti);
   };
 };
 exports.createHandleChange = createHandleChange;

package/lib/SelectOptionGroup/index.js

@@ -274,7 +274,11 @@ class SelectOptionGroup extends _react.Component {
               ClearIndicator: props => {
                 return /*#__PURE__*/(0, _jsxRuntime.jsx)("i", {
                   className: (0, _classnames.default)('select-search-text-clear input-icon-addon seatable-icon dtable-font dtable-icon-x'),
-                  onClick: this.clearValue
+                  onClick: e => {
+                    e.stopPropagation();
+                    e.nativeEvent.stopImmediatePropagation();
+                    props.clearValue();
+                  }
                 });
               }
             }

package/lib/SelectOptionGroup/option.js

@@ -10,8 +10,11 @@ var _jsxRuntime = require("react/jsx-runtime");
 class Option extends _react.Component {
   constructor() {
     super(...arguments);
-    this.onSelectOption = value => {
-      this.props.onSelectOption(value);
+    this.onSelectOption = (value, event) => {
+      if (this.props.supportMultipleSelect) {
+        event.stopPropagation();
+      }
+      this.props.onSelectOption(value, event);
     };
     this.onMouseEnter = () => {
       if (!this.props.disableHover) {
@@ -27,10 +30,7 @@ class Option extends _react.Component {
   render() {
     return /*#__PURE__*/(0, _jsxRuntime.jsx)("div", {
       className: this.props.isActive ? 'option option-active' : 'option',
-      onClick: event => {
-        event.stopPropagation();
-        this.onSelectOption(this.props.value);
-      },
+      onClick: this.onSelectOption.bind(this, this.props.value),
       onMouseEnter: this.onMouseEnter,
       onMouseLeave: this.onMouseLeave,
       children: this.props.children

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "dtable-ui-component",
-  "version": "6.0.110-sam.1",
+  "version": "6.0.110-sam.13",
   "main": "./lib/index.js",
   "dependencies": {
     "@seafile/react-image-lightbox": "^5.0.4",