dtable-ui-component 6.0.29-beta9 → 6.0.29

package/lib/RowExpandEditor/{department-editor/pc-editor.js → RowExpandDepartmentEditor/index.js}

@@ -8,63 +8,71 @@ Object.defineProperty(exports, "__esModule", {
 exports.default = void 0;
 var _react = _interopRequireWildcard(require("react"));
 var _classnames = _interopRequireDefault(require("classnames"));
+var _hooks = require("../../hooks");
 var _DepartmentSingleSelectFormatter = _interopRequireDefault(require("../../DepartmentSingleSelectFormatter"));
 var _constants = require("../../constants");
-var _DepartmentSingleSelectEditor = _interopRequireDefault(require("../../DepartmentSingleSelectEditor"));
-const RowExpandPCDepartmentEditor = _ref => {
-  let {
+var _departmentSingleSelect = _interopRequireDefault(require("../../Department-editor/department-single-select"));
+function RowExpandDepartmentEditor(props) {
+  const {
     row,
     column,
     valueKey,
     departments,
     userDepartmentIdsMap,
     isEditorFocus,
-    columnIndex,
-    onCommit,
-    updateTabIndex
-  } = _ref;
+    columnIndex
+  } = props;
   const [value, setValue] = (0, _react.useState)(row[column[valueKey]] || '');
   const [showEditor, setShowEditor] = (0, _react.useState)(false);
   const departmentSelectContainer = (0, _react.useRef)(null);
   const departmentSelectContent = (0, _react.useRef)(null);
-  const onKeyDown = (0, _react.useCallback)(event => {
-    if (event.keyCode === _constants.KeyCodes.Enter && isEditorFocus && !showEditor) {
-      setShowEditor(true);
-    } else if (event.keyCode === _constants.KeyCodes.Escape && showEditor) {
-      event.stopPropagation();
-      setShowEditor(false);
-      departmentSelectContent.current.focus();
-    }
-  }, [isEditorFocus, showEditor]);
-  const onToggleSelect = (0, _react.useCallback)(event => {
-    event.preventDefault();
-    event.stopPropagation();
-    updateTabIndex(columnIndex);
-    setShowEditor(true);
-  }, [columnIndex, updateTabIndex]);
-  const onFocus = (0, _react.useCallback)(() => {
-    updateTabIndex(columnIndex);
-  }, [columnIndex, updateTabIndex]);
-  const handleCommit = (0, _react.useCallback)(newValue => {
-    setShowEditor(false);
-    if (newValue === value) return;
-    setValue(newValue);
-    onCommit(newValue);
-  }, [value, onCommit]);
-  const closeEditor = (0, _react.useCallback)(() => {
-    setShowEditor(false);
-  }, []);
+  (0, _hooks.useClickOutside)({
+    currDOM: departmentSelectContainer.current,
+    onClickOutside: hideDropDownMenu
+  }, [isEditorFocus, value]);
   (0, _react.useEffect)(() => {
     document.addEventListener('keydown', onKeyDown);
     return () => {
       document.removeEventListener('keydown', onKeyDown);
     };
-  }, [onKeyDown]);
+    // eslint-disable-next-line
+  }, [isEditorFocus, showEditor]);
   (0, _react.useEffect)(() => {
     setValue(row[column[valueKey]] || '');
     setShowEditor(false);
     // eslint-disable-next-line
-  }, [row, column]);
+  }, [row]);
+  function hideDropDownMenu(event) {
+    if (!event.target) return;
+    toggleDepartmentSelect(false);
+  }
+  function onKeyDown(e) {
+    if (e.keyCode === _constants.KeyCodes.Enter && props.isEditorFocus && !showEditor) {
+      setShowEditor(true);
+    } else if (e.keyCode === _constants.KeyCodes.Escape && showEditor) {
+      e.stopPropagation();
+      setShowEditor(false);
+      departmentSelectContent.current.focus();
+    }
+  }
+  function toggleDepartmentSelect(value) {
+    setShowEditor(value);
+  }
+  function onToggleSelect(e) {
+    e.preventDefault();
+    e.stopPropagation();
+    props.updateTabIndex(columnIndex);
+    toggleDepartmentSelect(true);
+  }
+  function onFocus() {
+    props.updateTabIndex(columnIndex);
+  }
+  function onCommit(newValue) {
+    toggleDepartmentSelect(false);
+    if (newValue === value) return;
+    setValue(newValue);
+    props.onCommit(newValue);
+  }
   return /*#__PURE__*/_react.default.createElement("div", {
     className: "position-relative w-100",
     ref: departmentSelectContainer
@@ -84,16 +92,13 @@ const RowExpandPCDepartmentEditor = _ref => {
   })), /*#__PURE__*/_react.default.createElement("i", {
     "aria-hidden": "true",
     className: "dtable-font dtable-icon-down3"
-  }))), showEditor && /*#__PURE__*/_react.default.createElement(_DepartmentSingleSelectEditor.default, {
-    isInModal: true,
+  }))), showEditor && /*#__PURE__*/_react.default.createElement(_departmentSingleSelect.default, {
     enableSelectRange: false,
-    target: departmentSelectContent.current,
     column: column,
     value: value,
-    onCommit: handleCommit,
+    onCommit: onCommit,
     userDepartmentIdsMap: userDepartmentIdsMap,
-    departments: departments,
-    toggleDepartmentSelect: closeEditor
+    departments: departments
   }));
