@syncfusion/ej2-richtexteditor 23.2.7-52849 → 24.1.41-569421

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

@@ -3,7 +3,7 @@ import { NodeCutter } from './nodecutter';
 import * as CONSTANT from './../base/constant';
 import { detach, Browser, isNullOrUndefined as isNOU, createElement, closest } from '@syncfusion/ej2-base';
 import { InsertMethods } from './insert-methods';
-import { updateTextNode } from './../../common/util';
+import { updateTextNode, nestedListCleanUp } from './../../common/util';
 /**
  * Insert a HTML Node or Text
  *
@@ -59,6 +59,10 @@ var InsertHtml = /** @class */ (function () {
         var isCollapsed = range.collapsed;
         var nodes = this.getNodeCollection(range, nodeSelection, node);
         var closestParentNode = (node.nodeName.toLowerCase() === 'table') ? this.closestEle(nodes[0].parentNode, editNode) : nodes[0];
+        if (closestParentNode && closestParentNode.nodeName === 'LI' && node.nodeName.toLowerCase() === 'table') {
+            this.insertTableInList(range, node, closestParentNode, nodes[0], nodeCutter);
+            return;
+        }
         if (isExternal || (!isNOU(node) && !isNOU(node.classList) &&
             node.classList.contains('pasteContent'))) {
             this.pasteInsertHTML(nodes, node, range, nodeSelection, nodeCutter, docElement, isCollapsed, closestParentNode, editNode, enterAction);
@@ -82,7 +86,12 @@ var InsertHtml = /** @class */ (function () {
                     lasNode.textContent.length : lasNode.childNodes.length);
                 range = nodeSelection.getRange(docElement);
             }
-            range.extractContents();
+            if (range.startContainer.parentElement.closest('ol,ul') !== null && range.endContainer.parentElement.closest('ol,ul') !== null) {
+                nestedListCleanUp(range);
+            }
+            else {
+                range.extractContents();
+            }
             if (insertNode.tagName === 'TABLE') {
                 this.removeEmptyElements(editNode);
             }
@@ -119,6 +128,9 @@ var InsertHtml = /** @class */ (function () {
                         InsertMethods.AppendBefore(node, parentNode.firstChild, false);
                     }
                 }
+                else if (isNOU(preNode.previousSibling) && insertNode.tagName === 'TABLE') {
+                    parentNode.prepend(node);
+                }
                 else {
                     parentNode.appendChild(node);
                 }
@@ -204,19 +216,21 @@ var InsertHtml = /** @class */ (function () {
             || (node.nodeName.toLowerCase() === 'table' && closestParentNode &&
                 CONSTANT.TABLE_BLOCK_TAGS.indexOf(closestParentNode.tagName.toLocaleLowerCase()) === -1))) {
             preNode = nodeCutter.GetSpliceNode(range, closestParentNode);
-            sibNode = isNOU(preNode.previousSibling) ? preNode.parentNode.previousSibling : preNode.previousSibling;
-            if (nodes.length === 1) {
-                nodeSelection.setSelectionContents(docElement, preNode);
-                range = nodeSelection.getRange(docElement);
-                isSingleNode = true;
-            }
-            else {
-                lasNode = nodeCutter.GetSpliceNode(range, nodes[nodes.length - 1].parentElement);
-                lasNode = isNOU(lasNode) ? preNode : lasNode;
-                nodeSelection.setSelectionText(docElement, preNode, lasNode, 0, (lasNode.nodeType === 3) ?
-                    lasNode.textContent.length : lasNode.childNodes.length);
-                range = nodeSelection.getRange(docElement);
-                isSingleNode = false;
+            if (!isNOU(preNode)) {
+                sibNode = isNOU(preNode.previousSibling) ? preNode.parentNode.previousSibling : preNode.previousSibling;
+                if (nodes.length === 1) {
+                    nodeSelection.setSelectionContents(docElement, preNode);
+                    range = nodeSelection.getRange(docElement);
+                    isSingleNode = true;
+                }
+                else {
+                    lasNode = nodeCutter.GetSpliceNode(range, nodes[nodes.length - 1].parentElement);
+                    lasNode = isNOU(lasNode) ? preNode : lasNode;
+                    nodeSelection.setSelectionText(docElement, preNode, lasNode, 0, (lasNode.nodeType === 3) ?
+                        lasNode.textContent.length : lasNode.childNodes.length);
+                    range = nodeSelection.getRange(docElement);
+                    isSingleNode = false;
+                }
             }
         }
         var containsBlockNode = false;
@@ -240,12 +254,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 {
@@ -285,6 +304,9 @@ var InsertHtml = /** @class */ (function () {
                 var paraElm = void 0;
                 var previousParent = void 0;
                 if (!this.contentsDeleted) {
+                    if (!isCollapsed && range.startContainer.parentElement.textContent.length === 0 && range.startContainer.nodeName === 'BR' && range.startContainer.parentElement.nodeName === 'P') {
+                        editNode.removeChild(range.startContainer.parentElement);
+                    }
                     range.deleteContents();
                 }
                 while (node.firstChild) {
@@ -296,7 +318,7 @@ var InsertHtml = /** @class */ (function () {
                         (this.inlineNode.indexOf(node.firstChild.nodeName.toLocaleLowerCase()) >= 0 && isFirstTextNode)) {
                         lastSelectionNode = node.firstChild;
                         if (isNOU(node.previousElementSibling)) {
-                            var firstParaElm = createElement('p');
+                            var firstParaElm = enterAction === 'DIV' ? createElement('div') : createElement('p');
                             node.parentElement.insertBefore(firstParaElm, node);
                         }
                         if (node.previousElementSibling.nodeName === 'BR') {
@@ -311,7 +333,7 @@ var InsertHtml = /** @class */ (function () {
                         if (node.firstChild.nodeName === '#text' ||
                             (this.inlineNode.indexOf(node.firstChild.nodeName.toLocaleLowerCase()) >= 0)) {
                             if (!isPreviousInlineElem) {
-                                paraElm = createElement('p');
+                                paraElm = enterAction === 'DIV' ? createElement('div') : createElement('p');
                                 paraElm.appendChild(node.firstChild);
                                 fragment.appendChild(paraElm);
                             }
@@ -405,7 +427,7 @@ var InsertHtml = /** @class */ (function () {
             if (blockNode.nodeName === 'BODY' && range.startContainer === range.endContainer && range.startContainer.nodeType === 1) {
                 blockNode = range.startContainer;
             }
-            if (blockNode.closest('LI') && node && node.firstElementChild &&
+            if (blockNode.closest('LI') && blockNode.nodeName !== 'TD' && blockNode.nodeName !== 'TH' && blockNode.nodeName !== 'TR' && node && node.firstElementChild &&
                 ((node).firstElementChild.tagName === 'OL' || node.firstElementChild.tagName === 'UL')) {
                 var liNode = void 0;
                 while (node.firstElementChild.lastElementChild && node.firstElementChild.lastElementChild.tagName === 'LI') {
@@ -444,6 +466,12 @@ var InsertHtml = /** @class */ (function () {
                     }
                     if (!range.collapsed) {
                         range.deleteContents();
+                        var value = range.startContainer;
+                        if (!isNOU(value) && value.nodeName === 'LI' && !isNOU(value.parentElement) && (value.parentElement.nodeName === 'OL' || value.parentElement.nodeName === 'UL') && value.textContent.trim() === '') {
+                            value.parentElement.querySelectorAll('li').forEach(function (item) {
+                                item.remove();
+                            });
+                        }
                     }
                     range.insertNode(node);
                     this.contentsDeleted = true;
@@ -470,7 +498,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
@@ -525,6 +561,9 @@ var InsertHtml = /** @class */ (function () {
     };
     InsertHtml.closestEle = function (element, editNode) {
         var el = element;
+        if (closest(el, 'li')) {
+            return closest(el, 'li');
+        }
         while (el && el.nodeType === 1) {
             if (el.parentNode === editNode ||
                 (!isNOU(el.parentNode.tagName) &&
@@ -535,6 +574,30 @@ var InsertHtml = /** @class */ (function () {
         }
         return null;
     };
+    InsertHtml.insertTableInList = function (range, insertNode, parentNode, currentNode, nodeCutter) {
+        if (range.collapsed) {
+            var isStart = range.startOffset === 0;
+            var isEnd = range.startContainer.textContent.trimEnd().length === range.startOffset;
+            if (isStart || isEnd) {
+                if (isStart) {
+                    InsertMethods.AppendBefore(insertNode, currentNode, false);
+                }
+                else {
+                    InsertMethods.AppendBefore(insertNode, currentNode, true);
+                }
+            }
+            else {
+                var preNode = nodeCutter.SplitNode(range, parentNode, true);
+                var sibNode = preNode.previousSibling;
+                sibNode.appendChild(insertNode);
+            }
+        }
+        else {
+            range.deleteContents();
+            parentNode.appendChild(insertNode);
+        }
+        insertNode.classList.add('ignore-table');
+    };
     /**
      * Insert method
      *

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

@@ -54,7 +54,8 @@ var LinkCommand = /** @class */ (function () {
             }
             if (!isNOU(e.item.text) && e.item.text !== '') {
                 linkText = anchorEle.innerText;
-                anchorEle.innerText = e.item.text;
+                anchorEle.firstChild.nodeName === '#text' ? anchorEle.innerText = e.item.text :
+                    anchorEle.firstChild.innerText = e.item.text;
             }
             if (!isNOU(e.item.target)) {
                 anchorEle.setAttribute('target', e.item.target);
@@ -70,7 +71,8 @@ var LinkCommand = /** @class */ (function () {
             }
             else {
                 var startIndex = e.item.action === 'Paste' ? anchorEle.childNodes[0].textContent.length : 0;
-                e.item.selection.setSelectionText(this.parent.currentDocument, anchorEle.childNodes[0], anchorEle.childNodes[0], startIndex, anchorEle.childNodes[0].textContent.length);
+                var endIndex = anchorEle.firstChild.nodeName === '#text' ? anchorEle.childNodes[0].textContent.length : anchorEle.childNodes.length;
+                e.item.selection.setSelectionText(this.parent.currentDocument, anchorEle.childNodes[0], anchorEle.childNodes[0], startIndex, endIndex);
             }
         }
         else {
@@ -194,7 +196,7 @@ var LinkCommand = /** @class */ (function () {
         for (var i = 0, j_2 = 0, k = 0; i <= finalinlineNodes.length; i++) {
             if (i === 0) {
                 finalinlineNodes[i].parentNode.insertBefore(anchorNodes[j_2], finalinlineNodes[i].nextSibling);
-                if (this.parent.domNode.blockNodes().length === 1) {
+                if (this.parent.domNode.blockNodes().length === 1 && anchorNodes.length === 1) {
                     this.parent.nodeSelection.setSelectionNode(this.parent.currentDocument, anchorNodes[j_2]);
                 }
                 removeNodes[k] = finalinlineNodes[i];
@@ -230,6 +232,9 @@ var LinkCommand = /** @class */ (function () {
         if (!isNOU(e.item.target)) {
             anchorEle.setAttribute('target', e.item.target);
         }
+        if (!isNOU(e.item.ariaLabel)) {
+            anchorEle.setAttribute('aria-label', e.item.ariaLabel);
+        }
         return anchorEle;
     };
     LinkCommand.prototype.getSelectionNodes = function (nodeCollection) {

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

@@ -72,14 +72,21 @@ var Lists = /** @class */ (function () {
         var preElementOLTest = this.testList(preElement);
         var nextElementOLTest = this.testList(nextElement);
         if (!preElementOLTest && !nextElementOLTest && preElemULStart !== '*' && nextElemULStart !== '*') {
+            var brElement = createElement('br');
             if (startElementOLTest) {
                 range.startContainer.textContent = range.startContainer.textContent.slice(range.startOffset, range.startContainer.textContent.length);
+                if (range.startContainer.nodeName === '#text' && range.startContainer.textContent.length === 0) {
+                    this.parent.domNode.insertAfter(brElement, range.startContainer);
+                }
                 this.applyListsHandler({ subCommand: 'OL', callBack: e.callBack });
                 e.event.preventDefault();
             }
             else if (range.startContainer.textContent.replace(/\u200B/g, '').slice(0, range.startOffset).trim() === '*' ||
                 range.startContainer.textContent.replace(/\u200B/g, '').slice(0, range.startOffset).trim() === '-') {
                 range.startContainer.textContent = range.startContainer.textContent.slice(range.startOffset, range.startContainer.textContent.length);
+                if (range.startContainer.nodeName === '#text' && range.startContainer.textContent.length === 0) {
+                    this.parent.domNode.insertAfter(brElement, range.startContainer);
+                }
                 this.applyListsHandler({ subCommand: 'UL', callBack: e.callBack });
                 e.event.preventDefault();
             }
@@ -107,7 +114,8 @@ var Lists = /** @class */ (function () {
                 startNode.textContent = '';
             }
             var startNodeParent = startNode.parentElement;
-            if (isNOU(startNodeParent.parentElement.closest('UL')) && isNOU(startNodeParent.parentElement.closest('OL'))) {
+            var parentOfCurrentOLUL = startNodeParent.parentElement;
+            if (isNOU(parentOfCurrentOLUL.closest('UL')) && isNOU(parentOfCurrentOLUL.closest('OL'))) {
                 if (!isNOU(startNode.nextElementSibling)) {
                     var nearBlockNode = this.parent.domNode.blockParentNode(startNode);
                     this.parent.nodeCutter.GetSpliceNode(range, nearBlockNode);
@@ -134,6 +142,15 @@ var Lists = /** @class */ (function () {
                     detach(startNode);
                 }
             }
+            // To handle the nested enter key press in the list for the first LI element
+            if (!isNOU(parentOfCurrentOLUL) && (!isNOU(parentOfCurrentOLUL.closest('UL')) || !isNOU(parentOfCurrentOLUL.closest('OL'))) &&
+                parentOfCurrentOLUL.nodeName === 'LI' && parentOfCurrentOLUL.style.listStyleType === 'none' &&
+                parentOfCurrentOLUL.textContent === '' && startNode.textContent === '' && startNode === startNodeParent.firstElementChild &&
+                isNOU(startNode.nextSibling)) {
+                detach(startNodeParent);
+                parentOfCurrentOLUL.style.removeProperty('list-style-type');
+                e.event.preventDefault();
+            }
         }
     };
     Lists.prototype.backspaceList = function (e) {
@@ -190,11 +207,19 @@ var Lists = /** @class */ (function () {
     };
     Lists.prototype.removeList = function (range, e) {
         var startNode = this.parent.domNode.getSelectedNode(range.startContainer, range.startOffset);
-        var endNode = this.parent.domNode.getSelectedNode(range.endContainer, range.endOffset);
+        var endNode = (!isNOU(range.endContainer.parentElement.closest('li')) && range.endContainer.parentElement.closest('li').childElementCount > 1 && range.endContainer.nodeName === '#text') ? range.endContainer : this.parent.domNode.getSelectedNode(range.endContainer, range.endOffset);
+        var parentList = (range.startContainer.nodeName === "#text") ? range.startContainer.parentElement.closest('li') : range.startContainer.closest('li');
+        var fullContent = "";
+        if (!isNOU(parentList) && !isNOU(parentList.firstChild)) {
+            parentList.childNodes.forEach(function (e) {
+                fullContent = fullContent + e.textContent;
+            });
+        }
+        ;
         startNode = startNode.nodeName === 'BR' ? startNode.parentElement : startNode;
         endNode = endNode.nodeName === 'BR' ? endNode.parentElement : endNode;
         startNode = startNode.nodeName !== 'LI' && !isNOU(startNode.closest('LI')) ? startNode.closest('LI') : startNode;
-        endNode = endNode.nodeName !== 'LI' && !isNOU(endNode.closest('LI')) ? endNode.closest('LI') : endNode;
+        endNode = endNode.nodeName !== 'LI' && endNode.nodeName !== '#text' && !isNOU(endNode.closest('LI')) ? endNode.closest('LI') : endNode;
         if (((range.commonAncestorContainer.nodeName === 'OL' || range.commonAncestorContainer.nodeName === 'UL' || range.commonAncestorContainer.nodeName === 'LI') &&
             isNOU(endNode.nextElementSibling) && endNode.textContent.length === range.endOffset &&
             isNOU(startNode.previousElementSibling) && range.startOffset === 0) ||
@@ -211,6 +236,25 @@ var Lists = /** @class */ (function () {
             }
             e.event.preventDefault();
         }
+        else if (!isNOU(parentList) && !range.collapsed && parentList.textContent === fullContent) {
+            range.deleteContents();
+            this.parent.editableElement.querySelectorAll('li').forEach(function (li) {
+                if (!li.firstChild || li.textContent.trim() === '') {
+                    li.parentNode.removeChild(li);
+                }
+            });
+            this.parent.editableElement.querySelectorAll('ol').forEach(function (ol) {
+                if (!ol.firstChild || ol.textContent.trim() === '') {
+                    ol.parentNode.removeChild(ol);
+                }
+            });
+            this.parent.editableElement.querySelectorAll('ul').forEach(function (ul) {
+                if (!ul.firstChild || ul.textContent.trim() === '') {
+                    ul.parentNode.removeChild(ul);
+                }
+            });
+            e.event.preventDefault();
+        }
     };
     Lists.prototype.onKeyUp = function () {
         if (!isNOU(this.commonLIParent) && !isNOU(this.commonLIParent.querySelector('.removeList'))) {
@@ -250,7 +294,7 @@ var Lists = /** @class */ (function () {
         if (e.event.which === 8) {
             this.backspaceList(e);
         }
-        if (e.event.which === 46 && e.event.action === 'delete') {
+        if ((e.event.which === 46 && e.event.action === 'delete') || (e.event.which === 88 && e.event.action === 'cut')) {
             var range = this.parent.nodeSelection.getRange(this.parent.currentDocument);
             var commonAncestor = range.commonAncestorContainer;
             var startEle = range.startContainer;
@@ -507,7 +551,7 @@ var Lists = /** @class */ (function () {
         this.currentAction = e.subCommand;
         this.currentAction = e.subCommand = this.currentAction === 'NumberFormatList' ? 'OL' : this.currentAction === 'BulletFormatList' ? 'UL' : this.currentAction;
         this.domNode.setMarker(this.saveSelection);
-        var listsNodes = this.domNode.blockNodes();
+        var listsNodes = this.domNode.blockNodes(true);
         if (e.enterAction === 'BR') {
             this.setSelectionBRConfig();
             var allSelectedNode = this.parent.nodeSelection.getSelectedNodes(this.parent.currentDocument);
@@ -600,12 +644,16 @@ var Lists = /** @class */ (function () {
     };
     Lists.prototype.applyLists = function (elements, type, selector, item, e) {
         var isReverse = true;
-        if (this.isRevert(elements, type, item) && isNOU(item)) {
+        if (this.isRevert(elements, type, item) && isNOU(item) || (!isNOU(item) && item.listStyle === 'none')) {
             this.revertList(elements, e);
             this.removeEmptyListElements();
         }
         else {
             this.checkLists(elements, type, item);
+            var marginLeftAttribute = '';
+            if (elements[0].style.marginLeft !== '') {
+                marginLeftAttribute = ' style = "margin-left: ' + elements[0].style.marginLeft + ';"';
+            }
             for (var i = 0; i < elements.length; i++) {
                 if (!isNOU(item) && !isNOU(item.listStyle)) {
                     if (item.listStyle === 'listImage') {
@@ -616,16 +664,29 @@ var Lists = /** @class */ (function () {
                         setStyleAttribute(elements[i], { 'list-style-type': item.listStyle.replace(/([a-z])([A-Z])/g, '$1-$2').toLowerCase() });
                     }
                 }
+                var elemAtt = void 0;
+                elements[i].style.removeProperty('margin-left');
+                elemAtt = elements[i].tagName === 'IMG' ? '' : this.domNode.attributes(elements[i]);
                 if (elements[i].getAttribute('contenteditable') === 'true'
                     && elements[i].childNodes.length === 1 && elements[i].childNodes[0].nodeName === 'TABLE') {
                     var listEle = document.createElement(type);
                     listEle.innerHTML = '<li><br/></li>';
                     elements[i].appendChild(listEle);
                 }
+                else if ('LI' !== elements[i].tagName && isNOU(item) &&
+                    elements[i].nodeName === 'BLOCKQUOTE') {
+                    isReverse = false;
+                    var openTag = '<' + type + marginLeftAttribute + '>';
+                    var closeTag = '</' + type + '>';
+                    var newTag = 'li' + elemAtt;
+                    var replaceHTML = elements[i].innerHTML;
+                    var innerHTML = this.domNode.createTagString(newTag, null, replaceHTML);
+                    var collectionString = openTag + innerHTML + closeTag;
+                    elements[i].innerHTML = collectionString;
+                }
                 else if ('LI' !== elements[i].tagName && isNOU(item)) {
                     isReverse = false;
-                    var elemAtt = elements[i].tagName === 'IMG' ? '' : this.domNode.attributes(elements[i]);
-                    var openTag = '<' + type + '>';
+                    var openTag = '<' + type + marginLeftAttribute + '>';
                     var closeTag = '</' + type + '>';
                     var newTag = 'li' + elemAtt;
                     var replaceHTML = (elements[i].tagName.toLowerCase() === CONSTANT.DEFAULT_TAG ?
@@ -637,8 +698,8 @@ var Lists = /** @class */ (function () {
                 else if (!isNOU(item) && 'LI' !== elements[i].tagName) {
                     // eslint-disable-next-line
                     isReverse = false;
-                    var elemAtt = elements[i].tagName === 'IMG' ? '' : this.domNode.attributes(elements[i]);
-                    var openTag = '<' + type + elemAtt + '>';
+                    var currentElemAtt = elements[i].tagName === 'IMG' ? '' : this.domNode.attributes(elements[i]);
+                    var openTag = '<' + type + currentElemAtt + '>';
                     var closeTag = '</' + type + '>';
                     var newTag = 'li';
                     var replaceHTML = (elements[i].tagName.toLowerCase() === CONSTANT.DEFAULT_TAG ?
@@ -675,6 +736,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;
     };
@@ -711,8 +775,17 @@ var Lists = /** @class */ (function () {
     };
     Lists.prototype.cleanNode = function () {
         var liParents = this.parent.editableElement.querySelectorAll('ol + ol, ul + ul');
+        var listStyleType;
+        var firstNodeOL;
         for (var c = 0; c < liParents.length; c++) {
             var node = liParents[c];
+            var toFindtopOlUl = true;
+            if (toFindtopOlUl && (liParents[c].parentElement.parentElement.nodeName === 'OL' || liParents[c].parentElement.parentElement.nodeName === 'UL')) {
+                toFindtopOlUl = false;
+                var preElement = liParents[c].parentElement.parentElement;
+                listStyleType = preElement.style.listStyleType;
+                firstNodeOL = node.previousElementSibling;
+            }
             if (this.domNode.isList(node.previousElementSibling) &&
                 this.domNode.openTagString(node) === this.domNode.openTagString(node.previousElementSibling)) {
                 var contentNodes = this.domNode.contents(node);
@@ -727,6 +800,9 @@ var Lists = /** @class */ (function () {
                 }
             }
         }
+        if (firstNodeOL) {
+            firstNodeOL.style.listStyleType = listStyleType;
+        }
     };
     Lists.prototype.findUnSelected = function (temp, elements) {
         temp = temp.slice().reverse();
@@ -787,72 +863,85 @@ var Lists = /** @class */ (function () {
         var viewNode = [];
         for (var i = 0; i < elements.length; i++) {
             var element = elements[i];
-            if (this.domNode.contents(element)[0].nodeType === 3 && this.domNode.contents(element)[0].textContent.trim().length === 0) {
-                detach(this.domNode.contents(element)[0]);
-            }
-            var parentNode = elements[i].parentNode;
-            var className = element.getAttribute('class');
-            if (temp.length === 0) {
-                var siblingList = elements[i].querySelectorAll('ul, ol');
-                var firstNode = siblingList[0];
-                if (firstNode) {
-                    var child = firstNode
-                        .querySelectorAll('li');
-                    if (child) {
-                        var nestedElement = createElement(firstNode.tagName);
-                        append([nestedElement], firstNode.parentNode);
-                        var nestedElementLI = createElement('li', { styles: 'list-style-type: none;' });
-                        append([nestedElementLI], nestedElement);
-                        append([firstNode], nestedElementLI);
-                    }
-                }
-            }
-            if (element.parentNode.insertBefore(this.closeTag(parentNode.tagName), element),
-                'LI' === parentNode.parentNode.tagName || 'OL' === parentNode.parentNode.tagName ||
-                    'UL' === parentNode.parentNode.tagName) {
-                element.parentNode.insertBefore(this.closeTag('LI'), element);
-            }
-            else {
-                var classAttr = '';
-                if (className) {
-                    // eslint-disable-next-line
-                    classAttr += ' class="' + className + '"';
-                }
-                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 wrapper = '<' + CONSTANT.DEFAULT_TAG + wrapperclass +
-                        this.domNode.attributes(parentNode) + '></' + CONSTANT.DEFAULT_TAG + '>';
-                    if (e.enterAction !== 'BR') {
-                        this.domNode.wrapInner(element, this.domNode.parseHTMLFragment(wrapper));
+            if ((isNullOrUndefined(e.item)) || ((element.nodeName === 'LI' && e.item.listStyle === 'none'))) {
+                if (this.domNode.contents(element)[0].nodeType === 3 && this.domNode.contents(element)[0].textContent.trim().length === 0) {
+                    detach(this.domNode.contents(element)[0]);
+                }
+                var parentNode = elements[i].parentNode;
+                var className = element.getAttribute('class');
+                if (temp.length === 0) {
+                    var siblingList = elements[i].querySelectorAll('ul, ol');
+                    var firstNode = siblingList[0];
+                    if (firstNode) {
+                        var child = firstNode
+                            .querySelectorAll('li');
+                        if (child) {
+                            var nestedElement = createElement(firstNode.tagName);
+                            append([nestedElement], firstNode.parentNode);
+                            var nestedElementLI = createElement('li', { styles: 'list-style-type: none;' });
+                            append([nestedElementLI], nestedElement);
+                            append([firstNode], nestedElementLI);
+                        }
                     }
                 }
-                else if (this.domNode.contents(element)[0].nodeType === 3) {
-                    var replace = this.domNode.createTagString(CONSTANT.DEFAULT_TAG, parentNode, this.parent.domNode.encode(this.domNode.contents(element)[0].textContent));
-                    this.domNode.replaceWith(this.domNode.contents(element)[0], replace);
-                }
-                else if (this.domNode.contents(element)[0].classList.contains(markerClassName.startSelection) ||
-                    this.domNode.contents(element)[0].classList.contains(markerClassName.endSelection)) {
-                    var replace = this.domNode.createTagString(CONSTANT.DEFAULT_TAG, parentNode, this.domNode.contents(element)[0].outerHTML);
-                    this.domNode.replaceWith(this.domNode.contents(element)[0], replace);
+                if (element.parentNode.insertBefore(this.closeTag(parentNode.tagName), element),
+                    'LI' === parentNode.parentNode.tagName || 'OL' === parentNode.parentNode.tagName ||
+                        'UL' === parentNode.parentNode.tagName) {
+                    element.parentNode.insertBefore(this.closeTag('LI'), element);
                 }
                 else {
-                    var childNode = element.firstChild;
-                    className = childNode.getAttribute('class');
-                    attributes(childNode, this.domNode.rawAttributes(parentNode));
-                    if (className && childNode.getAttribute('class')) {
-                        attributes(childNode, { 'class': className + ' ' + childNode.getAttribute('class') });
+                    var classAttr = '';
+                    if (className) {
+                        // eslint-disable-next-line
+                        classAttr += ' class="' + className + '"';
                     }
+                    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 (elements.length === parentElement.querySelectorAll('li').length) {
+                            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(element) + '></' + CONSTANT.DEFAULT_TAG + '>';
+                        if (e.enterAction !== 'BR') {
+                            this.domNode.wrapInner(element, this.domNode.parseHTMLFragment(wrapper));
+                        }
+                    }
+                    else if (this.domNode.contents(element)[0].nodeType === 3) {
+                        var replace = this.domNode.createTagString(CONSTANT.DEFAULT_TAG, parentNode, this.parent.domNode.encode(this.domNode.contents(element)[0].textContent));
+                        this.domNode.replaceWith(this.domNode.contents(element)[0], replace);
+                    }
+                    else if (this.domNode.contents(element)[0].classList.contains(markerClassName.startSelection) ||
+                        this.domNode.contents(element)[0].classList.contains(markerClassName.endSelection)) {
+                        var replace = this.domNode.createTagString(CONSTANT.DEFAULT_TAG, parentNode, this.domNode.contents(element)[0].outerHTML);
+                        this.domNode.replaceWith(this.domNode.contents(element)[0], replace);
+                    }
+                    else {
+                        var childNode = element.firstChild;
+                        className = childNode.getAttribute('class');
+                        attributes(childNode, this.domNode.rawAttributes(parentNode));
+                        if (className && childNode.getAttribute('class')) {
+                            attributes(childNode, { 'class': className + ' ' + childNode.getAttribute('class') });
+                        }
+                    }
+                    append([this.openTag('LI')], element);
+                    prepend([this.closeTag('LI')], element);
+                }
+                this.domNode.insertAfter(this.openTag(parentNode.tagName), element);
+                if (parentNode.parentNode.tagName === 'LI') {
+                    parentNode = parentNode.parentNode.parentNode;
+                }
+                if (viewNode.indexOf(parentNode) < 0) {
+                    viewNode.push(parentNode);
                 }
-                append([this.openTag('LI')], element);
-                prepend([this.closeTag('LI')], element);
-            }
-            this.domNode.insertAfter(this.openTag(parentNode.tagName), element);
-            if (parentNode.parentNode.tagName === 'LI') {
-                parentNode = parentNode.parentNode.parentNode;
-            }
-            if (viewNode.indexOf(parentNode) < 0) {
-                viewNode.push(parentNode);
             }
         }
         for (var i = 0; i < viewNode.length; i++) {

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

@@ -21,6 +21,7 @@ export declare class MsWordPaste {
     private addEventListener;
     private cropImageDimensions;
     private wordCleanup;
+    private addDoubleBr;
     private cleanList;
     private insertAfter;
     private findClosestListElem;
@@ -50,5 +51,7 @@ export declare class MsWordPaste {
     private getlistStyleType;
     private makeConversion;
     private getListContent;
+    private processMargin;
     private removeEmptyAnchorTag;
+    private findSource;
 }