dtable-ui-component 6.0.5 → 6.0.7

package/lib/DTableColorPicker/index.js

@@ -26,17 +26,18 @@ const RGB_COLORS_MAP = {
   BLUE: 'b'
 };
 const LOCAL_STORAGE_KEY = 'dtable-color-picker';
-const DTableColorPicker = /*#__PURE__*/(0, _react.forwardRef)((props, ref) => {
-  const {
+const DTableColorPicker = /*#__PURE__*/(0, _react.forwardRef)((_ref, ref) => {
+  let {
     onToggle,
     popoverStyle,
-    color,
+    color = '#ffffff',
     defaultColors,
     useProtal,
     target,
     scrollContainerId,
-    throttleDelay = 20
-  } = props;
+    throttleDelay = 20,
+    onSubmit
+  } = _ref;
   const initialRgbaColor = (0, _utils.hexToRgba)(color);
   const [value, setValue] = (0, _react.useState)(initialRgbaColor);
   const [hexVal, setHexVal] = (0, _react.useState)((0, _utils.getInitialHexVal)(color));
@@ -186,7 +187,7 @@ const DTableColorPicker = /*#__PURE__*/(0, _react.forwardRef)((props, ref) => {
   const updateValue = newValue => {
     setValue(newValue);
     const submitHex = (0, _utils.rgbaToHex)(newValue);
-    props.onSubmit(submitHex);
+    onSubmit(submitHex);
   };
   const onAlphaInputBlur = () => {
     if ((0, _dtableUtils.isEmpty)(alphaVal) || alphaVal < 0 || alphaVal > 100) {
@@ -348,7 +349,4 @@ const DTableColorPicker = /*#__PURE__*/(0, _react.forwardRef)((props, ref) => {
   }
   return /*#__PURE__*/_react.default.createElement(_react.default.Fragment, null, colorPicker);
 });
-DTableColorPicker.defaultProps = {
-  color: '#ffffff'
-};
 var _default = exports.default = DTableColorPicker;

package/lib/DTableRadio/index.js

@@ -8,34 +8,35 @@ exports.default = void 0;
 var _react = _interopRequireDefault(require("react"));
 var _classnames = _interopRequireDefault(require("classnames"));
 require("./index.css");
-function DTableRadio(props) {
-  const {
-    className
-  } = props;
+function DTableRadio(_ref) {
+  let {
+    disabled = false,
+    name = 'dtable-radio-input',
+    onCheckedChange = () => {},
+    className,
+    isChecked,
+    value,
+    label
+  } = _ref;
   return /*#__PURE__*/_react.default.createElement("label", {
     className: (0, _classnames.default)('dtable-radio w-100 align-items-center', {
-      'dtable-radio-disable': props.disabled,
+      'dtable-radio-disable': disabled,
       [className]: className
     })
   }, /*#__PURE__*/_react.default.createElement("input", {
     type: "radio",
     className: "dtable-radio-input position-absolute",
-    checked: props.isChecked,
-    onChange: props.disabled ? () => {} : props.onCheckedChange,
-    name: props.name,
-    value: props.value
+    checked: isChecked,
+    onChange: disabled ? () => {} : onCheckedChange,
+    name: name,
+    value: value
   }), /*#__PURE__*/_react.default.createElement("span", {
     className: (0, _classnames.default)('dtable-radio-indicator position-relative', {
-      'dtable-radio-selected-indicator': props.isChecked,
-      'dtable-radio-indicator-disable': props.disabled
+      'dtable-radio-selected-indicator': isChecked,
+      'dtable-radio-indicator-disable': disabled
     })
   }), /*#__PURE__*/_react.default.createElement("span", {
     className: "dtable-radio-description text-truncate ml-2"
-  }, props.label));
+  }, label));
 }
-DTableRadio.defaultProps = {
-  disabled: false,
-  name: 'dtable-radio-input',
-  onCheckedChange: () => {}
-};
 var _default = exports.default = DTableRadio;

package/lib/DTableSelect/dtable-select-label.js

@@ -9,9 +9,9 @@ var _react = _interopRequireDefault(require("react"));
 require("./dtable-select-label.css");
 function DTableSelectLabel(_ref) {
   let {
-    classname,
-    name,
-    isSelect
+    classname = '',
+    name = '',
+    isSelect = false
   } = _ref;
   return /*#__PURE__*/_react.default.createElement("div", {
     className: "".concat(classname, " w-100 d-flex justify-content-between")
@@ -21,9 +21,4 @@ function DTableSelectLabel(_ref) {
     className: "dtable-font dtable-icon-check-mark"
   })));
 }
-DTableSelectLabel.defaultProps = {
-  classname: '',
-  name: '',
-  isSelect: false
-};
 var _default = exports.default = DTableSelectLabel;

package/lib/DTableSwitch/index.js

@@ -9,16 +9,16 @@ var _react = _interopRequireDefault(require("react"));
 var _classnames = _interopRequireDefault(require("classnames"));
 var _dtableUtils = require("dtable-utils");
 require("./index.css");
-function DTableSwitch(props) {
-  const {
+function DTableSwitch(_ref) {
+  let {
     onChange,
-    checked,
+    checked = false,
     placeholder,
     disabled,
-    size,
-    switchPosition,
+    size = 'sm',
+    switchPosition = 'right',
     switchClassName
-  } = props;
+  } = _ref;
   const switchNode = /*#__PURE__*/_react.default.createElement("span", {
     className: "custom-switch-indicator"
   });
@@ -46,9 +46,4 @@ function DTableSwitch(props) {
     id: 'dtable-switch-' + (0, _dtableUtils.generatorBase64Code)(12)
   }), switchPosition === 'left' && /*#__PURE__*/_react.default.createElement(_react.default.Fragment, null, switchNode, textNode), switchPosition === 'right' && /*#__PURE__*/_react.default.createElement(_react.default.Fragment, null, textNode, switchNode)));
 }
-DTableSwitch.defaultProps = {
-  checked: false,
-  size: 'sm',
-  switchPosition: 'right'
-};
 var _default = exports.default = DTableSwitch;

package/lib/Department-editor/selected-departments/index.js

@@ -10,13 +10,13 @@ var _dtableUtils = require("dtable-utils");
 var _constants = require("../constants");
 var _lang = require("../../lang");
 require("./index.css");
-function SelectedDepartments(props) {
-  const {
+function SelectedDepartments(_ref) {
+  let {
     value,
     removeDepartment,
-    isShowRemoveIcon,
-    departments
-  } = props;
+    isShowRemoveIcon = false,
+    departments = []
+  } = _ref;
   const idDepartmentMap = (0, _react.useMemo)(() => {
     let idDepartmentMap = {};
     departments.forEach(department => {
@@ -81,8 +81,4 @@ function SelectedDepartments(props) {
   }) : null;
   return dom;
 }
-SelectedDepartments.defaultProps = {
-  isShowRemoveIcon: false,
-  departments: []
-};
 var _default = exports.default = SelectedDepartments;

package/lib/RowExpandDialog/body/index.js

@@ -62,7 +62,8 @@ class Body extends _react.default.Component {
     this.onHotKey = event => {
       const {
         columns,
-        onKeyDown
+        onKeyDown,
+        onToggle
       } = this.props;
       const readonly = Array.isArray(columns) && columns.length > 0 ? !columns.some(c => c.editable) : true;
       const keyCode = event.keyCode;
@@ -71,7 +72,7 @@ class Body extends _react.default.Component {
         return;
       }
       if (keyCode === _constants.KeyCodes.Esc) {
-        this.props.onRowExpandCancel();
+        onToggle && onToggle();
         return;
       }
       onKeyDown && onKeyDown(event);

package/lib/RowExpandDialog/index.js

@@ -224,7 +224,8 @@ const RowExpandDialog = /*#__PURE__*/(0, _react.forwardRef)((_ref, ref) => {
     columns: columns,
     valueKey: valueKey,
     onChange: onChange,
-    uploadFile: uploadFile
+    uploadFile: uploadFile,
+    onToggle: onToggle
   }), children[1]), (!saveImmediately || isInsertingRow) && /*#__PURE__*/_react.default.createElement(_reactstrap.ModalFooter, null, /*#__PURE__*/_react.default.createElement(_reactstrap.Button, {
     onClick: toggle,
     color: "secondary"

package/lib/RowExpandEditor/RowExpandDepartmentEditor/index.js

@@ -36,7 +36,7 @@ function RowExpandDepartmentEditor(props) {
       document.removeEventListener('keydown', onKeyDown);
     };
     // eslint-disable-next-line
-  }, [isEditorFocus]);
+  }, [isEditorFocus, showEditor]);
   (0, _react.useEffect)(() => {
     setValue(row[column[valueKey]] || '');
     setShowEditor(false);
@@ -49,7 +49,7 @@ function RowExpandDepartmentEditor(props) {
   function onKeyDown(e) {
     if (e.keyCode === _constants.KeyCodes.Enter && props.isEditorFocus && !showEditor) {
       setShowEditor(true);
-    } else if (e.keyCode === _constants.KeyCodes.Escape) {
+    } else if (e.keyCode === _constants.KeyCodes.Escape && showEditor) {
       e.stopPropagation();
       setShowEditor(false);
       departmentSelectContent.current.focus();

package/lib/RowExpandEditor/RowExpandEmailEditor/index.js

@@ -45,19 +45,19 @@ class RowExpandEmailEditor extends _react.default.Component {
     this.onPaste = e => {
       e.stopPropagation();
     };
-    this.onKeyDown = e => {
-      if (e.keyCode === _constants.KeyCodes.Esc) {
-        e.stopPropagation();
+    this.onKeyDown = event => {
+      if (event.keyCode === _constants.KeyCodes.Esc) {
+        event.stopPropagation();
         this.blurInput();
         return;
       }
-      let {
+      const {
         selectionStart,
         selectionEnd,
         value
-      } = e.currentTarget;
-      if (e.keyCode === _constants.KeyCodes.ChineseInputMethod || e.keyCode === _constants.KeyCodes.LeftArrow && selectionStart === 0 || e.keyCode === _constants.KeyCodes.RightArrow && selectionEnd === value.length) {
-        e.stopPropagation();
+      } = event.currentTarget;
+      if (event.keyCode === _constants.KeyCodes.ChineseInputMethod || event.keyCode === _constants.KeyCodes.LeftArrow && selectionStart === 0 || event.keyCode === _constants.KeyCodes.RightArrow && selectionEnd === value.length) {
+        event.stopPropagation();
       }
     };
     this.onOpenEmailLink = () => {

package/lib/RowExpandEditor/RowExpandTextEditor/index.js

@@ -58,8 +58,17 @@ class RowExpandSimpleText extends _react.default.Component {
     };
     this.onKeyDown = event => {
       if (event.keyCode === _constants.KeyCodes.Esc) {
-        event.preventDefault();
+        event.stopPropagation();
         this.blurInput();
+        return;
+      }
+      const {
+        selectionStart,
+        selectionEnd,
+        value
+      } = event.currentTarget;
+      if (event.keyCode === _constants.KeyCodes.ChineseInputMethod || event.keyCode === _constants.KeyCodes.LeftArrow && selectionStart === 0 || event.keyCode === _constants.KeyCodes.RightArrow && selectionEnd === value.length) {
+        event.stopPropagation();
       }
     };
     this.isChecked = () => {

package/lib/RowExpandEditor/RowExpandUrlEditor/index.js

@@ -47,19 +47,19 @@ class RowExpandUrlEditor extends _react.default.Component {
     this.onPaste = e => {
       e.stopPropagation();
     };
-    this.onKeyDown = e => {
-      if (e.keyCode === _constants.KeyCodes.Esc) {
-        e.stopPropagation();
+    this.onKeyDown = event => {
+      if (event.keyCode === _constants.KeyCodes.Esc) {
+        event.preventDefault();
         this.blurInput();
         return;
       }
-      let {
+      const {
         selectionStart,
         selectionEnd,
         value
-      } = e.currentTarget;
-      if (e.keyCode === _constants.KeyCodes.ChineseInputMethod || e.keyCode === _constants.KeyCodes.LeftArrow && selectionStart === 0 || e.keyCode === _constants.KeyCodes.RightArrow && selectionEnd === value.length) {
-        e.stopPropagation();
+      } = event.currentTarget;
+      if (event.keyCode === _constants.KeyCodes.ChineseInputMethod || event.keyCode === _constants.KeyCodes.LeftArrow && selectionStart === 0 || event.keyCode === _constants.KeyCodes.RightArrow && selectionEnd === value.length) {
+        event.stopPropagation();
       }
     };
     this.onOpenUrlLink = () => {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "dtable-ui-component",
-  "version": "6.0.5",
+  "version": "6.0.7",
   "main": "./lib/index.js",
   "dependencies": {
     "@seafile/react-image-lightbox": "4.0.0",