@syncfusion/ej2-richtexteditor 21.2.5 → 21.2.6

package/dist/global/index.d.ts

@@ -1,6 +1,6 @@
 /*!
 *  filename: index.d.ts
-*  version : 21.2.5
+*  version : 21.2.6
 *  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@21.2.4",
+  "_id": "@syncfusion/ej2-richtexteditor@21.2.5",
   "_inBundle": false,
-  "_integrity": "sha512-eBrzNjkFqdoMunZ81qFy5/qOvaIzi171X1xZxVnpx0oYxYT/5NstDoiwthzG6AEg/JCcfxcvwj8jn8Xb17t3/w==",
+  "_integrity": "sha512-iVaRF/cRXXIePc2utfTH3f23LmO7GgH+S749SsNpr1RdfRCAw9VL6Sb2F+aGbNdyd+fGlfjmJqxvtOJss8NYNw==",
   "_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-21.2.4.tgz",
-  "_shasum": "011f6ac6194b8e0b752dbff698a42a8e84e69886",
+  "_resolved": "https://nexus.syncfusion.com/repository/ej2-hotfix-new/@syncfusion/ej2-richtexteditor/-/ej2-richtexteditor-21.2.5.tgz",
+  "_shasum": "43d27462cefa86acb98ad194685d1fd7c0ad31b6",
   "_spec": "@syncfusion/ej2-richtexteditor@*",
   "_where": "/jenkins/workspace/elease-automation_release_21.1.1/packages/included",
   "author": {
@@ -39,10 +39,10 @@
   "bundleDependencies": false,
   "dependencies": {
     "@syncfusion/ej2-base": "~21.2.3",
-    "@syncfusion/ej2-buttons": "~21.2.5",
+    "@syncfusion/ej2-buttons": "~21.2.6",
     "@syncfusion/ej2-filemanager": "~21.2.5",
-    "@syncfusion/ej2-inputs": "~21.2.4",
-    "@syncfusion/ej2-navigations": "~21.2.5",
+    "@syncfusion/ej2-inputs": "~21.2.6",
+    "@syncfusion/ej2-navigations": "~21.2.6",
     "@syncfusion/ej2-popups": "~21.2.4",
     "@syncfusion/ej2-splitbuttons": "~21.2.5"
   },
@@ -70,6 +70,6 @@
     "url": "git+https://github.com/syncfusion/ej2-javascript-ui-controls.git"
   },
   "typings": "index.d.ts",
-  "version": "21.2.5",
+  "version": "21.2.6",
   "sideEffects": false
 }

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

@@ -33,6 +33,7 @@ export declare class MsWordPaste {
     private findDetachElem;
     private removeUnwantedElements;
     private findDetachEmptyElem;
+    private hasParentWithClass;
     private removeEmptyElements;
     private styleCorrection;
     private filterStyles;
@@ -44,4 +45,5 @@ export declare class MsWordPaste {
     private getlistStyleType;
     private makeConversion;
     private getListContent;
+    private removeEmptyAnchorTag;
 }

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

@@ -77,6 +77,7 @@ var MsWordPaste = /** @class */ (function () {
             this.removingComments(elm);
             this.removeUnwantedElements(elm);
             this.removeEmptyElements(elm);
+            this.removeEmptyAnchorTag(elm);
             this.breakLineAddition(elm);
             this.removeClassName(elm);
             if (pattern4.test(tempHTMLContent)) {
@@ -130,7 +131,8 @@ var MsWordPaste = /** @class */ (function () {
                 imgElem[i].getAttribute('v:shapes').indexOf('Picture') < 0 &&
                 imgElem[i].getAttribute('v:shapes').indexOf('圖片') < 0 &&
                 imgElem[i].getAttribute('v:shapes').indexOf('Grafik') < 0 &&
-                imgElem[i].getAttribute('v:shapes').indexOf('Image') < 0) {
+                imgElem[i].getAttribute('v:shapes').indexOf('Image') < 0 &&
+                imgElem[i].getAttribute('v:shapes').indexOf('Graphic') < 0) {
                 detach(imgElem[i]);
             }
         }
@@ -303,6 +305,7 @@ var MsWordPaste = /** @class */ (function () {
         if (!isNOU(element.parentElement)) {
             if (element.parentElement.textContent.trim() === '' &&
                 element.parentElement.getAttribute('id') !== 'MSWord-Content' &&
+                !(this.hasParentWithClass(element, 'MsoListParagraph')) &&
                 isNOU(element.parentElement.querySelector('img'))) {
                 removableElement = this.findDetachEmptyElem(element.parentElement);
             }
@@ -315,6 +318,16 @@ var MsWordPaste = /** @class */ (function () {
         }
         return removableElement;
     };
+    MsWordPaste.prototype.hasParentWithClass = function (element, className) {
+        var currentParentElem = element.parentElement;
+        while (!isNOU(currentParentElem)) {
+            if (currentParentElem.classList.contains(className)) {
+                return true;
+            }
+            currentParentElem = currentParentElem.parentElement;
+        }
+        return false;
+    };
     MsWordPaste.prototype.removeEmptyElements = function (element) {
         var emptyElements = element.querySelectorAll(':empty');
         for (var i = 0; i < emptyElements.length; i++) {
@@ -454,7 +467,6 @@ var MsWordPaste = /** @class */ (function () {
     };
     MsWordPaste.prototype.cleanUp = function (node, listNodes) {
         // eslint-disable-next-line
-        var temp = '';
         var tempCleaner = [];
         var prevflagState;
         var allNodes = node.querySelectorAll('*');
@@ -466,7 +478,7 @@ var MsWordPaste = /** @class */ (function () {
             }
             else if (allNodes[index].className &&
                 allNodes[index].className.toLowerCase().indexOf('msolistparagraph') !== -1 &&
-                allNodes[index].childElementCount !== 1 && !isNOU(allNodes[index].getAttribute('style')) &&
+                !isNOU(allNodes[index].getAttribute('style')) &&
                 allNodes[index].getAttribute('style').indexOf('mso-list:') >= 0) {
                 if (allNodes[index].className.indexOf('MsoListParagraphCxSpFirst') >= 0 && listNodes.length > 0 &&
                     listNodes[listNodes.length - 1] !== null) {
@@ -647,6 +659,19 @@ var MsWordPaste = /** @class */ (function () {
         var listCount = 0;
         var elem;
         for (var index = 0; index < collection.length; index++) {
+            var listClass = ['MsoListParagraphCxSpFirst', 'MsoListParagraphCxSpMiddle', 'MsoListParagraphCxSpLast'];
+            var isNormalList = false;
+            for (var i = 0; i < listClass.length; i++) {
+                if (listClass[i].indexOf(collection[index].class) >= 0) {
+                    isNormalList = true;
+                    break;
+                }
+            }
+            if (!isNOU(prevList) && index != 0 &&
+                collection[index - 1].listType !== collection[index].listType &&
+                !isNormalList) {
+                prevList = null;
+            }
             var pElement = createElement('p');
             pElement.innerHTML = collection[index].content.join(' ');
             if ((collection[index].nestedLevel === 1) && listCount === 0 && collection[index].content) {
@@ -757,28 +782,29 @@ var MsWordPaste = /** @class */ (function () {
             this.listContents.push(pushContent);
         }
         else {
-            var styleNodes = ['b', 'em'];
-            if (firstChild.childNodes.length > 0 && (firstChild.querySelectorAll('b').length > 0
-                || firstChild.querySelectorAll('em').length > 0)) {
-                for (var i = 0; i < firstChild.childNodes.length; i++) {
-                    var nodeName = firstChild.childNodes[i].nodeName.toLowerCase();
-                    if (firstChild.childNodes[i].textContent.trim().length > 1 && styleNodes.indexOf(nodeName) !== -1) {
-                        pushContent = '<' + nodeName + '>' + firstChild.childNodes[i].textContent + '</' + nodeName + '>';
-                        this.listContents.push(pushContent);
-                    }
-                    else if (firstChild.childNodes[i].textContent.trim().length === 1) {
-                        this.listContents.push(firstChild.childNodes[i].textContent.trim());
-                    }
+            //Add to support separate list which looks like same list and also to add all tags as it is inside list
+            if (firstChild.childNodes.length > 0) {
+                var listOrder = firstChild.querySelector('span[style="mso-list:Ignore"]');
+                if (!isNOU(listOrder)) {
+                    this.listContents.push(listOrder.textContent.trim());
+                    detach(listOrder);
+                    this.removingComments(elem);
+                    this.removeUnwantedElements(elem);
                 }
             }
-            else {
-                pushContent = firstChild.textContent.trim();
-                this.listContents.push(pushContent);
-            }
         }
-        detach(firstChild);
         this.listContents.push(elem.innerHTML);
     };
+    MsWordPaste.prototype.removeEmptyAnchorTag = function (element) {
+        var removableElement = element.querySelectorAll('a:not([href])');
+        for (var j = removableElement.length - 1; j >= 0; j--) {
+            var parentElem = removableElement[j].parentNode;
+            while (removableElement[j].firstChild) {
+                parentElem.insertBefore(removableElement[j].firstChild, removableElement[j]);
+            }
+            parentElem.removeChild(removableElement[j]);
+        }
+    };
     return MsWordPaste;
 }());
 export { MsWordPaste };

package/src/editor-manager/plugin/table.d.ts

@@ -27,6 +27,7 @@ export declare class TableCommand {
     private insertColumn;
     private deleteColumn;
     private deleteRow;
+    private getMergedRow;
     private removeTable;
     private tableHeader;
     private tableVerticalAlign;

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

@@ -351,10 +351,13 @@ var TableCommand = /** @class */ (function () {
                             /* eslint-disable */
                             if (1 === rowSpanVal) {
                                 allCells[maxI][j].removeAttribute('rowspan');
-                                var cell = allCells[maxI][j].cloneNode(true);
-                                allCells = this.getCorrespondingColumns();
-                                if (allCells[rowSpanVal][j] && allCells[rowSpanVal][j].parentElement) {
-                                    allCells[rowSpanVal][j].parentElement.insertBefore(cell, allCells[rowSpanVal][j]);
+                                var cell = this.getMergedRow(this.getCorrespondingColumns())[j];
+                                if (cell) {
+                                    var cloneNode = cell.cloneNode(true);
+                                    cloneNode.innerHTML = '<br>';
+                                    if (cell.parentElement) {
+                                        cell.parentElement.insertBefore(cloneNode, cell);
+                                    }
                                 }
                             }
                             else {
@@ -404,6 +407,15 @@ var TableCommand = /** @class */ (function () {
             });
         }
     };
+    TableCommand.prototype.getMergedRow = function (cells) {
+        var mergedRow;
+        for (var i = 0; i < cells.length; i++) {
+            if (cells[i].length !== this.curTable.rows[0].childNodes.length) {
+                mergedRow = cells[i];
+            }
+        }
+        return mergedRow;
+    };
     TableCommand.prototype.removeTable = function (e) {
         var selectedCell = e.item.selection.range.startContainer;
         selectedCell = (selectedCell.nodeType === 3) ? selectedCell.parentNode : selectedCell;

package/src/rich-text-editor/actions/html-editor.js

@@ -116,7 +116,8 @@ var HtmlEditor = /** @class */ (function () {
             range.startContainer.nodeName === '#text' ? range.startContainer.parentElement !== this.parent.inputElement ? range.startContainer.parentElement.classList.add('currentStartMark')
                 : isRootParent = true : range.startContainer.classList.add('currentStartMark');
             if (range.startContainer.textContent.charCodeAt(0) === 8203) {
-                pointer = range.startOffset === 0 ? range.startOffset : range.startOffset - 1;
+                pointer = range.startOffset === 0 ? range.startOffset :
+                    range.startContainer.textContent.replace(regEx, '').trim().length !== 0 ? range.startOffset - 1 : 0;
                 range.startContainer.textContent = range.startContainer.textContent.replace(regEx, '');
                 this.parent.formatter.editorManager.nodeSelection.setCursorPoint(this.parent.contentModule.getDocument(), range.startContainer, pointer);
             }
@@ -331,7 +332,7 @@ var HtmlEditor = /** @class */ (function () {
                 this.parent.formatter.editorManager.nodeSelection.setCursorPoint(this.parent.contentModule.getDocument(), 
                 // eslint-disable-next-line
                 this.oldRangeElement, this.oldRangeElement.childNodes.length);
-                if (this.oldRangeElement.querySelector('BR')) {
+                if (this.oldRangeElement.querySelectorAll('BR').length === 1) {
                     detach(this.oldRangeElement.querySelector('BR'));
                 }
                 if (!isNullOrUndefined(this.rangeElement) && this.oldRangeElement !== this.rangeElement) {

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

@@ -387,7 +387,6 @@ var PasteCleanup = /** @class */ (function () {
                 statusCode: '1'
             }];
         this.uploadObj.createFileList(fileData);
-        this.uploadObj.filesData.push(fileData[0]);
         /* eslint-enable */
         rawFile = fileData;
         this.uploadObj.upload(fileData);
@@ -464,6 +463,7 @@ var PasteCleanup = /** @class */ (function () {
 
      */
     PasteCleanup.prototype.imageFormatting = function (pasteArgs, imgElement) {
+        imgElement.elements[0].classList.add('pasteContent_Img');
         var imageElement = this.parent.createElement('span');
         imageElement.appendChild(imgElement.elements[0]);
         var imageValue = imageElement.innerHTML;

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

@@ -729,6 +729,7 @@ var RichTextEditor = /** @class */ (function (_super) {
         }
         if (e.action !== 'insert-link' &&
             e.action !== 'format-copy' && e.action !== 'format-paste' &&
+            (!e.target || !e.target.classList.contains('e-mention')) &&
             (e.action && e.action !== 'paste' && e.action !== 'space'
                 || e.which === 9 || (e.code === 'Backspace' && e.which === 8))) {
             var FormatPainterEscapeAction = false;