@syncfusion/ej2-richtexteditor 24.2.4 → 24.2.7

package/dist/global/index.d.ts

@@ -1,6 +1,6 @@
 /*!
 *  filename: index.d.ts
-*  version : 24.2.4
+*  version : 24.2.7
 *  Copyright Syncfusion Inc. 2001 - 2023. 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@24.2.3",
+  "_id": "@syncfusion/ej2-richtexteditor@24.2.4",
   "_inBundle": false,
-  "_integrity": "sha512-qjy4z7YGj17wCO4I5dW2kqGyRSaUxHXprYekBaF78kmtSAbFQjy8QFO9+15bOUEcNTPaTaPWHNvZ61Vm3+qOEw==",
+  "_integrity": "sha512-gxGUXVmOFE1abnbYaLzzX3FEGyT+H3uIhWIt0jS7DALyg61NbYz8XViClAoYz62KxDenDXYzu+HyP5bjpMc7gg==",
   "_location": "/@syncfusion/ej2-richtexteditor",
   "_phantomChildren": {},
   "_requested": {
@@ -25,8 +25,8 @@
     "/@syncfusion/ej2-react-richtexteditor",
     "/@syncfusion/ej2-vue-richtexteditor"
   ],
-  "_resolved": "https://nexus.syncfusion.com/repository/ej2-hotfix-new/@syncfusion/ej2-richtexteditor/-/ej2-richtexteditor-24.2.3.tgz",
-  "_shasum": "c6180082b7903ea03940e96f5911e093ee6fab92",
+  "_resolved": "https://nexus.syncfusioninternal.com/repository/ej2-hotfix-new/@syncfusion/ej2-richtexteditor/-/ej2-richtexteditor-24.2.4.tgz",
+  "_shasum": "c1a662b91702ceddbdb9a858bae8cdccb2635ea7",
   "_spec": "@syncfusion/ej2-richtexteditor@*",
   "_where": "/jenkins/workspace/elease-automation_release_24.1.1/packages/included",
   "author": {
@@ -37,13 +37,13 @@
   },
   "bundleDependencies": false,
   "dependencies": {
-    "@syncfusion/ej2-base": "~24.2.3",
-    "@syncfusion/ej2-buttons": "~24.2.3",
-    "@syncfusion/ej2-filemanager": "~24.2.3",
-    "@syncfusion/ej2-inputs": "~24.2.4",
+    "@syncfusion/ej2-base": "~24.2.7",
+    "@syncfusion/ej2-buttons": "~24.2.7",
+    "@syncfusion/ej2-filemanager": "~24.2.7",
+    "@syncfusion/ej2-inputs": "~24.2.7",
     "@syncfusion/ej2-navigations": "~24.2.4",
-    "@syncfusion/ej2-popups": "~24.2.3",
-    "@syncfusion/ej2-splitbuttons": "~24.2.3"
+    "@syncfusion/ej2-popups": "~24.2.5",
+    "@syncfusion/ej2-splitbuttons": "~24.2.7"
   },
   "deprecated": false,
   "description": "Essential JS 2 RichTextEditor component",
@@ -69,6 +69,6 @@
     "url": "git+https://github.com/syncfusion/ej2-javascript-ui-controls.git"
   },
   "typings": "index.d.ts",
-  "version": "24.2.4",
+  "version": "24.2.7",
   "sideEffects": false
 }

package/src/common/util.js

@@ -86,7 +86,7 @@ export function updateTextNode(value, enterAction) {
                 tableElm[i].classList.add('e-rte-paste-table');
                 if (tableElm[i].classList.contains('e-rte-paste-word-table')) {
                     tableElm[i].classList.remove('e-rte-paste-word-table');
-                    continue; // Sking the removal of the border if the source is from word.
+                    continue; // Skiping the removal of the border if the source is from word.
                 }
                 else if (tableElm[i].classList.contains('e-rte-paste-excel-table')) {
                     tableElm[i].classList.remove('e-rte-paste-excel-table');
@@ -120,6 +120,9 @@ export function updateTextNode(value, enterAction) {
         }
         var imageElm = resultElm.querySelectorAll('img');
         for (var i = 0; i < imageElm.length; i++) {
+            if (imageElm[i].classList.contains('e-rte-image-unsupported')) {
+                continue; // Should not add the class if the image is Broken.
+            }
             if (!imageElm[i].classList.contains('e-rte-image')) {
                 imageElm[i].classList.add('e-rte-image');
             }

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

@@ -18,6 +18,7 @@ export declare class Formats {
     private addEventListener;
     private getParentNode;
     private onKeyUp;
+    private getBlockParent;
     private onKeyDown;
     private removeCodeContent;
     private deleteContent;

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

@@ -52,6 +52,14 @@ var Formats = /** @class */ (function () {
             }
         }
     };
