dtable-ui-component 5.3.1-beta6 → 5.3.2

package/lib/{RowExpandFormatter/RowExpandUrlFormatter → RowExpandUrlFormatter}/index.js

@@ -7,9 +7,8 @@ Object.defineProperty(exports, "__esModule", {
 exports.default = void 0;
 var _react = _interopRequireDefault(require("react"));
 var _classnames = _interopRequireDefault(require("classnames"));
-var _toaster = _interopRequireDefault(require("../../toaster"));
-var _editorUtils = require("../../utils/editor-utils");
-var _utils = require("../../utils/utils");
+var _toaster = _interopRequireDefault(require("../toaster"));
+var _editorUtils = require("../utils/editor-utils");
 require("./index.css");
 class UrlFormatter extends _react.default.Component {
   constructor() {
@@ -19,7 +18,7 @@ class UrlFormatter extends _react.default.Component {
         value
       } = this.props;
       const url = (0, _editorUtils.getTrimmedString)(value);
-      const validUrl = (0, _utils.isValidUrl)(url) ? url : "http://".concat(url);
+      const validUrl = (0, _editorUtils.isValidUrl)(url) ? url : "http://".concat(url);
       try {
         let a = document.createElement('a');
         document.body.appendChild(a);

package/lib/SingleSelectEditor/index.css

@@ -0,0 +1,14 @@
+.dtable-ui-single-select-editor {
+  position: relative;
+}
+
+.dtable-ui-single-select-option-container {
+  height: 40px;
+  padding: 10px 5px;
+  border-radius: 3px;
+  cursor: pointer;
+}
+
+.dtable-ui-single-select-option-container:hover {
+  background-color: #f5f5f5;
+}

package/lib/SingleSelectEditor/index.js

@@ -1,27 +1,167 @@
 "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 _lang = require("../lang");
+var _EditEditorButton = _interopRequireDefault(require("../EditEditorButton"));
 var _selectEditor = require("../select-editor");
-const SingleSelectEditor = _ref => {
-  let {
-    value: oldValue,
-    ...props
-  } = _ref;
-  const value = 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(_selectEditor.PCSelectEditor, Object.assign({}, props, {
-    value: value
-  }))), /*#__PURE__*/_react.default.createElement(_reactResponsive.default, {
-    query: "(max-width: 767.8px)"
-  }, /*#__PURE__*/_react.default.createElement(_selectEditor.MBSelectEditor, Object.assign({}, props, {
-    value: value
-  }))));
+require("./index.css");
+class SingleSelectEditor extends _react.default.Component {
+  constructor(props) {
+    super(props);
+    this.onMouseDown = e => {
+      if (this.editorContainer !== e.target && !this.editorContainer.contains(e.target)) {
+        this.onClosePopover();
+      }
+    };
+    this.formatOption = () => {
+      let {
+        newValue
+      } = this.state;
+      let option = this.options.find(option => option.name === newValue);
+      return option;
+    };
+    this.onAddOptionToggle = 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.onOptionItemToggle = option => {
+      let newValue = this.state.newValue === option.name ? '' : option.name;
+      this.setState({
+        newValue
+      }, () => {
+        this.onCommit(newValue);
+        this.onClosePopover();
+      });
+    };
+    this.caculatePopoverPosition = () => {
+      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.onAddNewOption = optionName => {
+      this.props.onAddNewOption(optionName);
+      this.onClosePopover();
+    };
+    this.onClosePopover = () => {
+      this.setState({
+        isPopoverShow: false
+      });
+    };
+    this.setEditorContainerRef = editorContainer => {
+      this.editorContainer = editorContainer;
+    };
+    this.setEditorRef = editor => {
+      this.editor = editor;
+    };
+    this.state = {
+      newValue: props.value,
+      isPopoverShow: false,
+      popoverPosition: {}
+    };
+    let {
+      column: _column
+    } = this.props;
+    this.options = _column.data && (_column.data.options || []);
+  }
+  componentDidMount() {
+    document.addEventListener('mousedown', this.onMouseDown);
+  }
+  componentWillUnmount() {
+    document.removeEventListener('mousedown', this.onMouseDown);
+  }
+  render() {
+    let {
+      isPopoverShow,
+      popoverPosition
+    } = this.state;
+    let option = this.formatOption();
+    let options = this.options;
+    let selectedOptions = option ? [option] : [];
+    return /*#__PURE__*/_react.default.createElement("div", {
+      ref: this.setEditorContainerRef,
+      className: "dtable-ui-single-select-editor"
+    }, /*#__PURE__*/_react.default.createElement("div", {
+      ref: this.setEditorRef,
+      className: option ? '' : 'd-inline-block',
+      onClick: this.onAddOptionToggle
+    }, option ? /*#__PURE__*/_react.default.createElement("div", {
+      className: "dtable-ui-single-select-option-container"
+    }, /*#__PURE__*/_react.default.createElement(_selectEditor.SelectEditorOption, {
+      option: option
+    })) : /*#__PURE__*/_react.default.createElement(_EditEditorButton.default, {
+      text: (0, _lang.getLocale)('Add_an_option')
+    })), isPopoverShow && /*#__PURE__*/_react.default.createElement(_react.Fragment, null, /*#__PURE__*/_react.default.createElement(_reactResponsive.default, {
+      query: "(min-width: 768px)"
+    }, /*#__PURE__*/_react.default.createElement(_selectEditor.PCSelectEditorPopover, {
+      popoverPosition: popoverPosition,
+      options: options,
+      selectedOptions: selectedOptions,
+      onOptionItemToggle: this.onOptionItemToggle,
+      isSupportNewOption: this.props.isSupportNewOption,
+      onAddNewOption: this.onAddNewOption
+    })), /*#__PURE__*/_react.default.createElement(_reactResponsive.default, {
+      query: "(max-width: 767.8px)"
+    }, /*#__PURE__*/_react.default.createElement(_selectEditor.MBSelectEditorPopover, {
+      isReadOnly: this.props.isReadOnly,
+      value: [this.state.newValue],
+      column: this.props.column,
+      options: options,
+      onOptionItemToggle: this.onOptionItemToggle,
+      isShowRemoveIcon: true,
+      isSupportNewOption: this.props.isSupportNewOption,
+      onAddNewOption: this.onAddNewOption,
+      onClosePopover: this.onClosePopover
+    }))));
+  }
+}
+SingleSelectEditor.defaultProps = {
+  isReadOnly: false,
+  value: ''
 };
 var _default = exports.default = SingleSelectEditor;

package/lib/TextEditor/index.js

@@ -1,152 +1,81 @@
 "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 _reactDom = _interopRequireDefault(require("react-dom"));
-var _classnames = _interopRequireDefault(require("classnames"));
-var _utils = require("../utils/utils");
-var _constants = require("../constants");
-var _cellComparer = require("../utils/cell-comparer");
-class TextEditor extends _react.Component {
+var _react = _interopRequireDefault(require("react"));
+var _isHotkey = _interopRequireDefault(require("is-hotkey"));
+var _reactstrap = require("reactstrap");
+class TextEditor extends _react.default.Component {
   constructor(props) {
     super(props);
-    this.getValue = () => {
-      const {
-        value
+    this.onCommit = () => {
+      let updated = {};
+      let {
+        column
+      } = this.props;
+      let {
+        newValue
       } = this.state;
-      const text = (0, _utils.getTrimmedString)(value) || null;
-      return text;
-    };
-    this.updateValue = (value, callback) => {
-      if (value === this.state.value) {
-        return;
-      }
-      this.setState({
-        value
-      }, () => {
-        callback && callback();
-      });
-    };
-    this.focusInput = () => {
-      this.input && this.input.focus();
-    };
-    this.blurInput = () => {
-      this.input && this.input.blur();
+      updated[column.name] = newValue ? newValue.trim() : '';
+      this.props.onCommit(updated);
     };
     this.onBlur = () => {
-      this.props.onCommit();
-    };
-    this.onPaste = e => {
-      e.stopPropagation();
-    };
-    this.onCut = e => {
-      e.stopPropagation();
+      this.onCommit();
     };
     this.onChange = event => {
-      event.persist();
-      const value = event.target.value;
+      let value = event.target.value;
       this.setState({
-        value
-      }, () => {
-        if (this.props.onChange) {
-          this.props.onChange(event);
-        }
+        newValue: value
       });
     };
-    this.onInputKeyDown = e => {
-      const {
+    this.onKeyDown = event => {
+      let {
         selectionStart,
         selectionEnd,
         value
-      } = e.currentTarget;
-      if (e.keyCode === _constants.keyCodes.Enter) {
-        e.preventDefault();
-        this.onBlur();
-        if (this.props.selectDownCell) this.props.selectDownCell();
-      } else if (e.keyCode === _constants.keyCodes.ChineseInputMethod || e.keyCode === _constants.keyCodes.LeftArrow && selectionStart === 0 || e.keyCode === _constants.keyCodes.RightArrow && selectionEnd === value.length) {
-        e.stopPropagation();
-      }
-      if (this.props.onKeyDown) {
-        this.props.onKeyDown(e);
-      }
-    };
-    this.onClick = event => {
-      if (this.props.onInputClick) {
-        this.props.onInputClick(event);
+      } = event.currentTarget;
+      if ((0, _isHotkey.default)('enter', event)) {
+        event.preventDefault();
+        event.target.blur();
+      } else if (event.keyCode === 37 && selectionStart === 0 || event.keyCode === 39 && selectionEnd === value.length) {
+        event.stopPropagation();
       }
     };
-    this.onCompositionStart = event => {
-      if (this.props.onCompositionStart) {
-        this.props.onCompositionStart(event);
-      }
-    };
-    this.onCompositionEnd = event => {
-      if (this.props.onCompositionEnd) {
-        this.props.onCompositionEnd(event);
-      }
-      this.onChange(event);
+    this.onPaste = e => {
+      e.stopPropagation();
     };
-    this.getInputNode = () => {
-      const domNode = _reactDom.default.findDOMNode(this.input);
-      if (domNode.tagName === 'INPUT') {
-        return domNode;
-      }
-      return domNode.querySelector('input:not([type=hidden])');
+    this.onCut = e => {
+      e.stopPropagation();
     };
     this.setInputRef = input => {
       this.input = input;
-      return this.input;
     };
     this.state = {
-      value: props.value || ''
+      newValue: props.value
     };
   }
-  UNSAFE_componentWillReceiveProps(nextProps) {
-    const {
-      value: oldValue,
-      column
-    } = this.props;
-    const {
-      value: newValue
-    } = nextProps;
-    if ((0, _cellComparer.isCellValueChanged)(oldValue, newValue, column.type)) {
-      this.setState({
-        value: newValue || ''
-      });
-    }
-  }
   render() {
     const {
-      column,
-      className,
-      placeholder
+      isReadOnly
     } = this.props;
-    const {
-      value
-    } = this.state;
-    return /*#__PURE__*/_react.default.createElement(_react.default.Fragment, null, /*#__PURE__*/_react.default.createElement("input", {
-      type: "text",
-      className: (0, _classnames.default)('form-control', className),
+    return /*#__PURE__*/_react.default.createElement(_reactstrap.Input, {
       ref: this.setInputRef,
-      placeholder: placeholder || '',
+      type: "text",
+      value: this.state.newValue,
+      readOnly: isReadOnly,
+      onChange: this.onChange,
+      onKeyDown: this.onKeyDown,
       onBlur: this.onBlur,
       onCut: this.onCut,
-      onPaste: this.onPaste,
-      value: value,
-      name: column.name,
-      title: column.name,
-      "aria-label": column.name,
-      onChange: this.onChange,
-      onKeyDown: this.onInputKeyDown,
-      onClick: this.onClick,
-      onCompositionStart: this.onCompositionStart,
-      onCompositionEnd: this.onCompositionEnd
-    }));
+      onPaste: this.onPaste
+    });
   }
 }
+TextEditor.defaultProps = {
+  isReadOnly: false,
+  value: ''
+};
 var _default = exports.default = TextEditor;

package/lib/constants/index.js

@@ -1,6 +1,5 @@
 "use strict";
 
-var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault").default;
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
@@ -11,22 +10,15 @@ Object.defineProperty(exports, "CellType", {
     return _dtableUtils.CellType;
   }
 });
-exports.FORMAT_REG_EXP_LIST = exports.FILE_EDITOR_STATUS = exports.EVENT_BUS_TYPE = exports.DELETED_OPTION_TIPS = exports.DELETED_OPTION_BACKGROUND_COLOR = exports.DEFAULT_CHECKBOX_MARK_STYLE = exports.DATE_TYPES = void 0;
+exports.EVENT_BUS_TYPE = exports.DATE_TYPES = void 0;
 Object.defineProperty(exports, "FORMULA_RESULT_TYPE", {
   enumerable: true,
   get: function () {
     return _dtableUtils.FORMULA_RESULT_TYPE;
   }
 });
-exports.SIMPLE_CELL_FORMULA_RESULTS = exports.SIMPLE_CELL_COLUMNS = exports.ROW_EXPAND_FOCUS_STYLE = exports.ROW_EXPAND_BTN_FOCUS_STYLE = exports.NUMBER_TYPES = exports.LONG_TEXT_LENGTH_LIMIT = exports.LONG_TEXT_EXCEED_LIMIT_SUGGEST = exports.LONG_TEXT_EXCEED_LIMIT_MESSAGE = exports.KeyCodes = void 0;
-Object.defineProperty(exports, "keyCodes", {
-  enumerable: true,
-  get: function () {
-    return _keyCodes.default;
-  }
-});
+exports.SIMPLE_CELL_FORMULA_RESULTS = exports.SIMPLE_CELL_COLUMNS = exports.NUMBER_TYPES = void 0;
 var _dtableUtils = require("dtable-utils");
-var _keyCodes = _interopRequireDefault(require("./key-codes"));
 const NUMBER_TYPES = exports.NUMBER_TYPES = {
   'NUMBER': 'number',
   'NUMBER_WITH_COMMAS': 'number-with-commas',
@@ -49,28 +41,4 @@ const ARRAY_FORMAT_COLUMNS = exports.ARRAY_FORMAT_COLUMNS = [_dtableUtils.CellTy
 const SIMPLE_CELL_FORMULA_RESULTS = exports.SIMPLE_CELL_FORMULA_RESULTS = [_dtableUtils.FORMULA_RESULT_TYPE.NUMBER, _dtableUtils.FORMULA_RESULT_TYPE.STRING, _dtableUtils.FORMULA_RESULT_TYPE.DATE, _dtableUtils.FORMULA_RESULT_TYPE.BOOL];
 const EVENT_BUS_TYPE = exports.EVENT_BUS_TYPE = {
   OPEN_SELECT: 'open-select'
-};
-const DEFAULT_CHECKBOX_MARK_STYLE = exports.DEFAULT_CHECKBOX_MARK_STYLE = {
-  type: 'check',
-  color: '#1DDD1D'
-};
-const ROW_EXPAND_FOCUS_STYLE = exports.ROW_EXPAND_FOCUS_STYLE = {
-  border: '2px solid #3B88FD'
-};
-const ROW_EXPAND_BTN_FOCUS_STYLE = exports.ROW_EXPAND_BTN_FOCUS_STYLE = {
-  border: '2px solid #3B88FD'
-};
-const FORMAT_REG_EXP_LIST = exports.FORMAT_REG_EXP_LIST = {
-  'chinese_id_card': /^[1-9]\d{5}(18|19|20)\d{2}((0[1-9])|(1[0-2]))(([0-2][1-9])|10|20|30|31)\d{3}[0-9Xx]$/,
-  'chinese_telephone_number': /^1(3[0-9]|4[01456879]|5[0-35-9]|6[2567]|7[0-8]|8[0-9]|9[0-35-9])\d{8}$/
-};
-const DELETED_OPTION_BACKGROUND_COLOR = exports.DELETED_OPTION_BACKGROUND_COLOR = '#eaeaea';
-const DELETED_OPTION_TIPS = exports.DELETED_OPTION_TIPS = 'Deleted_option';
-const KeyCodes = exports.KeyCodes = _keyCodes.default;
-const LONG_TEXT_EXCEED_LIMIT_MESSAGE = exports.LONG_TEXT_EXCEED_LIMIT_MESSAGE = 'Long_text_exceed_limit_message';
-const LONG_TEXT_EXCEED_LIMIT_SUGGEST = exports.LONG_TEXT_EXCEED_LIMIT_SUGGEST = 'Long_text_exceed_limit_suggest';
-const LONG_TEXT_LENGTH_LIMIT = exports.LONG_TEXT_LENGTH_LIMIT = 10 * 10000;
-const FILE_EDITOR_STATUS = exports.FILE_EDITOR_STATUS = {
-  PREVIEWER: 'previewer',
-  ADDITION: 'addition'
 };

package/lib/css/cell-editor.css

@@ -1,23 +1,7 @@
-.dtable-ui-editor-container {
+.dtable-ui-editor-popover {
   width: 300px;
+  max-width: 100%;
   box-shadow: 0 0 5px #ccc;
   background-color: #fff;
   z-index: 10;
 }
-
-.dtable-ui.collaborator-item.dtable-ui-unknown-collaborator .collaborator-avatar {
-  display: none;
-}
-
-.dtable-ui.collaborator-item.dtable-ui-unknown-collaborator {
-  padding-left: 8px;
-}
-
-
-.dtable-ui-editor-container .dtable-ui-editor-no-search-result {
-  color: #666666;
-  font-size: 14px;
-  padding-left: 10px;
-  padding: 10px;
-  overflow: auto;
-}