dtable-ui-component 5.3.1-beta1 → 6.0.0

package/lib/CheckboxEditor/index.css

@@ -4,11 +4,28 @@
   height: 24px;
 }
 
-.dtable-ui-checkbox-editor .dtable-ui-checkbox-check-mark {
+.dtable-ui-checkbox-editor .raw-checkbox {
+  position: absolute;
+  width: 100%;
+  height: 100%;
+  opacity: 0;
+}
+
+.dtable-ui-checkbox-editor .shown-checkbox {
+  height: 100%;
+  border: 2px solid #e0e0e0;
+  border-radius: 3px;
+}
+
+.dtable-ui-checkbox-editor .raw-checkbox:focus + .shown-checkbox {
+  border-color: #3b88fd;
+}
+
+.dtable-ui-checkbox-editor .shown-checkbox .dtable-icon-check-mark {
   display: flex;
   align-items: center;
   justify-content: center;
-  font-size: 16px;
-  font-weight: 600;
+  font-size: 14px;
   color: #20c933;
+  font-weight: 500;
 }

package/lib/CheckboxEditor/index.js

@@ -1,127 +1,64 @@
 "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 _utils = require("../utils/utils");
-var _constants = require("../constants");
+var _react = _interopRequireDefault(require("react"));
 require("./index.css");
-class CheckboxEditor extends _react.Component {
+class CheckboxEditor extends _react.default.Component {
   constructor(props) {
     super(props);
-    this.onKeyDown = event => {
-      const {
-        isEditorShow,
-        readOnly
+    this.onCommit = () => {
+      let updated = {};
+      let {
+        column
       } = this.props;
-      if (event.keyCode === _constants.keyCodes.Enter && isEditorShow && !readOnly) {
-        this.setState({
-          value: !this.state.value
-        });
-      }
-    };
-    this.getValue = () => {
-      const {
-        value
-      } = this.state;
-      return value;
+      updated[column.name] = this.state.value;
+      this.props.onCommit(updated);
     };
-    this.updateValue = value => {
-      if (value === this.state.value) {
+    this.onChange = event => {
+      if (this.props.isReadOnly) {
         return;
       }
       this.setState({
-        value
-      });
-    };
-    this.onChangeCheckboxValue = event => {
-      if (event) {
-        event.stopPropagation();
-        event.nativeEvent.stopImmediatePropagation();
-        event.persist();
-      }
-      const {
-        value
-      } = this.state;
-      const newValue = !value;
-      this.setState({
-        value: newValue
+        value: !this.state.value
       }, () => {
-        if (this.props.onCommit) {
-          this.props.onCommit(event);
-        }
-      });
-    };
-    this.renderIcon = (symbol, color) => {
-      const className = (0, _classnames.default)('dtable-ui-checkbox-check-mark', {
-        'dtable-ui-checkbox-check-svg': !(symbol !== null && symbol !== void 0 && symbol.startsWith('dtable-icon'))
-      });
-      if (symbol.startsWith('dtable-icon')) {
-        return /*#__PURE__*/_react.default.createElement("span", {
-          className: "dtable-font ".concat(symbol, " ").concat(className || ''),
-          style: {
-            color
-          }
-        });
-      }
-      return /*#__PURE__*/_react.default.createElement("span", {
-        className: "dtable-font dtable-icon-".concat(symbol, " ").concat(className || ''),
-        style: {
-          color
-        }
+        this.onCommit();
       });
     };
     this.state = {
-      value: props.value || false
+      value: props.value ? props.value : false
     };
   }
-  componentDidMount() {
-    document.addEventListener('keydown', this.onKeyDown);
-  }
-  componentWillUnmount() {
-    document.removeEventListener('keydown', this.onKeyDown);
-  }
-  componentDidUpdate(prevProps) {
-    const {
-      value
-    } = this.props;
-    if (value !== prevProps.value) {
-      this.setState({
-        value
-      });
-    }
-  }
   render() {
-    var _column$data;
-    const {
-      className,
-      style,
-      column
-    } = this.props;
     const {
       value
     } = this.state;
-    const checkboxProps = {
-      ...(!_utils.isMobile && {
-        onClick: this.onChangeCheckboxValue
-      }),
-      ...(_utils.isMobile && {
-        onTouchStart: this.onChangeCheckboxValue
-      })
+    const {
+      isReadOnly
+    } = this.props;
+    let style = {
+      cursor: isReadOnly ? 'default' : 'pointer'
     };
-    let checkboxStyle = column === null || column === void 0 ? void 0 : (_column$data = column.data) === null || _column$data === void 0 ? void 0 : _column$data.checkbox_style;
-    if (!checkboxStyle || Object.keys(checkboxStyle).length < 2) {
-      checkboxStyle = _constants.DEFAULT_CHECKBOX_MARK_STYLE;
-    }
-    return /*#__PURE__*/_react.default.createElement("div", Object.assign({
-      className: (0, _classnames.default)('dtable-ui-checkbox-editor', className),
-      style: style || {}
-    }, checkboxProps), value && this.renderIcon(checkboxStyle.type, checkboxStyle.color));
+    return /*#__PURE__*/_react.default.createElement("div", {
+      className: "dtable-ui-checkbox-editor",
+      style: style
+    }, /*#__PURE__*/_react.default.createElement("input", {
+      type: "checkbox",
+      className: "raw-checkbox",
+      checked: value,
+      onChange: this.onChange
+    }), /*#__PURE__*/_react.default.createElement("div", {
+      className: "shown-checkbox"
+    }, value && /*#__PURE__*/_react.default.createElement("span", {
+      className: "dtable-font dtable-icon-check-mark"
+    })));
   }
 }
+CheckboxEditor.defaultProps = {
+  isReadOnly: false,
+  value: false
+};
 var _default = exports.default = CheckboxEditor;

package/lib/CheckboxFormatter/index.js

@@ -8,7 +8,7 @@ exports.default = void 0;
 var _react = _interopRequireDefault(require("react"));
 var _classnames = _interopRequireDefault(require("classnames"));
 require("./index.css");
-const DEFAULT_CHECKBOX_MARK_STYLE = {
+const DAFAULT_CHECKBOX_MARK_STYLE = {
   type: 'check',
   color: '#1DDD1D'
 };
@@ -20,7 +20,7 @@ class CheckboxFormatter extends _react.default.PureComponent {
       checkboxStyle
     } = this.props;
     if (!checkboxStyle || !('type' in checkboxStyle && 'color' in checkboxStyle)) {
-      checkboxStyle = DEFAULT_CHECKBOX_MARK_STYLE;
+      checkboxStyle = DAFAULT_CHECKBOX_MARK_STYLE;
     }
     const currentValue = !!value;
     let classname = (0, _classnames.default)('dtable-ui cell-formatter-container checkbox-formatter d-flex align-items-center justify-content-center', containerClassName);
@@ -32,12 +32,15 @@ class CheckboxFormatter extends _react.default.PureComponent {
       style: {
         color: checkboxStyle.color
       }
-    }) : /*#__PURE__*/_react.default.createElement("span", {
-      className: "dtable-font dtable--icon-".concat(checkboxStyle.type, " checkbox-checked-mark"),
+    }) : /*#__PURE__*/_react.default.createElement("svg", {
       style: {
-        color: checkboxStyle.color
+        width: '16px',
+        height: '16px',
+        fill: checkboxStyle.color
       }
-    }));
+    }, /*#__PURE__*/_react.default.createElement("use", {
+      xlinkHref: "#".concat(checkboxStyle.type)
+    })));
   }
 }
 CheckboxFormatter.defaultProps = {

package/lib/CollaboratorEditor/index.css

@@ -1,22 +1,28 @@
-.dtable-ui-collaborator-editor-container {
+.dtable-ui-collaborator-editor {
   position: relative;
 }
 
-.dtable-ui-collaborator-editor-container .collaborator-search-container {
+.dtable-ui-collaborator-editor-popover .collaborator-search-container {
   padding: 10px 10px 0 10px;
 }
 
-.dtable-ui-collaborator-editor-container .collaborator-search-container input {
+.dtable-ui-collaborator-editor-popover .collaborator-search-container input {
   height: 28px;
 }
 
-.dtable-ui-collaborator-editor-container .collaborator-list-container {
+.dtable-ui-collaborator-editor-popover .collaborator-list-container {
   min-height: 160px;
   max-height: 200px;
   margin: 10px 0;
   overflow: auto;
 }
-.dtable-ui-collaborator-editor-container .collaborator-list-container .collaborator-item-container {
+
+.dtable-ui-collaborator-editor-popover .collaborator-list-container .no-search-result {
+  color: #666666;
+  padding-left: 10px;
+}
+
+.dtable-ui-collaborator-editor-popover .collaborator-list-container .collaborator-item-container {
   display: flex;
   align-items: center;
   justify-content: space-between;
@@ -26,22 +32,39 @@
   cursor: pointer;
 }
 
-.dtable-ui-collaborator-editor-container .collaborator-list-container .collaborator-item-container:hover,
-.dtable-ui-collaborator-editor-container .collaborator-list-container .collaborator-item-container-highlight {
-  background: #f5f5f5;
-  cursor: pointer;
+.dtable-ui-collaborator-editor-popover .collaborator-list-container .collaborator-item-container:hover {
+  background-color: #f5f5f5;
 }
 
-.dtable-ui-collaborator-editor-container .dtable-ui.collaborator-item {
+.dtable-ui-collaborator-editor-popover .dtable-ui.collaborator-item {
   background: none;
 }
 
-.dtable-ui-collaborator-editor-container .collaborator-checked {
+.dtable-ui-collaborator-editor-popover .collaborator-checked {
   width: 20px;
   text-align: center;
 }
 
-.dtable-ui-collaborator-editor-container .collaborator-checked .dtable-font {
+.dtable-ui-collaborator-editor-popover .collaborator-checked .dtable-font {
   font-size: 12px;
   color: #798d99;
 }
+
+.dtable-ui-collaborator-editor .dtable-ui-collaborator-editor-container-no-btn {
+  min-height: 40px;
+  padding: 0.375rem 0.75rem;
+  border: 1px solid rgba(0, 40, 100, 0.12);
+  border-radius: 3px;
+  transition: border-color .15s ease-in-out;
+}
+
+.dtable-ui-collaborator-editor .dtable-ui-collaborator-editor-container-no-btn .collaborators-container {
+  min-height: 26px;
+  display: flex;
+  align-items: center;
+  flex-wrap: wrap;
+}
+
+.dtable-ui-collaborator-editor .dtable-ui-collaborator-editor-container-no-btn .collaborators-container .collaborator-item {
+  margin: 2px 10px 2px 0;
+}

package/lib/CollaboratorEditor/index.js

@@ -1,29 +1,223 @@
 "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 = _interopRequireDefault(require("react"));
+var _react = _interopRequireWildcard(require("react"));
 var _reactResponsive = _interopRequireDefault(require("react-responsive"));
-var _pcCollaboratorEditor = _interopRequireDefault(require("./pc-collaborator-editor"));
-var _mbCollaboratorEditor = _interopRequireDefault(require("./mb-collaborator-editor"));
+var _lang = require("../lang");
+var _modalPortal = _interopRequireDefault(require("../common/modal-portal"));
+var _CollaboratorItem = _interopRequireDefault(require("../CollaboratorItem"));
+var _EditEditorButton = _interopRequireDefault(require("../EditEditorButton"));
+var _pcCollaboratorEditorPopover = _interopRequireDefault(require("./pc-collaborator-editor-popover"));
+var _mbCollaboratorEditorPopover = _interopRequireDefault(require("./mb-collaborator-editor-popover"));
 require("./index.css");
-const CollaboratorEditor = _ref => {
-  let {
-    value: oldValue,
-    ...props
-  } = _ref;
-  const value = Array.isArray(oldValue) ? oldValue : [];
-  return /*#__PURE__*/_react.default.createElement(_react.default.Fragment, null, /*#__PURE__*/_react.default.createElement(_reactResponsive.default, {
-    query: '(min-width: 768px)'
-  }, /*#__PURE__*/_react.default.createElement(_pcCollaboratorEditor.default, Object.assign({}, props, {
-    value: value
-  }))), /*#__PURE__*/_react.default.createElement(_reactResponsive.default, {
-    query: '(max-width: 767.8px)'
-  }, /*#__PURE__*/_react.default.createElement(_mbCollaboratorEditor.default, Object.assign({}, props, {
-    value: value
-  }))));
+class CollaboratorEditor extends _react.default.Component {
+  constructor(props) {
+    super(props);
+    this.onMouseDown = e => {
+      if (this.state.isPopoverShow && this.editorPopoverRef) {
+        if (this.editorPopoverRef === e.target || this.editorPopoverRef.contains(e.target)) {
+          return;
+        }
+      }
+      if (this.editorContainer !== e.target && !this.editorContainer.contains(e.target)) {
+        this.onClosePopover();
+      }
+    };
+    this.getFormattedCollaborators = () => {
+      let {
+        newValue
+      } = this.state;
+      if (Array.isArray(newValue) && newValue.length > 0) {
+        const {
+          collaborators
+        } = this.props;
+        return newValue.map(collaboratorEmail => {
+          return collaborators.find(collaborator => collaborator.email === collaboratorEmail);
+        }).filter(collaborator => !!collaborator);
+      }
+      return [];
+    };
+    this.togglePopover = event => {
+      event.nativeEvent.stopImmediatePropagation();
+      event.stopPropagation();
+      if (this.props.isReadOnly) {
+        return;
+      }
+      let isPopoverShow = !this.state.isPopoverShow;
+      if (isPopoverShow) {
+        let popoverPosition = this.caculatePopoverPosition();
+        this.setState({
+          isPopoverShow,
+          popoverPosition
+        });
+      } else {
+        this.setState({
+          isPopoverShow
+        });
+      }
+    };
+    this.onCommit = newValue => {
+      let updated = {};
+      let {
+        column
+      } = this.props;
+      updated[column.name] = newValue;
+      this.props.onCommit(updated);
+    };
+    this.onCollaboratorItemToggle = collaborator => {
+      let newValue = this.state.newValue.slice();
+      let collaboratorIndex = newValue.findIndex(collaboratorEmail => collaboratorEmail === collaborator.email);
+      if (collaboratorIndex !== -1) {
+        newValue.splice(collaboratorIndex, 1);
+      } else {
+        newValue.push(collaborator.email);
+      }
+      this.setState({
+        newValue
+      }, () => {
+        this.onCommit(newValue);
+      });
+    };
+    this.onDeleteCollaborator = collaborator => {
+      let newValue = this.state.newValue.slice();
+      let optionIndex = newValue.findIndex(collaboratorEmail => collaboratorEmail === collaborator.email);
+      if (optionIndex > -1) {
+        newValue.splice(optionIndex, 1);
+        this.setState({
+          newValue
+        }, () => {
+          this.onCommit(newValue);
+        });
+      }
+    };
+    this.caculatePopoverPosition = () => {
+      if (this.props.isInModel) {
+        const {
+          top,
+          left
+        } = this.editor.getBoundingClientRect();
+        return {
+          top: top + 40,
+          left,
+          zIndex: 1051
+        };
+      }
+      const POPOVER_MAX_HEIGHT = 200;
+      let innerHeight = window.innerHeight;
+      let {
+        top,
+        height
+      } = this.editor.getClientRects()[0];
+      let isBelow = innerHeight - (top + height) > POPOVER_MAX_HEIGHT;
+      let position = {
+        top: height + 1,
+        left: 0
+      };
+      if (!isBelow) {
+        let bottom = height + 1;
+        position = {
+          bottom: bottom,
+          left: 0
+        };
+      }
+      return position;
+    };
+    this.onClosePopover = () => {
+      this.setState({
+        isPopoverShow: false
+      });
+    };
+    this.onClickContainer = e => {
+      e.stopPropagation();
+      if (!this.props.isShowEditButton && !this.state.isPopoverShow) {
+        this.setState({
+          isPopoverShow: true,
+          popoverPosition: this.caculatePopoverPosition()
+        });
+      }
+    };
+    this.setEditorContainerRef = editorContainer => {
+      this.editorContainer = editorContainer;
+    };
+    this.setEditorRef = editor => {
+      this.editor = editor;
+    };
+    this.setPopoverRef = ref => {
+      this.editorPopoverRef = ref;
+    };
+    this.state = {
+      newValue: Array.isArray(props.value) ? props.value : [],
+      isPopoverShow: false,
+      popoverPosition: {}
+    };
+  }
+  componentDidMount() {
+    document.addEventListener('mousedown', this.onMouseDown);
+  }
+  componentWillUnmount() {
+    document.removeEventListener('mousedown', this.onMouseDown);
+  }
+  render() {
+    let {
+      collaborators,
+      isReadOnly,
+      isShowEditButton
+    } = this.props;
+    let {
+      isPopoverShow,
+      popoverPosition
+    } = this.state;
+    let selectedCollaborators = this.getFormattedCollaborators();
+    let enableDeleteCollaborator = !isReadOnly;
+    return /*#__PURE__*/_react.default.createElement("div", {
+      ref: this.setEditorContainerRef,
+      className: "dtable-ui-collaborator-editor"
+    }, /*#__PURE__*/_react.default.createElement("div", {
+      ref: this.setEditorRef,
+      className: "dtable-ui-collaborator-editor-container ".concat(isShowEditButton ? '' : 'dtable-ui-collaborator-editor-container-no-btn'),
+      onClick: this.onClickContainer
+    }, isShowEditButton && /*#__PURE__*/_react.default.createElement(_EditEditorButton.default, {
+      text: (0, _lang.getLocale)('Add_a_collaborator'),
+      onClick: this.togglePopover
+    }), selectedCollaborators.length > 0 && /*#__PURE__*/_react.default.createElement("div", {
+      className: "collaborators-container ".concat(isShowEditButton ? 'mt-2' : '')
+    }, selectedCollaborators.map(collaborator => {
+      return /*#__PURE__*/_react.default.createElement(_CollaboratorItem.default, {
+        key: collaborator.email,
+        collaborator: collaborator,
+        enableDeleteCollaborator: enableDeleteCollaborator,
+        onDeleteCollaborator: this.onDeleteCollaborator
+      });
+    }))), isPopoverShow && /*#__PURE__*/_react.default.createElement(_react.Fragment, null, /*#__PURE__*/_react.default.createElement(_reactResponsive.default, {
+      query: '(min-width: 768px)'
+    }, /*#__PURE__*/_react.default.createElement(_modalPortal.default, null, /*#__PURE__*/_react.default.createElement(_pcCollaboratorEditorPopover.default, {
+      popoverPosition: popoverPosition,
+      isReadOnly: this.props.isReadOnly,
+      selectedCollaborators: selectedCollaborators,
+      collaborators: collaborators,
+      onCollaboratorItemToggle: this.onCollaboratorItemToggle,
+      setPopoverRef: this.setPopoverRef
+    }))), /*#__PURE__*/_react.default.createElement(_reactResponsive.default, {
+      query: '(max-width: 767.8px)'
+    }, /*#__PURE__*/_react.default.createElement(_mbCollaboratorEditorPopover.default, {
+      isReadOnly: this.props.isReadOnly,
+      value: this.state.newValue,
+      column: this.props.column,
+      collaborators: this.props.collaborators,
+      onCollaboratorItemToggle: this.onCollaboratorItemToggle,
+      onClosePopover: this.onClosePopover
+    }))));
+  }
+}
+CollaboratorEditor.defaultProps = {
+  isShowEditButton: true,
+  isReadOnly: false,
+  value: [],
+  isInModel: false
 };
 var _default = exports.default = CollaboratorEditor;