@syncfusion/ej2-richtexteditor 20.4.50 → 20.4.52

package/dist/global/index.d.ts

@@ -1,6 +1,6 @@
 /*!
 *  filename: index.d.ts
-*  version : 20.4.50
+*  version : 20.4.52
 *  Copyright Syncfusion Inc. 2001 - 2020. All rights reserved.
 *  Use of this code is subject to the terms of our license.
 *  A copy of the current license can be obtained at any time by e-mailing

package/package.json

@@ -1,8 +1,8 @@
 {
   "_from": "@syncfusion/ej2-richtexteditor@*",
-  "_id": "@syncfusion/ej2-richtexteditor@20.4.49",
+  "_id": "@syncfusion/ej2-richtexteditor@20.4.51",
   "_inBundle": false,
-  "_integrity": "sha512-ERM3xTHQM8VUJBEZaf/nw2bNJeAJS8MqpQ8NkLDjpSvb5AJ5tj8AzjhPqicd6osd4hD+xNpYPdc/6X9pvl35xg==",
+  "_integrity": "sha512-KrCoVlwCvqCiQPFS/bTRaCsH8WAyiBTtWkbBRRLLxCXtjyUKz8X3XIOcSmekQFzmMGcvwXHPwqTfKUMBQs+mAQ==",
   "_location": "/@syncfusion/ej2-richtexteditor",
   "_phantomChildren": {},
   "_requested": {
@@ -26,8 +26,8 @@
     "/@syncfusion/ej2-react-richtexteditor",
     "/@syncfusion/ej2-vue-richtexteditor"
   ],
-  "_resolved": "https://nexus.syncfusion.com/repository/ej2-hotfix-new/@syncfusion/ej2-richtexteditor/-/ej2-richtexteditor-20.4.49.tgz",
-  "_shasum": "b5aa155ed03b18a46327b0ea6549aa40a807ac9f",
+  "_resolved": "https://nexus.syncfusion.com/repository/ej2-hotfix-new/@syncfusion/ej2-richtexteditor/-/ej2-richtexteditor-20.4.51.tgz",
+  "_shasum": "5a1cdfcc714424ed059b501d2c0eaa46d0b2c172",
   "_spec": "@syncfusion/ej2-richtexteditor@*",
   "_where": "/jenkins/workspace/ease-automation_release_19.1.0.1/packages/included",
   "author": {
@@ -38,12 +38,12 @@
   },
   "bundleDependencies": false,
   "dependencies": {
-    "@syncfusion/ej2-base": "~20.4.48",
+    "@syncfusion/ej2-base": "~20.4.51",
     "@syncfusion/ej2-buttons": "~20.4.50",
-    "@syncfusion/ej2-filemanager": "~20.4.48",
-    "@syncfusion/ej2-inputs": "~20.4.48",
-    "@syncfusion/ej2-navigations": "~20.4.49",
-    "@syncfusion/ej2-popups": "~20.4.49",
+    "@syncfusion/ej2-filemanager": "~20.4.51",
+    "@syncfusion/ej2-inputs": "~20.4.52",
+    "@syncfusion/ej2-navigations": "~20.4.52",
+    "@syncfusion/ej2-popups": "~20.4.52",
     "@syncfusion/ej2-splitbuttons": "~20.4.50"
   },
   "deprecated": false,
@@ -70,6 +70,6 @@
     "url": "git+https://github.com/syncfusion/ej2-javascript-ui-controls.git"
   },
   "typings": "index.d.ts",
-  "version": "20.4.50",
+  "version": "20.4.52",
   "sideEffects": false
 }

package/src/editor-manager/plugin/inserthtml.js

@@ -41,8 +41,8 @@ var InsertHtml = /** @class */ (function () {
         }
         if (range.startContainer.nodeName === 'BR' && range.startOffset === 0 && range.startOffset === range.endOffset &&
             range.startContainer === range.endContainer) {
-            var currentIndex = Array.prototype.slice.call(range.startContainer.parentElement.children).indexOf(range.startContainer);
-            nodeSelection.setSelectionText(docElement, range.startContainer.parentElement, range.startContainer.parentElement, currentIndex + 1, currentIndex + 1);
+            var currentIndex = Array.prototype.slice.call(range.startContainer.parentElement.childNodes).indexOf(range.startContainer);
+            nodeSelection.setSelectionText(docElement, range.startContainer.parentElement, range.startContainer.parentElement, currentIndex, currentIndex);
             range = nodeSelection.getRange(docElement);
         }
         var isCursor = range.startOffset === range.endOffset && range.startOffset === 0 &&

package/src/editor-manager/plugin/ms-word-clean-up.js

@@ -120,7 +120,10 @@ var MsWordPaste = /** @class */ (function () {
         this.checkVShape(elm);
         var imgElem = elm.querySelectorAll('img');
         for (var i = 0; i < imgElem.length; i++) {
-            if (!isNOU(imgElem[i].getAttribute('v:shapes')) && imgElem[i].getAttribute('v:shapes').indexOf('Picture') < 0 && imgElem[i].getAttribute('v:shapes').indexOf('Image') < 0) {
+            if (!isNOU(imgElem[i].getAttribute('v:shapes')) &&
+                imgElem[i].getAttribute('v:shapes').indexOf('Picture') < 0 &&
+                imgElem[i].getAttribute('v:shapes').indexOf('圖片') < 0 &&
+                imgElem[i].getAttribute('v:shapes').indexOf('Image') < 0) {
                 detach(imgElem[i]);
             }
         }

package/src/editor-manager/plugin/toolbar-status.js

@@ -156,7 +156,7 @@ var ToolbarStatus = /** @class */ (function () {
             formatCollection.fontname = this.isFontName(docElement, node, fontName);
         }
         if (!formatCollection.fontsize) {
-            formatCollection.fontsize = this.isFontSize(node, fontSize);
+            formatCollection.fontsize = this.isFontSize(docElement, node, fontSize);
         }
         if (!formatCollection.backgroundcolor) {
             formatCollection.backgroundcolor = this.isBackgroundColor(node);
@@ -216,8 +216,12 @@ var ToolbarStatus = /** @class */ (function () {
             return null;
         }
     };
-    ToolbarStatus.isFontSize = function (node, fontSize) {
+    ToolbarStatus.isFontSize = function (docElement, node, fontSize) {
         var size = node.style && node.style.fontSize;
+        if ((size === null || size === undefined || size === '') && node.nodeType !== 3 &&
+            node.parentElement.classList.contains('e-content')) {
+            size = this.getComputedStyle(docElement, node, 'font-size');
+        }
         if ((size !== null && size !== '' && size !== undefined)
             && (fontSize === null || fontSize === undefined || (fontSize.indexOf(size) > -1))) {
             return size;

package/src/rich-text-editor/actions/enter-key.js

@@ -47,7 +47,7 @@ var EnterKeyAction = /** @class */ (function () {
             isTableEnter = blockElement.tagName === 'TD' || blockElement.tagName === 'TBODY' ? false : true;
         }
         if (e.args.which === 13 && e.args.code === 'Enter') {
-            if (isNOU(this.startNode.closest('LI')) && isNOU(this.endNode.closest('LI')) && isTableEnter &&
+            if (isNOU(this.startNode.closest('LI,UL,OL')) && isNOU(this.endNode.closest('LI,UL,OL')) && isTableEnter &&
                 isNOU(this.startNode.closest('PRE')) && isNOU(this.endNode.closest('PRE'))) {
                 var shiftKey_1 = e.args.shiftKey;
                 var actionBeginArgs = {
@@ -340,7 +340,8 @@ var EnterKeyAction = /** @class */ (function () {
                             _this.removeBRElement(currentParent);
                             var isEmptyBrInserted = false;
                             var currentParentLastChild = currentParent.lastChild;
-                            while (!isNOU(currentParentLastChild) && !(currentParentLastChild.nodeName === '#text' || currentParentLastChild.nodeName === 'BR')) {
+                            while (!isNOU(currentParentLastChild) && !(currentParentLastChild.nodeName === '#text' || currentParentLastChild.nodeName === 'BR'
+                                || currentParentLastChild.nodeName === 'IMG')) {
                                 currentParentLastChild = currentParentLastChild.lastChild;
                             }
                             var isLastNodeLength = _this.range.startContainer === currentParentLastChild ?
@@ -348,7 +349,8 @@ var EnterKeyAction = /** @class */ (function () {
                             if (currentParent !== _this.parent.inputElement &&
                                 _this.parent.formatter.editorManager.domNode.isBlockNode(currentParent) &&
                                 _this.range.startOffset === _this.range.endOffset &&
-                                _this.range.startOffset === isLastNodeLength) {
+                                (_this.range.startOffset === isLastNodeLength ||
+                                    (currentParent.textContent.trim().length === 0 && currentParent.lastChild.nodeName === 'IMG'))) {
                                 var focusBRElem = _this.parent.createElement('br');
                                 if (_this.range.startOffset === 0 && _this.range.startContainer.nodeName === 'TABLE') {
                                     _this.range.startContainer.parentElement.insertBefore(focusBRElem, _this.range.startContainer);
@@ -357,6 +359,11 @@ var EnterKeyAction = /** @class */ (function () {
                                     if (currentParentLastChild.nodeName === 'BR' && currentParent.textContent.length === 0) {
                                         _this.parent.formatter.editorManager.domNode.insertAfter(focusBRElem, currentParentLastChild);
                                     }
+                                    else if (_this.range.startOffset === 0 && _this.range.endOffset === 0 &&
+                                        currentParent.lastChild && currentParent.lastChild.nodeName === 'IMG') {
+                                        currentParentLastChild.parentElement.insertBefore(focusBRElem, currentParentLastChild);
+                                        focusBRElem = currentParentLastChild;
+                                    }
                                     else {
                                         var lineBreakBRElem = _this.parent.createElement('br');
                                         _this.parent.formatter.editorManager.domNode.insertAfter(focusBRElem, _this.range.startContainer);

package/src/rich-text-editor/actions/paste-clean-up.js

@@ -552,7 +552,7 @@ var PasteCleanup = /** @class */ (function () {
         this.radioRender();
         /* eslint-disable */
         if (this.parent.element.offsetHeight < parseInt(this.dialogObj.height.split('px')[0], null)) {
-            this.parent.height = parseInt(this.dialogObj.height.split('px')[0], null) + 40;
+            this.parent.setProperties({ height: parseInt(this.dialogObj.height.split('px')[0], null) + 40 });
             /* eslint-enable */
             isHeight = true;
         }

package/src/rich-text-editor/actions/xhtml-validation.d.ts

@@ -16,7 +16,6 @@ export declare class XhtmlValidation {
 
      */
     selfEncloseValidation(currentValue: string, valueLength?: number): string;
-    private AddRootElement;
     private clean;
     private ImageTags;
     private removeTags;

package/src/rich-text-editor/actions/xhtml-validation.js

@@ -25,7 +25,6 @@ var XhtmlValidation = /** @class */ (function () {
                 this.currentElement = this.parent.inputElement;
             }
             this.clean(this.currentElement);
-            this.AddRootElement();
             this.ImageTags();
             this.removeTags();
             this.RemoveUnsupported();
@@ -72,16 +71,6 @@ var XhtmlValidation = /** @class */ (function () {
         }
         return currentValue;
     };
-    XhtmlValidation.prototype.AddRootElement = function () {
-        if ((this.currentElement.childNodes.length === 1 && this.currentElement.firstChild.nodeName !== 'DIV') ||
-            this.currentElement.childNodes.length > 1) {
-            var parentEle = this.parent.createElement('div');
-            while (this.currentElement.childNodes.length > 0) {
-                parentEle.appendChild(this.currentElement.childNodes[0]);
-            }
-            this.currentElement.appendChild(parentEle);
-        }
-    };
     XhtmlValidation.prototype.clean = function (node) {
         for (var n = 0; n < node.childNodes.length; n++) {
             var child = node.childNodes[n];

package/src/rich-text-editor/base/rich-text-editor.js

@@ -784,6 +784,7 @@ var RichTextEditor = /** @class */ (function (_super) {
             }
             else {
                 value = this.htmlEditorModule.sanitizeHelper(value);
+                value = this.enableXhtml ? this.htmlEditorModule.xhtmlValidation.selfEncloseValidation(value) : value;
             }
         }
         return value;
@@ -2003,7 +2004,9 @@ var RichTextEditor = /** @class */ (function (_super) {
         this.notify(events.windowResize, null);
     };
     RichTextEditor.prototype.scrollHandler = function (e) {
-        this.notify(events.scroll, { args: e });
+        if (this.element) {
+            this.notify(events.scroll, { args: e });
+        }
     };
     RichTextEditor.prototype.contentScrollHandler = function (e) {
         this.notify(events.contentscroll, { args: e });
@@ -2064,8 +2067,8 @@ var RichTextEditor = /** @class */ (function (_super) {
         }
         var getTextArea = this.element.querySelector('.e-rte-srctextarea');
         if (this.editorMode === 'HTML') {
-            value = (this.inputElement.innerHTML === '<p><br></p>' || this.inputElement.innerHTML === '<div><br></div>' ||
-                this.inputElement.innerHTML === '<br>') ? null : this.enableHtmlEncode ?
+            value = (this.inputElement.innerHTML === '<p><br></p>' || this.inputElement.innerHTML === '<div><br></div>'
+                || this.inputElement.innerHTML === '<br>') ? null : this.enableHtmlEncode ?
                 this.encode(decode(this.inputElement.innerHTML)) : this.inputElement.innerHTML;
             if (getTextArea && getTextArea.style.display === 'block') {
                 value = getTextArea.value;

package/src/rich-text-editor/renderer/table-module.js

@@ -916,12 +916,14 @@ var Table = /** @class */ (function () {
                             if ((totalwid - actualwid) > 20 && actualwid > 20) {
                                 var leftColumnWidth = totalwid - actualwid;
                                 var rightColWidth = actualwid;
-                                if (!isNOU(_this.curTable.rows[i].cells[_this.colIndex - 1])) {
-                                    _this.curTable.rows[i].cells[_this.colIndex - 1].style.width =
+                                var index = _this.curTable.rows[i].cells[i].hasAttribute('colspan') ?
+                                    parseInt(_this.curTable.rows[i].cells[i].getAttribute('colspan'), 10) - 1 : _this.colIndex;
+                                if (!isNOU(_this.curTable.rows[i].cells[index - 1])) {
+                                    _this.curTable.rows[i].cells[index - 1].style.width =
                                         _this.convertPixelToPercentage(leftColumnWidth, tableWidth) + '%';
                                 }
-                                if (!isNOU(_this.curTable.rows[i].cells[_this.colIndex])) {
-                                    _this.curTable.rows[i].cells[_this.colIndex].style.width =
+                                if (!isNOU(_this.curTable.rows[i].cells[index])) {
+                                    _this.curTable.rows[i].cells[index].style.width =
                                         _this.convertPixelToPercentage(rightColWidth, tableWidth) + '%';
                                 }
                             }