@syncfusion/ej2-richtexteditor 24.1.41-569421 → 24.1.41-581025

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

@@ -72,21 +72,14 @@ 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();
             }
@@ -114,8 +107,7 @@ var Lists = /** @class */ (function () {
                 startNode.textContent = '';
             }
             var startNodeParent = startNode.parentElement;
-            var parentOfCurrentOLUL = startNodeParent.parentElement;
-            if (isNOU(parentOfCurrentOLUL.closest('UL')) && isNOU(parentOfCurrentOLUL.closest('OL'))) {
+            if (isNOU(startNodeParent.parentElement.closest('UL')) && isNOU(startNodeParent.parentElement.closest('OL'))) {
                 if (!isNOU(startNode.nextElementSibling)) {
                     var nearBlockNode = this.parent.domNode.blockParentNode(startNode);
                     this.parent.nodeCutter.GetSpliceNode(range, nearBlockNode);
@@ -142,15 +134,6 @@ 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) {
@@ -207,19 +190,11 @@ var Lists = /** @class */ (function () {
     };
     Lists.prototype.removeList = function (range, e) {
         var startNode = this.parent.domNode.getSelectedNode(range.startContainer, range.startOffset);
-        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;
-            });
-        }
-        ;
+        var endNode = this.parent.domNode.getSelectedNode(range.endContainer, range.endOffset);
         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' && endNode.nodeName !== '#text' && !isNOU(endNode.closest('LI')) ? endNode.closest('LI') : endNode;
+        endNode = endNode.nodeName !== 'LI' && !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) ||
@@ -236,25 +211,6 @@ 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'))) {
@@ -294,7 +250,7 @@ var Lists = /** @class */ (function () {
         if (e.event.which === 8) {
             this.backspaceList(e);
         }
-        if ((e.event.which === 46 && e.event.action === 'delete') || (e.event.which === 88 && e.event.action === 'cut')) {
+        if (e.event.which === 46 && e.event.action === 'delete') {
             var range = this.parent.nodeSelection.getRange(this.parent.currentDocument);
             var commonAncestor = range.commonAncestorContainer;
             var startEle = range.startContainer;
@@ -551,7 +507,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(true);
+        var listsNodes = this.domNode.blockNodes();
         if (e.enterAction === 'BR') {
             this.setSelectionBRConfig();
             var allSelectedNode = this.parent.nodeSelection.getSelectedNodes(this.parent.currentDocument);
@@ -644,16 +600,12 @@ var Lists = /** @class */ (function () {
     };
     Lists.prototype.applyLists = function (elements, type, selector, item, e) {
         var isReverse = true;
-        if (this.isRevert(elements, type, item) && isNOU(item) || (!isNOU(item) && item.listStyle === 'none')) {
+        if (this.isRevert(elements, type, item) && isNOU(item)) {
             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') {
@@ -664,29 +616,16 @@ 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 openTag = '<' + type + marginLeftAttribute + '>';
+                    var elemAtt = elements[i].tagName === 'IMG' ? '' : this.domNode.attributes(elements[i]);
+                    var openTag = '<' + type + '>';
                     var closeTag = '</' + type + '>';
                     var newTag = 'li' + elemAtt;
                     var replaceHTML = (elements[i].tagName.toLowerCase() === CONSTANT.DEFAULT_TAG ?
@@ -698,8 +637,8 @@ var Lists = /** @class */ (function () {
                 else if (!isNOU(item) && 'LI' !== elements[i].tagName) {
                     // eslint-disable-next-line
                     isReverse = false;
-                    var currentElemAtt = elements[i].tagName === 'IMG' ? '' : this.domNode.attributes(elements[i]);
-                    var openTag = '<' + type + currentElemAtt + '>';
+                    var elemAtt = elements[i].tagName === 'IMG' ? '' : this.domNode.attributes(elements[i]);
+                    var openTag = '<' + type + elemAtt + '>';
                     var closeTag = '</' + type + '>';
                     var newTag = 'li';
                     var replaceHTML = (elements[i].tagName.toLowerCase() === CONSTANT.DEFAULT_TAG ?
@@ -736,9 +675,6 @@ 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;
     };
@@ -775,17 +711,8 @@ 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);
@@ -800,9 +727,6 @@ var Lists = /** @class */ (function () {
                 }
             }
         }
-        if (firstNodeOL) {
-            firstNodeOL.style.listStyleType = listStyleType;
-        }
     };
     Lists.prototype.findUnSelected = function (temp, elements) {
         temp = temp.slice().reverse();
@@ -863,85 +787,72 @@ var Lists = /** @class */ (function () {
         var viewNode = [];
         for (var i = 0; i < elements.length; i++) {
             var element = elements[i];
-            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);
-                        }
+            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 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') });
-                        }
+            }
+            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));
                     }
-                    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;
+                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 (viewNode.indexOf(parentNode) < 0) {
-                    viewNode.push(parentNode);
+                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);
             }
         }
         for (var i = 0; i < viewNode.length; i++) {

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

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