-};
-var _default = exports.default = RowExpandPCDepartmentEditor;
+}
+var _default = exports.default = RowExpandDepartmentEditor;

package/lib/RowExpandEditor/{digital-sign-editor/pc-editor → RowExpandDigitalSignEditor}/index.css

@@ -1,4 +1,4 @@
-@import url('../../image-editor/pc-editor/index.css');
+@import url('../RowExpandImageEditor/index.css');
 
 .dtable-ui-row-expand-digital-sign-container .dtable-ui-image-thumbnail {
   max-width: 200px;

package/lib/RowExpandEditor/{digital-sign-editor/pc-editor → RowExpandDigitalSignEditor}/index.js

@@ -6,16 +6,16 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.default = void 0;
 var _react = _interopRequireDefault(require("react"));
-var _ImagePreviewerLightbox = _interopRequireDefault(require("../../../ImagePreviewerLightbox"));
-var _ImageThumbnail = _interopRequireDefault(require("../../../ImageThumbnail"));
-var _utils = _interopRequireDefault(require("../../../DigitalSignEditor/utils"));
-var _constants = require("../../../constants");
-var _addBtn = _interopRequireDefault(require("../../add-btn"));
-var _DigitalSignEditor = _interopRequireDefault(require("../../../DigitalSignEditor"));
-var _lang = require("../../../lang");
-var _url = require("../../../utils/url");
+var _ImagePreviewerLightbox = _interopRequireDefault(require("../../ImagePreviewerLightbox"));
+var _ImageThumbnail = _interopRequireDefault(require("../../ImageThumbnail"));
+var _utils = _interopRequireDefault(require("../../DigitalSignEditor/utils"));
+var _constants = require("../../constants");
+var _RowExpandAddBtn = _interopRequireDefault(require("../RowExpandAddBtn"));
+var _DigitalSignEditor = _interopRequireDefault(require("../../DigitalSignEditor"));
+var _lang = require("../../lang");
+var _url = require("../../utils/url");
 require("./index.css");
-class RowExpandPCDigitalSignEditor extends _react.default.Component {
+class RowExpandDigitalSignEditor extends _react.default.Component {
   constructor(props) {
     super(props);
     this.onKeyDown = e => {
@@ -176,7 +176,7 @@ class RowExpandPCDigitalSignEditor extends _react.default.Component {
     return /*#__PURE__*/_react.default.createElement("div", {
       className: "position-relative mt-2",
       ref: ref => this.editorContainer = ref
-    }, !signImageExisted && /*#__PURE__*/_react.default.createElement(_addBtn.default, {
+    }, !signImageExisted && /*#__PURE__*/_react.default.createElement(_RowExpandAddBtn.default, {
       onClick: this.toggleEditor,
       onFocus: this.onFocus,
       isFocus: isEditorFocus,
@@ -205,4 +205,4 @@ class RowExpandPCDigitalSignEditor extends _react.default.Component {
     }));
   }
 }
-var _default = exports.default = RowExpandPCDigitalSignEditor;
+var _default = exports.default = RowExpandDigitalSignEditor;

package/lib/RowExpandEditor/{duration-editor/pc-editor.js → RowExpandDurationEditor/index.js}

@@ -10,7 +10,7 @@ var _react = _interopRequireWildcard(require("react"));
 var _dtableUtils = require("dtable-utils");
 var _constants = require("../../constants");
 var _DurationEditor = _interopRequireDefault(require("../../DurationEditor"));
-class RowExpandPCDurationEditor extends _react.default.Component {
+class RowExpandDurationEditor extends _react.default.Component {
   constructor(props) {
     super(props);
     this.onKeyDown = e => {
@@ -102,4 +102,4 @@ class RowExpandPCDurationEditor extends _react.default.Component {
     }, (0, _dtableUtils.getDurationDisplayString)(value, column.data)));
   }
 }
-var _default = exports.default = RowExpandPCDurationEditor;
+var _default = exports.default = RowExpandDurationEditor;

package/lib/RowExpandEditor/RowExpandEmailEditor/index.css

@@ -0,0 +1,2 @@
+@import url('../RowExpandUrlEditor/index.css');
+

package/lib/RowExpandEditor/{email-editor/pc-editor → RowExpandEmailEditor}/index.js

@@ -6,9 +6,9 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.default = void 0;
 var _react = _interopRequireDefault(require("react"));
-var _constants = require("../../../constants");
+var _constants = require("../../constants");
 require("./index.css");
-class RowExpandPCEmailEditor extends _react.default.Component {
+class RowExpandEmailEditor extends _react.default.Component {
   constructor(props) {
     super(props);
     this.focusInput = () => {
@@ -122,4 +122,4 @@ class RowExpandPCEmailEditor extends _react.default.Component {
     }));
   }
 }
-var _default = exports.default = RowExpandPCEmailEditor;
+var _default = exports.default = RowExpandEmailEditor;

package/lib/RowExpandEditor/RowExpandFileEditor/index.css

@@ -0,0 +1 @@
+@import url('../RowExpandImageEditor/index.css');

package/lib/RowExpandEditor/{file-editor/pc-editor → RowExpandFileEditor}/index.js

@@ -6,14 +6,14 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.default = void 0;
 var _react = _interopRequireDefault(require("react"));
-var _constants = require("../../../constants");
-var _addBtn = _interopRequireDefault(require("../../add-btn"));
-var _lang = require("../../../lang");
-var _ImageThumbnail = _interopRequireDefault(require("../../../ImageThumbnail"));
-var _url = require("../../../utils/url");
-var _FileEditor = _interopRequireDefault(require("../../../FileEditor"));
+var _constants = require("../../constants");
+var _RowExpandAddBtn = _interopRequireDefault(require("../RowExpandAddBtn"));
+var _lang = require("../../lang");
+var _ImageThumbnail = _interopRequireDefault(require("../../ImageThumbnail"));
+var _url = require("../../utils/url");
+var _FileEditor = _interopRequireDefault(require("../../FileEditor"));
 require("./index.css");
-class RowExpandPCFileEditor extends _react.default.Component {
+class RowExpandFileEditor extends _react.default.Component {
   constructor(props) {
     super(props);
     this.onKeyDown = e => {
@@ -128,7 +128,7 @@ class RowExpandPCFileEditor extends _react.default.Component {
     }
     return /*#__PURE__*/_react.default.createElement("div", {
       className: "dtable-ui-row-expand-image-editor mt-2"
-    }, /*#__PURE__*/_react.default.createElement(_addBtn.default, {
+    }, /*#__PURE__*/_react.default.createElement(_RowExpandAddBtn.default, {
       isFocus: isEditorFocus,
       text: (0, _lang.getLocale)('Add_files'),
       onFocus: this.onFocus,
@@ -145,4 +145,4 @@ class RowExpandPCFileEditor extends _react.default.Component {
     }));
   }
 }
-var _default = exports.default = RowExpandPCFileEditor;
+var _default = exports.default = RowExpandFileEditor;

package/lib/RowExpandEditor/{geolocation-editor/pc-editor → RowExpandGeolocationEditor}/index.js

@@ -7,12 +7,12 @@ Object.defineProperty(exports, "__esModule", {
 exports.default = void 0;
 var _react = _interopRequireDefault(require("react"));
 var _dtableUtils = require("dtable-utils");
-var _constants = require("../../../constants");
-var _addBtn = _interopRequireDefault(require("../../add-btn"));
-var _lang = require("../../../lang");
-var _GeolocationEditor = _interopRequireDefault(require("../../../GeolocationEditor"));
+var _constants = require("../../constants");
+var _RowExpandAddBtn = _interopRequireDefault(require("../RowExpandAddBtn"));
+var _lang = require("../../lang");
+var _GeolocationEditor = _interopRequireDefault(require("../../GeolocationEditor"));
 require("./index.css");
-class RowExpandPCGeolocationEditor extends _react.default.Component {
+class RowExpandGeolocationEditor extends _react.default.Component {
   constructor(props) {
     super(props);
     this.onKeyDown = e => {
@@ -24,6 +24,7 @@ class RowExpandPCGeolocationEditor extends _react.default.Component {
     };
     this.hideEditor = event => {
       if (!this.state.isShowEditor || !event.target || this.editorContainer.contains(event.target)) return;
+      if (this.state.isShowEditor && this.geoEditor.getLargeEditorState()) return;
       this.setState({
         isShowEditor: false
       });
@@ -73,7 +74,7 @@ class RowExpandPCGeolocationEditor extends _react.default.Component {
           onClick: this.toggleEditor
         }, displayContent);
       }
-      return /*#__PURE__*/_react.default.createElement(_addBtn.default, {
+      return /*#__PURE__*/_react.default.createElement(_RowExpandAddBtn.default, {
         ref: this.addBtnRef,
         onFocus: this.onFocus,
         onClick: this.toggleEditor,
@@ -82,18 +83,13 @@ class RowExpandPCGeolocationEditor extends _react.default.Component {
       });
     };
     this.getLocationInfo = value => {
-      var _window;
       const {
-        column,
-        config
+        column
       } = this.props;
       const {
         dtableBaiduMapKey,
         dtableMineMapKey
-      } = {
-        ...((_window = window) === null || _window === void 0 ? void 0 : _window.dtable),
-        ...config
-      };
+      } = window.dtable;
       const isBaiduMap = !!(dtableBaiduMapKey || dtableMineMapKey);
       return (0, _dtableUtils.getGeolocationDisplayString)(value, column.data, {
         isBaiduMap,
@@ -146,7 +142,7 @@ class RowExpandPCGeolocationEditor extends _react.default.Component {
   render() {
     const {
       column,
-      config
+      row
     } = this.props;
     const {
       value
@@ -158,12 +154,12 @@ class RowExpandPCGeolocationEditor extends _react.default.Component {
       ref: ref => this.geoEditor = ref,
       isInModal: true,
       column: column,
+      row: row,
       value: value,
-      config: config,
       onCommit: this.onCommit,
-      onToggle: this.toggleEditor,
+      onCommitCancel: this.toggleEditor,
       onPressTab: this.props.onPressTab
     }));
   }
 }
-var _default = exports.default = RowExpandPCGeolocationEditor;
+var _default = exports.default = RowExpandGeolocationEditor;

package/lib/RowExpandEditor/{image-editor/pc-editor → RowExpandImageEditor}/index.js

@@ -6,14 +6,14 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.default = void 0;
 var _react = _interopRequireDefault(require("react"));
-var _constants = require("../../../constants");
-var _addBtn = _interopRequireDefault(require("../../add-btn"));
-var _lang = require("../../../lang");
-var _ImagePreviewerLightbox = _interopRequireDefault(require("../../../ImagePreviewerLightbox"));
-var _ImageThumbnail = _interopRequireDefault(require("../../../ImageThumbnail"));
-var _ImageEditor = _interopRequireDefault(require("../../../ImageEditor"));
+var _constants = require("../../constants");
+var _RowExpandAddBtn = _interopRequireDefault(require("../RowExpandAddBtn"));
+var _lang = require("../../lang");
+var _ImagePreviewerLightbox = _interopRequireDefault(require("../../ImagePreviewerLightbox"));
+var _ImageThumbnail = _interopRequireDefault(require("../../ImageThumbnail"));
+var _ImageEditor = _interopRequireDefault(require("../../ImageEditor"));
 require("./index.css");
-class RowExpandPCImageEditor extends _react.default.Component {
+class RowExpandImageEditor extends _react.default.Component {
   constructor(props) {
     super(props);
     this.onKeyDown = e => {
@@ -145,7 +145,7 @@ class RowExpandPCImageEditor extends _react.default.Component {
     let value = this.getValue();
     return /*#__PURE__*/_react.default.createElement(_react.default.Fragment, null, /*#__PURE__*/_react.default.createElement("div", {
       className: "dtable-ui-row-expand-image-editor mt-2"
-    }, /*#__PURE__*/_react.default.createElement(_addBtn.default, {
+    }, /*#__PURE__*/_react.default.createElement(_RowExpandAddBtn.default, {
       isFocus: isEditorFocus,
       text: (0, _lang.getLocale)('Add_images'),
       onFocus: this.onFocus,
@@ -167,4 +167,4 @@ class RowExpandPCImageEditor extends _react.default.Component {
     }));
   }
 }
-var _default = exports.default = RowExpandPCImageEditor;
+var _default = exports.default = RowExpandImageEditor;

package/lib/RowExpandEditor/{long-text-editor/pc-editor → RowExpandLongTextEditor}/index.js

@@ -7,15 +7,15 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.default = void 0;
 var _react = _interopRequireWildcard(require("react"));
+var _toaster = _interopRequireDefault(require("../../toaster"));
+var _Loading = _interopRequireDefault(require("../../Loading"));
 var _reactI18next = require("react-i18next");
 var _seafileEditor = require("@seafile/seafile-editor");
-var _toaster = _interopRequireDefault(require("../../../toaster"));
-var _Loading = _interopRequireDefault(require("../../../Loading"));
-var _constants = require("../../../constants");
-var _cell = require("../../../utils/cell");
-var _lang = require("../../../lang");
+var _constants = require("../../constants");
+var _cell = require("../../utils/cell");
+var _lang = require("../../lang");
 require("./index.css");
-class RowExpandPCLongTextEditor extends _react.default.Component {
+class RowExpandLongTextEditor extends _react.default.Component {
   constructor(props) {
     super(props);
     this.convertMarkdown = value => {
@@ -120,4 +120,4 @@ class RowExpandPCLongTextEditor extends _react.default.Component {
     })));
   }
 }
-var _default = exports.default = RowExpandPCLongTextEditor;
+var _default = exports.default = RowExpandLongTextEditor;

package/lib/RowExpandEditor/{multiple-select-editor/pc-editor → RowExpandMultipleSelectEditor}/index.css

@@ -1,4 +1,4 @@
-@import url('../../single-select-editor/pc-editor/index.css');
+@import url('../RowExpandSingleSelectorEditor/index.css');
 
 .dtable-ui-row-expand-select-options {
   min-height: 30px;

package/lib/RowExpandEditor/{multiple-select-editor/pc-editor → RowExpandMultipleSelectEditor}/index.js

@@ -8,12 +8,12 @@ exports.default = void 0;
 var _react = _interopRequireDefault(require("react"));
 var _dtableUtils = require("dtable-utils");
 var _classnames = _interopRequireDefault(require("classnames"));
-var _constants = require("../../../constants");
-var _MultipleSelectEditor = _interopRequireDefault(require("../../../MultipleSelectEditor"));
-var _lang = require("../../../lang");
-var _objectUtils = _interopRequireDefault(require("../../../utils/object-utils"));
+var _constants = require("../../constants");
+var _MultipleSelectEditor = _interopRequireDefault(require("../../MultipleSelectEditor"));
+var _lang = require("../../lang");
+var _objectUtils = _interopRequireDefault(require("../../utils/object-utils"));
 require("./index.css");
-class RowExpandPCMultipleSelectEditor extends _react.default.Component {
+class RowExpandMultipleSelectEditor extends _react.default.Component {
   constructor(_props) {
     super(_props);
     this.getOptions = props => {
@@ -244,4 +244,4 @@ class RowExpandPCMultipleSelectEditor extends _react.default.Component {
     }));
   }
 }
-var _default = exports.default = RowExpandPCMultipleSelectEditor;
+var _default = exports.default = RowExpandMultipleSelectEditor;

package/lib/RowExpandEditor/{number-editor/pc-editor.js → RowExpandNumberEditor/index.js}

@@ -8,7 +8,7 @@ exports.default = void 0;
 var _react = _interopRequireDefault(require("react"));
 var _dtableUtils = require("dtable-utils");
 var _NumberEditor = _interopRequireDefault(require("../../NumberEditor"));
-class RowExpandPCNumberEditor extends _react.default.Component {
+class RowExpandNumberEditor extends _react.default.Component {
   constructor(props) {
     super(props);
     this.toggleEditor = () => {
@@ -102,4 +102,4 @@ class RowExpandPCNumberEditor extends _react.default.Component {
     }, formatValue);
   }
 }
-var _default = exports.default = RowExpandPCNumberEditor;
+var _default = exports.default = RowExpandNumberEditor;

package/lib/RowExpandEditor/RowExpandRateEditor/index.css

@@ -0,0 +1,13 @@
+.dtable-ui.dtable-ui-row-expand-rate-editor {
+  display: flex;
+}
+
+.dtable-ui.dtable-ui-row-expand-rate-editor > div {
+  padding-right: 5px;
+  cursor: pointer;
+  line-height: 1.5;
+}
+
+.dtable-ui.dtable-ui-row-expand-rate-editor .rate-item-active {
+  opacity: 1 !important;
+}

package/lib/RowExpandEditor/{rate-editor/pc-editor.js → RowExpandRateEditor/index.js}

@@ -8,7 +8,8 @@ exports.default = void 0;
 var _react = _interopRequireDefault(require("react"));
 var _classnames = _interopRequireDefault(require("classnames"));
 var _lang = require("../../lang");
-class RowExpandPCRateEditor extends _react.default.Component {
+require("./index.css");
+class RowExpandRateEditor extends _react.default.Component {
   constructor(props) {
     super(props);
     this.onKeyDown = event => {
@@ -148,4 +149,4 @@ class RowExpandPCRateEditor extends _react.default.Component {
     }, rateList);
   }
 }
-var _default = exports.default = RowExpandPCRateEditor;
+var _default = exports.default = RowExpandRateEditor;

package/lib/RowExpandEditor/{single-select-editor/pc-editor → RowExpandSingleSelectorEditor}/index.js

@@ -7,13 +7,13 @@ Object.defineProperty(exports, "__esModule", {
 exports.default = void 0;
 var _react = _interopRequireDefault(require("react"));
 var _dtableUtils = require("dtable-utils");
+var _constants = require("../../constants");
 var _classnames = _interopRequireDefault(require("classnames"));
-var _constants = require("../../../constants");
-var _SingleSelectEditor = _interopRequireDefault(require("../../../SingleSelectEditor"));
-var _lang = require("../../../lang");
-var _objectUtils = _interopRequireDefault(require("../../../utils/object-utils"));
+var _SingleSelectEditor = _interopRequireDefault(require("../../SingleSelectEditor"));
+var _lang = require("../../lang");
+var _objectUtils = _interopRequireDefault(require("../../utils/object-utils"));
 require("./index.css");
-class RowExpandPCSingleSelectEditor extends _react.default.Component {
+class RowExpandSingleSelectEditor extends _react.default.Component {
   constructor(_props) {
     super(_props);
     this.getOptions = props => {
@@ -43,15 +43,15 @@ class RowExpandPCSingleSelectEditor extends _react.default.Component {
       return options;
     };
     this.onKeyDown = e => {
-      if (e.keyCode === _constants.KeyCodes.Enter && this.props.isEditorFocus && !this.state.isShowEditor) {
+      if (e.keyCode === _constants.KeyCodes.Enter && this.props.isEditorFocus && !this.state.showSelectPopover) {
         this.setState({
-          isShowEditor: true
+          showSelectPopover: true
         });
       }
     };
     this.toggleSingleSelect = value => {
       this.setState({
-        isShowEditor: value
+        showSelectPopover: value
       }, () => {
         var _this$selectRef;
         if (value) return;
@@ -64,7 +64,7 @@ class RowExpandPCSingleSelectEditor extends _react.default.Component {
     };
     this.hideDropDownMenu = event => {
       if (!event.target) return;
-      if (!this.ref.contains(event.target) && this.state.isShowEditor) {
+      if (!this.ref.contains(event.target) && this.state.showSelectPopover) {
         const singleSelectEditor = document.getElementsByClassName('dtable-ui-select-editor-container')[0];
         if (singleSelectEditor && singleSelectEditor.contains(event.target)) return;
         this.toggleSingleSelect(false);
@@ -134,7 +134,7 @@ class RowExpandPCSingleSelectEditor extends _react.default.Component {
     };
     this.state = {
       value: _props.value,
-      isShowEditor: false
+      showSelectPopover: false
     };
     this.key = _props.valueKey === 'name' ? 'name' : 'id';
     this.options = this.getOptions(_props);
@@ -154,16 +154,16 @@ class RowExpandPCSingleSelectEditor extends _react.default.Component {
       this.options = this.getOptions(nextProps);
       this.setState({
         value,
-        isShowEditor: false
+        showSelectPopover: false
       });
     }
   }
   componentDidUpdate(prevProps, prevState) {
-    if (this.state.isShowEditor !== prevState.isShowEditor) {
-      if (this.state.isShowEditor === true && this.props.onEditorOpen) {
+    if (this.state.showSelectPopover !== prevState.showSelectPopover) {
+      if (this.state.showSelectPopover === true && this.props.onEditorOpen) {
         this.props.onEditorOpen();
       }
-      if (this.state.isShowEditor === false && this.props.onEditorClose) {
+      if (this.state.showSelectPopover === false && this.props.onEditorClose) {
         this.props.onEditorClose();
       }
     }
@@ -180,7 +180,7 @@ class RowExpandPCSingleSelectEditor extends _react.default.Component {
       classNamePrefix
     } = this.props;
     const {
-      isShowEditor,
+      showSelectPopover,
       value
     } = this.state;
     return /*#__PURE__*/_react.default.createElement("div", {
@@ -188,7 +188,7 @@ class RowExpandPCSingleSelectEditor extends _react.default.Component {
       ref: ref => this.ref = ref
     }, this.renderOption(), /*#__PURE__*/_react.default.createElement("span", {
       ref: ref => this.targetRef = ref
-    }), isShowEditor && /*#__PURE__*/_react.default.createElement(_SingleSelectEditor.default, {
+    }), showSelectPopover && /*#__PURE__*/_react.default.createElement(_SingleSelectEditor.default, {
       isInModal: true,
       options: this.options,
       column: column,
@@ -203,4 +203,4 @@ class RowExpandPCSingleSelectEditor extends _react.default.Component {
     }));
   }
 }
-var _default = exports.default = RowExpandPCSingleSelectEditor;
+var _default = exports.default = RowExpandSingleSelectEditor;

package/lib/RowExpandEditor/{text-editor/pc-editor → RowExpandTextEditor}/index.js

@@ -7,13 +7,13 @@ Object.defineProperty(exports, "__esModule", {
 exports.default = void 0;
 var _react = _interopRequireDefault(require("react"));
 var _reactstrap = require("reactstrap");
-var _TextEditor = _interopRequireDefault(require("../../../TextEditor"));
-var _columnUtils = require("../../../utils/column-utils");
-var _cell = require("../../../utils/cell");
-var _constants = require("../../../constants");
-var _lang = require("../../../lang");
+var _TextEditor = _interopRequireDefault(require("../../TextEditor"));
+var _columnUtils = require("../../utils/column-utils");
+var _cell = require("../../utils/cell");
+var _constants = require("../../constants");
+var _lang = require("../../lang");
 require("./index.css");
-class RowExpandPCTextEditor extends _react.default.Component {
+class RowExpandSimpleText extends _react.default.Component {
   constructor(props) {
     super(props);
     this.setEditorRef = ref => {
@@ -133,4 +133,4 @@ class RowExpandPCTextEditor extends _react.default.Component {
     }), inconformityFormat && /*#__PURE__*/_react.default.createElement(_reactstrap.FormFeedback, null, _lang.getLocale.get('Input_does_not_meet_specifications')));
   }
 }
-var _default = exports.default = RowExpandPCTextEditor;
+var _default = exports.default = RowExpandSimpleText;

package/lib/RowExpandEditor/{url-editor/pc-editor → RowExpandUrlEditor}/index.js

@@ -6,12 +6,12 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.default = void 0;
 var _react = _interopRequireDefault(require("react"));
-var _toaster = _interopRequireDefault(require("../../../toaster"));
-var _utils = require("../../../utils/utils");
-var _constants = require("../../../constants");
-var _lang = require("../../../lang");
+var _toaster = _interopRequireDefault(require("../../toaster"));
+var _utils = require("../../utils/utils");
+var _constants = require("../../constants");
+var _lang = require("../../lang");
 require("./index.css");
-class RowExpandPCUrlEditor extends _react.default.Component {
+class RowExpandUrlEditor extends _react.default.Component {
   constructor(props) {
     super(props);
     this.focusInput = () => {
@@ -127,4 +127,4 @@ class RowExpandPCUrlEditor extends _react.default.Component {
     }));
   }
 }
-var _default = exports.default = RowExpandPCUrlEditor;
+var _default = exports.default = RowExpandUrlEditor;