@syncfusion/ej2-richtexteditor 25.2.5 → 25.2.6

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

@@ -13211,7 +13211,7 @@ class Lists {
             e.event.preventDefault();
         }
     }
-    onKeyUp() {
+    onKeyUp(e) {
         if (!isNullOrUndefined(this.commonLIParent) && !isNullOrUndefined(this.commonLIParent.querySelector('.removeList'))) {
             const currentLIElem = this.commonLIParent.querySelector('.removeList');
             while (!isNullOrUndefined(currentLIElem.firstChild)) {
@@ -13219,6 +13219,14 @@ class Lists {
             }
             detach(currentLIElem);
         }
+        if (e.event.keyCode === 13) {
+            const listElements = this.parent.editableElement.querySelectorAll('UL, OL');
+            for (let i = 0; i < listElements.length; i++) {
+                if (!isNullOrUndefined(listElements[i]) && !isNullOrUndefined(listElements[i].parentElement) && !isNullOrUndefined(listElements[i].previousElementSibling) && (listElements[i].parentElement.nodeName === 'UL' || listElements[i].parentElement.nodeName === 'OL')) {
+                    listElements[i].previousElementSibling.appendChild(listElements[i]);
+                }
+            }
+        }
     }
     // eslint-disable-next-line @typescript-eslint/no-unused-vars
     firstListBackSpace(range, _e) {
@@ -13460,6 +13468,8 @@ class Lists {
                 else {
                     if (prevSibling.tagName === 'LI') {
                         const nestedElement = createElement(elements[i].parentNode.tagName);
+                        nestedElement.style.listStyleType =
+                            elements[i].parentNode.style.listStyleType;
                         append([nestedElement], prevSibling);
                         append([elements[i]], nestedElement);
                     }
@@ -13566,7 +13576,7 @@ class Lists {
                 }
                 let elemAtt;
                 elements[i].style.removeProperty('margin-left');
-                elemAtt = elements[i].tagName === 'IMG' ? '' : this.domNode.attributes(elements[i]);
+                elemAtt = elements[i].tagName === 'IMG' || elements[i].classList.contains('e-editor-select-start') ? '' : this.domNode.attributes(elements[i]);
                 if (elements[i].getAttribute('contenteditable') === 'true'
                     && elements[i].childNodes.length === 1 && elements[i].childNodes[0].nodeName === 'TABLE') {
                     const listEle = document.createElement(type);
@@ -13687,6 +13697,13 @@ class Lists {
         for (let c = 0; c < liParents.length; c++) {
             const node = liParents[c];
             let toFindtopOlUl = true;
+            let containsListElements = node;
+            while (containsListElements.parentElement) {
+                if (containsListElements.parentElement && containsListElements.parentElement.tagName !== 'LI' && containsListElements.parentElement.tagName !== 'OL' && containsListElements.parentElement.tagName !== 'UL') {
+                    break;
+                }
+                containsListElements = containsListElements.parentElement;
+            }
             if (toFindtopOlUl && (liParents[c].parentElement.parentElement.nodeName === 'OL' || liParents[c].parentElement.parentElement.nodeName === 'UL')) {
                 toFindtopOlUl = false;
                 const preElement = liParents[c].parentElement.parentElement;
@@ -13706,9 +13723,43 @@ class Lists {
                     node.previousElementSibling.lastChild.append(node);
                 }
             }
+            else if (this.domNode.isList(node.previousElementSibling) && containsListElements.contains(node.previousElementSibling) && ((node.tagName === 'OL' || node.tagName === 'UL') && (node.previousElementSibling.nodeName === 'OL' || node.previousElementSibling.nodeName === 'UL'))) {
+                const contentNodes = this.domNode.contents(node);
+                for (let f = 0; f < contentNodes.length; f++) {
+                    node.previousElementSibling.appendChild(contentNodes[f]);
+                }
+                node.parentNode.removeChild(node);
+            }
         }
         if (firstNodeOL) {
             firstNodeOL.style.listStyleType = listStyleType;
+            const range = this.parent.nodeSelection.getRange(this.parent.currentDocument);
+            let listOlUlElements = [];
+            if (range.commonAncestorContainer.nodeName === 'UL' || range.commonAncestorContainer.nodeName === 'OL') {
+                if (range.commonAncestorContainer instanceof Element) {
+                    listOlUlElements.push(range.commonAncestorContainer);
+                }
+                listOlUlElements = listOlUlElements.concat(Array.from(range.commonAncestorContainer.querySelectorAll('ol, ul')));
+            }
+            else {
+                listOlUlElements = Array.from(range.commonAncestorContainer.querySelectorAll('ol, ul'));
+            }
+            for (let k = 0; k < listOlUlElements.length; k++) {
+                let listStyle;
+                let listElements = listOlUlElements[k];
+                while (listElements) {
+                    if (listElements.nodeName === 'OL' || listElements.nodeName === 'OL') {
+                        if (listElements.style.listStyleType !== '' && listElements.style.listStyleType !== 'none' && listElements.nodeName !== 'LI') {
+                            listStyle = listElements.style.listStyleType;
+                        }
+                        else if (!isNullOrUndefined(listStyle) && (listElements.style.listStyleType === '' || listElements.style.listStyleType === 'none') &&
+                            listElements.nodeName !== 'LI' && (listElements.nodeName === 'UL' || listElements.nodeName === 'OL')) {
+                            listElements.style.listStyleType = listStyle;
+                        }
+                    }
+                    listElements = listElements.querySelector('UL,OL');
+                }
+            }
         }
     }
     findUnSelected(temp, elements) {
@@ -19930,7 +19981,7 @@ class MsWordPaste {
                 !isNormalList) {
                 prevList = null;
             }
-            const pElement = createElement('p', { className: 'MsoNormal' });
+            const pElement = createElement('p', { className: 'MsoNoSpacing' });
             pElement.innerHTML = collection[index].content.join(' ');
             if ((collection[index].nestedLevel === 1) &&
                 (listCount === 0 || lfo !== collection[index].listFormatOverride) &&
@@ -21964,7 +22015,7 @@ class HtmlEditor {
                 const range = this.nodeSelectionObj.getRange(this.contentRenderer.getDocument());
                 const parentNode = this.nodeSelectionObj.getParentNodeCollection(range);
                 if (!((parentNode[0].nodeName === 'LI' || closest(parentNode[0], 'li') ||
-                    closest(parentNode[0], 'table')) && range.startOffset === 0)) {
+                    closest(parentNode[0], 'table')))) {
                     args.preventDefault();
                     const selection = this.contentRenderer.getDocument().getSelection().getRangeAt(0);
                     let alignmentNodes = this.parent.formatter.editorManager.domNode.blockNodes();
@@ -23345,7 +23396,8 @@ class PasteCleanup {
             clipBoardElem = this.allowedStyle(clipBoardElem);
         }
         this.saveSelection.restore();
-        clipBoardElem.innerHTML = this.sanitizeHelper(clipBoardElem.innerHTML);
+        const newText = clipBoardElem.innerHTML.split("&").join("&amp;");
+        clipBoardElem.innerHTML = this.sanitizeHelper(newText);
         const allImg = clipBoardElem.querySelectorAll('img');
         for (let i = 0; i < allImg.length; i++) {
             if (!isNullOrUndefined(allImg[i].getAttribute('src'))) {
@@ -26704,13 +26756,13 @@ class Image$1 {
             selectParentEle = this.parent.formatter.editorManager.nodeSelection.getParentNodeCollection(range);
             if (!originalEvent.ctrlKey && originalEvent.key && (originalEvent.key.length === 1 || originalEvent.action === 'enter') &&
                 (!isNullOrUndefined(selectParentEle[0]) && selectParentEle[0].tagName === 'IMG') && selectParentEle[0].parentElement) {
-                const prev = selectParentEle[0].parentElement.childNodes[0];
                 if (this.contentModule.getEditPanel().querySelector('.e-img-resize')) {
                     this.removeResizeEle();
                 }
-                this.parent.formatter.editorManager.nodeSelection.setSelectionText(this.contentModule.getDocument(), prev, prev, prev.textContent.length, prev.textContent.length);
                 removeClass([selectParentEle[0]], 'e-img-focus');
-                this.quickToolObj.imageQTBar.hidePopup();
+                if (this.quickToolObj && this.quickToolObj.imageQTBar) {
+                    this.quickToolObj.imageQTBar.hidePopup();
+                }
             }
         }
         if (originalEvent.ctrlKey && (originalEvent.keyCode === 89 || originalEvent.keyCode === 90)) {
@@ -33488,16 +33540,18 @@ class EnterKeyAction {
         this.getRangeNode();
         let isTableEnter = true;
         this.formatTags = ['h1', 'h2', 'h3', 'h4', 'h5', 'h6', 'blockquote'];
-        const isCursorAtTableEnd = this.range.collapsed && (this.range.startContainer.nodeType === 1) &&
-            this.range.startContainer.isContentEditable &&
-            this.range.startContainer.childNodes[this.range.startOffset - 1] &&
-            this.range.startContainer.childNodes[this.range.startOffset - 1].nodeName === 'TABLE';
-        const isCursorAtTableStart = this.range.collapsed && (this.range.startContainer.nodeType === 1) &&
-            this.range.startContainer.isContentEditable && this.range.startContainer.childNodes[this.range.startOffset] &&
-            this.range.startContainer.childNodes[this.range.startOffset].nodeName === 'TABLE';
-        if (isCursorAtTableEnd || isCursorAtTableStart) {
-            this.handleCursorAtTableSide(e, isCursorAtTableStart, isCursorAtTableEnd);
-            return;
+        const tableImagCursor = this.processedTableImageCursor();
+        if (tableImagCursor.start || tableImagCursor.end) {
+            if (tableImagCursor.startName === 'TABLE' || tableImagCursor.endName === 'TABLE') { // Default browser action prevented and hanled manually.
+                this.handleCursorAtTableSide(e, tableImagCursor.start, tableImagCursor.end);
+                return;
+            }
+        }
+        if (tableImagCursor.start || tableImagCursor.end || this.range.startContainer.nodeName === 'IMG') {
+            if (this.parent.enterKey === 'BR' && (tableImagCursor.startName === 'IMG' || tableImagCursor.endName === 'IMG' || this.range.startContainer.nodeName === 'IMG')) { // Default browser action prevented and hanled manually.
+                this.handleEnterKeyAtImageSide(e, tableImagCursor.start, tableImagCursor.end);
+                return;
+            }
         }
         if (!isNullOrUndefined(this.startNode.closest('TABLE')) && !isNullOrUndefined(this.endNode.closest('TABLE'))) {
             isTableEnter = false;
@@ -33865,7 +33919,6 @@ class EnterKeyAction {
                                     const outerBRElem = this.parent.createElement('br');
                                     if (this.range.startOffset === 0 && this.range.endOffset === 0 &&
                                         !isNullOrUndefined(currentParent.previousSibling) && currentParent.previousSibling.nodeName === 'BR' && currentParent.nodeName !== 'P' && currentParent.nodeName !== 'DIV') {
-                                        // eslint-disable-next-line @typescript-eslint/no-unused-vars
                                         newElem = this.parent.formatter.editorManager.nodeCutter.SplitNode(this.range, currentParent, false).cloneNode(true);
                                         this.parent.formatter.editorManager.domNode.insertAfter(outerBRElem, currentParent);
                                         this.insertFocusContent();
@@ -33895,7 +33948,7 @@ class EnterKeyAction {
                             }
                             e.args.preventDefault();
                         }
-                        this.parent.trigger(actionComplete, { requestType: shiftKey ? 'ShiftEnterAction' : 'EnterAction', args: e.args });
+                        this.triggerActionComplete(e, shiftKey);
                     }
                 });
             }
@@ -33965,6 +34018,9 @@ class EnterKeyAction {
         }
         return insertElem;
     }
+    triggerActionComplete(e, shiftKey) {
+        this.parent.trigger(actionComplete, { requestType: shiftKey ? 'ShiftEnterAction' : 'EnterAction', args: e.args });
+    }
     handleCursorAtTableSide(e, isStart, isEnd) {
         if (this.parent.enterKey !== 'BR') {
             const shiftKey = e.args.shiftKey;
@@ -33994,11 +34050,91 @@ class EnterKeyAction {
                     }
                     this.parent.formatter.editorManager.nodeSelection.setCursorPoint(this.parent.contentModule.getDocument(), newElement, 0);
                     e.args.preventDefault();
-                    this.parent.trigger(actionComplete, { requestType: shiftKey ? 'ShiftEnterAction' : 'EnterAction', args: e.args });
+                    this.triggerActionComplete(e, shiftKey);
                 }
             });
         }
     }
+    handleEnterKeyAtImageSide(e, isStart, isEnd) {
+        const actionBeginArgs = {
+            cancel: false,
+            name: actionBegin,
+            requestType: e.args.shiftKey ? 'ShiftEnterAction' : 'EnterAction',
+            originalEvent: e.args
+        };
+        let directRange = false;
+        if (this.range.startContainer.nodeName === 'IMG' && this.range.startOffset === 0) {
+            directRange = true;
+        }
+        this.parent.trigger(actionBegin, actionBeginArgs, (actionBeginArgs) => {
+            if (!actionBeginArgs.cancel) {
+                if (this.parent.enterKey === 'BR') {
+                    const newElement = this.parent.createElement('BR');
+                    let imageElement;
+                    if (directRange) {
+                        imageElement = this.range.startContainer;
+                        imageElement.parentElement.insertBefore(newElement, imageElement);
+                        this.parent.formatter.editorManager.nodeSelection.
+                            setCursorPoint(this.parent.contentModule.getDocument(), imageElement, 0);
+                    }
+                    if (isStart) {
+                        imageElement = this.range.startContainer.childNodes[this.range.startOffset];
+                        imageElement.parentElement.insertBefore(newElement, imageElement);
+                        this.parent.formatter.editorManager.nodeSelection.
+                            setCursorPoint(this.parent.contentModule.getDocument(), imageElement, 0);
+                    }
+                    if (isEnd) {
+                        imageElement = this.range.startContainer.childNodes[this.range.startOffset - 1];
+                        if (!isNullOrUndefined(imageElement.nextSibling)) {
+                            imageElement.parentElement.insertBefore(newElement, imageElement.nextSibling);
+                            this.parent.formatter.editorManager.nodeSelection.setCursorPoint(this.parent.contentModule.getDocument(), newElement.nextSibling, 0);
+                        }
+                        else if (isNullOrUndefined(imageElement.nextSibling)) {
+                            imageElement.parentElement.appendChild(newElement);
+                            const brElement = this.parent.createElement('BR');
+                            imageElement.parentElement.appendChild(brElement);
+                            this.parent.formatter.editorManager.nodeSelection.setCursorPoint(this.parent.contentModule.getDocument(), brElement, 0);
+                        }
+                    }
+                    e.args.preventDefault();
+                    this.triggerActionComplete(e, e.args.shiftKey);
+                }
+            }
+        });
+    }
+    isTableOrImageStart() {
+        const customHandlerElements = ['IMG', 'TABLE'];
+        const startContainer = this.range.startContainer;
+        const startOffset = this.range.startOffset;
+        const isCursorAtStart = this.range.collapsed && (startContainer.nodeType === 1) &&
+            startContainer.isContentEditable && startContainer.childNodes[startOffset] &&
+            (customHandlerElements.indexOf(startContainer.childNodes[startOffset].nodeName) > -1);
+        if (isCursorAtStart) {
+            return { start: isCursorAtStart, startNodeName: startContainer.childNodes[startOffset].nodeName };
+        }
+        else {
+            return { start: false, startNodeName: '' };
+        }
+    }
+    isTableOrImageEnd() {
+        const customHandlerElements = ['IMG', 'TABLE'];
+        const startContainer = this.range.startContainer;
+        const startOffset = this.range.startOffset;
+        const isCursorAtEnd = this.range.collapsed && (startContainer.nodeType === 1) &&
+            startContainer.isContentEditable && startContainer.childNodes[startOffset - 1] &&
+            (customHandlerElements.indexOf(startContainer.childNodes[startOffset - 1].nodeName) > -1);
+        if (isCursorAtEnd) {
+            return { end: isCursorAtEnd, endNodeName: startContainer.childNodes[startOffset - 1].nodeName };
+        }
+        else {
+            return { end: false, endNodeName: '' };
+        }
+    }
+    processedTableImageCursor() {
+        const { start, startNodeName } = this.isTableOrImageStart();
+        const { end, endNodeName } = this.isTableOrImageEnd();
+        return { start, startName: startNodeName, end, endName: endNodeName };
+    }
 }
 
 var __decorate$1 = (undefined && undefined.__decorate) || function (decorators, target, key, desc) {
@@ -35370,7 +35506,7 @@ let RichTextEditor = class RichTextEditor extends Component {
         }
     }
     updatePanelValue() {
-        let value = this.value;
+        let value = this.listOrderCorrection(this.value);
         value = (this.enableHtmlEncode && this.value) ? decode(value) : value;
         const getTextArea = this.element.querySelector('.' + CLS_RTE_SOURCE_CODE_TXTAREA);
         if (value) {
@@ -35414,6 +35550,17 @@ let RichTextEditor = class RichTextEditor extends Component {
             this.countModule.refresh();
         }
     }
+    listOrderCorrection(value) {
+        const valueElementWrapper = this.createElement('div');
+        valueElementWrapper.innerHTML = value;
+        const listElements = valueElementWrapper.querySelectorAll('UL, OL');
+        for (let i = 0; i < listElements.length; i++) {
+            if (!isNullOrUndefined(listElements[i]) && !isNullOrUndefined(listElements[i].parentElement) && !isNullOrUndefined(listElements[i].previousElementSibling) && (listElements[i].parentElement.nodeName === 'UL' || listElements[i].parentElement.nodeName === 'OL')) {
+                listElements[i].previousElementSibling.appendChild(listElements[i]);
+            }
+        }
+        return valueElementWrapper.innerHTML;
+    }
     setHeight(height) {
         if (height !== 'auto') {
             this.element.style.height = formatUnit(height);