dtable-ui-component 6.0.3 → 6.0.4

package/lib/RowExpandFormatter/index.js

@@ -7,76 +7,46 @@ Object.defineProperty(exports, "__esModule", {
 exports.default = void 0;
 var _react = _interopRequireDefault(require("react"));
 var _classnames = _interopRequireDefault(require("classnames"));
-var _TextFormatter = _interopRequireDefault(require("../TextFormatter"));
-var _NumberFormatter = _interopRequireDefault(require("../NumberFormatter"));
-var _CheckboxFormatter = _interopRequireDefault(require("../CheckboxFormatter"));
-var _DateFormatter = _interopRequireDefault(require("../DateFormatter"));
-var _SingleSelectFormatter = _interopRequireDefault(require("../SingleSelectFormatter"));
-var _MultipleSelectFormatter = _interopRequireDefault(require("../MultipleSelectFormatter"));
-var _CollaboratorFormatter = _interopRequireDefault(require("../CollaboratorFormatter"));
-var _LongTextFormatter = _interopRequireDefault(require("../LongTextFormatter"));
-var _GeolocationFormatter = _interopRequireDefault(require("../GeolocationFormatter"));
-var _CTimeFormatter = _interopRequireDefault(require("../CTimeFormatter"));
-var _CreatorFormatter = _interopRequireDefault(require("../CreatorFormatter"));
-var _LastModifierFormatter = _interopRequireDefault(require("../LastModifierFormatter"));
-var _MTimeFormatter = _interopRequireDefault(require("../MTimeFormatter"));
-var _AutoNumberFormatter = _interopRequireDefault(require("../AutoNumberFormatter"));
-var _DurationFormatter = _interopRequireDefault(require("../DurationFormatter"));
-var _ButtonFormatter = _interopRequireDefault(require("../ButtonFormatter"));
-var _RowExpandUrlFormatter = _interopRequireDefault(require("../RowExpandUrlFormatter"));
-var _RowExpandEmailFormatter = _interopRequireDefault(require("../RowExpandEmailFormatter"));
-var _RowExpandRateFormatter = _interopRequireDefault(require("../RowExpandRateFormatter"));
-var _RowExpandImageFormatter = _interopRequireDefault(require("../RowExpandImageFormatter"));
-var _RowExpandFileFormatter = _interopRequireDefault(require("../RowExpandFileFormatter"));
-var _RowExpandLinkFormatter = _interopRequireDefault(require("../RowExpandLinkFormatter"));
-var _RowExpandFormulaFormatter = _interopRequireDefault(require("../RowExpandFormulaFormatter"));
-var _DigitalSignFormatter = _interopRequireDefault(require("../DigitalSignFormatter"));
-var _DepartmentSingleSelectFormatter = _interopRequireDefault(require("../DepartmentSingleSelectFormatter"));
-var _constants = require("../constants");
+var _dtableUtils = require("dtable-utils");
+var _constants = require("./constants");
 require("./index.css");
-class EditorFormatter extends _react.default.Component {
+class RowExpandFormatter extends _react.default.Component {
   constructor(_props) {
     super(_props);
     this.updateCollaborators = () => {
+      const {
+        column
+      } = this.props;
+      if (![_dtableUtils.CellType.CREATOR, _dtableUtils.CellType.LAST_MODIFIER, _dtableUtils.CellType.COLLABORATOR].includes(column.type)) return;
+      const collaborators = this.getCollaborators();
       this.setState({
-        collaborators: this.getCollaborator()
+        collaborators
       });
     };
     this.calculateCollaboratorData = props => {
       const {
         row,
-        column
+        column,
+        queryCollaborators
       } = props;
-      if (column.type === _constants.CellType.CREATOR || column.type === _constants.CellType.LAST_MODIFIER) {
+      if (column.type === _dtableUtils.CellType.CREATOR || column.type === _dtableUtils.CellType.LAST_MODIFIER) {
         const email = row[column.name];
-        this.loadCollaborator(email);
-      } else if (column.type === _constants.CellType.COLLABORATOR) {
+        queryCollaborators && queryCollaborators(email);
+      } else if (column.type === _dtableUtils.CellType.COLLABORATOR) {
         const emails = row[column.name];
         if (Array.isArray(emails)) {
-          emails.forEach(email => {
-            this.loadCollaborator(email);
-          });
+          queryCollaborators && queryCollaborators(emails);
         }
       }
     };
-    this.getCollaborator = () => {
+    this.getCollaborators = () => {
       const {
-        context,
+        getCollaborators,
         collaborators
       } = this.props;
-      if (context && context.getCollaboratorsFromCache) {
-        return context.getCollaboratorsFromCache();
-      }
+      if (getCollaborators) return getCollaborators();
       return collaborators || [];
     };
-    this.loadCollaborator = email => {
-      const {
-        context
-      } = this.props;
-      if (context && context.loadCollaborator) {
-        context.loadCollaborator(email);
-      }
-    };
     this.renderEmpty = () => {
       return /*#__PURE__*/_react.default.createElement("div", {
         className: "d-flex align-items-center form-control disabled h-auto"
@@ -86,7 +56,7 @@ class EditorFormatter extends _react.default.Component {
       let {
         column,
         row,
-        className
+        valueKey
       } = this.props;
       let {
         type: columnType
@@ -94,178 +64,180 @@ class EditorFormatter extends _react.default.Component {
       const {
         collaborators
       } = this.state;
-      const containerClassName = "dtable-".concat(columnType, "-formatter ").concat(className || '');
-      let cellValue = row[column.key] !== null && row[column.key] !== undefined ? row[column.key] : row[column.name];
+      const containerClassName = "dtable-ui-row-expand-".concat(columnType, "-formatter");
+      let cellValue = row[column[valueKey]];
+      const Formatter = this.component[columnType];
+      if (!Formatter) return null;
       switch (columnType) {
-        case _constants.CellType.TEXT:
+        case _dtableUtils.CellType.TEXT:
           {
             return /*#__PURE__*/_react.default.createElement("div", {
               className: "form-control d-flex align-items-center w-100"
-            }, /*#__PURE__*/_react.default.createElement(_TextFormatter.default, {
+            }, /*#__PURE__*/_react.default.createElement(Formatter, {
               value: cellValue,
               containerClassName: containerClassName
             }));
           }
-        case _constants.CellType.COLLABORATOR:
+        case _dtableUtils.CellType.COLLABORATOR:
           {
             return /*#__PURE__*/_react.default.createElement("div", {
               className: "form-control d-flex align-items-center w-100 h-auto"
-            }, /*#__PURE__*/_react.default.createElement(_CollaboratorFormatter.default, {
+            }, /*#__PURE__*/_react.default.createElement(Formatter, {
               value: cellValue,
               collaborators: collaborators,
               containerClassName: containerClassName
             }));
           }
-        case _constants.CellType.LONG_TEXT:
+        case _dtableUtils.CellType.LONG_TEXT:
           {
-            if (!cellValue) return null;
+            if (!cellValue) return /*#__PURE__*/_react.default.createElement("div", {
+              className: "form-control d-flex align-items-center w-100"
+            });
             return /*#__PURE__*/_react.default.createElement("div", {
               className: "longtext-formatter-container"
-            }, /*#__PURE__*/_react.default.createElement(_LongTextFormatter.default, {
+            }, /*#__PURE__*/_react.default.createElement(Formatter, {
               value: cellValue,
               containerClassName: containerClassName,
               isSample: false
             }));
           }
-        case _constants.CellType.GEOLOCATION:
+        case _dtableUtils.CellType.GEOLOCATION:
           {
+            if (!cellValue) return null;
             if (typeof cellValue !== 'object') return null;
             return /*#__PURE__*/_react.default.createElement("div", {
-              className: "geolocation-formatter-container"
-            }, /*#__PURE__*/_react.default.createElement(_GeolocationFormatter.default, {
+              className: "dtable-ui-geolocation-formatter-container"
+            }, /*#__PURE__*/_react.default.createElement(Formatter, {
               value: cellValue,
               data: column.data,
               containerClassName: containerClassName
             }));
           }
-        case _constants.CellType.NUMBER:
+        case _dtableUtils.CellType.NUMBER:
           {
             return /*#__PURE__*/_react.default.createElement("div", {
               className: "form-control d-flex align-items-center",
               style: {
                 width: 320
               }
-            }, /*#__PURE__*/_react.default.createElement(_NumberFormatter.default, {
+            }, /*#__PURE__*/_react.default.createElement(Formatter, {
               value: cellValue,
               data: column.data,
               containerClassName: containerClassName
             }));
           }
-        case _constants.CellType.DATE:
+        case _dtableUtils.CellType.DATE:
           {
             return /*#__PURE__*/_react.default.createElement("div", {
               className: "form-control d-flex align-items-center",
               style: {
                 width: 320
               }
-            }, /*#__PURE__*/_react.default.createElement(_DateFormatter.default, {
+            }, /*#__PURE__*/_react.default.createElement(Formatter, {
               value: cellValue,
               format: column.data.format,
               containerClassName: containerClassName
             }));
           }
-        case _constants.CellType.CTIME:
+        case _dtableUtils.CellType.CTIME:
           {
             return /*#__PURE__*/_react.default.createElement("div", {
               className: "form-control d-flex align-items-center ctime-formatter-container",
               style: {
                 width: 320
               }
-            }, /*#__PURE__*/_react.default.createElement(_CTimeFormatter.default, {
-              value: row._ctime,
+            }, /*#__PURE__*/_react.default.createElement(Formatter, {
+              value: cellValue,
               containerClassName: containerClassName
             }));
           }
-        case _constants.CellType.MTIME:
+        case _dtableUtils.CellType.MTIME:
           {
             return /*#__PURE__*/_react.default.createElement("div", {
               className: "form-control d-flex align-items-center mtime-formatter-container",
               style: {
                 width: 320
               }
-            }, /*#__PURE__*/_react.default.createElement(_MTimeFormatter.default, {
-              value: row._mtime,
+            }, /*#__PURE__*/_react.default.createElement(Formatter, {
+              value: cellValue,
               containerClassName: containerClassName
             }));
           }
-        case _constants.CellType.MULTIPLE_SELECT:
+        case _dtableUtils.CellType.MULTIPLE_SELECT:
           {
-            const options = column.data ? column.data.options : [];
+            var _column, _column$data;
+            const options = ((_column = column) === null || _column === void 0 ? void 0 : (_column$data = _column.data) === null || _column$data === void 0 ? void 0 : _column$data.options) || [];
             return /*#__PURE__*/_react.default.createElement("div", {
               className: "form-control d-flex align-items-center w-100 h-auto"
-            }, /*#__PURE__*/_react.default.createElement(_MultipleSelectFormatter.default, {
+            }, /*#__PURE__*/_react.default.createElement(Formatter, {
               value: cellValue,
               options: options,
               containerClassName: containerClassName
             }));
           }
-        case _constants.CellType.SINGLE_SELECT:
+        case _dtableUtils.CellType.SINGLE_SELECT:
           {
-            const options = column.data ? column.data.options : [];
+            var _column2, _column2$data;
+            const options = ((_column2 = column) === null || _column2 === void 0 ? void 0 : (_column2$data = _column2.data) === null || _column2$data === void 0 ? void 0 : _column2$data.options) || [];
             return /*#__PURE__*/_react.default.createElement("div", {
               className: "form-control d-flex align-items-center w-100"
-            }, /*#__PURE__*/_react.default.createElement(_SingleSelectFormatter.default, {
+            }, /*#__PURE__*/_react.default.createElement(Formatter, {
               value: cellValue,
               options: options,
               containerClassName: containerClassName
             }));
           }
-        case _constants.CellType.FILE:
+        case _dtableUtils.CellType.FILE:
           {
-            return /*#__PURE__*/_react.default.createElement(_RowExpandFileFormatter.default, {
+            return /*#__PURE__*/_react.default.createElement(Formatter, {
               value: cellValue,
               column: column,
               downloadFile: this.props.downloadFile,
-              deleteFile: this.props.deleteFile
+              deleteFile: this.props.deleteFile,
+              config: this.props.config
             });
           }
-        case _constants.CellType.IMAGE:
+        case _dtableUtils.CellType.IMAGE:
           {
-            return /*#__PURE__*/_react.default.createElement(_RowExpandImageFormatter.default, {
+            return /*#__PURE__*/_react.default.createElement(Formatter, {
               value: cellValue,
               column: column,
               downloadImage: this.props.downloadImage,
               deleteFile: this.props.deleteFile,
-              onRotateImage: this.props.onRotateImage
+              onRotateImage: this.props.onRotateImage,
+              config: this.props.config
             });
           }
-        case _constants.CellType.CHECKBOX:
+        case _dtableUtils.CellType.CHECKBOX:
           {
-            var _column$data;
+            var _column$data2;
             return /*#__PURE__*/_react.default.createElement("div", {
               className: "checkbox-formatter-container"
-            }, /*#__PURE__*/_react.default.createElement(_CheckboxFormatter.default, {
+            }, /*#__PURE__*/_react.default.createElement(Formatter, {
               value: cellValue,
-              checkboxStyle: ((_column$data = column.data) === null || _column$data === void 0 ? void 0 : _column$data.checkbox_style) || {}
+              checkboxStyle: ((_column$data2 = column.data) === null || _column$data2 === void 0 ? void 0 : _column$data2.checkbox_style) || {}
             }));
           }
-        case _constants.CellType.CREATOR:
-          {
-            return /*#__PURE__*/_react.default.createElement(_CreatorFormatter.default, {
-              collaborators: collaborators,
-              value: cellValue,
-              containerClassName: containerClassName
-            });
-          }
-        case _constants.CellType.LAST_MODIFIER:
+        case _dtableUtils.CellType.CREATOR:
+        case _dtableUtils.CellType.LAST_MODIFIER:
           {
-            return /*#__PURE__*/_react.default.createElement(_LastModifierFormatter.default, {
+            return /*#__PURE__*/_react.default.createElement(Formatter, {
               collaborators: collaborators,
               value: cellValue,
               containerClassName: containerClassName
             });
           }
-        case _constants.CellType.FORMULA:
-        case _constants.CellType.LINK_FORMULA:
+        case _dtableUtils.CellType.FORMULA:
+        case _dtableUtils.CellType.LINK_FORMULA:
           {
-            return /*#__PURE__*/_react.default.createElement(_RowExpandFormulaFormatter.default, {
+            return /*#__PURE__*/_react.default.createElement(Formatter, {
               value: cellValue,
               column: column,
               collaborators: collaborators,
               containerClassName: containerClassName
             });
           }
-        case _constants.CellType.LINK:
+        case _dtableUtils.CellType.LINK:
           {
             // handle link column do not have column.data.display_column
             const {
@@ -283,106 +255,117 @@ class EditorFormatter extends _react.default.Component {
                   ...data,
                   display_column: {
                     key: display_column_key || '0000',
-                    type: array_type || _constants.CellType.TEXT,
+                    type: array_type || _dtableUtils.CellType.TEXT,
                     data: array_data || null
                   }
                 }
               };
             }
-            return /*#__PURE__*/_react.default.createElement(_RowExpandLinkFormatter.default, {
+            return /*#__PURE__*/_react.default.createElement(Formatter, {
               value: cellValue,
               column: column,
               collaborators: collaborators,
               containerClassName: containerClassName,
-              renderEmpty: this.renderEmpty
+              renderEmpty: () => null
             });
           }
-        case _constants.CellType.AUTO_NUMBER:
+        case _dtableUtils.CellType.AUTO_NUMBER:
           {
-            return /*#__PURE__*/_react.default.createElement(_AutoNumberFormatter.default, {
+            return /*#__PURE__*/_react.default.createElement(Formatter, {
               value: cellValue,
               containerClassName: containerClassName
             });
           }
-        case _constants.CellType.URL:
+        case _dtableUtils.CellType.URL:
           {
             return /*#__PURE__*/_react.default.createElement("div", {
               className: "form-control d-flex align-items-center w-100"
-            }, /*#__PURE__*/_react.default.createElement(_RowExpandUrlFormatter.default, {
+            }, /*#__PURE__*/_react.default.createElement(Formatter, {
               value: cellValue,
               containerClassName: containerClassName
             }));
           }
-        case _constants.CellType.EMAIL:
+        case _dtableUtils.CellType.EMAIL:
           {
             return /*#__PURE__*/_react.default.createElement("div", {
               className: "form-control d-flex align-items-center w-100"
-            }, /*#__PURE__*/_react.default.createElement(_RowExpandEmailFormatter.default, {
+            }, /*#__PURE__*/_react.default.createElement(Formatter, {
               value: cellValue,
               containerClassName: containerClassName
             }));
           }
-        case _constants.CellType.DURATION:
+        case _dtableUtils.CellType.DURATION:
           {
             return /*#__PURE__*/_react.default.createElement("div", {
               className: "form-control d-flex align-items-center",
               style: {
                 width: 320
               }
-            }, /*#__PURE__*/_react.default.createElement(_DurationFormatter.default, {
+            }, /*#__PURE__*/_react.default.createElement(Formatter, {
               value: cellValue,
               format: column.data.duration_format,
               containerClassName: containerClassName
             }));
           }
-        case _constants.CellType.RATE:
+        case _dtableUtils.CellType.RATE:
           {
             return /*#__PURE__*/_react.default.createElement("div", {
               className: "form-control d-flex align-items-center",
               style: {
                 width: 320
               }
-            }, /*#__PURE__*/_react.default.createElement(_RowExpandRateFormatter.default, {
+            }, /*#__PURE__*/_react.default.createElement(Formatter, {
               value: cellValue,
               data: column.data,
               containerClassName: containerClassName
             }));
           }
-        case _constants.CellType.BUTTON:
+        case _dtableUtils.CellType.BUTTON:
           {
-            return /*#__PURE__*/_react.default.createElement(_ButtonFormatter.default, {
+            return /*#__PURE__*/_react.default.createElement(Formatter, {
               data: column.data,
               containerClassName: containerClassName,
               onClickButton: this.props.onClickButton
             });
           }
-        case _constants.CellType.DIGITAL_SIGN:
+        case _dtableUtils.CellType.DIGITAL_SIGN:
           {
-            return /*#__PURE__*/_react.default.createElement(_DigitalSignFormatter.default, {
+            return /*#__PURE__*/_react.default.createElement(Formatter, {
               value: cellValue,
               containerClassName: containerClassName,
               config: this.props.config
             });
           }
-        case _constants.CellType.DEPARTMENT_SINGLE_SELECT:
+        case _dtableUtils.CellType.DEPARTMENT_SINGLE_SELECT:
           {
-            return /*#__PURE__*/_react.default.createElement(_DepartmentSingleSelectFormatter.default, {
+            return /*#__PURE__*/_react.default.createElement(Formatter, {
               value: cellValue,
               departments: this.props.departments
             });
           }
         default:
-          return null;
+          {
+            return /*#__PURE__*/_react.default.createElement(Formatter, {
+              value: cellValue,
+              containerClassName: containerClassName,
+              config: this.props.config
+            });
+          }
       }
     };
     this.state = {
-      collaborators: this.getCollaborator()
+      collaborators: this.getCollaborators()
+    };
+    this.component = {
+      ..._constants.DEFAULT_FORMATTER,
+      ...this.props.component
     };
   }
   componentDidMount() {
     this.calculateCollaboratorData(this.props);
-    if (this.props.eventBus) {
-      this.unsubscribeCollaboratorsUpdated = this.props.eventBus.subscribe('collaborators-updated', this.updateCollaborators);
+    const eventBus = this.props.eventBus;
+    if (eventBus) {
+      this.unsubscribeCollaboratorsUpdated = eventBus.subscribe('collaborators-updated', this.updateCollaborators);
     }
   }
   UNSAFE_componentWillReceiveProps(nextProps) {
@@ -398,13 +381,12 @@ class EditorFormatter extends _react.default.Component {
       className
     } = this.props;
     return /*#__PURE__*/_react.default.createElement("div", {
-      className: (0, _classnames.default)('dtable-ui dtable-row-expand-formatter', {
-        [className]: className
-      })
+      className: (0, _classnames.default)('dtable-ui dtable-row-expand-formatter', className)
     }, this.renderFormatter());
   }
 }
-exports.default = EditorFormatter;
-EditorFormatter.defaultProps = {
-  className: ''
-};
+RowExpandFormatter.defaultProps = {
+  className: '',
+  valueKey: 'name'
+};
+var _default = exports.default = RowExpandFormatter;

package/lib/SimpleLongTextFormatter/widgets/longTextEditor.css

@@ -210,14 +210,14 @@
   display: flex;
 }
 
-.longtext-modal-dialog-header  .longtext-browser-warning {
+.longtext-modal-dialog-header .longtext-browser-warning {
   margin-right: 4px; 
   display: inline-block;
   line-height: 12px;
   transform: scale(0.8);
 }
 
-.longtext-modal-dialog-header  .browser-warning-content {
+.longtext-modal-dialog-header .browser-warning-content {
   line-height: 12px;
 }