@syncfusion/ej2-richtexteditor 25.2.4 → 25.2.6

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

@@ -4573,11 +4573,14 @@ function nestedListCleanUp(range) {
                     item.remove();
                 });
             }
+            else {
+                break;
+            }
         }
         var liElem = (range.startContainer.nodeName === "#text" ? range.startContainer.parentElement : range.startContainer).querySelectorAll("li");
         if (liElem.length > 0) {
             liElem.forEach(function (item) {
-                if (item.firstChild.nodeName === "OL" || item.firstChild.nodeName === "UL") {
+                if (!isNullOrUndefined(item.firstChild) && (item.firstChild.nodeName === "OL" || item.firstChild.nodeName === "UL")) {
                     item.style.listStyleType = "none";
                 }
             });
@@ -5456,8 +5459,6 @@ var ToolbarRenderer = /** @__PURE__ @class */ (function () {
             target: colorPicker.element.parentElement, cssClass: css,
             enablePersistence: this.parent.enablePersistence, enableRtl: this.parent.enableRtl,
             beforeOpen: function (dropDownArgs) {
-                colorPicker.inline = true;
-                colorPicker.dataBind();
                 if (proxy.parent.readonly || !proxy.parent.enabled) {
                     dropDownArgs.cancel = true;
                     return;
@@ -5596,14 +5597,18 @@ var ToolbarRenderer = /** @__PURE__ @class */ (function () {
         var colorPicker = new ColorPicker({
             enablePersistence: this.parent.enablePersistence,
             enableRtl: this.parent.enableRtl,
-            inline: false,
-            value: '#fff',
+            inline: true,
+            value: null,
+            cssClass: ((item === 'backgroundcolor') ? CLS_BACKGROUND_COLOR_PICKER : CLS_FONT_COLOR_PICKER) + ' ' + args.cssClass + ' ' + 'e-rte-picker-init',
             created: function () {
                 var value = (item === 'backgroundcolor') ? proxy.parent.backgroundColor.default : proxy.parent.fontColor.default;
-                colorPicker.setProperties({ value: value });
+                colorPicker.cssClass = ((item === 'backgroundcolor') ? CLS_BACKGROUND_COLOR_PICKER : CLS_FONT_COLOR_PICKER) + ' ' + args.cssClass;
+                colorPicker.value = value;
             },
             mode: ((item === 'backgroundcolor') ? proxy.parent.backgroundColor.mode : proxy.parent.fontColor.mode),
             modeSwitcher: ((item === 'backgroundcolor') ? proxy.parent.backgroundColor.modeSwitcher : proxy.parent.fontColor.modeSwitcher),
+            presetColors: (item === 'backgroundcolor') ? this.parent.backgroundColor.colorCode : this.parent.fontColor.colorCode,
+            columns: (item === 'backgroundcolor') ? this.parent.backgroundColor.columns : this.parent.fontColor.columns,
             beforeTileRender: function (args) {
                 args.element.classList.add(CLS_COLOR_PALETTE);
                 args.element.classList.add(CLS_CUSTOM_TILE);
@@ -5648,10 +5653,6 @@ var ToolbarRenderer = /** @__PURE__ @class */ (function () {
             }
         });
         colorPicker.isStringTemplate = true;
-        colorPicker.columns = (item === 'backgroundcolor') ? this.parent.backgroundColor.columns : this.parent.fontColor.columns;
-        colorPicker.presetColors = (item === 'backgroundcolor') ? this.parent.backgroundColor.colorCode :
-            this.parent.fontColor.colorCode;
-        colorPicker.cssClass = ((item === 'backgroundcolor') ? CLS_BACKGROUND_COLOR_PICKER : CLS_FONT_COLOR_PICKER) + ' ' + args.cssClass;
         colorPicker.createElement = this.parent.createElement;
         colorPicker.appendTo(document.getElementById(args.target));
         return colorPicker;
@@ -12698,6 +12699,109 @@ var DOMNode = /** @__PURE__ @class */ (function () {
         }
         return null;
     };
+    /**
+     * Method to wrap the inline and text node with block node.
+     *
+     * @param {HTMLElement} node - specifies the element sent to wrap the node around it with block nodes.
+     * @param {string} wrapperElement - specifies which block nodes to wrap around.
+     * @returns {HTMLElement} - returns the wrapped element.
+     * @hidden
+     * @deprecated
+     */
+    DOMNode.prototype.gatherElementsAround = function (node, wrapperElement) {
+        var newWrapElem = createElement(wrapperElement);
+        // Insert the new div element before the current node.
+        var currentNode = node.previousSibling;
+        var currentNodeParent = node.parentElement;
+        if (currentNodeParent.className === 'e-editor-select-start') {
+            currentNodeParent.parentNode.insertBefore(newWrapElem, currentNodeParent);
+        }
+        else if (currentNodeParent) {
+            currentNodeParent.insertBefore(newWrapElem, node);
+        }
+        var i = 0;
+        while (currentNode !== null && currentNode.nodeName !== 'BR' &&
+            !this.isBlockNode(currentNode)) {
+            var prevSibling = currentNode.previousSibling;
+            if (currentNode.nodeType === 3 || currentNode.nodeType === 1) {
+                if (i === 0) {
+                    newWrapElem.appendChild(currentNode);
+                }
+                else {
+                    newWrapElem.insertBefore(currentNode, newWrapElem.firstChild);
+                }
+            }
+            currentNode = prevSibling;
+            i++;
+        }
+        // Add the current node to the new div
+        newWrapElem.appendChild(node);
+        // Gather text and inline elements after the currentNode
+        currentNode = newWrapElem.nextSibling ? newWrapElem.nextSibling :
+            newWrapElem.parentElement.nextSibling;
+        while (currentNode !== null && currentNode.nodeName !== 'BR' &&
+            !this.isBlockNode(currentNode)) {
+            var nextSibling = currentNode.nextSibling ?
+                currentNode.nextSibling : currentNode.parentElement.nextSibling;
+            if (currentNode.nodeType === 3 || currentNode.nodeType === 1) {
+                newWrapElem.appendChild(currentNode);
+            }
+            currentNode = nextSibling;
+        }
+        return newWrapElem;
+    };
+    /**
+     * Method to convert all the inline nodes between the selection to block nodes.
+     *
+     * @param {Node[]} selectedNodes - specifies the nodes of the start and end selection.
+     * @param {boolean} fromList - specifies if the method is called from list module.
+     * @returns {Node[]} - returns the selected list of elements as block nodes.
+     * @hidden
+     * @deprecated
+     */
+    DOMNode.prototype.convertToBlockNodes = function (selectedNodes, fromList) {
+        if (selectedNodes.length > 1) {
+            var i = 0;
+            var currentSelectedNode = selectedNodes[0];
+            while (!isNullOrUndefined(currentSelectedNode)) {
+                if (currentSelectedNode.nodeName === 'BR') {
+                    var nextNode = currentSelectedNode.nextSibling;
+                    detach(currentSelectedNode);
+                    currentSelectedNode = nextNode;
+                }
+                if (!isNullOrUndefined(currentSelectedNode)) {
+                    if (fromList) {
+                        selectedNodes[i] = currentSelectedNode.nodeName === 'LI' || this.isBlockNode(currentSelectedNode) ?
+                            currentSelectedNode :
+                            this.gatherElementsAround(currentSelectedNode, (fromList ? 'p' : 'div'));
+                    }
+                    else {
+                        selectedNodes[i] = !this.isBlockNode(selectedNodes[i]) ?
+                            this.gatherElementsAround(currentSelectedNode, (fromList ? 'p' : 'div')) :
+                            selectedNodes[i];
+                    }
+                    var currentProcessNode = selectedNodes[i].nodeName === 'LI' ? selectedNodes[i].parentElement : selectedNodes[i];
+                    var currentElementCheckNode = currentProcessNode.nodeName === '#text' ? currentProcessNode.parentElement : currentProcessNode;
+                    currentSelectedNode = !isNullOrUndefined(currentElementCheckNode.querySelector('.e-editor-select-end')) ||
+                        !isNullOrUndefined(closest(currentSelectedNode, '.e-editor-select-end')) ?
+                        null : currentProcessNode.nextSibling;
+                    if (currentSelectedNode === null && !isNullOrUndefined(currentProcessNode.nextSibling) && currentProcessNode.nextSibling.nodeName === 'BR') {
+                        detach(currentProcessNode.nextSibling);
+                    }
+                }
+                i++;
+            }
+        }
+        else {
+            if (!this.isBlockNode(selectedNodes[0])) {
+                selectedNodes[0] = this.gatherElementsAround(selectedNodes[0], (fromList ? 'p' : 'div'));
+                if (!isNullOrUndefined(selectedNodes[0].nextSibling) && (selectedNodes[0].nextSibling.nodeName === 'BR')) {
+                    detach(selectedNodes[0].nextSibling);
+                }
+            }
+        }
+        return selectedNodes;
+    };
     /**
      * blockNodes method
      *
@@ -13206,7 +13310,7 @@ var Lists = /** @__PURE__ @class */ (function () {
             e.event.preventDefault();
         }
     };
-    Lists.prototype.onKeyUp = function () {
+    Lists.prototype.onKeyUp = function (e) {
         if (!isNullOrUndefined(this.commonLIParent) && !isNullOrUndefined(this.commonLIParent.querySelector('.removeList'))) {
             var currentLIElem = this.commonLIParent.querySelector('.removeList');
             while (!isNullOrUndefined(currentLIElem.firstChild)) {
@@ -13214,6 +13318,14 @@ var Lists = /** @__PURE__ @class */ (function () {
             }
             detach(currentLIElem);
         }
+        if (e.event.keyCode === 13) {
+            var listElements = this.parent.editableElement.querySelectorAll('UL, OL');
+            for (var 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
     Lists.prototype.firstListBackSpace = function (range, _e) {
@@ -13455,6 +13567,8 @@ var Lists = /** @__PURE__ @class */ (function () {
                 else {
                     if (prevSibling.tagName === 'LI') {
                         var nestedElement = createElement(elements[i].parentNode.tagName);
+                        nestedElement.style.listStyleType =
+                            elements[i].parentNode.style.listStyleType;
                         append([nestedElement], prevSibling);
                         append([elements[i]], nestedElement);
                     }
@@ -13504,39 +13618,7 @@ var Lists = /** @__PURE__ @class */ (function () {
         var listsNodes = this.domNode.blockNodes(true);
         if (e.enterAction === 'BR') {
             this.setSelectionBRConfig();
-            var selectedNodes = this.parent.domNode.blockNodes();
-            if (selectedNodes.length > 1) {
-                var i = 0;
-                var currentAlignmentNode = selectedNodes[0];
-                while (!isNullOrUndefined(currentAlignmentNode)) {
-                    if (currentAlignmentNode.nodeName === 'BR') {
-                        var nextNode = currentAlignmentNode.nextSibling;
-                        detach(currentAlignmentNode);
-                        currentAlignmentNode = nextNode;
-                    }
-                    if (!isNullOrUndefined(currentAlignmentNode)) {
-                        selectedNodes[i] = currentAlignmentNode.nodeName === 'LI' || this.parent.domNode.isBlockNode(currentAlignmentNode) ?
-                            currentAlignmentNode : this.gatherElementsAround(currentAlignmentNode);
-                        var currentSelectNode = selectedNodes[i].nodeName === 'LI' ? selectedNodes[i].parentElement : selectedNodes[i];
-                        var currentElementCheckNode = currentAlignmentNode.nodeName === '#text' ? currentAlignmentNode.parentElement : currentAlignmentNode;
-                        currentAlignmentNode = !isNullOrUndefined(currentElementCheckNode.querySelector('.e-editor-select-end')) ||
-                            !isNullOrUndefined(closest(currentAlignmentNode, '.e-editor-select-end')) ?
-                            null : currentSelectNode.nextSibling;
-                        if (currentAlignmentNode === null && !isNullOrUndefined(currentSelectNode.nextSibling) && currentSelectNode.nextSibling.nodeName === 'BR') {
-                            detach(currentSelectNode.nextSibling);
-                        }
-                    }
-                    i++;
-                }
-            }
-            else {
-                if (!this.parent.domNode.isBlockNode(selectedNodes[0])) {
-                    selectedNodes[0] = this.gatherElementsAround(selectedNodes[0]);
-                    if (!isNullOrUndefined(selectedNodes[0].nextSibling) && (selectedNodes[0].nextSibling.nodeName === 'BR')) {
-                        detach(selectedNodes[0].nextSibling);
-                    }
-                }
-            }
+            this.parent.domNode.convertToBlockNodes(this.parent.domNode.blockNodes(), true);
             this.setSelectionBRConfig();
             listsNodes = this.parent.domNode.blockNodes();
         }
@@ -13593,7 +13675,7 @@ var Lists = /** @__PURE__ @class */ (function () {
                 }
                 var elemAtt = void 0;
                 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') {
                     var listEle = document.createElement(type);
@@ -13714,6 +13796,13 @@ var Lists = /** @__PURE__ @class */ (function () {
         for (var c = 0; c < liParents.length; c++) {
             var node = liParents[c];
             var toFindtopOlUl = true;
+            var 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;
                 var preElement = liParents[c].parentElement.parentElement;
@@ -13733,9 +13822,43 @@ var Lists = /** @__PURE__ @class */ (function () {
                     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'))) {
+                var contentNodes = this.domNode.contents(node);
+                for (var f = 0; f < contentNodes.length; f++) {
+                    node.previousElementSibling.appendChild(contentNodes[f]);
+                }
+                node.parentNode.removeChild(node);
+            }
         }
         if (firstNodeOL) {
             firstNodeOL.style.listStyleType = listStyleType;
+            var range = this.parent.nodeSelection.getRange(this.parent.currentDocument);
+            var 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 (var k = 0; k < listOlUlElements.length; k++) {
+                var listStyle = void 0;
+                var 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');
+                }
+            }
         }
     };
     Lists.prototype.findUnSelected = function (temp, elements) {
@@ -13838,7 +13961,7 @@ var Lists = /** @__PURE__ @class */ (function () {
                                 parentNode.removeAttribute("style");
                             }
                         }
-                        var wrapper = '<' + DEFAULT_TAG + wrapperclass + this.domNode.attributes(element) + '></' + DEFAULT_TAG + '>';
+                        var wrapper = '<' + e.enterAction + wrapperclass + this.domNode.attributes(element) + '></' + e.enterAction + '>';
                         if (e.enterAction !== 'BR') {
                             this.domNode.wrapInner(element, this.domNode.parseHTMLFragment(wrapper));
                         }
@@ -13912,48 +14035,6 @@ var Lists = /** @__PURE__ @class */ (function () {
     Lists.prototype.closeTag = function (type) {
         return this.domNode.parseHTMLFragment('<span class="e-rte-list-close-' + type.toLowerCase() + '"></span>');
     };
-    Lists.prototype.gatherElementsAround = function (node) {
-        var pWrap = document.createElement('p');
-        // Insert the new div before the current node
-        var currentNode = node.previousSibling;
-        var classNode = node.parentNode;
-        if (classNode.className === 'e-editor-select-start') {
-            node.parentNode.parentNode.insertBefore(pWrap, node.parentNode);
-        }
-        else if (node.parentNode) {
-            node.parentNode.insertBefore(pWrap, node);
-        }
-        // Gather text and inline elements before the currentNode
-        var i = 0;
-        while (currentNode !== null && currentNode.nodeName !== 'BR' &&
-            !this.parent.domNode.isBlockNode(currentNode)) {
-            var prevSibling = currentNode.previousSibling;
-            if (currentNode.nodeType === 3 || currentNode.nodeType === 1) {
-                if (i === 0) {
-                    pWrap.appendChild(currentNode);
-                }
-                else {
-                    pWrap.insertBefore(currentNode, pWrap.firstChild);
-                }
-            }
-            currentNode = prevSibling;
-            i++;
-        }
-        // Add the current node to the new p
-        pWrap.appendChild(node);
-        // Gather text and inline elements after the currentNode
-        currentNode = pWrap.nextSibling ? pWrap.nextSibling : pWrap.parentElement.nextSibling;
-        while (currentNode !== null && currentNode.nodeName !== 'BR' &&
-            !this.parent.domNode.isBlockNode(currentNode)) {
-            var nextSibling = currentNode.nextSibling ?
-                currentNode.nextSibling : currentNode.parentElement.nextSibling;
-            if (currentNode.nodeType === 3 || currentNode.nodeType === 1) {
-                pWrap.appendChild(currentNode);
-            }
-            currentNode = nextSibling;
-        }
-        return pWrap;
-    };
     return Lists;
 }());
 
@@ -14293,7 +14374,7 @@ var Formats = /** @__PURE__ @class */ (function () {
                 }
             }
         }
-        if (e.enterAction !== 'BR' && !isNullOrUndefined(range.startContainer) && !isNullOrUndefined(range.startContainer.parentElement) && range.startContainer === range.endContainer && range.startContainer.nodeName === '#text' && range.startContainer.parentElement.classList.contains("e-content") && range.startContainer.parentElement.isContentEditable) {
+        if (e.enterAction !== 'BR' && !isNullOrUndefined(range.startContainer) && !isNullOrUndefined(range.startContainer.parentElement) && range.startContainer === range.endContainer && range.startContainer.nodeName === '#text' && range.startContainer.parentElement.classList.contains('e-content') && range.startContainer.parentElement.isContentEditable) {
             var pTag = createElement(e.enterAction);
             range.startContainer.parentElement.insertBefore(pTag, range.startContainer);
             pTag.appendChild(range.startContainer);
@@ -15640,6 +15721,9 @@ var Alignments = /** @__PURE__ @class */ (function () {
         if (!isTableAlign) {
             this.parent.domNode.setMarker(save);
             var alignmentNodes = this.parent.domNode.blockNodes();
+            if (e.enterAction === 'BR') {
+                alignmentNodes = this.parent.domNode.convertToBlockNodes(alignmentNodes, false);
+            }
             for (var i = 0; i < alignmentNodes.length; i++) {
                 var parentNode = alignmentNodes[i];
                 setStyleAttribute(parentNode, { 'text-align': this.alignments[e.subCommand] });
@@ -15723,6 +15807,9 @@ var Indents = /** @__PURE__ @class */ (function () {
         var save = this.parent.nodeSelection.save(range, this.parent.currentDocument);
         this.parent.domNode.setMarker(save);
         var indentsNodes = this.parent.domNode.blockNodes();
+        if (e.enterAction === 'BR') {
+            indentsNodes = this.parent.domNode.convertToBlockNodes(indentsNodes, false);
+        }
         var parentNodes = indentsNodes.slice();
         var listsNodes = [];
         for (var i = 0; i < parentNodes.length; i++) {
@@ -20025,7 +20112,7 @@ var MsWordPaste = /** @__PURE__ @class */ (function () {
                 !isNormalList) {
                 prevList = null;
             }
-            var pElement = createElement('p', { className: 'MsoNormal' });
+            var pElement = createElement('p', { className: 'MsoNoSpacing' });
             pElement.innerHTML = collection[index].content.join(' ');
             if ((collection[index].nestedLevel === 1) &&
                 (listCount === 0 || lfo !== collection[index].listFormatOverride) &&
@@ -21105,12 +21192,14 @@ var EditorManager = /** @__PURE__ @class */ (function () {
             case 'alignments':
                 this.observer.notify(ALIGNMENT_TYPE, {
                     subCommand: value, event: event, callBack: callBack,
-                    selector: selector,
-                    value: exeValue
+                    selector: selector, value: exeValue, enterAction: enterAction
                 });
                 break;
             case 'indents':
-                this.observer.notify(INDENT_TYPE, { subCommand: value, event: event, callBack: callBack, selector: selector });
+                this.observer.notify(INDENT_TYPE, {
+                    subCommand: value, event: event, callBack: callBack,
+                    selector: selector, enterAction: enterAction
+                });
                 break;
             case 'links':
                 this.observer.notify(LINK, { command: command, value: value, item: exeValue, event: event, callBack: callBack });
@@ -21991,25 +22080,54 @@ var HtmlEditor = /** @__PURE__ @class */ (function () {
             this.deleteCleanup(e, currentRange);
         }
         if (args.keyCode === 9 && this.parent.enableTabKey) {
+            this.parent.formatter.saveData(e);
             if (!isNullOrUndefined(args.target) && isNullOrUndefined(closest(args.target, '.e-rte-toolbar'))) {
                 var range = this.nodeSelectionObj.getRange(this.contentRenderer.getDocument());
                 var 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();
-                    if (!args.shiftKey) {
-                        InsertHtml.Insert(this.contentRenderer.getDocument(), '&nbsp;&nbsp;&nbsp;&nbsp;');
-                        this.rangeCollection.push(this.nodeSelectionObj.getRange(this.contentRenderer.getDocument()));
+                    var selection = this.contentRenderer.getDocument().getSelection().getRangeAt(0);
+                    var alignmentNodes = this.parent.formatter.editorManager.domNode.blockNodes();
+                    if (this.parent.enterKey === 'BR') {
+                        if (selection.startOffset !== selection.endOffset && selection.startOffset === 0) {
+                            var save = this.nodeSelectionObj.save(range, this.contentRenderer.getDocument());
+                            this.parent.formatter.editorManager.domNode.setMarker(save);
+                            alignmentNodes = this.parent.formatter.editorManager.domNode.blockNodes();
+                            this.parent.formatter.editorManager.domNode.convertToBlockNodes(alignmentNodes, false);
+                            this.marginTabAdd(args.shiftKey, alignmentNodes);
+                            save = this.parent.formatter.editorManager.domNode.saveMarker(save);
+                            save.restore();
+                        }
+                        else {
+                            InsertHtml.Insert(this.contentRenderer.getDocument(), '&nbsp;&nbsp;&nbsp;&nbsp;');
+                            this.rangeCollection.push(this.nodeSelectionObj.getRange(this.contentRenderer.getDocument()));
+                        }
                     }
-                    else if (this.rangeCollection.length > 0 &&
-                        this.rangeCollection[this.rangeCollection.length - 1].startContainer.textContent.length === 4) {
-                        var textCont = this.rangeCollection[this.rangeCollection.length - 1].startContainer;
-                        this.nodeSelectionObj.setSelectionText(this.contentRenderer.getDocument(), textCont, textCont, 0, textCont.textContent.length);
-                        InsertHtml.Insert(this.contentRenderer.getDocument(), document.createTextNode(''));
-                        this.rangeCollection.pop();
+                    else {
+                        if (!args.shiftKey) {
+                            if (selection.startOffset !== selection.endOffset && selection.startOffset === 0) {
+                                this.marginTabAdd(args.shiftKey, alignmentNodes);
+                            }
+                            else {
+                                InsertHtml.Insert(this.contentRenderer.getDocument(), '&nbsp;&nbsp;&nbsp;&nbsp;');
+                                this.rangeCollection.push(this.nodeSelectionObj.getRange(this.contentRenderer.getDocument()));
+                            }
+                        }
+                        else if (this.rangeCollection.length > 0 &&
+                            this.rangeCollection[this.rangeCollection.length - 1].startContainer.textContent.length === 4) {
+                            var textCont = this.rangeCollection[this.rangeCollection.length - 1].startContainer;
+                            this.nodeSelectionObj.setSelectionText(this.contentRenderer.getDocument(), textCont, textCont, 0, textCont.textContent.length);
+                            InsertHtml.Insert(this.contentRenderer.getDocument(), document.createTextNode(''));
+                            this.rangeCollection.pop();
+                        }
+                        else {
+                            this.marginTabAdd(args.shiftKey, alignmentNodes);
+                        }
                     }
                 }
             }
+            this.parent.formatter.saveData(e);
         }
         if (e.args.action === 'space' ||
             e.args.action === 'enter' ||
@@ -22672,6 +22790,30 @@ var HtmlEditor = /** @__PURE__ @class */ (function () {
     HtmlEditor.prototype.getSelectedHtml = function (e) {
         e.callBack(this.parent.formatter.editorManager.nodeSelection.getRange(this.parent.contentModule.getDocument()).toString());
     };
+    HtmlEditor.prototype.marginTabAdd = function (val, alignmentNodes) {
+        for (var index = 0; index < alignmentNodes.length; index++) {
+            var element = alignmentNodes[index];
+            if (element.closest('li')) {
+                continue;
+            }
+            if (element.style.marginLeft) {
+                var count$$1 = parseInt(element.style.marginLeft, 10);
+                if (val) {
+                    count$$1 -= 20;
+                }
+                else {
+                    count$$1 += 20;
+                }
+                element.style.marginLeft = count$$1.toString() + 'px';
+                if (element.style.marginLeft === '0px') {
+                    element.removeAttribute('style');
+                }
+            }
+            else if (!val) {
+                element.style.marginLeft = '20px';
+            }
+        }
+    };
     return HtmlEditor;
 }());
 
@@ -23332,7 +23474,8 @@ var PasteCleanup = /** @__PURE__ @class */ (function () {
             clipBoardElem = this.allowedStyle(clipBoardElem);
         }
         this.saveSelection.restore();
-        clipBoardElem.innerHTML = this.sanitizeHelper(clipBoardElem.innerHTML);
+        var newText = clipBoardElem.innerHTML.split("&").join("&amp;");
+        clipBoardElem.innerHTML = this.sanitizeHelper(newText);
         var allImg = clipBoardElem.querySelectorAll('img');
         for (var i = 0; i < allImg.length; i++) {
             if (!isNullOrUndefined(allImg[i].getAttribute('src'))) {
@@ -24253,9 +24396,6 @@ var FullScreen = /** @__PURE__ @class */ (function () {
             && !isNullOrUndefined(this.parent.quickToolbarModule)) {
             this.parent.quickToolbarModule.hideQuickToolbars();
         }
-        if (this.parent.showTooltip && !isNullOrUndefined(document.querySelector('.e-tooltip-wrap'))) {
-            this.parent.notify(destroyTooltip, { args: event });
-        }
         this.scrollableParent = getScrollableParent(this.parent.element);
         if (!this.parent.element.classList.contains(CLS_FULL_SCREEN)) {
             var evenArgs = {
@@ -24308,9 +24448,6 @@ var FullScreen = /** @__PURE__ @class */ (function () {
             && !isNullOrUndefined(this.parent.quickToolbarModule)) {
             this.parent.quickToolbarModule.hideQuickToolbars();
         }
-        if (this.parent.showTooltip && !isNullOrUndefined(document.querySelector('.e-tooltip-wrap'))) {
-            this.parent.notify(destroyTooltip, { args: event });
-        }
         if (this.parent.element.classList.contains(CLS_FULL_SCREEN)) {
             var evenArgs = {
                 cancel: false,
@@ -26723,13 +26860,13 @@ var Image$1 = /** @__PURE__ @class */ (function () {
             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) {
-                var 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)) {
@@ -33690,16 +33827,18 @@ var EnterKeyAction = /** @__PURE__ @class */ (function () {
         this.getRangeNode();
         var isTableEnter = true;
         this.formatTags = ['h1', 'h2', 'h3', 'h4', 'h5', 'h6', 'blockquote'];
-        var 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';
-        var 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;
+        var 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;
@@ -34067,7 +34206,6 @@ var EnterKeyAction = /** @__PURE__ @class */ (function () {
                                     var 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();
@@ -34097,7 +34235,7 @@ var EnterKeyAction = /** @__PURE__ @class */ (function () {
                             }
                             e.args.preventDefault();
                         }
-                        _this.parent.trigger(actionComplete, { requestType: shiftKey_1 ? 'ShiftEnterAction' : 'EnterAction', args: e.args });
+                        _this.triggerActionComplete(e, shiftKey_1);
                     }
                 });
             }
@@ -34167,6 +34305,9 @@ var EnterKeyAction = /** @__PURE__ @class */ (function () {
         }
         return insertElem;
     };
+    EnterKeyAction.prototype.triggerActionComplete = function (e, shiftKey) {
+        this.parent.trigger(actionComplete, { requestType: shiftKey ? 'ShiftEnterAction' : 'EnterAction', args: e.args });
+    };
     EnterKeyAction.prototype.handleCursorAtTableSide = function (e, isStart, isEnd) {
         var _this = this;
         if (this.parent.enterKey !== 'BR') {
@@ -34197,11 +34338,92 @@ var EnterKeyAction = /** @__PURE__ @class */ (function () {
                     }
                     _this.parent.formatter.editorManager.nodeSelection.setCursorPoint(_this.parent.contentModule.getDocument(), newElement, 0);
                     e.args.preventDefault();
-                    _this.parent.trigger(actionComplete, { requestType: shiftKey_2 ? 'ShiftEnterAction' : 'EnterAction', args: e.args });
+                    _this.triggerActionComplete(e, shiftKey_2);
                 }
             });
         }
     };
+    EnterKeyAction.prototype.handleEnterKeyAtImageSide = function (e, isStart, isEnd) {
+        var _this = this;
+        var actionBeginArgs = {
+            cancel: false,
+            name: actionBegin,
+            requestType: e.args.shiftKey ? 'ShiftEnterAction' : 'EnterAction',
+            originalEvent: e.args
+        };
+        var directRange = false;
+        if (this.range.startContainer.nodeName === 'IMG' && this.range.startOffset === 0) {
+            directRange = true;
+        }
+        this.parent.trigger(actionBegin, actionBeginArgs, function (actionBeginArgs) {
+            if (!actionBeginArgs.cancel) {
+                if (_this.parent.enterKey === 'BR') {
+                    var newElement = _this.parent.createElement('BR');
+                    var imageElement = void 0;
+                    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);
+                            var 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);
+                }
+            }
+        });
+    };
+    EnterKeyAction.prototype.isTableOrImageStart = function () {
+        var customHandlerElements = ['IMG', 'TABLE'];
+        var startContainer = this.range.startContainer;
+        var startOffset = this.range.startOffset;
+        var 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: '' };
+        }
+    };
+    EnterKeyAction.prototype.isTableOrImageEnd = function () {
+        var customHandlerElements = ['IMG', 'TABLE'];
+        var startContainer = this.range.startContainer;
+        var startOffset = this.range.startOffset;
+        var 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: '' };
+        }
+    };
+    EnterKeyAction.prototype.processedTableImageCursor = function () {
+        var _a = this.isTableOrImageStart(), start = _a.start, startNodeName = _a.startNodeName;
+        var _b = this.isTableOrImageEnd(), end = _b.end, endNodeName = _b.endNodeName;
+        return { start: start, startName: startNodeName, end: end, endName: endNodeName };
+    };
     return EnterKeyAction;
 }());
 
@@ -35603,7 +35825,7 @@ var RichTextEditor = /** @__PURE__ @class */ (function (_super) {
         }
     };
     RichTextEditor.prototype.updatePanelValue = function () {
-        var value = this.value;
+        var value = this.listOrderCorrection(this.value);
         value = (this.enableHtmlEncode && this.value) ? decode(value) : value;
         var getTextArea = this.element.querySelector('.' + CLS_RTE_SOURCE_CODE_TXTAREA);
         if (value) {
@@ -35647,6 +35869,17 @@ var RichTextEditor = /** @__PURE__ @class */ (function (_super) {
             this.countModule.refresh();
         }
     };
+    RichTextEditor.prototype.listOrderCorrection = function (value) {
+        var valueElementWrapper = this.createElement('div');
+        valueElementWrapper.innerHTML = value;
+        var listElements = valueElementWrapper.querySelectorAll('UL, OL');
+        for (var 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;
+    };
     RichTextEditor.prototype.setHeight = function (height) {
         if (height !== 'auto') {
             this.element.style.height = formatUnit(height);