+    Formats.prototype.getBlockParent = function (node, endNode) {
+        var currentParent;
+        while (node != endNode) {
+            currentParent = node;
+            node = node.parentElement;
+        }
+        return currentParent;
+    };
     Formats.prototype.onKeyDown = function (e) {
         if (e.event.which === 13) {
             var range = this.parent.nodeSelection.getRange(this.parent.currentDocument);
@@ -61,6 +69,8 @@ var Formats = /** @class */ (function () {
                 ? range.endContainer : range.endContainer.parentElement;
             var preElem = closest(startCon, 'pre');
             var endPreElem = closest(endCon, 'pre');
+            var blockquoteEle = closest(startCon, 'blockquote');
+            var endBlockquoteEle = closest(endCon, 'blockquote');
             var liParent = !isNOU(preElem) && !isNOU(preElem.parentElement) && preElem.parentElement.tagName === 'LI';
             if (liParent) {
                 return;
@@ -72,6 +82,17 @@ var Formats = /** @class */ (function () {
                 range = this.parent.nodeSelection.getRange(this.parent.currentDocument);
                 this.parent.nodeSelection.setCursorPoint(this.parent.currentDocument, endCon, 0);
             }
+            if (e.event.which === 13 && ((!isNOU(blockquoteEle) && !isNOU(endBlockquoteEle)) || (!isNOU(blockquoteEle) && isNOU(endBlockquoteEle)))) {
+                var startParent = this.getBlockParent(range.startContainer, blockquoteEle);
+                if ((startParent.textContent.charCodeAt(0) === 8203 &&
+                    startParent.textContent.length === 1) || startParent.textContent.length === 0) {
+                    if (isNOU(startParent.nextSibling) && ((startParent.previousSibling.textContent.charCodeAt(0) === 8203 &&
+                        startParent.previousSibling.textContent.length === 1) || startParent.previousSibling.textContent.length === 0)) {
+                        e.event.preventDefault();
+                        this.paraFocus(startParent.parentElement); //Revert from blockquotes while pressing enter key
+                    }
+                }
+            }
             if (e.event.which === 13 && !isNOU(preElem) && !isNOU(endPreElem)) {
                 e.event.preventDefault();
                 this.deleteContent(range);
@@ -295,7 +316,7 @@ var Formats = /** @class */ (function () {
                 replaceHTML = parentNode.innerHTML;
             }
             if ((e.subCommand.toLowerCase() === parentNode.tagName.toLowerCase() &&
-                (e.subCommand.toLowerCase() !== 'pre' ||
+                (e.subCommand.toLowerCase() !== 'pre' && e.subCommand.toLowerCase() !== 'blockquote' ||
                     (!isNOU(e.exeValue) && e.exeValue.name === 'dropDownSelect'))) ||
                 isNOU(parentNode.parentNode) ||
                 (parentNode.tagName === 'TABLE' && e.subCommand.toLowerCase() === 'pre')) {
@@ -304,7 +325,21 @@ var Formats = /** @class */ (function () {
             this.cleanFormats(parentNode, e.subCommand);
             var replaceNode = (e.subCommand.toLowerCase() === 'pre' && parentNode.tagName.toLowerCase() === 'pre') ?
                 'p' : e.subCommand;
-            var replaceTag = this.parent.domNode.createTagString(replaceNode, parentNode, replaceHTML.replace(/>\s+</g, '><'));
+            var isToggleBlockquoteList = e.subCommand.toLowerCase() === parentNode.tagName.toLowerCase() &&
+                e.subCommand.toLowerCase() === 'blockquote' && this.parent.domNode.isList(parentNode.firstElementChild);
+            var isToggleBlockquote = e.subCommand.toLowerCase() === parentNode.tagName.toLowerCase()
+                && e.subCommand.toLowerCase() === 'blockquote';
+            var replaceTag = void 0;
+            if (isToggleBlockquoteList) {
+                replaceTag = replaceHTML.replace(/>\s+</g, '><');
+            }
+            else if (isToggleBlockquote) {
+                var tagWrap = (e.enterAction == 'BR' || e.enterAction == 'P') ? 'P' : e.enterAction;
+                replaceTag = this.parent.domNode.createTagString(tagWrap, parentNode, replaceHTML.replace(/>\s+</g, '><'));
+            }
+            else {
+                replaceTag = this.parent.domNode.createTagString(replaceNode, parentNode, replaceHTML.replace(/>\s+</g, '><'));
+            }
             if (parentNode.tagName === 'LI') {
                 parentNode.innerHTML = '';
                 parentNode.insertAdjacentHTML('beforeend', replaceTag);

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

@@ -248,12 +248,17 @@ var InsertHtml = /** @class */ (function () {
                     preNode.parentNode.replaceChild(fragment, preNode);
                 }
                 else {
+                    var startContainerParent = range.startContainer.parentNode;
+                    // Get the index of the start container among its siblings
+                    var startIndex = Array.prototype.indexOf.call(startContainerParent.childNodes, range.startContainer);
                     range.deleteContents();
+                    range.setStart(startContainerParent, startIndex);
+                    range.setEnd(startContainerParent, startIndex);
                     if (!isNOU(lasNode)) {
                         detach(lasNode);
                     }
                     // eslint-disable-next-line
-                    !isNOU(sibNode) ? sibNode.parentNode.appendChild(fragment) : editNode.appendChild(fragment);
+                    !isNOU(sibNode) ? (sibNode.parentNode === editNode ? sibNode.appendChild(fragment) : sibNode.parentNode.appendChild(fragment)) : range.insertNode(fragment);
                 }
             }
             else {
@@ -478,7 +483,15 @@ var InsertHtml = /** @class */ (function () {
     };
     InsertHtml.imageFocus = function (node, nodeSelection, docElement) {
         var focusNode = document.createTextNode(' ');
-        node.parentNode.insertBefore(focusNode, node.nextSibling);
+        if (node.parentNode && node.parentNode.nodeName === 'A') {
+            var anchorTag = node.parentNode;
+            var parentNode = anchorTag.parentNode;
+            parentNode.insertBefore(focusNode, anchorTag.nextSibling);
+            parentNode.insertBefore(node, focusNode);
+        }
+        else {
+            node.parentNode.insertBefore(focusNode, node.nextSibling);
+        }
         nodeSelection.setSelectionText(docElement, node.nextSibling, node.nextSibling, 0, 0);
     };
     // eslint-disable-next-line

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

@@ -675,6 +675,9 @@ var Lists = /** @class */ (function () {
                 isNOU(item) && nodes[i].parentNode.style.listStyleType !== '') {
                 isRevert = false;
             }
+            if (nodes[i].parentNode.tagName === tagName && nodes[i].parentNode.style.listStyleType !== '') {
+                isRevert = true;
+            }
         }
         return isRevert;
     };
@@ -821,8 +824,18 @@ var Lists = /** @class */ (function () {
                 if (CONSTANT.DEFAULT_TAG && 0 === element.querySelectorAll(CONSTANT.BLOCK_TAGS.join(', ')).length) {
                     var wrapperclass = isNullOrUndefined(className) ? ' class="e-rte-wrap-inner"' :
                         ' class="' + className + ' e-rte-wrap-inner"';
+                    var parentElement = parentNode;
+                    if (!isNOU(parentElement.style.listStyleType)) {
+                        parentNode.style.removeProperty("list-style-type");
+                    }
+                    if (!isNOU(parentElement.style.listStyleImage)) {
+                        parentNode.style.removeProperty("list-style-image");
+                    }
+                    if (parentElement.style.length === 0) {
+                        parentNode.removeAttribute("style");
+                    }
                     var wrapper = '<' + CONSTANT.DEFAULT_TAG + wrapperclass +
-                        this.domNode.attributes(parentNode) + '></' + CONSTANT.DEFAULT_TAG + '>';
+                        this.domNode.attributes(parentElement) + '></' + CONSTANT.DEFAULT_TAG + '>';
                     if (e.enterAction !== 'BR') {
                         this.domNode.wrapInner(element, this.domNode.parseHTMLFragment(wrapper));
                     }

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

@@ -1,5 +1,5 @@
 import * as EVENTS from '../../common/constant';
-import { createElement, isNullOrUndefined as isNOU, detach } from '@syncfusion/ej2-base';
+import { createElement, isNullOrUndefined as isNOU, detach, addClass } from '@syncfusion/ej2-base';
 import { PASTE_SOURCE } from '../base/constant';
 /**
  * PasteCleanup for MsWord content
@@ -68,7 +68,6 @@ var MsWordPaste = /** @class */ (function () {
         if (patern.test(tempHTMLContent) || patern2.test(tempHTMLContent) || patern3.test(tempHTMLContent) ||
             pattern4.test(tempHTMLContent)) {
             var source = this.findSource(elm);
-            this.imageConversion(elm, rtfData);
             tempHTMLContent = tempHTMLContent.replace(/<img[^>]+>/i, '');
             this.addListClass(elm);
             listNodes = this.cleanUp(elm, listNodes);
@@ -76,6 +75,7 @@ var MsWordPaste = /** @class */ (function () {
                 listNodes[0].parentElement.tagName !== 'OL') {
                 this.listConverter(listNodes);
             }
+            this.imageConversion(elm, rtfData);
             this.cleanList(elm, 'UL');
             this.cleanList(elm, 'OL');
             this.styleCorrection(elm, wordPasteStyleConfig);
@@ -84,11 +84,11 @@ var MsWordPaste = /** @class */ (function () {
             this.removeEmptyElements(elm);
             this.removeEmptyAnchorTag(elm);
             this.breakLineAddition(elm);
+            this.processMargin(elm);
             this.removeClassName(elm);
             if (pattern4.test(tempHTMLContent)) {
                 this.addTableBorderClass(elm);
             }
-            this.processMargin(elm);
             e.callBack(elm.innerHTML, this.cropImageDimensions, source);
         }
         else {
@@ -159,8 +159,9 @@ var MsWordPaste = /** @class */ (function () {
                 imgElem[i].getAttribute('v:shapes').indexOf('Graphic') < 0 &&
                 imgElem[i].getAttribute('v:shapes').indexOf('_x0000_s') < 0 &&
                 imgElem[i].getAttribute('v:shapes').indexOf('_x0000_i') < 0) {
-                detach(imgElem[i]);
+                imgElem[i].classList.add('e-rte-image-unsupported');
             }
+            imgElem[i].removeAttribute('v:shapes');
         }
         imgElem = elm.querySelectorAll('img');
         var imgSrc = [];
@@ -190,6 +191,7 @@ var MsWordPaste = /** @class */ (function () {
                     });
                 }
             }
+            imgElem = elm.querySelectorAll('img:not(.e-rte-image-unsupported');
             for (var i = 0; i < imgElem.length; i++) {
                 if (imgSrc[i].match(linkRegex)) {
                     imgElem[i].setAttribute('src', imgSrc[i]);
@@ -200,7 +202,7 @@ var MsWordPaste = /** @class */ (function () {
                     }
                     else {
                         imgElem[i].removeAttribute('src');
-                        imgElem[i].setAttribute('alt', 'Unsupported file format');
+                        imgElem[i].classList.add('e-rte-image-unsupported');
                     }
                     if (!isNOU(base64Src[i]) && base64Src[i].isCroppedImage) {
                         imgElem[i].classList.add('e-img-cropped');
@@ -208,6 +210,10 @@ var MsWordPaste = /** @class */ (function () {
                 }
                 imgElem[i].setAttribute('id', 'msWordImg-' + imgName[i]);
             }
+            imgElem = elm.querySelectorAll('.e-rte-image-unsupported');
+            for (var i = 0; i < imgElem.length; i++) {
+                imgElem[i].removeAttribute('src');
+            }
         }
     };
     MsWordPaste.prototype.checkVShape = function (elm) {
@@ -281,6 +287,9 @@ var MsWordPaste = /** @class */ (function () {
         var result = [];
         if (!isNOU(fullImg)) {
             for (var i = 0; i < fullImg.length; i++) {
+                if (fullImg[i].indexOf('fIsBullet') !== -1 && fullImg[i].indexOf('wzName') === -1) {
+                    continue;
+                }
                 var isCroppedImage = false;
                 var goalWidth = 0;
                 var goalHeight = 0;
@@ -295,7 +304,7 @@ var MsWordPaste = /** @class */ (function () {
                     else if (fullImg[i].indexOf('\\jpegblip') !== -1) {
                         imgType = 'image/jpeg';
                     }
-                    else if (fullImg[i].indexOf('\\picprop') !== -1) {
+                    else if (fullImg[i].indexOf('\\emfblip') !== -1) {
                         imgType = null;
                     }
                     else {
@@ -335,7 +344,7 @@ var MsWordPaste = /** @class */ (function () {
         return parseInt(result, 10);
     };
     MsWordPaste.prototype.removeClassName = function (elm) {
-        var elmWithClass = elm.querySelectorAll('*[class]:not(.e-img-cropped)');
+        var elmWithClass = elm.querySelectorAll('*[class]:not(.e-img-cropped):not(.e-rte-image-unsupported)');
         for (var i = 0; i < elmWithClass.length; i++) {
             elmWithClass[i].removeAttribute('class');
         }
@@ -608,6 +617,7 @@ var MsWordPaste = /** @class */ (function () {
     MsWordPaste.prototype.listConverter = function (listNodes) {
         var level;
         var data = [];
+        var listFormatOverride;
         var collection = [];
         var content = '';
         var stNode;
@@ -629,6 +639,17 @@ var MsWordPaste = /** @class */ (function () {
             else {
                 level = 1;
             }
+            if (content && content.indexOf('mso-list:') !== -1) {
+                var msoListValue = void 0;
+                if (content.match(/mso-list:[^;]+;?/)) {
+                    var changedContent = content.replace('\n', '').split(' ').join('');
+                    msoListValue = changedContent.match(/mso-list:[^;]+;?/)[0].split(':l');
+                    listFormatOverride = isNOU(msoListValue) ? null : parseInt(msoListValue[1].split('level')[0], 10);
+                }
+                else {
+                    listFormatOverride = null;
+                }
+            }
             this.listContents = [];
             this.getListContent(listNodes[i]);
             var type = void 0;
@@ -664,9 +685,9 @@ var MsWordPaste = /** @class */ (function () {
                             startAttr = this.lowerGreekNumber.indexOf(this.listContents[0].split('.')[0]) + 1;
                         }
                     }
-                    if (listNodes[i].style.marginLeft !== '') {
-                        styleMarginLeft = listNodes[i].style.marginLeft;
-                    }
+                }
+                if (listNodes[i].style.marginLeft !== '') {
+                    styleMarginLeft = listNodes[i].style.marginLeft;
                 }
                 var tempNode = [];
                 for (var j = 1; j < this.listContents.length; j++) {
@@ -682,7 +703,8 @@ var MsWordPaste = /** @class */ (function () {
                     currentListStyle = listNodes[i].getAttribute('style');
                 }
                 collection.push({
-                    listType: type, content: tempNode, nestedLevel: level, class: currentClassName,
+                    listType: type, content: tempNode, nestedLevel: level,
+                    listFormatOverride: listFormatOverride, class: currentClassName,
                     listStyle: currentListStyle, listStyleTypeName: listStyleType, start: startAttr, styleMarginLeft: styleMarginLeft
                 });
             }
@@ -755,6 +777,7 @@ var MsWordPaste = /** @class */ (function () {
         var prevList;
         var listCount = 0;
         var elem;
+        var lfo = collection[0].listFormatOverride;
         for (var index = 0; index < collection.length; index++) {
             var listClass = ['MsoListParagraphCxSpFirst', 'MsoListParagraphCxSpMiddle', 'MsoListParagraphCxSpLast'];
             var isNormalList = false;
@@ -771,16 +794,24 @@ var MsWordPaste = /** @class */ (function () {
             }
             var pElement = createElement('p', { className: 'MsoNormal' });
             pElement.innerHTML = collection[index].content.join(' ');
-            if ((collection[index].nestedLevel === 1) && listCount === 0 && collection[index].content) {
+            if ((collection[index].nestedLevel === 1) &&
+                (listCount === 0 || lfo !== collection[index].listFormatOverride) &&
+                collection[index].content) {
                 root.appendChild(temp = createElement(collection[index].listType, { className: collection[index].class }));
                 prevList = createElement('li');
                 prevList.appendChild(pElement);
                 temp.appendChild(prevList);
                 temp.setAttribute('level', collection[index].nestedLevel.toString());
-                temp.style.marginLeft = collection[index].styleMarginLeft;
+                if (collection[index].class !== 'msolistparagraph') {
+                    temp.style.marginLeft = collection[index].styleMarginLeft;
+                }
+                else {
+                    addClass([temp], 'marginLeftIgnore');
+                }
                 temp.style.listStyleType = collection[index].listStyleTypeName;
             }
-            else if (collection[index].nestedLevel === pLevel) {
+            else if (collection[index].nestedLevel === pLevel &&
+                lfo === collection[index].listFormatOverride) {
                 if (!isNOU(prevList) && !isNOU(prevList.parentElement)
                     && prevList.parentElement.tagName.toLowerCase() === collection[index].listType) {
                     prevList.parentElement.appendChild(prevList = createElement('li'));
@@ -843,6 +874,12 @@ var MsWordPaste = /** @class */ (function () {
                         prevList.appendChild(pElement);
                         temp.appendChild(prevList);
                         temp.setAttribute('level', collection[index].nestedLevel.toString());
+                        if (collection[index].class !== 'msolistparagraph') {
+                            temp.style.marginLeft = collection[index].styleMarginLeft;
+                        }
+                        else {
+                            addClass([temp], 'marginLeftIgnore');
+                        }
                         temp.style.listStyleType = collection[index].listStyleTypeName;
                     }
                 }
@@ -866,14 +903,34 @@ var MsWordPaste = /** @class */ (function () {
                     elem = elem.parentElement;
                     if (elem.attributes.getNamedItem('level')) {
                         // eslint-disable-next-line
-                        if (parseInt(elem.attributes.getNamedItem('level').textContent, null) === collection[index].nestedLevel) {
+                        if (parseInt(elem.attributes.getNamedItem('level').textContent, null) === collection[index].nestedLevel &&
+                            lfo === collection[index].listFormatOverride) {
                             prevList = createElement('li');
                             prevList.appendChild(pElement);
                             elem.appendChild(prevList);
                             break;
                             // eslint-disable-next-line
                         }
-                        else if (collection[index].nestedLevel > parseInt(elem.attributes.getNamedItem('level').textContent, null)) {
+                        else if (parseInt(elem.attributes.getNamedItem('level').textContent, null) === collection[index].nestedLevel &&
+                            lfo !== collection[index].listFormatOverride) {
+                            temp = createElement(collection[index].listType);
+                            prevList = createElement('li');
+                            temp.appendChild(prevList);
+                            if (collection[index].nestedLevel > 1) {
+                                for (var k = 0; k < collection[index].nestedLevel - 1; k++) {
+                                    prevList.appendChild(temp = createElement(collection[index].listType));
+                                    prevList = createElement('li');
+                                    temp.appendChild(prevList);
+                                    temp.style.listStyleType = 'none';
+                                }
+                            }
+                            prevList.appendChild(pElement);
+                            elem.appendChild(temp);
+                            temp.setAttribute('level', collection[index].nestedLevel.toString());
+                            temp.style.listStyleType = collection[index].listStyleTypeName;
+                            break;
+                        }
+                        else if (collection[index].nestedLevel > parseInt(elem.attributes.getNamedItem('level').textContent, 10)) {
                             elem.appendChild(temp = createElement(collection[index].listType));
                             prevList = createElement('li');
                             prevList.appendChild(pElement);
@@ -889,8 +946,9 @@ var MsWordPaste = /** @class */ (function () {
             prevList.setAttribute('class', collection[index].class);
             prevList.setAttribute('style', (!isNOU(collection[index].listStyle) ? collection[index].listStyle : ''));
             pLevel = collection[index].nestedLevel;
+            lfo = collection[index].listFormatOverride;
             listCount++;
-            if (!isNOU(collection[index].start)) {
+            if (!isNOU(collection[index].start && collection[index].start !== 1 && collection[index].listType === 'ol')) {
                 temp.setAttribute('start', collection[index].start.toString());
             }
         }
@@ -927,7 +985,7 @@ var MsWordPaste = /** @class */ (function () {
         var liChildren = element.querySelectorAll('li');
         if (liChildren.length > 0) {
             for (var i = 0; i < liChildren.length; i++) {
-                if (!isNOU((liChildren[i]).style.marginLeft)) {
+                if (!isNOU((liChildren[i]).style.marginLeft) && !liChildren[i].parentElement.classList.contains('marginLeftIgnore')) {
                     (liChildren[i]).style.marginLeft = '';
                 }
             }
@@ -941,6 +999,17 @@ var MsWordPaste = /** @class */ (function () {
                 }
             }
         }
+        var ignoredNode = element.querySelectorAll('.marginLeftIgnore li');
+        if (ignoredNode.length > 0) {
+            for (var i = 0; i < ignoredNode.length; i++) {
+                if (!isNOU((ignoredNode[i]).style.marginLeft) && (ignoredNode[i]).style.marginLeft !== '') {
+                    var marginLeft = (ignoredNode[i]).style.marginLeft;
+                    var marginLeftValue = parseFloat(marginLeft.split('in')[0]);
+                    var result = marginLeftValue - 0.5;
+                    (ignoredNode[i]).style.marginLeft = result.toString() + 'in';
+                }
+            }
+        }
     };
     MsWordPaste.prototype.removeEmptyAnchorTag = function (element) {
         var removableElement = element.querySelectorAll('a:not([href])');

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

@@ -125,7 +125,7 @@ var NodeCutter = /** @class */ (function () {
         else if (len > -1) {
             this.spliceEmptyNode(fragment.childNodes[0], isStart);
         }
-        else if (fragment.nodeType !== 3 && fragment.nodeType !== 11 && fragment.nodeName !== 'IMG' && !(fragment.classList.contains('e-video-wrap')) && !(fragment.classList.contains('e-audio-wrap'))) {
+        else if (fragment.nodeType !== 3 && fragment.nodeType !== 11 && fragment.nodeName !== 'IMG' && !(fragment.querySelectorAll('img').length > 0) && !(fragment.classList.contains('e-video-wrap')) && !(fragment.classList.contains('e-audio-wrap'))) {
             fragment.parentNode.removeChild(fragment);
         }
         return fragment;

package/src/editor-manager/plugin/selection-commands.d.ts

@@ -29,4 +29,5 @@ export declare class SelectionCommands {
     private static updateStyles;
     private static insertFormatPainterElem;
     private static formatPainterCleanup;
+    private static concatenateTextExcludingList;
 }

package/src/editor-manager/plugin/selection-commands.js

@@ -38,6 +38,29 @@ var SelectionCommands = /** @class */ (function () {
             var nodeCutter = new NodeCutter();
             var isFormatted = new IsFormatted();
             var range = domSelection.getRange(docElement);
+            var currentAnchorNode = range.startContainer.parentElement;
+            if (range.collapsed && !isNOU(currentAnchorNode) &&
+                currentAnchorNode.tagName === 'A' &&
+                (range.startOffset === currentAnchorNode.textContent.length || range.startOffset === 0)) {
+                var emptyTextNode = document.createTextNode('');
+                if (range.startOffset === 0) {
+                    currentAnchorNode.parentNode.insertBefore(emptyTextNode, currentAnchorNode);
+                }
+                else {
+                    if (!isNOU(currentAnchorNode.nextSibling)) {
+                        currentAnchorNode.parentElement.insertBefore(emptyTextNode, currentAnchorNode.nextSibling);
+                    }
+                    else {
+                        currentAnchorNode.parentNode.appendChild(emptyTextNode);
+                    }
+                }
+                // Set the range to the empty text node
+                var newRange = docElement.createRange();
+                range.setStart(emptyTextNode, 0);
+                range.setEnd(emptyTextNode, 0);
+                range.collapse(true);
+                domSelection.setRange(docElement, newRange);
+            }
             if (Browser.userAgent.indexOf('Firefox') !== -1 && range.startContainer === range.endContainer && !isNOU(endNode) && range.startContainer === endNode) {
                 var startChildNodes = range.startContainer.childNodes;
                 var startNode = ((startChildNodes[(range.startOffset > 0) ? (range.startOffset - 1) :
@@ -413,7 +436,10 @@ var SelectionCommands = /** @class */ (function () {
                 }
                 var num = index;
                 var liChildContent = '';
-                while (num >= 0 && !isNOU(liElement) && liElement.tagName.toLowerCase() === 'li' && liElement.textContent.replace('/\u200B/g', '').trim().includes(nodes[num].textContent.trim())) {
+                /* eslint-disable security/detect-object-injection */
+                while (num >= 0 && !isNOU(liElement) && liElement.tagName.toLowerCase() === 'li' && liElement.contains(nodes[num]) &&
+                    liElement.textContent.replace('/\u200B/g', '').trim().includes(nodes[num].textContent.trim())) {
+                    /* eslint-enable security/detect-object-injection */
                     liChildContent = ' ' + nodes[num].textContent.trim() + liChildContent;
                     num--;
                 }
@@ -485,6 +511,23 @@ var SelectionCommands = /** @class */ (function () {
                             parentElement = parentElement.parentElement;
                             liElement = parentElement;
                         }
+                        if (format === 'fontcolor') {
+                            var parentElem = nodes[index].parentElement;
+                            if (!isNOU(parentElem) && parentElem.childNodes) {
+                                for (var i = 0; i < parentElem.childNodes.length; i++) {
+                                    if (this.concatenateTextExcludingList(nodes, index) === nodes[index].textContent) {
+                                        if (parentElem.tagName === 'LI') {
+                                            parentElem.style.color = value;
+                                        }
+                                    }
+                                    // eslint-disable-next-line
+                                    var childElement = parentElem.childNodes[i];
+                                    if (childElement.tagName === 'OL' || childElement.tagName === 'UL') {
+                                        childElement.style.color = 'initial';
+                                    }
+                                }
+                            }
+                        }
                         if (!isNOU(liElement) && liElement.tagName.toLowerCase() === 'li' &&
                             liElement.textContent.trim() === nodes[index].textContent.trim()) {
                             if (format === 'fontsize') {
@@ -784,6 +827,18 @@ var SelectionCommands = /** @class */ (function () {
             }
         }
     };
+    SelectionCommands.concatenateTextExcludingList = function (nodes, index) {
+        var result = '';
+        var parentNode = nodes[index].parentElement;
+        for (var i = 0; i < parentNode.childNodes.length; i++) {
+            // eslint-disable-next-line
+            var childNode = parentNode.childNodes[i];
+            if ((childNode.nodeType === 3) || (childNode.nodeType === 1 && (childNode.tagName !== 'OL' && childNode.tagName !== 'UL'))) {
+                result += childNode.textContent;
+            }
+        }
+        return result;
+    };
     SelectionCommands.enterAction = 'P';
     return SelectionCommands;
 }());

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

@@ -538,7 +538,7 @@ var TableCommand = /** @class */ (function () {
         var eleArray = elements;
         //eslint-disable-next-line
         if (min < (max = Math.min(max, eleArray[0].length - 1))) {
-            for (colIndex === min; colIndex <= max; colIndex++) {
+            for (colIndex = min; colIndex <= max; colIndex++) {
                 // eslint-disable-next-line
                 if (!(min < colIndex && eleArray[0][colIndex] === eleArray[0][colIndex - 1]) && 1 < (index =
                     Math.min(parseInt(eleArray[0][colIndex].getAttribute('colspan'), 10) || 1, max - min + 1)) &&

package/src/rich-text-editor/actions/base-quick-toolbar.js

@@ -79,7 +79,7 @@ var BaseQuickToolbar = /** @class */ (function () {
             e.target.classList.contains('e-imgbreak')) ? false : true;
         var target = !isNOU(imgWrapper) ? imgWrapper : e.target;
         addClass([this.toolbarElement], [classes.CLS_RM_WHITE_SPACE]);
-        var targetOffsetTop = target.offsetTop;
+        var targetOffsetTop = (target.classList.contains("e-rte-audio")) ? target.parentElement.offsetTop : target.offsetTop;
         var parentOffsetTop = window.pageYOffset + e.parentData.top;
         if ((targetOffsetTop - e.editTop) > e.popHeight) {
             y = parentOffsetTop + e.tBarElementHeight + (targetOffsetTop - e.editTop) - e.popHeight - 5;
@@ -92,7 +92,7 @@ var BaseQuickToolbar = /** @class */ (function () {
         }
         target = isAligned ? e.target : target;
         if (target.offsetWidth > e.popWidth) {
-            x = (target.offsetWidth / 2) - (e.popWidth / 2) + e.parentData.left + target.offsetLeft;
+            x = (target.offsetWidth / 2) - (e.popWidth / 2) + e.parentData.left + ((target.classList.contains("e-rte-audio")) ? target.parentElement.offsetLeft : target.offsetLeft);
         }
         else {
             x = e.parentData.left + target.offsetLeft;

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

@@ -485,10 +485,10 @@ var EnterKeyAction = /** @class */ (function () {
         }
         var previousBlockNode = this.parent.formatter.editorManager.domNode.blockNodes()[0].previousSibling;
         var nextBlockNode = this.parent.formatter.editorManager.domNode.blockNodes()[0].nextSibling;
-        if (!isNOU(previousBlockNode) && previousBlockNode.hasAttribute('style')) {
+        if (!isNOU(previousBlockNode) && previousBlockNode.hasAttribute('style') && previousBlockNode.nodeName !== 'TABLE') {
             insertElem.setAttribute('style', previousBlockNode.getAttribute('style'));
         }
-        if (isNOU(previousBlockNode) && !isNOU(nextBlockNode) && nextBlockNode.hasAttribute('style')) {
+        if (isNOU(previousBlockNode) && !isNOU(nextBlockNode) && nextBlockNode.hasAttribute('style') && nextBlockNode.nodeName !== 'TABLE') {
             insertElem.setAttribute('style', nextBlockNode.getAttribute('style'));
         }
         return insertElem;