@syncfusion/ej2-richtexteditor 25.2.3 → 25.2.4-621927

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

@@ -3570,7 +3570,7 @@ function updateDropDownFontFormatLocale(self) {
  * @hidden
  * @deprecated
  */
-var IsFormatted = /** @__PURE__ @class */ (function () {
+var IsFormatted = /** @class */ (function () {
     function IsFormatted() {
     }
     /**
@@ -3916,7 +3916,7 @@ var PASTE_SOURCE = ['word', 'excel', 'onenote'];
 /**
  * `Selection` module is used to handle RTE Selections.
  */
-var NodeSelection = /** @__PURE__ @class */ (function () {
+var NodeSelection = /** @class */ (function () {
     function NodeSelection() {
         this.startNodeName = [];
         this.endNodeName = [];
@@ -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";
                 }
             });
@@ -4640,7 +4643,7 @@ function scrollToCursor(document, inputElement) {
  * @deprecated
  */
 var statusCollection = getDefaultHtmlTbStatus();
-var ToolbarStatus = /** @__PURE__ @class */ (function () {
+var ToolbarStatus = /** @class */ (function () {
     function ToolbarStatus() {
     }
     /**
@@ -5009,7 +5012,7 @@ var ToolbarStatus = /** @__PURE__ @class */ (function () {
  * @hidden
  * @deprecated
  */
-var ToolbarRenderer = /** @__PURE__ @class */ (function () {
+var ToolbarRenderer = /** @class */ (function () {
     /**
      * Constructor for toolbar renderer module
      *
@@ -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;
@@ -5698,7 +5699,7 @@ var ToolbarRenderer = /** @__PURE__ @class */ (function () {
 /**
  * `Toolbar` module is used to handle Toolbar actions.
  */
-var BaseToolbar = /** @__PURE__ @class */ (function () {
+var BaseToolbar = /** @class */ (function () {
     function BaseToolbar(parent, serviceLocator) {
         this.tools = {};
         this.parent = parent;
@@ -5906,7 +5907,7 @@ var BaseToolbar = /** @__PURE__ @class */ (function () {
 /**
  * `Toolbar` module is used to handle Toolbar actions.
  */
-var DropDownButtons = /** @__PURE__ @class */ (function () {
+var DropDownButtons = /** @class */ (function () {
     function DropDownButtons(parent, serviceLocator) {
         this.parent = parent;
         this.locator = serviceLocator;
@@ -6437,7 +6438,7 @@ var DropDownButtons = /** @__PURE__ @class */ (function () {
  * @hidden
  * @deprecated
  */
-var ServiceLocator = /** @__PURE__ @class */ (function () {
+var ServiceLocator = /** @class */ (function () {
     function ServiceLocator() {
         this.services = {};
     }
@@ -6481,7 +6482,7 @@ var ServiceLocator = /** @__PURE__ @class */ (function () {
  * @hidden
  * @deprecated
  */
-var RendererFactory = /** @__PURE__ @class */ (function () {
+var RendererFactory = /** @class */ (function () {
     function RendererFactory() {
         this.rendererMap = {};
     }
@@ -6524,7 +6525,7 @@ var RendererFactory = /** @__PURE__ @class */ (function () {
 /**
  * `ToolbarAction` module is used to toolbar click action
  */
-var ToolbarAction = /** @__PURE__ @class */ (function () {
+var ToolbarAction = /** @class */ (function () {
     function ToolbarAction(parent) {
         this.parent = parent;
         this.addEventListener();
@@ -6598,7 +6599,7 @@ var ToolbarAction = /** @__PURE__ @class */ (function () {
 /**
  * `Toolbar` module is used to handle Toolbar actions.
  */
-var Toolbar$2 = /** @__PURE__ @class */ (function () {
+var Toolbar$2 = /** @class */ (function () {
     function Toolbar$$1(parent, serviceLocator) {
         this.tools = {};
         this.parent = parent;
@@ -7237,25 +7238,25 @@ var Toolbar$2 = /** @__PURE__ @class */ (function () {
     return Toolbar$$1;
 }());
 
-var __extends = (undefined && undefined.__extends) || (function () {
-    var extendStatics = function (d, b) {
-        extendStatics = Object.setPrototypeOf ||
-            ({ __proto__: [] } instanceof Array && function (d, b) { d.__proto__ = b; }) ||
-            function (d, b) { for (var p in b) if (b.hasOwnProperty(p)) d[p] = b[p]; };
-        return extendStatics(d, b);
-    };
-    return function (d, b) {
-        extendStatics(d, b);
-        function __() { this.constructor = d; }
-        d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
-    };
-})();
-var __decorate = (undefined && undefined.__decorate) || function (decorators, target, key, desc) {
-    var c = arguments.length, r = c < 3 ? target : desc === null ? desc = Object.getOwnPropertyDescriptor(target, key) : desc, d;
-    if (typeof Reflect === "object" && typeof Reflect.decorate === "function") r = Reflect.decorate(decorators, target, key, desc);
-    else for (var i = decorators.length - 1; i >= 0; i--) if (d = decorators[i]) r = (c < 3 ? d(r) : c > 3 ? d(target, key, r) : d(target, key)) || r;
-    return c > 3 && r && Object.defineProperty(target, key, r), r;
-};
+var __extends = (undefined && undefined.__extends) || (function () {
+    var extendStatics = function (d, b) {
+        extendStatics = Object.setPrototypeOf ||
+            ({ __proto__: [] } instanceof Array && function (d, b) { d.__proto__ = b; }) ||
+            function (d, b) { for (var p in b) if (b.hasOwnProperty(p)) d[p] = b[p]; };
+        return extendStatics(d, b);
+    };
+    return function (d, b) {
+        extendStatics(d, b);
+        function __() { this.constructor = d; }
+        d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
+    };
+})();
+var __decorate = (undefined && undefined.__decorate) || function (decorators, target, key, desc) {
+    var c = arguments.length, r = c < 3 ? target : desc === null ? desc = Object.getOwnPropertyDescriptor(target, key) : desc, d;
+    if (typeof Reflect === "object" && typeof Reflect.decorate === "function") r = Reflect.decorate(decorators, target, key, desc);
+    else for (var i = decorators.length - 1; i >= 0; i--) if (d = decorators[i]) r = (c < 3 ? d(r) : c > 3 ? d(target, key, r) : d(target, key)) || r;
+    return c > 3 && r && Object.defineProperty(target, key, r), r;
+};
 var keyCode = {
     'backspace': 8,
     'tab': 9,
@@ -7325,7 +7326,7 @@ var keyCode = {
  * @hidden
  * @deprecated
  */
-var KeyboardEvents$1 = /** @__PURE__ @class */ (function (_super) {
+var KeyboardEvents$1 = /** @class */ (function (_super) {
     __extends(KeyboardEvents$$1, _super);
     /**
      * Initializes the KeyboardEvents
@@ -7468,7 +7469,7 @@ var KeyboardEvents$1 = /** @__PURE__ @class */ (function (_super) {
 /**
  * `Color Picker` module is used to handle ColorPicker actions.
  */
-var ColorPickerInput = /** @__PURE__ @class */ (function () {
+var ColorPickerInput = /** @class */ (function () {
     function ColorPickerInput(parent, serviceLocator) {
         this.tools = {};
         this.parent = parent;
@@ -7721,7 +7722,7 @@ var ColorPickerInput = /** @__PURE__ @class */ (function () {
 /**
  * `Quick toolbar` module is used to handle Quick toolbar actions.
  */
-var BaseQuickToolbar = /** @__PURE__ @class */ (function () {
+var BaseQuickToolbar = /** @class */ (function () {
     function BaseQuickToolbar(parent, locator) {
         this.parent = parent;
         this.locator = locator;
@@ -8203,7 +8204,7 @@ var BaseQuickToolbar = /** @__PURE__ @class */ (function () {
  * @hidden
  * @deprecated
  */
-var PopupRenderer = /** @__PURE__ @class */ (function () {
+var PopupRenderer = /** @class */ (function () {
     /**
      * Constructor for popup renderer module
      *
@@ -8272,7 +8273,7 @@ var PopupRenderer = /** @__PURE__ @class */ (function () {
 /**
  * `Quick toolbar` module is used to handle Quick toolbar actions.
  */
-var QuickToolbar = /** @__PURE__ @class */ (function () {
+var QuickToolbar = /** @class */ (function () {
     function QuickToolbar(parent, locator) {
         this.debounceTimeout = 1000;
         this.parent = parent;
@@ -8889,7 +8890,7 @@ var QuickToolbar = /** @__PURE__ @class */ (function () {
 /**
  * `Count` module is used to handle Count actions.
  */
-var Count = /** @__PURE__ @class */ (function () {
+var Count = /** @class */ (function () {
     function Count(parent, serviceLocator) {
         this.parent = parent;
         this.locator = serviceLocator;
@@ -9017,7 +9018,7 @@ var Count = /** @__PURE__ @class */ (function () {
  * @hidden
  * @deprecated
  */
-var MarkdownSelection = /** @__PURE__ @class */ (function () {
+var MarkdownSelection = /** @class */ (function () {
     function MarkdownSelection() {
     }
     /**
@@ -9233,7 +9234,7 @@ var MarkdownSelection = /** @__PURE__ @class */ (function () {
 /**
  * MarkdownToolbarStatus module for refresh the toolbar status
  */
-var MarkdownToolbarStatus = /** @__PURE__ @class */ (function () {
+var MarkdownToolbarStatus = /** @class */ (function () {
     function MarkdownToolbarStatus(parent) {
         this.toolbarStatus = this.prevToolbarStatus = getDefaultMDTbStatus();
         this.selection = new MarkdownSelection();
@@ -9356,7 +9357,7 @@ var MarkdownToolbarStatus = /** @__PURE__ @class */ (function () {
 /**
  * `ExecCommandCallBack` module is used to run the editor manager command
  */
-var ExecCommandCallBack = /** @__PURE__ @class */ (function () {
+var ExecCommandCallBack = /** @class */ (function () {
     function ExecCommandCallBack(parent) {
         this.parent = parent;
         this.addEventListener();
@@ -9486,7 +9487,7 @@ var MOUSE_DOWN = 'mouseDown';
  * @hidden
  * @deprecated
  */
-var Formatter = /** @__PURE__ @class */ (function () {
+var Formatter = /** @class */ (function () {
     function Formatter() {
     }
     /**
@@ -9795,7 +9796,7 @@ var INSERT_TEXT_COMMAND = 'insert-text';
  *
  * @hidden
  */
-var MDLists = /** @__PURE__ @class */ (function () {
+var MDLists = /** @class */ (function () {
     /**
      * Constructor for creating the Lists plugin
      *
@@ -10266,7 +10267,7 @@ var MDLists = /** @__PURE__ @class */ (function () {
  * @hidden
  * @deprecated
  */
-var MDFormats = /** @__PURE__ @class */ (function () {
+var MDFormats = /** @class */ (function () {
     /**
      * Constructor for creating the Formats plugin
      *
@@ -10494,7 +10495,7 @@ var MDFormats = /** @__PURE__ @class */ (function () {
  * @hidden
  * @deprecated
  */
-var MDSelectionFormats = /** @__PURE__ @class */ (function () {
+var MDSelectionFormats = /** @class */ (function () {
     function MDSelectionFormats(parent) {
         extend(this, this, parent, true);
         this.selection = this.parent.markdownSelection;
@@ -10964,7 +10965,7 @@ var imageResizeFactor = {
 /**
  * `Undo` module is used to handle undo actions.
  */
-var UndoRedoCommands = /** @__PURE__ @class */ (function () {
+var UndoRedoCommands = /** @class */ (function () {
     function UndoRedoCommands(parent, options) {
         this.undoRedoStack = [];
         this.parent = parent;
@@ -11159,7 +11160,7 @@ var UndoRedoCommands = /** @__PURE__ @class */ (function () {
  * @hidden
  * @deprecated
  */
-var MDLink = /** @__PURE__ @class */ (function () {
+var MDLink = /** @class */ (function () {
     /**
      * Constructor for creating the Formats plugin
      *
@@ -11210,7 +11211,7 @@ var MDLink = /** @__PURE__ @class */ (function () {
  * @hidden
  * @deprecated
  */
-var MDTable = /** @__PURE__ @class */ (function () {
+var MDTable = /** @class */ (function () {
     /**
      * Constructor for creating the Formats plugin
      *
@@ -11439,7 +11440,7 @@ var MDTable = /** @__PURE__ @class */ (function () {
  * @hidden
  * @deprecated
  */
-var ClearFormat = /** @__PURE__ @class */ (function () {
+var ClearFormat = /** @class */ (function () {
     /**
      * Constructor for creating the clear format plugin
      *
@@ -11557,7 +11558,7 @@ var ClearFormat = /** @__PURE__ @class */ (function () {
  * @hidden
  * @deprecated
  */
-var MDInsertText = /** @__PURE__ @class */ (function () {
+var MDInsertText = /** @class */ (function () {
     /**
      * Constructor for creating the insert text plugin
      *
@@ -11607,7 +11608,7 @@ var MDInsertText = /** @__PURE__ @class */ (function () {
  * @hidden
  * @deprecated
  */
-var MarkdownParser = /** @__PURE__ @class */ (function () {
+var MarkdownParser = /** @class */ (function () {
     /**
      * Constructor for creating the component
      *
@@ -11703,26 +11704,26 @@ var MarkdownParser = /** @__PURE__ @class */ (function () {
     return MarkdownParser;
 }());
 
-var __extends$1 = (undefined && undefined.__extends) || (function () {
-    var extendStatics = function (d, b) {
-        extendStatics = Object.setPrototypeOf ||
-            ({ __proto__: [] } instanceof Array && function (d, b) { d.__proto__ = b; }) ||
-            function (d, b) { for (var p in b) if (b.hasOwnProperty(p)) d[p] = b[p]; };
-        return extendStatics(d, b);
-    };
-    return function (d, b) {
-        extendStatics(d, b);
-        function __() { this.constructor = d; }
-        d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
-    };
-})();
+var __extends$1 = (undefined && undefined.__extends) || (function () {
+    var extendStatics = function (d, b) {
+        extendStatics = Object.setPrototypeOf ||
+            ({ __proto__: [] } instanceof Array && function (d, b) { d.__proto__ = b; }) ||
+            function (d, b) { for (var p in b) if (b.hasOwnProperty(p)) d[p] = b[p]; };
+        return extendStatics(d, b);
+    };
+    return function (d, b) {
+        extendStatics(d, b);
+        function __() { this.constructor = d; }
+        d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
+    };
+})();
 /**
  * Markdown adapter
  *
  * @hidden
  * @deprecated
  */
-var MarkdownFormatter = /** @__PURE__ @class */ (function (_super) {
+var MarkdownFormatter = /** @class */ (function (_super) {
     __extends$1(MarkdownFormatter, _super);
     function MarkdownFormatter(options) {
         var _this = _super.call(this) || this;
@@ -11769,7 +11770,7 @@ var MarkdownFormatter = /** @__PURE__ @class */ (function (_super) {
  * @hidden
  * @deprecated
  */
-var MarkdownRender = /** @__PURE__ @class */ (function () {
+var MarkdownRender = /** @class */ (function () {
     /**
      * Constructor for content renderer module
      *
@@ -11852,7 +11853,7 @@ var MarkdownRender = /** @__PURE__ @class */ (function () {
 /**
  * `MarkdownEditor` module is used to markdown editor
  */
-var MarkdownEditor = /** @__PURE__ @class */ (function () {
+var MarkdownEditor = /** @class */ (function () {
     function MarkdownEditor(parent, serviceLocator) {
         this.parent = parent;
         this.locator = serviceLocator;
@@ -12043,7 +12044,7 @@ var markerClassName = {
  * @hidden
  * @deprecated
  */
-var DOMNode = /** @__PURE__ @class */ (function () {
+var DOMNode = /** @class */ (function () {
     /**
      * Constructor for creating the DOMNode plugin
      *
@@ -12348,7 +12349,7 @@ var DOMNode = /** @__PURE__ @class */ (function () {
     DOMNode.prototype.unWrap = function (element) {
         var parent = element.parentNode;
         var unWrapNode = [];
-        while (element.firstChild) {
+        while (element.firstChild && (element.previousSibling !== this.parent.querySelector('.e-mention-chip') || element.textContent !== ' ')) {
             unWrapNode.push(element.firstChild);
             parent.insertBefore(element.firstChild, element);
         }
@@ -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
      *
@@ -12962,7 +13066,7 @@ var DOMNode = /** @__PURE__ @class */ (function () {
  * @hidden
  * @deprecated
  */
-var Lists = /** @__PURE__ @class */ (function () {
+var Lists = /** @class */ (function () {
     /**
      * Constructor for creating the Lists plugin
      *
@@ -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;
 }());
 
@@ -13962,7 +14043,7 @@ var Lists = /** @__PURE__ @class */ (function () {
  *
  * @hidden
  */
-var InsertMethods = /** @__PURE__ @class */ (function () {
+var InsertMethods = /** @class */ (function () {
     function InsertMethods() {
     }
     /**
@@ -14039,7 +14120,7 @@ var InsertMethods = /** @__PURE__ @class */ (function () {
  * @hidden
  * @deprecated
  */
-var NodeCutter = /** @__PURE__ @class */ (function () {
+var NodeCutter = /** @class */ (function () {
     function NodeCutter() {
         this.enterAction = 'P';
         this.position = -1;
@@ -14251,7 +14332,7 @@ var NodeCutter = /** @__PURE__ @class */ (function () {
  * @hidden
  * @deprecated
  */
-var Formats = /** @__PURE__ @class */ (function () {
+var Formats = /** @class */ (function () {
     /**
      * Constructor for creating the Formats plugin
      *
@@ -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);
@@ -14661,7 +14742,7 @@ var Formats = /** @__PURE__ @class */ (function () {
  * @hidden
  * @deprecated
  */
-var InsertHtml = /** @__PURE__ @class */ (function () {
+var InsertHtml = /** @class */ (function () {
     function InsertHtml() {
     }
     InsertHtml.Insert = function (docElement, insertNode, editNode, isExternal, enterAction) {
@@ -14714,6 +14795,9 @@ var InsertHtml = /** @__PURE__ @class */ (function () {
             this.insertTableInList(range, node, closestParentNode, nodes[0], nodeCutter);
             return;
         }
+        if (isCursor && range.startContainer.textContent === '' && range.startContainer.nodeName !== 'BR' && enterAction !== 'BR' && node.nodeName !== '#text' && !isNullOrUndefined(node.children[0]) && !isNullOrUndefined(node.children[0].tagName) && node.children[0].tagName === 'IMG' && node.children.length === 1) {
+            range.startContainer.innerHTML = '';
+        }
         if (isExternal || (!isNullOrUndefined(node) && !isNullOrUndefined(node.classList) &&
             node.classList.contains('pasteContent'))) {
             this.pasteInsertHTML(nodes, node, range, nodeSelection, nodeCutter, docElement, isCollapsed, closestParentNode, editNode, enterAction);
@@ -15276,7 +15360,7 @@ var InsertHtml = /** @__PURE__ @class */ (function () {
  * @hidden
  * @deprecated
  */
-var LinkCommand = /** @__PURE__ @class */ (function () {
+var LinkCommand = /** @class */ (function () {
     /**
      * Constructor for creating the Formats plugin
      *
@@ -15584,7 +15668,7 @@ var LinkCommand = /** @__PURE__ @class */ (function () {
  * @hidden
  * @deprecated
  */
-var Alignments = /** @__PURE__ @class */ (function () {
+var Alignments = /** @class */ (function () {
     /**
      * Constructor for creating the Formats plugin
      *
@@ -15640,6 +15724,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] });
@@ -15687,7 +15774,7 @@ var Alignments = /** @__PURE__ @class */ (function () {
  * @hidden
  * @deprecated
  */
-var Indents = /** @__PURE__ @class */ (function () {
+var Indents = /** @class */ (function () {
     /**
      * Constructor for creating the Formats plugin
      *
@@ -15723,6 +15810,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++) {
@@ -15823,7 +15913,7 @@ var CLASS_VIDEO_INLINE = 'e-video-inline';
  * @hidden
  * @deprecated
  */
-var ImageCommand = /** @__PURE__ @class */ (function () {
+var ImageCommand = /** @class */ (function () {
     /**
      * Constructor for creating the Formats plugin
      *
@@ -16210,7 +16300,7 @@ var ImageCommand = /** @__PURE__ @class */ (function () {
  * @hidden
  * @deprecated
  */
-var AudioCommand = /** @__PURE__ @class */ (function () {
+var AudioCommand = /** @class */ (function () {
     /**
      * Constructor for creating the Audio plugin
      *
@@ -16349,7 +16439,7 @@ var AudioCommand = /** @__PURE__ @class */ (function () {
  * @hidden
  * @deprecated
  */
-var VideoCommand = /** @__PURE__ @class */ (function () {
+var VideoCommand = /** @class */ (function () {
     /**
      * Constructor for creating the Video plugin
      *
@@ -16597,7 +16687,7 @@ var VideoCommand = /** @__PURE__ @class */ (function () {
  * @hidden
  * @deprecated
  */
-var TableCommand = /** @__PURE__ @class */ (function () {
+var TableCommand = /** @class */ (function () {
     /**
      * Constructor for creating the Formats plugin
      *
@@ -17578,7 +17668,7 @@ var TableCommand = /** @__PURE__ @class */ (function () {
     
     return TableCommand;
 }());
-var MinMax = /** @__PURE__ @class */ (function () {
+var MinMax = /** @class */ (function () {
     function MinMax() {
     }
     return MinMax;
@@ -17587,7 +17677,7 @@ var MinMax = /** @__PURE__ @class */ (function () {
 /**
  * `Selection` module is used to handle RTE Selections.
  */
-var SelectionCommands = /** @__PURE__ @class */ (function () {
+var SelectionCommands = /** @class */ (function () {
     function SelectionCommands() {
     }
     /**
@@ -18563,7 +18653,7 @@ var SelectionCommands = /** @__PURE__ @class */ (function () {
  * @hidden
  * @deprecated
  */
-var SelectionBasedExec = /** @__PURE__ @class */ (function () {
+var SelectionBasedExec = /** @class */ (function () {
     /**
      * Constructor for creating the Formats plugin
      *
@@ -18612,7 +18702,7 @@ var SelectionBasedExec = /** @__PURE__ @class */ (function () {
  * @hidden
  * @deprecated
  */
-var InsertHtmlExec = /** @__PURE__ @class */ (function () {
+var InsertHtmlExec = /** @class */ (function () {
     /**
      * Constructor for creating the Formats plugin
      *
@@ -18659,7 +18749,7 @@ var InsertHtmlExec = /** @__PURE__ @class */ (function () {
 /**
  * `Clear Format` module is used to handle Clear Format.
  */
-var ClearFormat$1 = /** @__PURE__ @class */ (function () {
+var ClearFormat$1 = /** @class */ (function () {
     function ClearFormat() {
     }
     /**
@@ -18912,7 +19002,7 @@ var ClearFormat$1 = /** @__PURE__ @class */ (function () {
  * @hidden
  * @deprecated
  */
-var ClearFormatExec = /** @__PURE__ @class */ (function () {
+var ClearFormatExec = /** @class */ (function () {
     /**
      * Constructor for creating the Formats plugin
      *
@@ -18957,7 +19047,7 @@ var ClearFormatExec = /** @__PURE__ @class */ (function () {
 /**
  * `Undo` module is used to handle undo actions.
  */
-var UndoRedoManager = /** @__PURE__ @class */ (function () {
+var UndoRedoManager = /** @class */ (function () {
     function UndoRedoManager(parent, options) {
         this.undoRedoStack = [];
         this.parent = parent;
@@ -19211,7 +19301,7 @@ var UndoRedoManager = /** @__PURE__ @class */ (function () {
  * @hidden
  * @deprecated
  */
-var MsWordPaste = /** @__PURE__ @class */ (function () {
+var MsWordPaste = /** @class */ (function () {
     function MsWordPaste(parent) {
         this.olData = [
             'decimal',
@@ -20025,7 +20115,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) &&
@@ -20279,7 +20369,7 @@ var MsWordPaste = /** @__PURE__ @class */ (function () {
  * @hidden
  * @deprecated
  */
-var InsertTextExec = /** @__PURE__ @class */ (function () {
+var InsertTextExec = /** @class */ (function () {
     /**
      * Constructor for creating the InsertText plugin
      *
@@ -20310,7 +20400,7 @@ var InsertTextExec = /** @__PURE__ @class */ (function () {
     return InsertTextExec;
 }());
 
-var EmojiPickerAction = /** @__PURE__ @class */ (function () {
+var EmojiPickerAction = /** @class */ (function () {
     function EmojiPickerAction(parent) {
         this.parent = parent;
         this.addEventListener();
@@ -20374,7 +20464,7 @@ var EmojiPickerAction = /** @__PURE__ @class */ (function () {
  * Base export
  */
 
-var FormatPainterActions = /** @__PURE__ @class */ (function () {
+var FormatPainterActions = /** @class */ (function () {
     function FormatPainterActions(parent, options) {
         this.INVALID_TAGS = ['A', 'AUDIO', 'IMG', 'VIDEO', 'IFRAME'];
         this.parent = parent;
@@ -21017,7 +21107,7 @@ var FormatPainterActions = /** @__PURE__ @class */ (function () {
  * @hidden
  * @deprecated
  */
-var EditorManager = /** @__PURE__ @class */ (function () {
+var EditorManager = /** @class */ (function () {
     /**
      * Constructor for creating the component
      *
@@ -21105,12 +21195,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 });
@@ -21263,26 +21355,26 @@ var EditorManager = /** @__PURE__ @class */ (function () {
     return EditorManager;
 }());
 
-var __extends$2 = (undefined && undefined.__extends) || (function () {
-    var extendStatics = function (d, b) {
-        extendStatics = Object.setPrototypeOf ||
-            ({ __proto__: [] } instanceof Array && function (d, b) { d.__proto__ = b; }) ||
-            function (d, b) { for (var p in b) if (b.hasOwnProperty(p)) d[p] = b[p]; };
-        return extendStatics(d, b);
-    };
-    return function (d, b) {
-        extendStatics(d, b);
-        function __() { this.constructor = d; }
-        d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
-    };
-})();
+var __extends$2 = (undefined && undefined.__extends) || (function () {
+    var extendStatics = function (d, b) {
+        extendStatics = Object.setPrototypeOf ||
+            ({ __proto__: [] } instanceof Array && function (d, b) { d.__proto__ = b; }) ||
+            function (d, b) { for (var p in b) if (b.hasOwnProperty(p)) d[p] = b[p]; };
+        return extendStatics(d, b);
+    };
+    return function (d, b) {
+        extendStatics(d, b);
+        function __() { this.constructor = d; }
+        d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
+    };
+})();
 /**
  * HTML adapter
  *
  * @hidden
  * @deprecated
  */
-var HTMLFormatter = /** @__PURE__ @class */ (function (_super) {
+var HTMLFormatter = /** @class */ (function (_super) {
     __extends$2(HTMLFormatter, _super);
     function HTMLFormatter(options) {
         var _this = _super.call(this) || this;
@@ -21323,7 +21415,7 @@ var HTMLFormatter = /** @__PURE__ @class */ (function (_super) {
 /**
  * HtmlToolbarStatus module for refresh the toolbar status
  */
-var HtmlToolbarStatus = /** @__PURE__ @class */ (function () {
+var HtmlToolbarStatus = /** @class */ (function () {
     function HtmlToolbarStatus(parent) {
         this.parent = parent;
         this.toolbarStatus = this.prevToolbarStatus = getDefaultHtmlTbStatus();
@@ -21370,7 +21462,7 @@ var HtmlToolbarStatus = /** @__PURE__ @class */ (function () {
  * @hidden
  * @deprecated
  */
-var ContentRender = /** @__PURE__ @class */ (function () {
+var ContentRender = /** @class */ (function () {
     /**
      * Constructor for content renderer module
      *
@@ -21458,19 +21550,19 @@ var ContentRender = /** @__PURE__ @class */ (function () {
     return ContentRender;
 }());
 
-var __extends$3 = (undefined && undefined.__extends) || (function () {
-    var extendStatics = function (d, b) {
-        extendStatics = Object.setPrototypeOf ||
-            ({ __proto__: [] } instanceof Array && function (d, b) { d.__proto__ = b; }) ||
-            function (d, b) { for (var p in b) if (b.hasOwnProperty(p)) d[p] = b[p]; };
-        return extendStatics(d, b);
-    };
-    return function (d, b) {
-        extendStatics(d, b);
-        function __() { this.constructor = d; }
-        d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
-    };
-})();
+var __extends$3 = (undefined && undefined.__extends) || (function () {
+    var extendStatics = function (d, b) {
+        extendStatics = Object.setPrototypeOf ||
+            ({ __proto__: [] } instanceof Array && function (d, b) { d.__proto__ = b; }) ||
+            function (d, b) { for (var p in b) if (b.hasOwnProperty(p)) d[p] = b[p]; };
+        return extendStatics(d, b);
+    };
+    return function (d, b) {
+        extendStatics(d, b);
+        function __() { this.constructor = d; }
+        d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
+    };
+})();
 var IFRAMEHEADER = "\n<!DOCTYPE html> \n    <html>\n         <head>\n            <meta charset='utf-8' /> \n            <style>\n                @charset \"UTF-8\";\n                body {\n                    font-family: \"Roboto\", sans-serif;\n                    font-size: 14px;\n                }\n                html, body{height: 100%;margin: 0;}\n                body.e-cursor{cursor:default}\n                span.e-selected-node\t{background-color: #939393;color: white;}\n                span.e-selected-node.e-highlight {background-color: #1d9dd8;}\n                body{color:#333;word-wrap:break-word;padding: 8px;box-sizing: border-box;}\n                .e-rte-image, .e-rte-video {border: 0;cursor: pointer;display:\n                    block;float: none;height: auto;margin: 5px auto;max-width: 100%;position: relative;}\n                .e-rte-audio {border: 0;cursor: pointer;display:\n                        block;float: none;margin: 5px auto;max-width: 100%;position: relative;}\n                .e-rte-image.e-imginline, .e-rte-audio.e-audio-inline, .e-rte-video.e-video-inline {display: inline-block;float: none;\n                    margin-left: 5px;margin-right: 5px;max-width: calc(100% - (2 * 5px));padding: 1px;vertical-align: bottom;}\n                .e-rte-image.e-imgcenter, .e-rte-video.e-video-center {cursor: pointer;display: block;float: none;margin: 5px auto;max-width: 100%;position: relative;}\n                .e-rte-image.e-imgright, .e-rte-video.e-video-right { float: right; margin: 0 auto;margin-left: 5px;text-align: right;}\n                .e-rte-image.e-imgleft, .e-rte-video.e-video-left {float: left;margin: 0 auto;margin-right: 5px;text-align: left;}\n                .e-img-caption { display: inline-block; float: none; margin: 5px auto; max-width: 100%;position: relative;}\n                .e-img-caption.e-caption-inline {display: inline-block;float: none;\n                    margin: 5px auto;margin-left: 5px;margin-right: 5px;max-width: calc(100% - (2 * 5px));\n                    position: relativetext-align: center;vertical-align: bottom;}\n                .e-rte-img-caption.e-imgcenter {display: contents; margin-left: auto; margin-right: auto;}\n                .e-rte-img-caption.e-imgright {display: contents; margin-left: auto; margin-right: 0;}\n                .e-rte-img-caption.e-imgleft {display: contents;margin-left: 0;margin-right: auto;}\n                .e-img-caption.e-rte-img-caption.e-imgbreak {display: contents;}\n                .e-img-inner {box-sizing: border-box;display: block;font-size: 16px;font-weight: initial;\n                    margin: auto;opacity: .9;text-align: center;width: 100%;}\n                .e-img-wrap {display: inline-block;margin: auto;padding: 0;text-align: center;width: 100%;}\n                .e-imgleft, .e-video-left {float: left;margin: 0 5px 0 0;text-align: left;}\n                .e-imgright, .e-video-right {float: right;margin: 0 0 0 5px;text-align: right;}\n                .e-imgcenter, .e-video-center {cursor: pointer;display: block;float: none;height: auto;margin: 5px auto;max-width: 100%;position: relative;}\n                .e-control img:not(.e-resize) {border: 2px solid transparent; z-index: 1000}\n                .e-imginline , .e-audio-inline, .e-video-inline {display: inline-block;float: none;margin-left: 5px;margin-right: 5px;\n                    max-width: calc(100% - (2 * 5px));vertical-align: bottom;}\n                .e-imgbreak, .e-audio-break, .e-video-break {border: 0;cursor: pointer;\n                    display: block;float: none;height: auto;margin: 5px auto;max-width: 100%;position: relative;}\n                .e-rte-image.e-img-focus:not(.e-resize), .e-audio-focus:not(.e-resize), .e-video-focus:not(.e-resize) {border: solid 2px #4a90e2;}\n                img.e-img-focus::selection, audio.e-audio-focus::selection, .e-video-focus::selection { background: transparent;color: transparent;}\n                span.e-rte-imageboxmark, span.e-rte-videoboxmark {  width: 10px; height: 10px; position: absolute; display: block;\n                    background: #4a90e2; border: 1px solid #fff; z-index: 1000;}\n                .e-mob-rte.e-mob-span span.e-rte-imageboxmark, .e-mob-rte.e-mob-span span.e-rte-videoboxmark { background: #4a90e2; border: 1px solid #fff; }\n                .e-mob-rte span.e-rte-imageboxmark, .e-mob-rte span.e-rte-videoboxmark { background: #fff; border: 1px solid #4a90e2;\n                    border-radius: 15px; height: 20px; width: 20px; }\n                .e-mob-rte.e-mob-span span.e-rte-imageboxmark, .e-mob-rte.e-mob-span span.e-rte-videoboxmark { background: #4a90e2; border: 1px solid #fff; }\n                .e-rte-content .e-content img.e-resize, .e-rte-content .e-content video.e-resize { z-index: 1000; }\n                .e-img-caption .e-img-inner { outline: 0; }\n                .e-rte-img-caption.e-imgleft .e-img-inner { float: left; text-align: left; }\n                .e-rte-img-caption.e-imgright .e-img-inner { float: right; text-align: right; }\n                .e-rte-img-caption.e-imgleft .e-img-wrap, .e-rte-img-caption.e-imgright .e-img-wrap { display: contents; }\n                .e-img-caption a:focus-visible { outline: none; }\n                .e-rte-img-caption .e-rte-image.e-imgright { margin-left: auto; margin-right: 0; }\n                .e-rte-img-caption .e-rte-image.e-imgleft { margin: 0; }\n                body{box-sizing: border-box;min-height: 100px;outline: 0 solid transparent;\n                    overflow-x: auto;padding: 16px;position: relative;text-align: inherit;z-index: 2;}\n                p{margin: 0 0 10px;margin-bottom: 10px;}\n                li{margin-bottom: 10px;}\n                table{margin-bottom: 10px;}\n                h1{font-size: 2.17em;font-weight: 400;line-height: 1;margin: 10px 0;}\n                h2{font-size: 1.74em;font-weight: 400;margin: 10px 0;}\n                h3{font-size: 1.31em;font-weight: 400;margin: 10px 0;}\n                h4{font-size: 16px;font-weight: 400;line-height: 1.5;margin: 0;}\n                h5{font-size: 00.8em;font-weight: 400;margin: 0;}\n                h6{font-size: 00.65em;font-weight: 400;margin: 0;}\n                blockquote{margin: 10px 0;margin-left: 0;padding-left: 5px;border-left: solid 2px #5c5c5c;}\n                pre{background-color: inherit;border: 0;border-radius: 0;color: #333;\n                    font-size: inherit;line-height: inherit;margin: 0 0 10px;overflow: visible;padding: 0;\n                    white-space: pre-wrap;word-break: inherit;word-wrap: break-word;}\n                strong, b{font-weight: 700;}\n                a{text-decoration: none;user-select: auto;}\n                a:hover{text-decoration: underline;};\n                p:last-child, pre:last-child, blockquote:last-child{margin-bottom: 0;}\n                h3+h4, h4+h5, h5+h6{margin-top: 00.6em;}\n                ul:last-child{margin-bottom: 0;}\n                table { border-collapse: collapse; empty-cells: show;}\n                table td,table th {border: 1px solid #BDBDBD; height: 20px; padding: 2px 5px; vertical-align: middle;}\n                table.e-alternate-border tbody tr:nth-child(2n) {background-color: #F5F5F5;}\n                table th {background-color: #E0E0E0;}\n                table.e-dashed-border td,table.e-dashed-border th { border: 1px dashed #BDBDBD} \n                table .e-cell-select {border: 1px double #4a90e2;}\n                span.e-table-box { cursor: nwse-resize; display: block; height: 10px; position: absolute; width: 10px; }\n                span.e-table-box.e-rmob {height: 14px;width: 14px;}\n                .e-row-resize, .e-column-resize { background-color: transparent; background-repeat: repeat;\n                    bottom: 0;cursor: col-resize;height: 1px;overflow: visible;position: absolute;width: 1px; }\n                .e-row-resize { cursor: row-resize; height: 1px;}\n                .e-table-rhelper { cursor: col-resize; opacity: .87;position: absolute;}\n                .e-table-rhelper.e-column-helper { width: 1px; }\n                .e-table-rhelper.e-row-helper {height: 1px;}\n                .e-reicon::before { border-bottom: 6px solid transparent; border-right: 6px solid;\n                    border-top: 6px solid transparent; content: ''; display: block; height: 0;\n                    position: absolute; right: 4px; top: 4px; width: 20px; }\n                .e-reicon::after { border-bottom: 6px solid transparent; border-left: 6px solid;\n                    border-top: 6px solid transparent; content: ''; display: block;\n                    height: 0; left: 4px; position: absolute; top: 4px; width: 20px; z-index: 3; }\n                .e-row-helper.e-reicon::after { top: 10px; transform: rotate(90deg); }\n                .e-row-helper.e-reicon::before { left: 4px; top: -20px; transform: rotate(90deg); }\n                span.e-table-box { background-color: #ffffff; border: 1px solid #BDBDBD; }\n                span.e-table-box.e-rbox-select { background-color: #BDBDBD; border: 1px solid #BDBDBD; }\n                .e-table-rhelper { background-color: #4a90e2;}\n                .e-rtl { direction: rtl; }\n                .e-rte-placeholder::before { content: attr(placeholder); opacity: 0.54; overflow: hidden; padding-top: 16px; position: absolute; text-align: start; top: 0; z-index: 1; }\n                li ol, li ul { margin-block-start: 10px;}\n            </style>\n        </head>";
 /**
  * Content module is used to render Rich Text Editor content
@@ -21478,7 +21570,7 @@ var IFRAMEHEADER = "\n<!DOCTYPE html> \n    <html>\n         <head>\n
  * @hidden
  * @deprecated
  */
-var IframeContentRender = /** @__PURE__ @class */ (function (_super) {
+var IframeContentRender = /** @class */ (function (_super) {
     __extends$3(IframeContentRender, _super);
     function IframeContentRender() {
         return _super !== null && _super.apply(this, arguments) || this;
@@ -21551,7 +21643,7 @@ var IframeContentRender = /** @__PURE__ @class */ (function (_super) {
 /**
  * XhtmlValidation module called when set enableXhtml as true
  */
-var XhtmlValidation = /** @__PURE__ @class */ (function () {
+var XhtmlValidation = /** @class */ (function () {
     function XhtmlValidation(parent) {
         this.parent = parent;
         this.addEventListener();
@@ -21722,7 +21814,7 @@ var XhtmlValidation = /** @__PURE__ @class */ (function () {
 /**
  * `HtmlEditor` module is used to HTML editor
  */
-var HtmlEditor = /** @__PURE__ @class */ (function () {
+var HtmlEditor = /** @class */ (function () {
     function HtmlEditor(parent, serviceLocator) {
         this.rangeCollection = [];
         this.isImageDelete = false;
@@ -21991,25 +22083,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,13 +22793,37 @@ 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;
 }());
 
 /**
  * PasteCleanup module called when pasting content in RichTextEditor
  */
-var PasteCleanup = /** @__PURE__ @class */ (function () {
+var PasteCleanup = /** @class */ (function () {
     function PasteCleanup(parent, serviceLocator) {
         this.inlineNode = ['a', 'abbr', 'acronym', 'audio', 'b', 'bdi', 'bdo', 'big', 'br', 'button',
             'canvas', 'cite', 'code', 'data', 'datalist', 'del', 'dfn', 'em', 'embed', 'font', 'i', 'iframe', 'img', 'input',
@@ -23332,7 +23477,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'))) {
@@ -23387,11 +23533,36 @@ var PasteCleanup = /** @__PURE__ @class */ (function () {
             this.cropImageHandler(this.parent.inputElement);
         }
     };
+    PasteCleanup.prototype.convertBlobToBase64 = function (element) {
+        var imgElem = element.querySelectorAll('img');
+        var _loop_1 = function (i) {
+            if (imgElem[i].getAttribute('src') &&
+                imgElem[i].getAttribute('src').startsWith("blob")) {
+                var blobImageUrl = imgElem[i].getAttribute('src');
+                var img_1 = new Image();
+                var onImageLoadEvent_1 = function () {
+                    var canvas = document.createElement('canvas');
+                    var ctx = canvas.getContext('2d');
+                    canvas.width = img_1.width;
+                    canvas.height = img_1.height;
+                    ctx.drawImage(img_1, 0, 0);
+                    var base64String = canvas.toDataURL('image/png');
+                    imgElem[i].src = base64String;
+                    img_1.removeEventListener('load', onImageLoadEvent_1);
+                };
+                img_1.src = blobImageUrl;
+                img_1.addEventListener('load', onImageLoadEvent_1);
+            }
+        };
+        for (var i = 0; i < imgElem.length; i++) {
+            _loop_1(i);
+        }
+    };
     PasteCleanup.prototype.cropImageHandler = function (element) {
         var _this = this;
         var allImgElm = element.querySelectorAll('.e-img-cropped');
         if (allImgElm.length > 0) {
-            var _loop_1 = function (i) {
+            var _loop_2 = function (i) {
                 if (allImgElm[i].getAttribute('src').split(',')[0].indexOf('base64') >= 0) {
                     var image_1 = new Image();
                     image_1.src = allImgElm[i].getAttribute('src');
@@ -23425,13 +23596,24 @@ var PasteCleanup = /** @__PURE__ @class */ (function () {
                 }
             };
             for (var i = 0; i < allImgElm.length; i++) {
-                _loop_1(i);
+                _loop_2(i);
             }
         }
         else {
-            this.imgUploading(this.parent.inputElement);
-            if (this.parent.iframeSettings.enable) {
-                this.parent.updateValue();
+            if (!isNullOrUndefined(this.parent.insertImageSettings.saveUrl) && !isNullOrUndefined(this.parent.insertImageSettings.path) && !isNullOrUndefined(this.parent.inputElement.querySelectorAll("img")) && this.parent.inputElement.querySelectorAll("img")[0].src.startsWith("blob")) {
+                this.convertBlobToBase64(this.parent.inputElement);
+                setTimeout(function () {
+                    _this.imgUploading(_this.parent.inputElement);
+                    if (_this.parent.iframeSettings.enable) {
+                        _this.parent.updateValue();
+                    }
+                }, 20);
+            }
+            else {
+                this.imgUploading(this.parent.inputElement);
+                if (this.parent.iframeSettings.enable) {
+                    this.parent.updateValue();
+                }
             }
         }
     };
@@ -23814,7 +23996,7 @@ var PasteCleanup = /** @__PURE__ @class */ (function () {
 /**
  * `Resize` module is used to resize the editor
  */
-var Resize = /** @__PURE__ @class */ (function () {
+var Resize = /** @class */ (function () {
     function Resize(parent) {
         this.parent = parent;
         this.addEventListener();
@@ -23948,7 +24130,7 @@ var Resize = /** @__PURE__ @class */ (function () {
 /**
  * `FileManager` module is used to display the directories and images inside the editor.
  */
-var FileManager$1 = /** @__PURE__ @class */ (function () {
+var FileManager$1 = /** @class */ (function () {
     function FileManager$$1(parent, locator) {
         FileManager.Inject(ContextMenu, DetailsView, NavigationPane, Toolbar$1);
         this.parent = parent;
@@ -24198,7 +24380,7 @@ var FileManager$1 = /** @__PURE__ @class */ (function () {
 /**
  * `FullScreen` module is used to maximize and minimize screen
  */
-var FullScreen = /** @__PURE__ @class */ (function () {
+var FullScreen = /** @class */ (function () {
     function FullScreen(parent) {
         this.parent = parent;
         this.addEventListener();
@@ -24217,9 +24399,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 = {
@@ -24272,9 +24451,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,
@@ -24429,7 +24605,7 @@ function setAttributes(htmlAttributes, rte, isFrame, initial) {
     }
 }
 
-var FormatPainter = /** @__PURE__ @class */ (function () {
+var FormatPainter = /** @class */ (function () {
     function FormatPainter(parent) {
         this.isSticky = false;
         this.isActive = false;
@@ -24587,7 +24763,7 @@ var FormatPainter = /** @__PURE__ @class */ (function () {
     return FormatPainter;
 }());
 
-var EmojiPicker = /** @__PURE__ @class */ (function () {
+var EmojiPicker = /** @class */ (function () {
     function EmojiPicker(parent, serviceLocator) {
         this.parent = parent;
         this.locator = serviceLocator;
@@ -25404,7 +25580,7 @@ var EmojiPicker = /** @__PURE__ @class */ (function () {
  * @hidden
  * @deprecated
  */
-var Render = /** @__PURE__ @class */ (function () {
+var Render = /** @class */ (function () {
     /**
      * Constructor for render module
      *
@@ -25503,7 +25679,7 @@ var Render = /** @__PURE__ @class */ (function () {
 /**
  * `Link` module is used to handle undo actions.
  */
-var Link = /** @__PURE__ @class */ (function () {
+var Link = /** @class */ (function () {
     function Link(parent, serviceLocator) {
         this.parent = parent;
         this.rteID = parent.element.id;
@@ -26075,7 +26251,7 @@ var Link = /** @__PURE__ @class */ (function () {
 /**
  * `Image` module is used to handle image actions.
  */
-var Image$1 = /** @__PURE__ @class */ (function () {
+var Image$1 = /** @class */ (function () {
     function Image(parent, serviceLocator) {
         this.isImgUploaded = false;
         this.isAllowedTypes = true;
@@ -26687,13 +26863,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)) {
@@ -27459,7 +27635,12 @@ var Image$1 = /** @__PURE__ @class */ (function () {
             animationSettings: { effect: 'None' },
             close: function (event) {
                 if (_this.isImgUploaded) {
-                    _this.uploadObj.remove();
+                    if (_this.dialogObj.element.querySelector('.e-file-abort-btn')) {
+                        _this.dialogObj.element.querySelector('.e-file-abort-btn').click();
+                    }
+                    else {
+                        _this.uploadObj.remove();
+                    }
                 }
                 _this.parent.isBlur = false;
                 if (event && !isNullOrUndefined(event.event) && event.event.returnValue) {
@@ -28406,7 +28587,7 @@ var Image$1 = /** @__PURE__ @class */ (function () {
 /**
  * `Audio` module is used to handle audio actions.
  */
-var Audio = /** @__PURE__ @class */ (function () {
+var Audio = /** @class */ (function () {
     function Audio(parent, serviceLocator) {
         this.isAudioUploaded = false;
         this.isAllowedTypes = true;
@@ -28979,7 +29160,12 @@ var Audio = /** @__PURE__ @class */ (function () {
             animationSettings: { effect: 'None' },
             close: function (event) {
                 if (_this.isAudioUploaded) {
-                    _this.uploadObj.removing();
+                    if (_this.dialogObj.element.querySelector('.e-file-abort-btn')) {
+                        _this.dialogObj.element.querySelector('.e-file-abort-btn').click();
+                    }
+                    else {
+                        _this.uploadObj.remove();
+                    }
                 }
                 _this.parent.isBlur = false;
                 if (event && !isNullOrUndefined(event.event) && event.event.returnValue) {
@@ -29265,7 +29451,7 @@ var Audio = /** @__PURE__ @class */ (function () {
     return Audio;
 }());
 
-var Video = /** @__PURE__ @class */ (function () {
+var Video = /** @class */ (function () {
     function Video(parent, serviceLocator) {
         this.isVideoUploaded = false;
         this.isAllowedTypes = true;
@@ -30339,7 +30525,12 @@ var Video = /** @__PURE__ @class */ (function () {
             animationSettings: { effect: 'None' },
             close: function (event) {
                 if (_this.isVideoUploaded) {
-                    _this.uploadObj.removing();
+                    if (_this.dialogObj.element.querySelector('.e-file-abort-btn')) {
+                        _this.dialogObj.element.querySelector('.e-file-abort-btn').click();
+                    }
+                    else {
+                        _this.uploadObj.remove();
+                    }
                 }
                 _this.parent.isBlur = false;
                 if (event && !isNullOrUndefined(event.event) && event.event.returnValue) {
@@ -30716,7 +30907,7 @@ var Video = /** @__PURE__ @class */ (function () {
  * @hidden
  * @deprecated
  */
-var ViewSource = /** @__PURE__ @class */ (function () {
+var ViewSource = /** @class */ (function () {
     /**
      * Constructor for view source module
      *
@@ -30996,7 +31187,7 @@ var ViewSource = /** @__PURE__ @class */ (function () {
 /**
  * `Table` module is used to handle table actions.
  */
-var Table = /** @__PURE__ @class */ (function () {
+var Table = /** @class */ (function () {
     function Table(parent, serviceLocator) {
         this.ensureInsideTableList = true;
         this.pageX = null;
@@ -32579,7 +32770,8 @@ var Table = /** @__PURE__ @class */ (function () {
             var argument = ((Browser.isDevice || (!isNullOrUndefined(args.args)
                 && !isNullOrUndefined(args.args.originalEvent) &&
                 args.args.originalEvent.action === 'insert-table')
-                || proxy.parent.inlineMode.enable || !isNullOrUndefined(proxy.parent.quickToolbarSettings.text)) ? args :
+                || proxy.parent.inlineMode.enable || ((!isNullOrUndefined(proxy.parent.quickToolbarSettings.text)) &&
+                !(args instanceof PointerEvent))) ? args :
                 this);
             proxy.tableInsert(proxy.rowTextBox.value, proxy.columnTextBox.value, e, argument);
         }
@@ -32714,7 +32906,7 @@ var Table = /** @__PURE__ @class */ (function () {
 /**
  * Dialog Renderer
  */
-var DialogRenderer = /** @__PURE__ @class */ (function () {
+var DialogRenderer = /** @class */ (function () {
     function DialogRenderer(parent) {
         this.parent = parent;
         this.addEventListener();
@@ -33031,29 +33223,29 @@ var executeGroup = {
     }
 };
 
-var __extends$5 = (undefined && undefined.__extends) || (function () {
-    var extendStatics = function (d, b) {
-        extendStatics = Object.setPrototypeOf ||
-            ({ __proto__: [] } instanceof Array && function (d, b) { d.__proto__ = b; }) ||
-            function (d, b) { for (var p in b) if (b.hasOwnProperty(p)) d[p] = b[p]; };
-        return extendStatics(d, b);
-    };
-    return function (d, b) {
-        extendStatics(d, b);
-        function __() { this.constructor = d; }
-        d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
-    };
-})();
-var __decorate$2 = (undefined && undefined.__decorate) || function (decorators, target, key, desc) {
-    var c = arguments.length, r = c < 3 ? target : desc === null ? desc = Object.getOwnPropertyDescriptor(target, key) : desc, d;
-    if (typeof Reflect === "object" && typeof Reflect.decorate === "function") r = Reflect.decorate(decorators, target, key, desc);
-    else for (var i = decorators.length - 1; i >= 0; i--) if (d = decorators[i]) r = (c < 3 ? d(r) : c > 3 ? d(target, key, r) : d(target, key)) || r;
-    return c > 3 && r && Object.defineProperty(target, key, r), r;
-};
+var __extends$5 = (undefined && undefined.__extends) || (function () {
+    var extendStatics = function (d, b) {
+        extendStatics = Object.setPrototypeOf ||
+            ({ __proto__: [] } instanceof Array && function (d, b) { d.__proto__ = b; }) ||
+            function (d, b) { for (var p in b) if (b.hasOwnProperty(p)) d[p] = b[p]; };
+        return extendStatics(d, b);
+    };
+    return function (d, b) {
+        extendStatics(d, b);
+        function __() { this.constructor = d; }
+        d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
+    };
+})();
+var __decorate$2 = (undefined && undefined.__decorate) || function (decorators, target, key, desc) {
+    var c = arguments.length, r = c < 3 ? target : desc === null ? desc = Object.getOwnPropertyDescriptor(target, key) : desc, d;
+    if (typeof Reflect === "object" && typeof Reflect.decorate === "function") r = Reflect.decorate(decorators, target, key, desc);
+    else for (var i = decorators.length - 1; i >= 0; i--) if (d = decorators[i]) r = (c < 3 ? d(r) : c > 3 ? d(target, key, r) : d(target, key)) || r;
+    return c > 3 && r && Object.defineProperty(target, key, r), r;
+};
 /**
  * Configures the toolbar settings of the RichTextEditor.
  */
-var ToolbarSettings$1 = /** @__PURE__ @class */ (function (_super) {
+var ToolbarSettings$1 = /** @class */ (function (_super) {
     __extends$5(ToolbarSettings$$1, _super);
     function ToolbarSettings$$1() {
         return _super !== null && _super.apply(this, arguments) || this;
@@ -33078,7 +33270,7 @@ var ToolbarSettings$1 = /** @__PURE__ @class */ (function (_super) {
 /**
  * Configures the image settings of the RichTextEditor.
  */
-var ImageSettings = /** @__PURE__ @class */ (function (_super) {
+var ImageSettings = /** @class */ (function (_super) {
     __extends$5(ImageSettings, _super);
     function ImageSettings() {
         return _super !== null && _super.apply(this, arguments) || this;
@@ -33130,7 +33322,7 @@ var ImageSettings = /** @__PURE__ @class */ (function (_super) {
 /**
  * Configures the audio settings of the RichTextEditor.
  */
-var AudioSettings = /** @__PURE__ @class */ (function (_super) {
+var AudioSettings = /** @class */ (function (_super) {
     __extends$5(AudioSettings, _super);
     function AudioSettings() {
         return _super !== null && _super.apply(this, arguments) || this;
@@ -33158,7 +33350,7 @@ var AudioSettings = /** @__PURE__ @class */ (function (_super) {
 /**
  * Configures the video settings of the RichTextEditor.
  */
-var VideoSettings = /** @__PURE__ @class */ (function (_super) {
+var VideoSettings = /** @class */ (function (_super) {
     __extends$5(VideoSettings, _super);
     function VideoSettings() {
         return _super !== null && _super.apply(this, arguments) || this;
@@ -33210,7 +33402,7 @@ var VideoSettings = /** @__PURE__ @class */ (function (_super) {
 /**
  * Configures the file manager settings of the RichTextEditor.
  */
-var FileManagerSettings = /** @__PURE__ @class */ (function (_super) {
+var FileManagerSettings = /** @class */ (function (_super) {
     __extends$5(FileManagerSettings, _super);
     function FileManagerSettings() {
         return _super !== null && _super.apply(this, arguments) || this;
@@ -33271,7 +33463,7 @@ var FileManagerSettings = /** @__PURE__ @class */ (function (_super) {
     ], FileManagerSettings.prototype, "view", void 0);
     return FileManagerSettings;
 }(ChildProperty));
-var TableSettings = /** @__PURE__ @class */ (function (_super) {
+var TableSettings = /** @class */ (function (_super) {
     __extends$5(TableSettings, _super);
     function TableSettings() {
         return _super !== null && _super.apply(this, arguments) || this;
@@ -33296,7 +33488,7 @@ var TableSettings = /** @__PURE__ @class */ (function (_super) {
 /**
  * Configures the quick toolbar settings of the RichTextEditor.
  */
-var QuickToolbarSettings = /** @__PURE__ @class */ (function (_super) {
+var QuickToolbarSettings = /** @class */ (function (_super) {
     __extends$5(QuickToolbarSettings, _super);
     function QuickToolbarSettings() {
         return _super !== null && _super.apply(this, arguments) || this;
@@ -33333,7 +33525,7 @@ var QuickToolbarSettings = /** @__PURE__ @class */ (function (_super) {
 /**
  * Configure the format painter settings of the Rich Text Editor.
  */
-var FormatPainterSettings = /** @__PURE__ @class */ (function (_super) {
+var FormatPainterSettings = /** @class */ (function (_super) {
     __extends$5(FormatPainterSettings, _super);
     function FormatPainterSettings() {
         return _super !== null && _super.apply(this, arguments) || this;
@@ -33349,7 +33541,7 @@ var FormatPainterSettings = /** @__PURE__ @class */ (function (_super) {
 /**
  * Specifies the emoji picker options in Rich Text Editor with the following properties.
  */
-var EmojiSettings = /** @__PURE__ @class */ (function (_super) {
+var EmojiSettings = /** @class */ (function (_super) {
     __extends$5(EmojiSettings, _super);
     function EmojiSettings() {
         return _super !== null && _super.apply(this, arguments) || this;
@@ -33365,7 +33557,7 @@ var EmojiSettings = /** @__PURE__ @class */ (function (_super) {
 /**
  * Configures the Paste Cleanup settings of the RichTextEditor.
  */
-var PasteCleanupSettings = /** @__PURE__ @class */ (function (_super) {
+var PasteCleanupSettings = /** @class */ (function (_super) {
     __extends$5(PasteCleanupSettings, _super);
     function PasteCleanupSettings() {
         return _super !== null && _super.apply(this, arguments) || this;
@@ -33393,7 +33585,7 @@ var PasteCleanupSettings = /** @__PURE__ @class */ (function (_super) {
 /**
  * Configures the font family settings of the RichTextEditor.
  */
-var FontFamily = /** @__PURE__ @class */ (function (_super) {
+var FontFamily = /** @class */ (function (_super) {
     __extends$5(FontFamily, _super);
     function FontFamily() {
         return _super !== null && _super.apply(this, arguments) || this;
@@ -33412,7 +33604,7 @@ var FontFamily = /** @__PURE__ @class */ (function (_super) {
 /**
  * Configures the font size settings of the RichTextEditor.
  */
-var FontSize = /** @__PURE__ @class */ (function (_super) {
+var FontSize = /** @class */ (function (_super) {
     __extends$5(FontSize, _super);
     function FontSize() {
         return _super !== null && _super.apply(this, arguments) || this;
@@ -33431,7 +33623,7 @@ var FontSize = /** @__PURE__ @class */ (function (_super) {
 /**
  * Configures the format settings of the RichTextEditor.
  */
-var Format = /** @__PURE__ @class */ (function (_super) {
+var Format = /** @class */ (function (_super) {
     __extends$5(Format, _super);
     function Format() {
         return _super !== null && _super.apply(this, arguments) || this;
@@ -33450,7 +33642,7 @@ var Format = /** @__PURE__ @class */ (function (_super) {
 /**
  * Configures the font Color settings of the RichTextEditor.
  */
-var FontColor = /** @__PURE__ @class */ (function (_super) {
+var FontColor = /** @class */ (function (_super) {
     __extends$5(FontColor, _super);
     function FontColor() {
         return _super !== null && _super.apply(this, arguments) || this;
@@ -33475,7 +33667,7 @@ var FontColor = /** @__PURE__ @class */ (function (_super) {
 /**
  * Configures the background Color settings of the RichTextEditor.
  */
-var BackgroundColor = /** @__PURE__ @class */ (function (_super) {
+var BackgroundColor = /** @class */ (function (_super) {
     __extends$5(BackgroundColor, _super);
     function BackgroundColor() {
         return _super !== null && _super.apply(this, arguments) || this;
@@ -33500,7 +33692,7 @@ var BackgroundColor = /** @__PURE__ @class */ (function (_super) {
 /**
  * Configures the numberFormatList settings of the RichTextEditor.
  */
-var NumberFormatList = /** @__PURE__ @class */ (function (_super) {
+var NumberFormatList = /** @class */ (function (_super) {
     __extends$5(NumberFormatList, _super);
     function NumberFormatList() {
         return _super !== null && _super.apply(this, arguments) || this;
@@ -33513,7 +33705,7 @@ var NumberFormatList = /** @__PURE__ @class */ (function (_super) {
 /**
  * Configures the bulletFormatList settings of the RichTextEditor.
  */
-var BulletFormatList = /** @__PURE__ @class */ (function (_super) {
+var BulletFormatList = /** @class */ (function (_super) {
     __extends$5(BulletFormatList, _super);
     function BulletFormatList() {
         return _super !== null && _super.apply(this, arguments) || this;
@@ -33524,29 +33716,29 @@ var BulletFormatList = /** @__PURE__ @class */ (function (_super) {
     return BulletFormatList;
 }(ChildProperty));
 
-var __extends$6 = (undefined && undefined.__extends) || (function () {
-    var extendStatics = function (d, b) {
-        extendStatics = Object.setPrototypeOf ||
-            ({ __proto__: [] } instanceof Array && function (d, b) { d.__proto__ = b; }) ||
-            function (d, b) { for (var p in b) if (b.hasOwnProperty(p)) d[p] = b[p]; };
-        return extendStatics(d, b);
-    };
-    return function (d, b) {
-        extendStatics(d, b);
-        function __() { this.constructor = d; }
-        d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
-    };
-})();
-var __decorate$3 = (undefined && undefined.__decorate) || function (decorators, target, key, desc) {
-    var c = arguments.length, r = c < 3 ? target : desc === null ? desc = Object.getOwnPropertyDescriptor(target, key) : desc, d;
-    if (typeof Reflect === "object" && typeof Reflect.decorate === "function") r = Reflect.decorate(decorators, target, key, desc);
-    else for (var i = decorators.length - 1; i >= 0; i--) if (d = decorators[i]) r = (c < 3 ? d(r) : c > 3 ? d(target, key, r) : d(target, key)) || r;
-    return c > 3 && r && Object.defineProperty(target, key, r), r;
-};
+var __extends$6 = (undefined && undefined.__extends) || (function () {
+    var extendStatics = function (d, b) {
+        extendStatics = Object.setPrototypeOf ||
+            ({ __proto__: [] } instanceof Array && function (d, b) { d.__proto__ = b; }) ||
+            function (d, b) { for (var p in b) if (b.hasOwnProperty(p)) d[p] = b[p]; };
+        return extendStatics(d, b);
+    };
+    return function (d, b) {
+        extendStatics(d, b);
+        function __() { this.constructor = d; }
+        d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
+    };
+})();
+var __decorate$3 = (undefined && undefined.__decorate) || function (decorators, target, key, desc) {
+    var c = arguments.length, r = c < 3 ? target : desc === null ? desc = Object.getOwnPropertyDescriptor(target, key) : desc, d;
+    if (typeof Reflect === "object" && typeof Reflect.decorate === "function") r = Reflect.decorate(decorators, target, key, desc);
+    else for (var i = decorators.length - 1; i >= 0; i--) if (d = decorators[i]) r = (c < 3 ? d(r) : c > 3 ? d(target, key, r) : d(target, key)) || r;
+    return c > 3 && r && Object.defineProperty(target, key, r), r;
+};
 /**
  * Objects used for configuring the iframe resources properties.
  */
-var Resources = /** @__PURE__ @class */ (function (_super) {
+var Resources = /** @class */ (function (_super) {
     __extends$6(Resources, _super);
     function Resources() {
         return _super !== null && _super.apply(this, arguments) || this;
@@ -33562,7 +33754,7 @@ var Resources = /** @__PURE__ @class */ (function (_super) {
 /**
  * Configures the iframe settings of the RTE.
  */
-var IFrameSettings = /** @__PURE__ @class */ (function (_super) {
+var IFrameSettings = /** @class */ (function (_super) {
     __extends$6(IFrameSettings, _super);
     function IFrameSettings() {
         return _super !== null && _super.apply(this, arguments) || this;
@@ -33579,29 +33771,29 @@ var IFrameSettings = /** @__PURE__ @class */ (function (_super) {
     return IFrameSettings;
 }(ChildProperty));
 
-var __extends$7 = (undefined && undefined.__extends) || (function () {
-    var extendStatics = function (d, b) {
-        extendStatics = Object.setPrototypeOf ||
-            ({ __proto__: [] } instanceof Array && function (d, b) { d.__proto__ = b; }) ||
-            function (d, b) { for (var p in b) if (b.hasOwnProperty(p)) d[p] = b[p]; };
-        return extendStatics(d, b);
-    };
-    return function (d, b) {
-        extendStatics(d, b);
-        function __() { this.constructor = d; }
-        d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
-    };
-})();
-var __decorate$4 = (undefined && undefined.__decorate) || function (decorators, target, key, desc) {
-    var c = arguments.length, r = c < 3 ? target : desc === null ? desc = Object.getOwnPropertyDescriptor(target, key) : desc, d;
-    if (typeof Reflect === "object" && typeof Reflect.decorate === "function") r = Reflect.decorate(decorators, target, key, desc);
-    else for (var i = decorators.length - 1; i >= 0; i--) if (d = decorators[i]) r = (c < 3 ? d(r) : c > 3 ? d(target, key, r) : d(target, key)) || r;
-    return c > 3 && r && Object.defineProperty(target, key, r), r;
-};
+var __extends$7 = (undefined && undefined.__extends) || (function () {
+    var extendStatics = function (d, b) {
+        extendStatics = Object.setPrototypeOf ||
+            ({ __proto__: [] } instanceof Array && function (d, b) { d.__proto__ = b; }) ||
+            function (d, b) { for (var p in b) if (b.hasOwnProperty(p)) d[p] = b[p]; };
+        return extendStatics(d, b);
+    };
+    return function (d, b) {
+        extendStatics(d, b);
+        function __() { this.constructor = d; }
+        d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
+    };
+})();
+var __decorate$4 = (undefined && undefined.__decorate) || function (decorators, target, key, desc) {
+    var c = arguments.length, r = c < 3 ? target : desc === null ? desc = Object.getOwnPropertyDescriptor(target, key) : desc, d;
+    if (typeof Reflect === "object" && typeof Reflect.decorate === "function") r = Reflect.decorate(decorators, target, key, desc);
+    else for (var i = decorators.length - 1; i >= 0; i--) if (d = decorators[i]) r = (c < 3 ? d(r) : c > 3 ? d(target, key, r) : d(target, key)) || r;
+    return c > 3 && r && Object.defineProperty(target, key, r), r;
+};
 /**
  * Configures the inlineMode property of the RTE.
  */
-var InlineMode = /** @__PURE__ @class */ (function (_super) {
+var InlineMode = /** @class */ (function (_super) {
     __extends$7(InlineMode, _super);
     function InlineMode() {
         return _super !== null && _super.apply(this, arguments) || this;
@@ -33618,7 +33810,7 @@ var InlineMode = /** @__PURE__ @class */ (function (_super) {
 /**
  * `EnterKey` module is used to handle enter key press actions.
  */
-var EnterKeyAction = /** @__PURE__ @class */ (function () {
+var EnterKeyAction = /** @class */ (function () {
     function EnterKeyAction(parent) {
         this.parent = parent;
         this.addEventListener();
@@ -33654,16 +33846,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;
@@ -34031,7 +34225,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();
@@ -34061,7 +34254,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);
                     }
                 });
             }
@@ -34131,6 +34324,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') {
@@ -34161,44 +34357,125 @@ 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;
 }());
 
-var __extends$4 = (undefined && undefined.__extends) || (function () {
-    var extendStatics = function (d, b) {
-        extendStatics = Object.setPrototypeOf ||
-            ({ __proto__: [] } instanceof Array && function (d, b) { d.__proto__ = b; }) ||
-            function (d, b) { for (var p in b) if (b.hasOwnProperty(p)) d[p] = b[p]; };
-        return extendStatics(d, b);
-    };
-    return function (d, b) {
-        extendStatics(d, b);
-        function __() { this.constructor = d; }
-        d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
-    };
-})();
-var __assign = (undefined && undefined.__assign) || function () {
-    __assign = Object.assign || function(t) {
-        for (var s, i = 1, n = arguments.length; i < n; i++) {
-            s = arguments[i];
-            for (var p in s) if (Object.prototype.hasOwnProperty.call(s, p))
-                t[p] = s[p];
-        }
-        return t;
-    };
-    return __assign.apply(this, arguments);
-};
-var __decorate$1 = (undefined && undefined.__decorate) || function (decorators, target, key, desc) {
-    var c = arguments.length, r = c < 3 ? target : desc === null ? desc = Object.getOwnPropertyDescriptor(target, key) : desc, d;
-    if (typeof Reflect === "object" && typeof Reflect.decorate === "function") r = Reflect.decorate(decorators, target, key, desc);
-    else for (var i = decorators.length - 1; i >= 0; i--) if (d = decorators[i]) r = (c < 3 ? d(r) : c > 3 ? d(target, key, r) : d(target, key)) || r;
-    return c > 3 && r && Object.defineProperty(target, key, r), r;
-};
+var __extends$4 = (undefined && undefined.__extends) || (function () {
+    var extendStatics = function (d, b) {
+        extendStatics = Object.setPrototypeOf ||
+            ({ __proto__: [] } instanceof Array && function (d, b) { d.__proto__ = b; }) ||
+            function (d, b) { for (var p in b) if (b.hasOwnProperty(p)) d[p] = b[p]; };
+        return extendStatics(d, b);
+    };
+    return function (d, b) {
+        extendStatics(d, b);
+        function __() { this.constructor = d; }
+        d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
+    };
+})();
+var __assign = (undefined && undefined.__assign) || function () {
+    __assign = Object.assign || function(t) {
+        for (var s, i = 1, n = arguments.length; i < n; i++) {
+            s = arguments[i];
+            for (var p in s) if (Object.prototype.hasOwnProperty.call(s, p))
+                t[p] = s[p];
+        }
+        return t;
+    };
+    return __assign.apply(this, arguments);
+};
+var __decorate$1 = (undefined && undefined.__decorate) || function (decorators, target, key, desc) {
+    var c = arguments.length, r = c < 3 ? target : desc === null ? desc = Object.getOwnPropertyDescriptor(target, key) : desc, d;
+    if (typeof Reflect === "object" && typeof Reflect.decorate === "function") r = Reflect.decorate(decorators, target, key, desc);
+    else for (var i = decorators.length - 1; i >= 0; i--) if (d = decorators[i]) r = (c < 3 ? d(r) : c > 3 ? d(target, key, r) : d(target, key)) || r;
+    return c > 3 && r && Object.defineProperty(target, key, r), r;
+};
 /**
  * Represents the Rich Text Editor component.
  * ```html
@@ -34209,7 +34486,7 @@ var __decorate$1 = (undefined && undefined.__decorate) || function (decorators,
  * </script>
  * ```
  */
-var RichTextEditor = /** @__PURE__ @class */ (function (_super) {
+var RichTextEditor = /** @class */ (function (_super) {
     __extends$4(RichTextEditor, _super);
     function RichTextEditor(options, element) {
         var _this = _super.call(this, options, element) || this;
@@ -34338,6 +34615,7 @@ var RichTextEditor = /** @__PURE__ @class */ (function (_super) {
         this.persistData();
         setStyleAttribute(this.element, { 'width': formatUnit(this.width) });
         attributes(this.element, { role: 'application', 'aria-label': 'Rich Text Editor' });
+        this.beforeRenderClassValue = this.element.getAttribute('class');
     };
     RichTextEditor.prototype.persistData = function () {
         if (this.enablePersistence && this.originalElement.tagName === 'TEXTAREA') {
@@ -35210,6 +35488,10 @@ var RichTextEditor = /** @__PURE__ @class */ (function (_super) {
         if (this.isDestroyed || !this.isRendered) {
             return;
         }
+        this.element.className = this.beforeRenderClassValue;
+        this.removeHtmlAttributes();
+        this.removeAttributes();
+        this.beforeRenderClassValue = null;
         if (!isNullOrUndefined(this.timeInterval)) {
             clearInterval(this.timeInterval);
             this.timeInterval = null;
@@ -35277,8 +35559,6 @@ var RichTextEditor = /** @__PURE__ @class */ (function (_super) {
                 }
             }
         }
-        this.removeHtmlAttributes();
-        this.removeAttributes();
         _super.prototype.destroy.call(this);
         this.isRendered = false;
     };
@@ -35309,6 +35589,7 @@ var RichTextEditor = /** @__PURE__ @class */ (function (_super) {
         this.element.removeAttribute('aria-disabled');
         this.element.removeAttribute('role');
         this.element.removeAttribute('tabindex');
+        this.element.removeAttribute('aria-label');
     };
     RichTextEditor.prototype.destroyDependentModules = function () {
         /* destroy dependent modules */
@@ -35563,7 +35844,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) {
@@ -35607,6 +35888,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);