@zohodesk/dot 1.5.5 → 1.6.0

package/lib/utils/editorUtils.js

@@ -15,8 +15,8 @@ exports.isImageFormat = isImageFormat;
 exports.loadResource = loadResource;
 exports.triggerKeyup = triggerKeyup;
 exports.validateEditorContentOnInsertHtml = validateEditorContentOnInsertHtml;
-var ATTACHMENT_FILE_NAME_SIZE_LIMIT = 200; // editorUtils
 
+// editorUtils
 function editorContentValidate(editorObj) {
   var content = editorObj && editorObj.getContent && editorObj.getContent() || '';
 
@@ -67,13 +67,14 @@ function encodeForHtml(str) {
 } // attachment
 
 
-function isFileNameSizeInvalid(fileName) {
-  return fileName.length > ATTACHMENT_FILE_NAME_SIZE_LIMIT;
+function isFileNameSizeInvalid(fileName, fileNameMaxCharacters) {
+  return fileName.length > fileNameMaxCharacters;
 }
 
-function isImageFormat(fileName) {
+function isImageFormat(fileName, allowedFileExtensions) {
   var extension = getExtensionFromFileName(fileName);
-  return /jpeg|jpg|png|gif|bmp|ico/i.test(extension);
+  var isValidExtension = allowedFileExtensions.includes(extension);
+  return isValidExtension;
 }
 
 function getExtensionFromFileName(fileName) {

package/lib/v1/form/fields/TextEditor/TextEditor.js

@@ -27,8 +27,6 @@ function _getRequireWildcardCache(nodeInterop) { if (typeof WeakMap !== "functio
 
 function _interopRequireWildcard(obj, nodeInterop) { if (!nodeInterop && obj && obj.__esModule) { return obj; } if (obj === null || _typeof(obj) !== "object" && typeof obj !== "function") { return { "default": obj }; } var cache = _getRequireWildcardCache(nodeInterop); if (cache && cache.has(obj)) { return cache.get(obj); } var newObj = {}; var hasPropertyDescriptor = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var key in obj) { if (key !== "default" && Object.prototype.hasOwnProperty.call(obj, key)) { var desc = hasPropertyDescriptor ? Object.getOwnPropertyDescriptor(obj, key) : null; if (desc && (desc.get || desc.set)) { Object.defineProperty(newObj, key, desc); } else { newObj[key] = obj[key]; } } } newObj["default"] = obj; if (cache) { cache.set(obj, newObj); } return newObj; }
 
-function _defineProperty(obj, key, value) { if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
-
 function _classCallCheck(instance, Constructor) { if (!(instance instanceof Constructor)) { throw new TypeError("Cannot call a class as a function"); } }
 
 function _defineProperties(target, props) { for (var i = 0; i < props.length; i++) { var descriptor = props[i]; descriptor.enumerable = descriptor.enumerable || false; descriptor.configurable = true; if ("value" in descriptor) descriptor.writable = true; Object.defineProperty(target, descriptor.key, descriptor); } }
@@ -70,7 +68,8 @@ var TextEditor = /*#__PURE__*/function (_Component) {
       isResourceLoaded: false,
       isEditorShow: false
     };
-    var methods = ['editorCallback', 'handleUpload', 'handleChange', 'focusCallback', 'handleInlineUpload', 'handleDropUpload', 'blurCallback', 'handleGetContent', 'initializeEditor', 'clearEditorData', 'plainTextSwitchCallback', 'onWindowClick', 'toggleEditor'];
+    var methods = ['editorCallback', 'handleUpload', 'handleChange', 'focusCallback', 'handleInlineUpload', // 'handleDropUpload',
+    'blurCallback', 'handleGetContent', 'initializeEditor', 'clearEditorData', 'plainTextSwitchCallback', 'onWindowClick', 'toggleEditor'];
 
     _editorUtils.bind.apply(_assertThisInitialized(_this), methods);
 
@@ -109,22 +108,20 @@ var TextEditor = /*#__PURE__*/function (_Component) {
           editorOptions = _this$props$editorOpt === void 0 ? {} : _this$props$editorOpt,
           _this$props$needEdito = _this$props.needEditorFocus,
           needEditorFocus = _this$props$needEdito === void 0 ? true : _this$props$needEdito,
-          handleDropUpload = _this$props.handleDropUpload,
           fontFamily = _this$props.fontFamily,
           fontSize = _this$props.fontSize,
           initCallback = _this$props.initCallback,
           handleAlertMessage = _this$props.handleAlertMessage,
-          needInlineAttachment = _this$props.needInlineAttachment;
+          needInlineAttachment = _this$props.needInlineAttachment,
+          customInitOption = _this$props.customInitOption;
 
       if (id && global.ZohoDeskEditor) {
-        var _defaultObj;
-
-        var defaultObj = (_defaultObj = {
+        var defaultObj = {
           id: id,
           content: (0, _editorUtils.fixEncoding)(value),
           callback: this.editorCallback,
           imageuploadcallback: this.handleInlineUpload,
-          handleInlineDropImage: handleDropUpload ? this.handleDropUpload : undefined,
+          // handleInlineDropImage: handleDropUpload ? this.handleDropUpload : undefined,
           contentChanged: this.handleChange,
           focusCallback: this.focusCallback,
           lineHeight: 'Normal',
@@ -137,18 +134,27 @@ var TextEditor = /*#__PURE__*/function (_Component) {
           mode: mode,
           handleAlertMessage: handleAlertMessage,
           plainTextSwitchCallback: this.plainTextSwitchCallback,
-          imgAspect: true
-        }, _defineProperty(_defaultObj, "handleInlineDropImage", needInlineAttachment ? this.handleInlineUpload : null), _defineProperty(_defaultObj, "needInlineAttachHandling", needInlineAttachment), _defineProperty(_defaultObj, "hookOnInsertHTML", _editorUtils.validateEditorContentOnInsertHtml), _defineProperty(_defaultObj, "needCustomPaste", function needCustomPaste(event, editorObj) {
-          return true; // By default reply editor needs customPaste, so returning true.
-        }), _defineProperty(_defaultObj, "htmlVersion", '<!Doctype html>'), _defaultObj);
+          imgAspect: true,
+          handleInlineDropImage: needInlineAttachment ? this.handleInlineUpload : null,
+          needInlineAttachHandling: needInlineAttachment,
+          hookOnInsertHTML: _editorUtils.validateEditorContentOnInsertHtml,
+          needCustomPaste: function needCustomPaste(event, editorObj) {
+            return true; // By default reply editor needs customPaste, so returning true.
+          },
+          htmlVersion: '<!Doctype html>'
+        };
+
+        if (!customInitOption) {
+          if (!ZohoDeskEditor_Init.init) {
+            global.editorInitialize && global.editorInitialize();
+          }
 
-        if (!ZohoDeskEditor_Init.init) {
-          global.editorInitialize && global.editorInitialize();
+          ZohoDeskEditor_Init.init(editorMode, fontFamily, initCallback, fontSize);
         }
 
         defaultObj = Object.assign(defaultObj, editorOptions);
-        ZohoDeskEditor_Init.init(editorMode, fontFamily, initCallback, fontSize);
-        ZohoDeskEditor.create && ZohoDeskEditor.create(defaultObj);
+        var globalEditor = global.ZohoDeskEditor;
+        globalEditor && typeof globalEditor.create == 'function' && globalEditor.create(defaultObj, customInitOption);
       }
     }
   }, {
@@ -172,8 +178,8 @@ var TextEditor = /*#__PURE__*/function (_Component) {
       getRef && getRef(null);
     }
   }, {
-    key: "componentWillReceiveProps",
-    value: function componentWillReceiveProps(np) {
+    key: "UNSAFE_componentWillReceiveProps",
+    value: function UNSAFE_componentWillReceiveProps(np) {
       var changeEditorContent = this.props.changeEditorContent;
       var id = np.id;
       var editorObj = global.editor ? global.editor[id] ? global.editor[id] : {} : {};
@@ -251,7 +257,8 @@ var TextEditor = /*#__PURE__*/function (_Component) {
       var _this$props5 = this.props,
           editorCallback = _this$props5.editorCallback,
           getRef = _this$props5.getRef,
-          isCustomScroll = _this$props5.isCustomScroll;
+          isCustomScroll = _this$props5.isCustomScroll,
+          customCSS = _this$props5.customCSS;
       this.setState({
         isEditorLoad: true,
         isEditorShow: true
@@ -263,18 +270,6 @@ var TextEditor = /*#__PURE__*/function (_Component) {
         global.editor[id] = editorObj;
       }
 
-      var css = 'pre {white-space: pre-wrap}',
-          head = editorObj.doc.head || editorObj.doc.getElementsByTagName('head')[0],
-          style = document.createElement('style');
-      style.type = 'text/css';
-
-      if (style.styleSheet) {
-        style.styleSheet.cssText = css;
-      } else {
-        style.appendChild(editorObj.doc.createTextNode(css));
-      }
-
-      head.appendChild(style);
       editorCallback && editorCallback(editorObj);
       var iframe = (0, _selectn["default"])('iframe.contentDocument.body', editorObj) || null;
       var iframeHead = (0, _selectn["default"])('iframe.contentDocument.head', editorObj) || null;
@@ -292,9 +287,12 @@ var TextEditor = /*#__PURE__*/function (_Component) {
           iframe.classList.add('scroll');
         }
 
-        var customFonts = document.createElement('style');
-        customFonts.innerText = "@font-face {font-family: 'ZohoPuviRegular';src: url('https://static.zohocdn.com/zohofonts/zohopuvi/4.0/Zoho_Puvi_Regular.woff2') format('woff2');font-style: normal;font-weight: normal;text-rendering: optimizeLegibility;font-display: swap}@font-face {font-family: Regular;src: url('https://static.zohocdn.com/webfonts/lato2regular/font.woff2') format('woff2');font-weight: 400;font-style: normal;font-display: swap}@font-face {font-family: 'RobotoRegular';font-weight: 400;font-style: normal;font-display: swa;src: url('https://static.zohocdn.com/webfonts/robotoregular/font.woff2')}";
-        iframeHead.appendChild(customFonts);
+        var customStyleTag = document.createElement('style');
+        customStyleTag.type = 'text/css';
+        var customizedCSS = "pre {white-space: pre-wrap} ".concat(customCSS);
+        var fontCSS = "@font-face {font-family: 'ZohoPuviRegular';src: url('https://static.zohocdn.com/zohofonts/zohopuvi/4.0/Zoho_Puvi_Regular.woff2') format('woff2');font-style: normal;font-weight: normal;text-rendering: optimizeLegibility;font-display: swap}@font-face {font-family: Regular;src: url('https://static.zohocdn.com/webfonts/lato2regular/font.woff2') format('woff2');font-weight: 400;font-style: normal;font-display: swap}@font-face {font-family: 'RobotoRegular';font-weight: 400;font-style: normal;font-display: swa;src: url('https://static.zohocdn.com/webfonts/robotoregular/font.woff2')}";
+        customStyleTag.textContent = "".concat(customizedCSS, " ").concat(fontCSS);
+        iframeHead.appendChild(customStyleTag);
       }
     }
   }, {
@@ -303,12 +301,24 @@ var TextEditor = /*#__PURE__*/function (_Component) {
       var _this$props6 = this.props,
           id = _this$props6.id,
           progress = _this$props6.setInlineAttachmentInProgress,
-          i18nKeys = _this$props6.i18nKeys;
-
-      if (!(0, _editorUtils.isFileNameSizeInvalid)(file.name)) {
+          i18nKeys = _this$props6.i18nKeys,
+          inlineImageProps = _this$props6.inlineImageProps;
+      var fileUploadError = i18nKeys.fileUploadError,
+          fileNotSupported = i18nKeys.fileNotSupported,
+          fileSizeLimitExceed = i18nKeys.fileSizeLimitExceed,
+          fileEmptyError = i18nKeys.fileEmptyError,
+          fileNameLimitExceed = i18nKeys.fileNameLimitExceed;
+      var _inlineImageProps$all = inlineImageProps.allowedFileExtensions,
+          allowedFileExtensions = _inlineImageProps$all === void 0 ? ["jpeg", "jpg", "png", "gif", "bmp", "ico"] : _inlineImageProps$all,
+          _inlineImageProps$fil = inlineImageProps.fileNameMaxCharacters,
+          fileNameMaxCharacters = _inlineImageProps$fil === void 0 ? 200 : _inlineImageProps$fil,
+          _inlineImageProps$fil2 = inlineImageProps.fileSizeMaxBytes,
+          fileSizeMaxBytes = _inlineImageProps$fil2 === void 0 ? 3 * 1024 * 1024 : _inlineImageProps$fil2;
+
+      if (!(0, _editorUtils.isFileNameSizeInvalid)(file.name, fileNameMaxCharacters)) {
         if (file.size != 0) {
-          if (file.size <= 3 * 1024 * 1024) {
-            if ((0, _editorUtils.isImageFormat)(file.name)) {
+          if (file.size <= fileSizeMaxBytes) {
+            if ((0, _editorUtils.isImageFormat)(file.name, allowedFileExtensions)) {
               progress && progress(true);
               this.handleUpload(file).then(function (res) {
                 successCallback(res);
@@ -318,36 +328,33 @@ var TextEditor = /*#__PURE__*/function (_Component) {
                   (0, _editorUtils.triggerKeyup)(editorObj.doc);
                 }
               }, function () {
-                failureCallback(i18nKeys.fileUploadError);
+                failureCallback(fileUploadError);
               });
             } else {
-              failureCallback(i18nKeys.fileNotSupported);
+              failureCallback(fileNotSupported);
             }
           } else {
-            failureCallback(i18nKeys.fileSizeLimitExceed);
+            failureCallback(fileSizeLimitExceed);
           }
         } else {
-          failureCallback(i18nKeys.fileEmptyError);
+          failureCallback(fileEmptyError);
         }
       } else {
-        failureCallback(i18nKeys.fileNameLimitExceed);
+        failureCallback(fileNameLimitExceed);
       }
-    }
-  }, {
-    key: "handleDropUpload",
-    value: function handleDropUpload(file, successCallback, failureCallback) {
-      var e = {
-        target: {
-          files: [file]
-        }
-      };
-      var handleDropUpload = this.props.handleDropUpload;
-      handleDropUpload(e).then(function (res) {
-        successCallback(res);
-      }, function () {
-        failureCallback();
-      });
-    }
+    } // handleDropUpload(file, successCallback, failureCallback) {
+    //   let e = { target: { files: [file] } };
+    //   let { handleDropUpload } = this.props;
+    //   handleDropUpload(e).then(
+    //     (res) => {
+    //       successCallback(res);
+    //     },
+    //     () => {
+    //       failureCallback();
+    //     }
+    //   );
+    // }
+
   }, {
     key: "blurCallback",
     value: function blurCallback() {
@@ -372,15 +379,7 @@ var TextEditor = /*#__PURE__*/function (_Component) {
           formData.append(getCSRFCookieName(), getCSRFCookie());
         }
 
-        return onUpload(formData, file).then(function (res) {
-          if (editorMode === 'TicketReply') {
-            return "".concat(res.data, "&from=r");
-          }
-
-          return res.data;
-        }, function (err) {
-          throw err;
-        });
+        return onUpload(formData, file);
       } catch (err) {
         return Promise.reject();
       }
@@ -399,7 +398,6 @@ var TextEditor = /*#__PURE__*/function (_Component) {
         var cont = value;
 
         if (typeof editor !== 'undefined') {
-          // eslint-disable-next-line
           cont = editor['addFormEditor'] && editor['addFormEditor'].getContent();
         }
 
@@ -428,13 +426,14 @@ var TextEditor = /*#__PURE__*/function (_Component) {
           loadingComponent = _this$props9.loadingComponent,
           isNightMode = _this$props9.isNightMode,
           isReadOnly = _this$props9.isReadOnly,
-          dataSelectorId = _this$props9.dataSelectorId;
+          dataSelectorId = _this$props9.dataSelectorId,
+          isDisabled = _this$props9.isDisabled;
       var _this$state = this.state,
           isEditorLoad = _this$state.isEditorLoad,
           isEditorShow = _this$state.isEditorShow;
       var editorDoc = ImgLazyLoad && global.editor && global.editor[id] ? global.editor[id].doc : null;
       return /*#__PURE__*/_react["default"].createElement(_Layout.Container, {
-        className: "".concat(_TextEditorModule["default"].textEditor, " ").concat(_TextEditorModule["default"][type], " ").concat(_TextEditorModule["default"][border], "\n        ").concat(isNightMode ? _TextEditorModule["default"].night : _TextEditorModule["default"].light, " ").concat(isReadOnly ? _TextEditorModule["default"].readOnly : '', " ").concat(!isEditorShow ? _TextEditorModule["default"].editorHide : ''),
+        className: "".concat(_TextEditorModule["default"].textEditor, " ").concat(_TextEditorModule["default"][type], " ").concat(_TextEditorModule["default"][border], "\n        ").concat(isNightMode ? _TextEditorModule["default"].night : _TextEditorModule["default"].light, " ").concat(isReadOnly ? _TextEditorModule["default"].readOnly : '', " ").concat(isReadOnly || isDisabled ? _TextEditorModule["default"].disable : '', " ").concat(!isEditorShow ? _TextEditorModule["default"].editorHide : ''),
         dataId: dataId,
         "data-isEditor": true,
         dataSelectorId: dataSelectorId
@@ -444,7 +443,7 @@ var TextEditor = /*#__PURE__*/function (_Component) {
         dataId: dataId
       }), editorDoc && ImgLazyLoad ? /*#__PURE__*/_react["default"].createElement(ImgLazyLoad, {
         node: editorDoc
-      }) : null, isReadOnly ? /*#__PURE__*/_react["default"].createElement("div", {
+      }) : null, isReadOnly || isDisabled ? /*#__PURE__*/_react["default"].createElement("div", {
         className: _TextEditorModule["default"].readOnlyMask
       }) : null);
     }

package/lib/v1/form/fields/TextEditor/props/defaultProps.js

@@ -15,6 +15,9 @@ var defaultProps = {
   needInlineAttachment: false,
   isNightMode: false,
   isReadOnly: false,
-  dataSelectorId: 'textEditor'
+  dataSelectorId: 'textEditor',
+  customCSS: '',
+  isDisabled: false,
+  inlineImageProps: {}
 };
 exports.defaultProps = defaultProps;

package/lib/v1/form/fields/TextEditor/props/propTypes.js

@@ -22,7 +22,6 @@ var propTypes = {
   fontSize: _propTypes["default"].string,
   getRef: _propTypes["default"].func,
   handleAlertMessage: _propTypes["default"].func,
-  handleDropUpload: _propTypes["default"].func,
   i18nKeys: _propTypes["default"].shape({
     fileUploadError: _propTypes["default"].string,
     fileNotSupported: _propTypes["default"].string,
@@ -31,7 +30,7 @@ var propTypes = {
     fileSizeLimitExceed: _propTypes["default"].string
   }),
   id: _propTypes["default"].string,
-  initCallback: _propTypes["default"].func.isRequired,
+  initCallback: _propTypes["default"].func,
   isCustomScroll: _propTypes["default"].bool,
   loadingComponent: _propTypes["default"].node,
   mode: _propTypes["default"].string,
@@ -52,6 +51,14 @@ var propTypes = {
   getCSRFCookie: _propTypes["default"].string,
   isEditorDefaultOpen: _propTypes["default"].bool,
   toggleEdit: _propTypes["default"].func,
-  dataSelectorId: _propTypes["default"].string
+  dataSelectorId: _propTypes["default"].string,
+  customInitOption: _propTypes["default"].object,
+  customCSS: _propTypes["default"].string,
+  isDisabled: _propTypes["default"].bool,
+  inlineImageProps: _propTypes["default"].shape({
+    allowedFileExtensions: _propTypes["default"].array,
+    fileNameMaxCharacters: _propTypes["default"].number,
+    fileSizeMaxBytes: _propTypes["default"].number
+  })
 };
 exports.propTypes = propTypes;

package/lib/v1/utils/editorUtils.js

@@ -15,8 +15,8 @@ exports.isImageFormat = isImageFormat;
 exports.loadResource = loadResource;
 exports.triggerKeyup = triggerKeyup;
 exports.validateEditorContentOnInsertHtml = validateEditorContentOnInsertHtml;
-var ATTACHMENT_FILE_NAME_SIZE_LIMIT = 200; // editorUtils
 
+// editorUtils
 function editorContentValidate(editorObj) {
   var content = editorObj && editorObj.getContent && editorObj.getContent() || '';
 
@@ -67,13 +67,14 @@ function encodeForHtml(str) {
 } // attachment
 
 
-function isFileNameSizeInvalid(fileName) {
-  return fileName.length > ATTACHMENT_FILE_NAME_SIZE_LIMIT;
+function isFileNameSizeInvalid(fileName, fileNameMaxCharacters) {
+  return fileName.length > fileNameMaxCharacters;
 }
 
-function isImageFormat(fileName) {
+function isImageFormat(fileName, allowedFileExtensions) {
   var extension = getExtensionFromFileName(fileName);
-  return /jpeg|jpg|png|gif|bmp|ico/i.test(extension);
+  var isValidExtension = allowedFileExtensions.includes(extension);
+  return isValidExtension;
 }
 
 function getExtensionFromFileName(fileName) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@zohodesk/dot",
-  "version": "1.5.5",
+  "version": "1.6.0",
   "main": "lib/index",
   "module": "es/index.js",
   "private": false,
@@ -37,7 +37,7 @@
     "sstest": "react-cli sstest",
     "common_package_build": "cd ../common && npm run build && cd ../dot",
     "docs": "npm run css:review && review:props && react-cli docs",
-    "prepublishOnly": "node prePublish.js && npm run download && npm run css:review  && npm run review:props",
+    "prepublishOnly": "node prePublish.js && npm run download && npm run test && npm run css:review  && npm run review:props",
     "postpublish": "node postPublish.js",
     "test-clean": "react-cli clean coverage",
     "download": "react-cli clean ./node_modules ./package-lock.json  && npm install",