@syncfusion/ej2-richtexteditor 21.2.5 → 21.2.8

package/dist/es6/ej2-richtexteditor.es2015.js

@@ -14858,7 +14858,7 @@ class TableCommand {
         const colIndex = Array.prototype.indexOf.call(selectedCell.parentNode.childNodes, selectedCell);
         this.curTable = closest(selectedCell, 'table');
         let currentRow;
-        let allCells = this.getCorrespondingColumns();
+        const allCells = this.getCorrespondingColumns();
         const minMaxIndex = this.getSelectedCellMinMaxIndex(allCells);
         let maxI;
         let j;
@@ -14876,10 +14876,13 @@ class TableCommand {
                             /* eslint-disable */
                             if (1 === rowSpanVal) {
                                 allCells[maxI][j].removeAttribute('rowspan');
-                                const 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]);
+                                const cell = this.getMergedRow(this.getCorrespondingColumns())[j];
+                                if (cell) {
+                                    const cloneNode = cell.cloneNode(true);
+                                    cloneNode.innerHTML = '<br>';
+                                    if (cell.parentElement) {
+                                        cell.parentElement.insertBefore(cloneNode, cell);
+                                    }
                                 }
                             }
                             else {
@@ -14929,6 +14932,15 @@ class TableCommand {
             });
         }
     }
