dtable-ui-component 7.0.1-beta.btn1 → 7.0.1-beta.select1

package/lib/SelectOptionGroup/index.js

@@ -8,10 +8,10 @@ Object.defineProperty(exports, "__esModule", {
 exports.default = void 0;
 var _react = _interopRequireWildcard(require("react"));
 var _classnames = _interopRequireDefault(require("classnames"));
+var _ClickOutside = _interopRequireDefault(require("../ClickOutside"));
+var _DTableCustomizeSearchInput = _interopRequireDefault(require("../DTableCustomizeSearchInput"));
 var _option = _interopRequireDefault(require("./option"));
-var _DTableSearchInput = _interopRequireDefault(require("../DTableSearchInput"));
 var _KeyCodes = _interopRequireDefault(require("./KeyCodes"));
-var _ClickOutside = _interopRequireDefault(require("../ClickOutside"));
 require("./index.css");
 var _jsxRuntime = require("react/jsx-runtime");
 const OPTION_HEIGHT = 32;
@@ -19,21 +19,16 @@ class SelectOptionGroup extends _react.Component {
   constructor(props) {
     super(props);
     this.resetMenuStyle = () => {
-      if (!this.optionGroupRef) return;
       const _this$props = this.props,
         isInModal = _this$props.isInModal,
         position = _this$props.position;
       const _this$optionGroupRef$ = this.optionGroupRef.getBoundingClientRect(),
         top = _this$optionGroupRef$.top,
-        height = _this$optionGroupRef$.height,
-        width = _this$optionGroupRef$.width;
+        height = _this$optionGroupRef$.height;
       if (isInModal) {
         if (position.y + position.height + height > window.innerHeight) {
           this.optionGroupRef.style.top = position.y - height + 'px';
         }
-        if (position && position.x + width > window.innerWidth) {
-          this.optionGroupRef.style.left = window.innerWidth - width - 10 + 'px';
-        }
         this.optionGroupRef.style.opacity = 1;
         this.searchInputRef.current && this.searchInputRef.current.inputRef.focus();
       } else {
@@ -127,10 +122,17 @@ class SelectOptionGroup extends _react.Component {
         });
       }
     };
+    this.clearSearch = () => {
+      this.setState({
+        searchVal: '',
+        activeIndex: -1
+      });
+    };
     this.renderOptGroup = searchVal => {
       let _this$props2 = this.props,
         noOptionsPlaceholder = _this$props2.noOptionsPlaceholder,
-        onSelectOption = _this$props2.onSelectOption;
+        onSelectOption = _this$props2.onSelectOption,
+        value = _this$props2.value;
       this.filterOptions = this.props.getFilterOptions(searchVal);
       if (this.filterOptions.length === 0) {
         return /*#__PURE__*/(0, _jsxRuntime.jsx)("div", {
@@ -141,7 +143,16 @@ class SelectOptionGroup extends _react.Component {
       return this.filterOptions.map((opt, i) => {
         let key = opt.value.column ? opt.value.column.key : i;
         let isActive = this.state.activeIndex === i;
-        return /*#__PURE__*/(0, _jsxRuntime.jsx)(_option.default, {
+        let isSelected = false;
+        if (value) {
+          // Handle both single value and array of values
+          if (Array.isArray(value.value)) {
+            isSelected = value.value.includes(opt.value);
+          } else {
+            isSelected = opt.value === value.value || JSON.stringify(opt.value) === JSON.stringify(value.value);
+          }
+        }
+        return /*#__PURE__*/(0, _jsxRuntime.jsxs)(_option.default, {
           index: i,
           isActive: isActive,
           value: opt.value,
@@ -149,8 +160,13 @@ class SelectOptionGroup extends _react.Component {
           changeIndex: this.changeIndex,
           supportMultipleSelect: this.props.supportMultipleSelect,
           disableHover: this.state.disableHover,
-          children: opt.label
-        }, "".concat(key, "-").concat(i));
+          children: [/*#__PURE__*/(0, _jsxRuntime.jsx)("div", {
+            className: "select-label",
+            children: opt.label
+          }), isSelected && /*#__PURE__*/(0, _jsxRuntime.jsx)("i", {
+            className: "dtable-font dtable-icon-check seatable-check-color"
+          })]
+        }, key);
       });
     };
     this.state = {
@@ -215,9 +231,8 @@ class SelectOptionGroup extends _react.Component {
       ref: ref => this.clickOutsideRef = ref,
       onClickOutside: this.props.onClickOutside,
       children: /*#__PURE__*/(0, _jsxRuntime.jsxs)("div", {
-        className: (0, _classnames.default)('option-group', className ? 'option-group-' + className : '', {
-          'pt-0': isShowSelected,
-          'create-new-option-group': addOptionAble
+        className: (0, _classnames.default)('seatable-option-group', className ? 'seatable-option-group-' + className : '', {
+          'pt-0': isShowSelected
         }),
         ref: ref => this.optionGroupRef = ref,
         style: style,
@@ -227,16 +242,18 @@ class SelectOptionGroup extends _react.Component {
           onClick: e => e.stopPropagation(),
           children: value.label || ''
         }), searchable && /*#__PURE__*/(0, _jsxRuntime.jsx)("div", {
-          className: "option-group-search",
-          children: /*#__PURE__*/(0, _jsxRuntime.jsx)(_DTableSearchInput.default, {
+          className: "seatable-select-search",
+          children: /*#__PURE__*/(0, _jsxRuntime.jsx)(_DTableCustomizeSearchInput.default, {
             className: "option-search-control",
             placeholder: searchPlaceholder,
             onChange: this.onChangeSearch,
+            clearValue: this.clearSearch,
             autoFocus: true,
+            isClearable: true,
             ref: this.searchInputRef
           })
         }), /*#__PURE__*/(0, _jsxRuntime.jsx)("div", {
-          className: "option-group-content",
+          className: "seatable-option-group-content",
           ref: ref => this.optionGroupContentRef = ref,
           children: this.renderOptGroup(searchVal)
         }), addOptionAble && AddOption]

package/lib/SelectOptionGroup/option.js

@@ -1,20 +1,22 @@
 "use strict";
 
+var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault").default;
 var _interopRequireWildcard = require("@babel/runtime/helpers/interopRequireWildcard").default;
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.default = void 0;
 var _react = _interopRequireWildcard(require("react"));
+var _classnames = _interopRequireDefault(require("classnames"));
 var _jsxRuntime = require("react/jsx-runtime");
 class Option extends _react.Component {
   constructor() {
     super(...arguments);
-    this.onSelectOption = (value, event) => {
+    this.onSelectOption = event => {
       if (this.props.supportMultipleSelect) {
         event.stopPropagation();
       }
-      this.props.onSelectOption(value, event);
+      this.props.onSelectOption(this.props.value, event);
     };
     this.onMouseEnter = () => {
       if (!this.props.disableHover) {
@@ -26,11 +28,21 @@ class Option extends _react.Component {
         this.props.changeIndex(-1);
       }
     };
+    this.onKeyDown = e => {
+      if (e.key === 'Enter' || e.key === 'Space') {
+        e.target.click();
+      }
+    };
   }
   render() {
     return /*#__PURE__*/(0, _jsxRuntime.jsx)("div", {
-      className: this.props.isActive ? 'option option-active' : 'option',
-      onClick: this.onSelectOption.bind(this, this.props.value),
+      className: (0, _classnames.default)('seatable-select-option', {
+        'seatable-select-option-active': this.props.isActive
+      }),
+      tabIndex: "0",
+      role: "menuitem",
+      onClick: this.onSelectOption,
+      onKeyDown: this.onKeyDown,
       onMouseEnter: this.onMouseEnter,
       onMouseLeave: this.onMouseLeave,
       children: this.props.children

package/lib/assets/icons/close.svg

@@ -0,0 +1 @@
+<?xml version="1.0" standalone="no"?><!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"><svg t="1718937171668" class="icon" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="18368" xmlns:xlink="http://www.w3.org/1999/xlink" width="200" height="200"><path d="M489.6 444.8l294.4-294.4 67.2 67.2-294.4 294.4 294.4 294.4-67.2 67.2-294.4-294.4-272 272-67.2-67.2 272-272-272-272 67.2-67.2z" p-id="18369" fill="currentColor"></path></svg>

package/lib/assets/icons/down.svg

@@ -0,0 +1,3 @@
+<svg width="32" height="32" viewBox="0 0 32 32" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M3.27148 11.2718L6.09991 8.44336L15.9994 18.3429L25.8989 8.44336L28.7273 11.2718L15.9994 23.9997L3.27148 11.2718Z" fill="currentColor"/>
+</svg>

package/lib/index.js

@@ -118,10 +118,10 @@ Object.defineProperty(exports, "DTableCustomFooter", {
     return _DTableCustomFooter.default;
   }
 });
-Object.defineProperty(exports, "DTableCustomizeCollaboratorSelect", {
+Object.defineProperty(exports, "DTableCustomizeSearchInput", {
   enumerable: true,
   get: function () {
-    return _DTableCustomizeCollaboratorSelect.default;
+    return _DTableCustomizeSearchInput.default;
   }
 });
 Object.defineProperty(exports, "DTableCustomizeSelect", {
@@ -154,12 +154,6 @@ Object.defineProperty(exports, "DTableFiltersPopover", {
     return _DTableFiltersPopover.default;
   }
 });
-Object.defineProperty(exports, "DTableGroupSelect", {
-  enumerable: true,
-  get: function () {
-    return _index.default;
-  }
-});
 Object.defineProperty(exports, "DTableIcon", {
   enumerable: true,
   get: function () {
@@ -718,12 +712,11 @@ var _DTableRadio = _interopRequireDefault(require("./DTableRadio"));
 var _DTableCommonAddTool = _interopRequireDefault(require("./DTableCommonAddTool"));
 var _NotificationPopover = _interopRequireDefault(require("./NotificationPopover"));
 var _DTableSelect = _interopRequireDefault(require("./DTableSelect"));
-var _index = _interopRequireDefault(require("./DTableGroupSelect/index"));
 var _dtableSelectLabel = _interopRequireDefault(require("./DTableSelect/dtable-select-label"));
 var _DTableSwitch = _interopRequireDefault(require("./DTableSwitch"));
 var _DTableCustomizeSelect = _interopRequireDefault(require("./DTableCustomizeSelect"));
-var _DTableCustomizeCollaboratorSelect = _interopRequireDefault(require("./DTableCustomizeCollaboratorSelect"));
 var _DTableSearchInput = _interopRequireDefault(require("./DTableSearchInput"));
+var _DTableCustomizeSearchInput = _interopRequireDefault(require("./DTableCustomizeSearchInput"));
 var _DTableColorPicker = _interopRequireDefault(require("./DTableColorPicker"));
 var _ModalPortal = _interopRequireDefault(require("./ModalPortal"));
 var _RoleStatusEditor = _interopRequireDefault(require("./RoleStatusEditor"));

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "dtable-ui-component",
-  "version": "7.0.1-beta.btn1",
+  "version": "7.0.1-beta.select1",
   "main": "./lib/index.js",
   "dependencies": {
     "@seafile/react-image-lightbox": "5.0.9",

package/lib/DTableCustomizeCollaboratorSelect/index.css

@@ -1,86 +0,0 @@
-.dtable-customize-collaborator-select.dtable-select {
-  position: unset;
-}
-
-.dtable-customize-collaborator-select .collaborator-avatar {
-  width: 16px;
-  height: 16px;
-  transform: translateY(-1px);
-}
-
-.dtable-customize-collaborator-select .selected-option-show {
-  width: calc(100% - 20px);
-  height: 20px;
-}
-
-.dtable-customize-collaborator-select .selected-option {
-  width: auto;
-  overflow-x: auto;
-}
-
-.dtable-customize-collaborator-select .dtable-icon-down3 {
-  margin-left: .5rem;
-}
-
-.dtable-customize-collaborator-select .option-collaborator {
-  display: flex;
-}
-
-.dtable-customize-collaborator-select .collaborator-container {
-  flex: 1 1;
-}
-
-.dtable-customize-collaborator-select .editor-list-delete .collaborator-container {
-  flex: 1 1;
-  display: inline;
-}
-
-.dtable-customize-collaborator-select .multiple-check-icon {
-  display: inline-flex;
-  width: 20px;
-  text-align: center;
-}
-
-.dtable-customize-collaborator-select .collaborator-check-icon .dtable-icon-check-mark,
-.dtable-customize-collaborator-select .multiple-check-icon .dtable-icon-check-mark {
-  font-size: 12px;
-  color: #798d99;
-}
-
-.dtable-customize-collaborator-select.dtable-select .option-active,
-.dtable-customize-collaborator-select.dtable-select .option:hover {
-  color: #212529;
-  background-color: #f5f5f5;
-}
-
-.dtable-customize-collaborator-select.dtable-select .option.option-active .select-option-name {
-  color: #212529;
-}
-
-.collaborator-select .option-group-content .collaborator,
-.dtable-customize-collaborator-select .option-group .option-group-content .collaborator {
-  background: none;
-}
-
-.dtable-customize-collaborator-select .collaborator-avatar-container {
-  width: 16px;
-}
-
-.dtable-customize-collaborator-select .option-group-content .remove-container {
-  display: none;
-}
-
-.dtable-customize-collaborator-select .collaborator-container {
-  display: flex;
-  justify-content: space-between;
-}
-
-.collaborator-container .collaborator-name {
-  margin-left: 5px;
-  max-width: 200px;
-  color: #212529;
-}
-
-.collaborator-select .option-group {
-  max-height: fit-content;
-}

package/lib/DTableCustomizeCollaboratorSelect/index.js

@@ -1,158 +0,0 @@
-"use strict";
-
-var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault").default;
-var _interopRequireWildcard = require("@babel/runtime/helpers/interopRequireWildcard").default;
-Object.defineProperty(exports, "__esModule", {
-  value: true
-});
-exports.default = void 0;
-var _react = _interopRequireWildcard(require("react"));
-var _classnames = _interopRequireDefault(require("classnames"));
-var _reactstrap = require("reactstrap");
-var _dtableUtils = require("dtable-utils");
-var _SelectOptionGroup = _interopRequireDefault(require("../SelectOptionGroup"));
-require("./index.css");
-var _jsxRuntime = require("react/jsx-runtime");
-class CollaboratorSelect extends _react.Component {
-  constructor(props) {
-    super(props);
-    this.onSelectToggle = event => {
-      event.preventDefault();
-      /*
-        if select is showing, click events do not need to be monitored by other click events,
-        so it can be closed when other select is clicked.
-      */
-      if (this.state.isShowSelectOptions) event.nativeEvent.stopImmediatePropagation();
-      let eventClassName = event.target.className;
-      if (this.props.isLocked || eventClassName.indexOf('option-search-control') > -1 || eventClassName === 'option-group-search') return;
-      // Prevent closing by pressing the spacebar in the search input
-      if (event.target.value === '') return;
-      this.selectedOptionWidth = this.selectedOptionRef.clientWidth;
-      this.setState({
-        isShowSelectOptions: !this.state.isShowSelectOptions
-      });
-    };
-    this.onMousedown = event => {
-      const name = event.target.className;
-      if (name === 'select-placeholder' || name.includes('icon-fork-number')) {
-        return;
-      }
-      if (!this.selector.contains(event.target)) {
-        this.closeSelect();
-      }
-    };
-    this.closeSelect = () => {
-      this.setState({
-        isShowSelectOptions: false
-      });
-    };
-    this.getFilterOptions = searchValue => {
-      const _this$props = this.props,
-        options = _this$props.options,
-        searchable = _this$props.searchable;
-      if (!searchable) return options || [];
-      return (0, _dtableUtils.searchCollaborators)(options, searchValue);
-    };
-    this.renderOptionGroup = () => {
-      const _this$props2 = this.props,
-        value = _this$props2.value,
-        options = _this$props2.options,
-        searchable = _this$props2.searchable,
-        searchPlaceholder = _this$props2.searchPlaceholder,
-        noOptionsPlaceholder = _this$props2.noOptionsPlaceholder,
-        top = _this$props2.top,
-        left = _this$props2.left,
-        isUsePopover = _this$props2.isUsePopover;
-      if (!isUsePopover) {
-        return /*#__PURE__*/(0, _jsxRuntime.jsx)(_SelectOptionGroup.default, {
-          value: value,
-          top: top,
-          left: left,
-          minWidth: this.btnWidth + 8 // 8px is padding
-          ,
-          options: options,
-          onSelectOption: this.props.onSelectOption,
-          searchable: searchable,
-          searchPlaceholder: searchPlaceholder,
-          noOptionsPlaceholder: noOptionsPlaceholder,
-          closeSelect: this.closeSelect,
-          getFilterOptions: this.getFilterOptions,
-          supportMultipleSelect: this.props.supportMultipleSelect,
-          stopClickEvent: true,
-          isShowSelected: true
-        });
-      }
-      return /*#__PURE__*/(0, _jsxRuntime.jsx)(_reactstrap.Popover, {
-        placement: "bottom",
-        isOpen: true,
-        target: this.id,
-        fade: false,
-        hideArrow: true,
-        className: "dtable-customize-collaborator-select dtable-select",
-        children: /*#__PURE__*/(0, _jsxRuntime.jsx)(_SelectOptionGroup.default, {
-          value: value,
-          top: top,
-          left: left,
-          minWidth: this.btnWidth + 8 // 8px is padding
-          ,
-          options: options,
-          onSelectOption: this.props.onSelectOption,
-          searchable: searchable,
-          searchPlaceholder: searchPlaceholder,
-          noOptionsPlaceholder: noOptionsPlaceholder,
-          closeSelect: this.closeSelect,
-          getFilterOptions: this.getFilterOptions,
-          supportMultipleSelect: this.props.supportMultipleSelect,
-          stopClickEvent: true,
-          isShowSelected: true
-        })
-      });
-    };
-    this.state = {
-      isShowSelectOptions: false
-    };
-    this.id = 'collaborator-select-' + Math.trunc(Math.random() * 10000);
-  }
-  componentDidMount() {
-    document.addEventListener('mousedown', this.onMousedown);
-    this.btnWidth = this.selector.clientWidth;
-  }
-  componentWillUnmount() {
-    document.removeEventListener('mousedown', this.onMousedown);
-  }
-  render() {
-    let _this$props3 = this.props,
-      className = _this$props3.className,
-      value = _this$props3.value,
-      placeholder = _this$props3.placeholder,
-      isLocked = _this$props3.isLocked;
-    return /*#__PURE__*/(0, _jsxRuntime.jsxs)("button", {
-      ref: node => this.selector = node,
-      className: (0, _classnames.default)('dtable-select custom-select collaborator-select', {
-        'focus': this.state.isShowSelectOptions
-      }, {
-        'disabled': isLocked
-      }, className),
-      id: this.id,
-      onClick: this.onSelectToggle,
-      children: [/*#__PURE__*/(0, _jsxRuntime.jsxs)("div", {
-        className: "selected-option",
-        ref: node => this.selectedOptionRef = node,
-        children: [value.label ? /*#__PURE__*/(0, _jsxRuntime.jsx)("span", {
-          className: "selected-option-show",
-          children: value.label
-        }) : /*#__PURE__*/(0, _jsxRuntime.jsx)("span", {
-          className: "select-placeholder",
-          children: placeholder
-        }), !isLocked && /*#__PURE__*/(0, _jsxRuntime.jsx)("i", {
-          className: "dtable-font dtable-icon-down3"
-        })]
-      }), this.state.isShowSelectOptions && this.renderOptionGroup()]
-    });
-  }
-}
-CollaboratorSelect.defaultProps = {
-  top: -3,
-  left: -3
-};
-var _default = exports.default = CollaboratorSelect;

package/lib/DTableGroupSelect/index.css

@@ -1,96 +0,0 @@
-.group-select {
-  position: relative;
-}
-
-.group-select.custom-select {
-  display: flex;
-  padding: 5px 10px;
-  border-radius: 3px;
-  align-items: center;
-  justify-content: space-between;
-  max-width: 900px;
-  user-select: none;
-  text-align: left;
-  border-color: 1px solid rgba(0, 40, 100, 0.12);
-  height: auto;
-  min-height: 38px;
-  cursor: pointer;
-}
-
-.group-select.custom-select:focus,
-.group-select.custom-select.focus {
-  border-color: #1991eb !important;
-  box-shadow: 0 0 0 2px rgba(70, 127, 207, 0.25);
-}
-
-.group-select.custom-select.disabled:focus,
-.group-select.custom-select.focus.disabled,
-.group-select.custom-select.disabled:hover {
-  border-color: rgba(0, 40, 100, 0.12) !important;
-  box-shadow: unset;
-  cursor: default;
-}
-
-.group-select .sf3-font-down {
-  display: inline-block;
-  color: #999;
-  transform: translateY(2px);
-  transition: all 0.1s;
-  font-size: 14px !important;
-}
-
-.group-select .sf3-font-down:hover {
-  color: #666;
-}
-
-.group-select .selected-option {
-  display: flex;
-  flex: 1;
-  overflow: hidden;
-  flex-wrap: nowrap;
-  align-items: center;
-  justify-content: space-between;
-  background: #fff;
-}
-
-.group-select.dtable-ui-collaborator-selector .option-group .option-group-content {
-  padding: 10px;
-}
-
-.group-select.custom-select.dtable-ui-collaborator-selector .option-group .option-group-content {
-  padding: 10px 0;
-}
-
-.group-select.custom-select.dtable-ui-collaborator-selector .option {
-  padding: 5px 0 5px 10px !important;
-  line-height: 20px;
-}
-
-.group-select .select-placeholder {
-  line-height: 1;
-  font-size: 14px;
-  white-space: nowrap;
-}
-
-.group-select .selected-option-show {
-  display: flex;
-  flex-wrap: wrap;
-  gap: 4px;
-}
-
-.group-select .selected-option-show .selected-option-item {
-  background-color: rgb(240, 240, 240);
-  border-radius: 16px;
-  display: flex;
-  align-items: center;
-}
-
-.group-select .selected-option-show .selected-option-item .selected-option-item-name {
-  font-size: 13px;
-  color: #212529;
-}
-
-.group-select .selected-option-show .selected-option-item .dtable-icon-x {
-  cursor: pointer;
-  color: rgb(103, 103, 103);
-}