@syncfusion/ej2-richtexteditor 21.2.10 → 22.1.34

package/src/editor-manager/plugin/format-painter-actions.js

@@ -3,6 +3,7 @@ import * as EVENTS from '../../common/constant';
 import { SelectionCommands } from '../plugin';
 var FormatPainterActions = /** @class */ (function () {
     function FormatPainterActions(parent, options) {
+        this.INVALID_TAGS = ['A', 'AUDIO', 'IMG', 'VIDEO', 'IFRAME'];
         this.parent = parent;
         this.settings = options;
         this.addEventListener();
@@ -10,8 +11,43 @@ var FormatPainterActions = /** @class */ (function () {
     }
     FormatPainterActions.prototype.addEventListener = function () {
         this.parent.observer.on(EVENTS.FORMAT_PAINTER_ACTIONS, this.actionHandler, this);
+        this.parent.observer.on(EVENTS.MODEL_CHANGED_PLUGIN, this.onPropertyChanged, this);
+    };
+    FormatPainterActions.prototype.onPropertyChanged = function (prop) {
+        if (prop && prop.module === 'formatPainter') {
+            if (!isNOU(prop.newProp.formatPainterSettings.allowedFormats)) {
+                this.settings.allowedFormats = prop.newProp.formatPainterSettings.allowedFormats;
+            }
+            if (!isNOU(prop.newProp.formatPainterSettings.deniedFormats)) {
+                this.settings.deniedFormats = prop.newProp.formatPainterSettings.deniedFormats;
+                this.setDeniedFormats();
+            }
+        }
+    };
+    FormatPainterActions.prototype.removeEventListener = function () {
+        this.parent.observer.off(EVENTS.FORMAT_PAINTER_ACTIONS, this.actionHandler);
+        this.parent.observer.off(EVENTS.MODEL_CHANGED_PLUGIN, this.onPropertyChanged);
+    };
+    /**
+     * Destroys the format painter.
+     *
+     * @function destroy
+     * @returns {void}
+     * @hidden
+
+     */
+    FormatPainterActions.prototype.destroy = function () {
+        this.removeEventListener();
+        this.INVALID_TAGS = null;
+        this.copyCollection = null;
+        this.deniedFormatsCollection = null;
+        this.newElem = null;
+        this.newElemLastChild = null;
+        this.settings = null;
+        this.parent = null;
     };
     FormatPainterActions.prototype.actionHandler = function (args) {
+        this.settings.allowedContext = ['Text', 'List', 'Table'];
         if (!isNOU(args) && !isNOU(args.item) && !isNOU(args.item.formatPainterAction)) {
             switch (args.item.formatPainterAction) {
                 case 'format-copy':
@@ -24,6 +60,19 @@ var FormatPainterActions = /** @class */ (function () {
                     this.escapeAction();
                     break;
             }
+            this.callBack(args);
+        }
+    };
+    FormatPainterActions.prototype.callBack = function (event) {
+        if (event.callBack) {
+            event.callBack({
+                requestType: 'FormatPainter',
+                action: event.item.formatPainterAction,
+                event: event.event,
+                editorMode: 'HTML',
+                range: this.parent.nodeSelection.getRange(this.parent.currentDocument),
+                elements: this.parent.nodeSelection.getSelectedNodes(this.parent.currentDocument)
+            });
         }
     };
     FormatPainterActions.prototype.generateElement = function () {
@@ -78,7 +127,6 @@ var FormatPainterActions = /** @class */ (function () {
             return;
         }
         this.insertFormatNode(this.newElem, this.newElemLastChild);
-        this.parent.undoRedoManager.saveData();
     };
     FormatPainterActions.prototype.removeDeniedFormats = function (parentElement) {
         if (!isNOU(this.deniedFormatsCollection) && this.deniedFormatsCollection.length > 0) {
@@ -127,13 +175,23 @@ var FormatPainterActions = /** @class */ (function () {
     FormatPainterActions.prototype.copyAction = function () {
         var copyCollection = [];
         var range = this.parent.nodeSelection.getRange(document);
-        var parentElem = range.startContainer.parentElement;
+        var domSelection = this.parent.nodeSelection;
+        var nodes = range.collapsed ? domSelection.getSelectionNodeCollection(range) :
+            domSelection.getSelectionNodeCollectionBr(range);
+        if (nodes.length === 0 && domSelection.getSelectionNodeCollectionBr(range).length === 0) {
+            return;
+        }
+        else {
+            nodes = nodes.length === 0 ? domSelection.getSelectionNodeCollectionBr(range) : nodes;
+        }
+        var parentElem = nodes[0].parentElement;
         var currentContext = this.findCurrentContext(parentElem);
-        var allowedRulesArray = this.settings.allowedFormats.split(';');
+        var allowedRulesArray = this.settings.allowedFormats.indexOf(';') > -1 ? this.settings.allowedFormats.split(';') :
+            [this.settings.allowedFormats];
         for (var i = 0; i < allowedRulesArray.length; i++) {
             allowedRulesArray[i] = allowedRulesArray[i].trim();
         }
-        var _a = this.getRangeParentElem(currentContext, range), rangeParentElem = _a[0], context = _a[1];
+        var _a = this.getRangeParentElem(currentContext, parentElem), rangeParentElem = _a[0], context = _a[1];
         if (currentContext === null) {
             currentContext = context;
         }
@@ -178,8 +236,8 @@ var FormatPainterActions = /** @class */ (function () {
         }
         this.generateElement();
     };
-    FormatPainterActions.prototype.getRangeParentElem = function (currentContext, range) {
-        var startContainer = range.startContainer;
+    FormatPainterActions.prototype.getRangeParentElem = function (currentContext, rangeParent) {
+        var startContainer = rangeParent;
         var rangeParentELem;
         if (startContainer.nodeType === 3) {
             startContainer = startContainer.parentElement;
@@ -199,7 +257,7 @@ var FormatPainterActions = /** @class */ (function () {
                 break;
         }
         if (isNOU(rangeParentELem)) {
-            var nearBlockParentName = this.getNearestBlockParentElement(range);
+            var nearBlockParentName = this.getNearestBlockParentElement(rangeParent);
             if (!isNOU(nearBlockParentName) && nearBlockParentName !== 'UL' &&
                 nearBlockParentName !== 'OL' && nearBlockParentName !== 'LI') {
                 rangeParentELem = closest(startContainer, nearBlockParentName);
@@ -211,8 +269,8 @@ var FormatPainterActions = /** @class */ (function () {
         }
         return [rangeParentELem, currentContext];
     };
-    FormatPainterActions.prototype.getNearestBlockParentElement = function (range) {
-        var node = range.commonAncestorContainer;
+    FormatPainterActions.prototype.getNearestBlockParentElement = function (rangeParent) {
+        var node = rangeParent;
         if (node.nodeType === 3) {
             node = node.parentNode;
         }
@@ -255,29 +313,32 @@ var FormatPainterActions = /** @class */ (function () {
         }
     };
     FormatPainterActions.prototype.validateELementTag = function (node) {
-        var INVALID_TAGS = ['A', 'AUDIO', 'IMG', 'VIDEO', 'IFRAME'];
         if (node.nodeType === 3) {
             node = node.parentElement;
         }
-        return INVALID_TAGS.indexOf(node.tagName) > -1;
+        return this.INVALID_TAGS.indexOf(node.tagName) > -1;
     };
     FormatPainterActions.prototype.findCurrentContext = function (parentElem) {
-        if (closest(parentElem, 'td') || closest(parentElem, 'tr') || closest(parentElem, 'tbody')) {
-            return 'Table';
+        if (closest(parentElem, 'p')) {
+            return 'Text';
         }
         else if (closest(parentElem, 'li')) {
             return 'List';
         }
-        else if (closest(parentElem, 'p')) {
-            return 'Text';
+        else if (closest(parentElem, 'td') || closest(parentElem, 'tr') || closest(parentElem, 'th')) {
+            return 'Table';
         }
         return null;
     };
     FormatPainterActions.prototype.insertFormatNode = function (elem, lastChild) {
+        var clonedElem = elem.cloneNode(true);
+        if (!this.isBlockElement(elem)) {
+            var newBlockElem = createElement('P');
+            newBlockElem.appendChild(elem);
+            clonedElem = newBlockElem.cloneNode(true);
+        }
         var endNode = this.parent.editableElement;
         var docElement = this.parent.currentDocument;
-        var domSelection = this.parent.nodeSelection;
-        var clonedElem = elem.cloneNode(true);
         var childElem = clonedElem.firstChild;
         var inlineElement;
         while (childElem) {
@@ -294,107 +355,183 @@ var FormatPainterActions = /** @class */ (function () {
             lastChild: lastChild
         };
         SelectionCommands.applyFormat(docElement, null, endNode, 'P', 'formatPainter', null, formatValues);
-        var isFullNodeSelected;
         var range = this.parent.nodeSelection.getRange(docElement);
         var isCollapsed = range.collapsed;
-        var nodes = range.collapsed ? domSelection.getSelectionNodeCollection(range) :
-            domSelection.getSelectionNodeCollectionBr(range);
-        if (nodes.length === 1) {
-            while (!this.isBlockElement(nodes[0])) {
-                nodes[0] = nodes[0].parentElement;
-            }
-            isFullNodeSelected = nodes[0].textContent.trim() === range.commonAncestorContainer.wholeText.trim();
+        var blockNodes = this.parent.domNode.blockNodes();
+        var isFullNodeSelected = false;
+        if (blockNodes.length === 1) {
+            isFullNodeSelected = blockNodes[0].textContent.trim() === range.toString().trim();
         }
-        if (this.isBlockElement(elem) && isCollapsed || nodes.length > 1 || isFullNodeSelected) {
-            this.insertBlockNode(elem, range, docElement, endNode, nodes);
+        if (this.isBlockElement(clonedElem) && isCollapsed || blockNodes.length > 1 || isFullNodeSelected) {
+            this.insertBlockNode(clonedElem, range, docElement, blockNodes);
         }
     };
-    FormatPainterActions.prototype.insertBlockNode = function (element, range, docElement, endNode, nodes) {
+    FormatPainterActions.prototype.insertBlockNode = function (element, range, docElement, nodes) {
         var domSelection = this.parent.nodeSelection;
+        var saveSelection = domSelection.save(range, docElement);
+        this.parent.domNode.setMarker(saveSelection);
         var listElement; // To clone to multiple list elements
         var cloneListParentNode;
+        var sameListType = false;
         if (element.nodeName === 'UL' || element.nodeName === 'OL') {
             cloneListParentNode = element.cloneNode(true);
             listElement = cloneListParentNode.firstChild;
         }
-        var textNode = range.startContainer; // To set cursor position
+        var cloneElementNode = isNOU(cloneListParentNode) ? element : element.firstChild;
         for (var index = 0; index < nodes.length; index++) {
-            var lastTextNode = nodes[index];
-            if (nodes[index].nodeType === 3) {
-                nodes[index] = nodes[index].parentElement;
-            }
-            while (!this.isBlockElement(nodes[index])) {
-                nodes[index] = nodes[index].parentElement;
-            }
-            var cloneParentNode = void 0;
-            if (!isNOU(cloneListParentNode)) {
-                cloneParentNode = listElement.cloneNode(true);
-            }
-            else {
-                cloneParentNode = element.cloneNode(true);
+            if (this.INVALID_TAGS.indexOf(nodes[index].nodeName) > -1 ||
+                nodes[index].querySelectorAll('a,img,audio,video,iframe').length > 0) {
+                continue;
             }
+            var cloneParentNode = cloneElementNode.cloneNode(false);
             // Appending all the child elements
             while (nodes[index].firstChild) {
-                if (cloneParentNode.nodeName === 'LI') {
+                if (nodes[index].textContent.trim().length !== 0) {
                     cloneParentNode.appendChild(nodes[index].firstChild);
                 }
                 else {
-                    // Except list nodes other block nodes replaced here
-                    if (nodes[index].nodeType === 3) {
-                        cloneParentNode.appendChild(nodes[index].firstChild);
-                    }
-                    else {
-                        cloneParentNode.innerHTML = nodes[index].innerHTML;
-                        nodes[index].innerHTML = '';
-                    }
-                    nodes[index] = nodes[index].parentNode.replaceChild(cloneParentNode, nodes[index]);
+                    nodes[index].removeChild(nodes[index].firstChild);
                 }
             }
-            if (cloneParentNode.nodeName === 'LI') {
-                // Appending the li nodes to the ol or ul node
-                cloneListParentNode.append(cloneParentNode);
-                if (index === 0) {
-                    var nodeName = nodes[index].nodeName;
-                    nodes[index] = nodes[index].parentNode.replaceChild(cloneListParentNode, nodes[index]);
-                    var parent_1 = nodeName === 'LI' ? cloneListParentNode.parentElement
-                        : cloneListParentNode;
-                    // Splicing and then inserting the node to previous element sibling of the Listparent.parent
-                    this.parent.nodeCutter.SplitNode(range, parent_1, true);
-                    if (!isNOU(parent_1.previousElementSibling)) {
-                        parent_1.parentNode.insertBefore(cloneListParentNode, parent_1.nextElementSibling);
-                    }
-                    else {
-                        parent_1.parentElement.insertBefore(cloneListParentNode, parent_1);
-                    }
+            if (nodes[index].nodeName === 'TD' || nodes[index].nodeName === 'TH') {
+                if (isNOU(cloneListParentNode)) {
+                    nodes[index].appendChild(cloneParentNode);
+                    continue;
+                }
+                else if (index === 0 && !isNOU(cloneListParentNode)) {
+                    nodes[index].appendChild(cloneListParentNode);
+                    cloneListParentNode.appendChild(cloneParentNode);
+                    continue;
+                }
+                else {
+                    nodes[index].appendChild(cloneParentNode);
+                    continue;
                 }
-                detach(nodes[index]);
+            }
+            if (!isNOU(cloneListParentNode)) {
+                sameListType = this.isSameListType(element, nodes[index]);
+            }
+            if (cloneParentNode.nodeName === 'LI' && !sameListType) {
+                this.insertNewList(range, nodes, index, cloneListParentNode, cloneParentNode);
+            }
+            else if (sameListType) {
+                this.insertSameList(nodes, index, cloneListParentNode, cloneParentNode);
+            }
+            else {
+                nodes[index].parentNode.replaceChild(cloneParentNode, nodes[index]);
             }
             /**Removing the inserted block node in list and appending to previous element sibling */
             if (cloneParentNode.nodeName !== 'LI' && (cloneParentNode.parentElement.nodeName === 'OL' ||
                 cloneParentNode.parentElement.nodeName === 'UL')) {
-                var parent_2 = cloneParentNode.parentElement;
+                var parent_1 = cloneParentNode.parentElement;
                 // Cutting single ul or ol to two ul or ol based on the range
-                this.parent.nodeCutter.SplitNode(range, parent_2, true);
-                if (!isNOU(parent_2.previousElementSibling)) {
-                    parent_2.previousElementSibling.after(cloneParentNode);
+                this.parent.nodeCutter.SplitNode(range, parent_1, true);
+                if (!isNOU(parent_1.previousElementSibling)) {
+                    parent_1.previousElementSibling.after(cloneParentNode);
+                    // To remove the nested list items out of the block element
+                    if (cloneParentNode.childNodes.length > 1) {
+                        for (var j = 0; j < cloneParentNode.childNodes.length; j++) {
+                            var currentChild = cloneParentNode.childNodes[j];
+                            if (currentChild.nodeName === 'OL' || currentChild.nodeName === 'UL') {
+                                cloneParentNode.after(currentChild);
+                            }
+                        }
+                    }
                 }
                 else {
-                    parent_2.parentElement.prepend(cloneParentNode);
+                    parent_1.parentElement.prepend(cloneParentNode);
                 }
             }
-            nodes[index] = lastTextNode;
         }
         // eslint-disable-next-line @typescript-eslint/no-unused-expressions
         !isNOU(listElement) ? detach(listElement) : false;
         this.cleanEmptyLists();
-        if (nodes.length > 1) {
-            var startSelectNode = nodes[0];
-            var endSelectNode = nodes[nodes.length - 1];
-            domSelection.setSelectionText(docElement, startSelectNode, endSelectNode, 0, endSelectNode.textContent.length);
+        var save = this.parent.domNode.saveMarker(saveSelection, null);
+        save.restore();
+    };
+    FormatPainterActions.prototype.insertNewList = function (range, nodes, index, cloneListParentNode, cloneParentNode) {
+        // Appending the li nodes to the ol or ul node
+        if (index === 0) {
+            var nodeName = nodes[index].nodeName;
+            nodes[index] = nodes[index].parentNode.replaceChild(cloneListParentNode, nodes[index]);
+            var parent_2 = nodeName === 'LI' ? cloneListParentNode.parentElement
+                : cloneListParentNode;
+            // Splicing and then inserting the node to previous element sibling of the Listparent.parent
+            this.parent.nodeCutter.SplitNode(range, parent_2, true);
+            if (nodes[index].nodeName === 'LI' && !isNOU(parent_2)) {
+                cloneListParentNode.append(cloneParentNode);
+                if (!isNOU(parent_2.parentNode)) {
+                    parent_2.parentNode.insertBefore(cloneListParentNode, parent_2);
+                }
+            }
+            else {
+                if (!isNOU(parent_2)) {
+                    if (!isNOU(parent_2.previousElementSibling) && parent_2.previousElementSibling.nodeName === cloneListParentNode.nodeName) {
+                        var currentParent = parent_2.previousElementSibling;
+                        currentParent.append(cloneParentNode);
+                        while (currentParent.firstChild) {
+                            cloneListParentNode.append(currentParent.firstChild);
+                        }
+                    }
+                    else if (!isNOU(parent_2.nextElementSibling) && parent_2.nextElementSibling.nodeName === cloneListParentNode.nodeName) {
+                        var currentParent = parent_2.nextElementSibling;
+                        currentParent.prepend(cloneParentNode);
+                        while (currentParent.firstChild) {
+                            cloneListParentNode.append(currentParent.firstChild);
+                        }
+                    }
+                    else {
+                        cloneListParentNode.append(cloneParentNode);
+                    }
+                }
+                else {
+                    cloneListParentNode.append(cloneParentNode);
+                }
+            }
+        }
+        else {
+            cloneListParentNode.append(cloneParentNode);
+        }
+        this.detachEmptyBlockNodes(nodes[index]);
+    };
+    FormatPainterActions.prototype.insertSameList = function (nodes, index, cloneListParentNode, cloneParentNode) {
+        if (index === 0) {
+            if (!isNOU(nodes[index].parentNode) && (nodes[index].parentNode.nodeName === 'UL' || nodes[index].parentNode.nodeName === 'OL')) {
+                // append the nodes[index].parentNode.childNodes to the clonelistparentnode
+                if (nodes.length === 1) {
+                    // When clicked with cursor in the single list item
+                    while (cloneParentNode.firstChild) {
+                        nodes[index].append(cloneParentNode.firstChild);
+                    }
+                    for (var i = 0; i < nodes[index].parentNode.childNodes.length; i++) {
+                        var currentChild = nodes[index].parentNode.childNodes[i];
+                        cloneListParentNode.append(currentChild.cloneNode(true));
+                    }
+                }
+                else {
+                    cloneListParentNode.append(cloneParentNode);
+                }
+                // replace the older ol and ul with new ol and ul of clonelistparentnode
+                nodes[index].parentNode.parentNode.replaceChild(cloneListParentNode, nodes[index].parentNode);
+            }
         }
         else {
-            domSelection.setCursorPoint(docElement, textNode, textNode.textContent.length);
+            cloneListParentNode.append(cloneParentNode);
+        }
+        this.detachEmptyBlockNodes(nodes[index]);
+    };
+    FormatPainterActions.prototype.isSameListType = function (element, node) {
+        var isSameListType = false;
+        var nearestListNode = closest(node, 'ol, ul');
+        if (!isNOU(nearestListNode) && nearestListNode.querySelectorAll('li').length > 0) {
+            if (nearestListNode.nodeName === element.nodeName) {
+                isSameListType = true;
+            }
+            else {
+                isSameListType = false;
+            }
         }
+        return isSameListType;
     };
     FormatPainterActions.prototype.cleanEmptyLists = function () {
         var listElem = this.parent.editableElement.querySelectorAll('ol, ul');
@@ -409,7 +546,8 @@ var FormatPainterActions = /** @class */ (function () {
         if (isNOU(this.settings) || isNOU(this.settings.deniedFormats)) {
             return;
         }
-        var deniedFormats = this.settings.deniedFormats.split(';');
+        var deniedFormats = this.settings.deniedFormats.indexOf(';') > -1 ? this.settings.deniedFormats.split(';') :
+            [this.settings.deniedFormats];
         var length = deniedFormats.length;
         for (var i = 0; i < length; i++) {
             var formatString = deniedFormats[i];
@@ -423,6 +561,11 @@ var FormatPainterActions = /** @class */ (function () {
         }
         this.deniedFormatsCollection = deniedFormatsCollection;
     };
+    FormatPainterActions.prototype.detachEmptyBlockNodes = function (node) {
+        if (!isNOU(node) && node.textContent.trim() === '') {
+            detach(node);
+        }
+    };
     FormatPainterActions.prototype.makeDeniedFormatsCollection = function (value) {
         var openParenIndex = value.indexOf('(');
         var closeParenIndex = value.indexOf(')');

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

@@ -478,7 +478,12 @@ var InsertHtml = /** @class */ (function () {
     InsertHtml.removeEmptyElements = function (element) {
         var emptyElements = element.querySelectorAll(':empty');
         for (var i = 0; i < emptyElements.length; i++) {
-            if (CONSTANT.SELF_CLOSING_TAGS.indexOf(emptyElements[i].tagName.toLowerCase()) < 0) {
+            var lineWithDiv = true;
+            if (emptyElements[i].tagName === 'DIV') {
+                lineWithDiv = emptyElements[i].style.borderBottom === 'none' ||
+                    emptyElements[i].style.borderBottom === '' ? true : false;
+            }
+            if (CONSTANT.SELF_CLOSING_TAGS.indexOf(emptyElements[i].tagName.toLowerCase()) < 0 && lineWithDiv) {
                 var detachableElement = this.findDetachEmptyElem(emptyElements[i]);
                 if (!isNOU(detachableElement)) {
                     detach(detachableElement);

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

@@ -75,7 +75,7 @@ var LinkCommand = /** @class */ (function () {
             var domSelection = new NodeSelection();
             var range = domSelection.getRange(this.parent.currentDocument);
             if (range.endContainer.nodeName === '#text' && range.startContainer.textContent.length === (range.endOffset + 1) &&
-                range.endContainer.textContent.charAt(range.endOffset) === ' ' && range.endContainer.nextSibling.nodeName === 'A') {
+                range.endContainer.textContent.charAt(range.endOffset) === ' ' && (!isNOU(range.endContainer.nextSibling) && range.endContainer.nextSibling.nodeName === 'A')) {
                 domSelection.setSelectionText(this.parent.currentDocument, range.startContainer, range.endContainer, range.startOffset, range.endOffset + 1);
                 range = domSelection.getRange(this.parent.currentDocument);
             }

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

@@ -20,6 +20,9 @@ export declare class MsWordPaste {
     private listContents;
     private addEventListener;
     private wordCleanup;
+    private cleanList;
+    private insertAfter;
+    private findClosestListElem;
     private addListClass;
     private addTableBorderClass;
     private imageConversion;

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

@@ -73,6 +73,8 @@ var MsWordPaste = /** @class */ (function () {
                 listNodes[0].parentElement.tagName !== 'OL') {
                 this.listConverter(listNodes);
             }
+            this.cleanList(elm, 'UL');
+            this.cleanList(elm, 'OL');
             this.styleCorrection(elm, wordPasteStyleConfig);
             this.removingComments(elm);
             this.removeUnwantedElements(elm);
@@ -98,11 +100,38 @@ var MsWordPaste = /** @class */ (function () {
             e.callBack(elm.innerHTML);
         }
     };
+    MsWordPaste.prototype.cleanList = function (elm, listTag) {
+        var replacableElem = elm.querySelectorAll(listTag + ' div');
+        for (var j = replacableElem.length - 1; j >= 0; j--) {
+            var parentElem = replacableElem[j].parentNode;
+            while (replacableElem[j].firstChild) {
+                parentElem.insertBefore(replacableElem[j].firstChild, replacableElem[j]);
+            }
+            var closestListElem = this.findClosestListElem(replacableElem[j]);
+            if (closestListElem) {
+                this.insertAfter(replacableElem[j], closestListElem);
+            }
+        }
+    };
+    MsWordPaste.prototype.insertAfter = function (newNode, referenceNode) {
+        referenceNode.parentNode.insertBefore(newNode, referenceNode.nextSibling);
+    };
+    MsWordPaste.prototype.findClosestListElem = function (listElem) {
+        var closestListElem;
+        while (!isNOU(listElem)) {
+            listElem = !isNOU(listElem.closest('ul')) && listElem.tagName !== 'UL' ?
+                listElem.closest('ul') : (listElem.tagName !== 'OL' ? listElem.closest('ol') : null);
+            closestListElem = !isNOU(listElem) ? listElem : closestListElem;
+        }
+        return closestListElem;
+    };
     MsWordPaste.prototype.addListClass = function (elm) {
         var allNodes = elm.querySelectorAll('*');
         for (var index = 0; index < allNodes.length; index++) {
             if (!isNOU(allNodes[index].getAttribute('style')) && allNodes[index].getAttribute('style').replace(/ /g, '').replace('\n', '').indexOf('mso-list:l') >= 0 &&
-                allNodes[index].className.toLowerCase().indexOf('msolistparagraph') === -1 && allNodes[index].tagName.charAt(0) !== 'H') {
+                allNodes[index].className.toLowerCase().indexOf('msolistparagraph') === -1 &&
+                allNodes[index].tagName.charAt(0) !== 'H' && allNodes[index].tagName !== 'LI' &&
+                allNodes[index].tagName !== 'OL' && allNodes[index].tagName !== 'UL') {
                 allNodes[index].classList.add('msolistparagraph');
             }
         }
@@ -226,7 +255,7 @@ var MsWordPaste = /** @class */ (function () {
     MsWordPaste.prototype.hexConversion = function (rtfData) {
         // eslint-disable-next-line
         var picHead = /\{\\pict[\s\S]+?\\bliptag\-?\d+(\\blipupi\-?\d+)?(\{\\\*\\blipuid\s?[\da-fA-F]+)?[\s\}]*?/;
-        // eslint-disable-next-line
+        // eslint-disable-next-line security/detect-non-literal-regexp
         var pic = new RegExp('(?:(' + picHead.source + '))([\\da-fA-F\\s]+)\\}', 'g');
         var fullImg = rtfData.match(pic);
         var imgType;
@@ -290,9 +319,9 @@ var MsWordPaste = /** @class */ (function () {
     MsWordPaste.prototype.removeUnwantedElements = function (elm) {
         var innerElement = elm.innerHTML;
         for (var i = 0; i < this.removableElements.length; i++) {
-            // eslint-disable-next-line
+            // eslint-disable-next-line security/detect-non-literal-regexp
             var regExpStartElem = new RegExp('<' + this.removableElements[i] + '>', 'g');
-            // eslint-disable-next-line
+            // eslint-disable-next-line security/detect-non-literal-regexp
             var regExpEndElem = new RegExp('</' + this.removableElements[i] + '>', 'g');
             innerElement = innerElement.replace(regExpStartElem, '');
             innerElement = innerElement.replace(regExpEndElem, '');
@@ -335,9 +364,14 @@ var MsWordPaste = /** @class */ (function () {
                 !isNOU(emptyElements[i].closest('td').querySelector('.MsoNormal'))) {
                 emptyElements[i].innerHTML = '-';
             }
+            var lineWithDiv = true;
+            if (emptyElements[i].tagName === 'DIV') {
+                lineWithDiv = emptyElements[i].style.borderBottom === 'none' ||
+                    emptyElements[i].style.borderBottom === '' ? true : false;
+            }
             if (emptyElements[i].tagName !== 'IMG' && emptyElements[i].tagName !== 'BR' &&
                 emptyElements[i].tagName !== 'IFRAME' && emptyElements[i].tagName !== 'TD' &&
-                emptyElements[i].tagName !== 'HR') {
+                emptyElements[i].tagName !== 'HR' && lineWithDiv) {
                 var detachableElement = this.findDetachEmptyElem(emptyElements[i]);
                 if (!isNOU(detachableElement)) {
                     detach(detachableElement);
@@ -466,7 +500,6 @@ var MsWordPaste = /** @class */ (function () {
         elm.innerHTML = innerElement;
     };
     MsWordPaste.prototype.cleanUp = function (node, listNodes) {
-        // eslint-disable-next-line
         var tempCleaner = [];
         var prevflagState;
         var allNodes = node.querySelectorAll('*');
@@ -667,7 +700,7 @@ var MsWordPaste = /** @class */ (function () {
                     break;
                 }
             }
-            if (!isNOU(prevList) && index != 0 &&
+            if (!isNOU(prevList) && index !== 0 &&
                 collection[index - 1].listType !== collection[index].listType &&
                 !isNormalList) {
                 prevList = null;

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

@@ -1,4 +1,4 @@
-import { FormatPainterValue } from '../plugin';
+import { FormatPainterValue } from '../base/interface';
 export declare class SelectionCommands {
     static enterAction: string;
     /**
@@ -28,4 +28,5 @@ export declare class SelectionCommands {
     private static GetFormatNode;
     private static updateStyles;
     private static insertFormatPainterElem;
+    private static formatPainterCleanup;
 }