+    getMergedRow(cells) {
+        let mergedRow;
+        for (let i = 0; i < cells.length; i++) {
+            if (cells[i].length !== this.curTable.rows[0].childNodes.length) {
+                mergedRow = cells[i];
+            }
+        }
+        return mergedRow;
+    }
     removeTable(e) {
         let selectedCell = e.item.selection.range.startContainer;
         selectedCell = (selectedCell.nodeType === 3) ? selectedCell.parentNode : selectedCell;
@@ -15570,9 +15582,12 @@ class IsFormatted {
         const validTags = ['u'];
         if (validTags.indexOf(node.nodeName.toLowerCase()) !== -1) {
             return true;
+            /* eslint-disable */
         }
         else if (this.inlineTags.indexOf(node.nodeName.toLowerCase()) !== -1 &&
-            node.style && node.style.textDecoration === 'underline') {
+            node.style && (node.style.textDecoration === 'underline' ||
+            node.style.textDecorationLine === 'underline')) {
+            /* eslint-enable */
             return true;
         }
         else {
@@ -15591,9 +15606,12 @@ class IsFormatted {
         const validTags = ['del', 'strike'];
         if (validTags.indexOf(node.nodeName.toLowerCase()) !== -1) {
             return true;
+            /* eslint-disable */
         }
         else if (this.inlineTags.indexOf(node.nodeName.toLowerCase()) !== -1 &&
-            node.style && node.style.textDecoration === 'line-through') {
+            node.style && (node.style.textDecoration === 'line-through' ||
+            node.style.textDecorationLine === 'line-through')) {
+            /* eslint-enable */
             return true;
         }
         else {
@@ -17071,6 +17089,7 @@ class MsWordPaste {
             this.removingComments(elm);
             this.removeUnwantedElements(elm);
             this.removeEmptyElements(elm);
+            this.removeEmptyAnchorTag(elm);
             this.breakLineAddition(elm);
             this.removeClassName(elm);
             if (pattern4.test(tempHTMLContent)) {
@@ -17124,7 +17143,8 @@ class MsWordPaste {
                 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]);
             }
         }
@@ -17297,6 +17317,7 @@ class MsWordPaste {
         if (!isNullOrUndefined(element.parentElement)) {
             if (element.parentElement.textContent.trim() === '' &&
                 element.parentElement.getAttribute('id') !== 'MSWord-Content' &&
+                !(this.hasParentWithClass(element, 'MsoListParagraph')) &&
                 isNullOrUndefined(element.parentElement.querySelector('img'))) {
                 removableElement = this.findDetachEmptyElem(element.parentElement);
             }
@@ -17309,6 +17330,16 @@ class MsWordPaste {
         }
         return removableElement;
     }
+    hasParentWithClass(element, className) {
+        let currentParentElem = element.parentElement;
+        while (!isNullOrUndefined(currentParentElem)) {
+            if (currentParentElem.classList.contains(className)) {
+                return true;
+            }
+            currentParentElem = currentParentElem.parentElement;
+        }
+        return false;
+    }
     removeEmptyElements(element) {
         const emptyElements = element.querySelectorAll(':empty');
         for (let i = 0; i < emptyElements.length; i++) {
@@ -17459,7 +17490,7 @@ class MsWordPaste {
             }
             else if (allNodes[index].className &&
                 allNodes[index].className.toLowerCase().indexOf('msolistparagraph') !== -1 &&
-                allNodes[index].childElementCount !== 1 && !isNullOrUndefined(allNodes[index].getAttribute('style')) &&
+                !isNullOrUndefined(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) {
@@ -17640,6 +17671,19 @@ class MsWordPaste {
         let listCount = 0;
         let elem;
         for (let index = 0; index < collection.length; index++) {
+            const listClass = ['MsoListParagraphCxSpFirst', 'MsoListParagraphCxSpMiddle', 'MsoListParagraphCxSpLast'];
+            let isNormalList = false;
+            for (let i = 0; i < listClass.length; i++) {
+                if (listClass[i].indexOf(collection[index].class) >= 0) {
+                    isNormalList = true;
+                    break;
+                }
+            }
+            if (!isNullOrUndefined(prevList) && index != 0 &&
+                collection[index - 1].listType !== collection[index].listType &&
+                !isNormalList) {
+                prevList = null;
+            }
             const pElement = createElement('p');
             pElement.innerHTML = collection[index].content.join(' ');
             if ((collection[index].nestedLevel === 1) && listCount === 0 && collection[index].content) {
@@ -17750,28 +17794,29 @@ class MsWordPaste {
             this.listContents.push(pushContent);
         }
         else {
-            const styleNodes = ['b', 'em'];
-            if (firstChild.childNodes.length > 0 && (firstChild.querySelectorAll('b').length > 0
-                || firstChild.querySelectorAll('em').length > 0)) {
-                for (let i = 0; i < firstChild.childNodes.length; i++) {
-                    const 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) {
+                let listOrder = firstChild.querySelector('span[style="mso-list:Ignore"]');
+                if (!isNullOrUndefined(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);
     }
+    removeEmptyAnchorTag(element) {
+        const removableElement = element.querySelectorAll('a:not([href])');
+        for (let j = removableElement.length - 1; j >= 0; j--) {
+            const parentElem = removableElement[j].parentNode;
+            while (removableElement[j].firstChild) {
+                parentElem.insertBefore(removableElement[j].firstChild, removableElement[j]);
+            }
+            parentElem.removeChild(removableElement[j]);
+        }
+    }
 }
 
 /**
@@ -19432,7 +19477,8 @@ class HtmlEditor {
             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);
             }
@@ -19646,7 +19692,7 @@ class HtmlEditor {
                 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) {
@@ -20504,7 +20550,6 @@ class PasteCleanup {
                 statusCode: '1'
             }];
         this.uploadObj.createFileList(fileData);
-        this.uploadObj.filesData.push(fileData[0]);
         /* eslint-enable */
         rawFile = fileData;
         this.uploadObj.upload(fileData);
@@ -20580,6 +20625,7 @@ class PasteCleanup {
      * @deprecated
      */
     imageFormatting(pasteArgs, imgElement) {
+        imgElement.elements[0].classList.add('pasteContent_Img');
         const imageElement = this.parent.createElement('span');
         imageElement.appendChild(imgElement.elements[0]);
         const imageValue = imageElement.innerHTML;
@@ -30642,6 +30688,7 @@ let RichTextEditor = class RichTextEditor extends Component {
         }
         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))) {
             let FormatPainterEscapeAction = false;