@syncfusion/ej2-richtexteditor 19.2.62 → 19.3.43

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

@@ -1,8 +1,8 @@
-import { Ajax, Base, Browser, ChildProperty, Complex, Component, Event, EventHandler, KeyboardEvents, L10n, NotifyPropertyChanges, Observer, Property, SanitizeHtmlHelper, Touch, addClass, append, attributes, closest, compile, createElement, debounce, detach, extend, formatUnit, getEnumValue, getInstance, getUniqueID, isBlazor, isNullOrUndefined, prepend, print, removeClass, select, selectAll, setStyleAttribute } from '@syncfusion/ej2-base';
+import { Ajax, Base, Browser, ChildProperty, Complex, Component, Event, EventHandler, KeyboardEvents, L10n, NotifyPropertyChanges, Observer, Property, SanitizeHtmlHelper, Touch, addClass, append, attributes, closest, compile, createElement, debounce, detach, extend, formatUnit, getEnumValue, getInstance, getUniqueID, isNullOrUndefined, prepend, print, removeClass, select, selectAll, setStyleAttribute } from '@syncfusion/ej2-base';
 import { Toolbar } from '@syncfusion/ej2-navigations';
 import { DropDownButton } from '@syncfusion/ej2-splitbuttons';
 import { Dialog, Popup, getScrollableParent, isCollide } from '@syncfusion/ej2-popups';
-import { ColorPicker, NumericTextBox, Uploader } from '@syncfusion/ej2-inputs';
+import { ColorPicker, NumericTextBox, TextBox, Uploader } from '@syncfusion/ej2-inputs';
 import { Button, CheckBox, RadioButton } from '@syncfusion/ej2-buttons';
 import { AjaxSettings, ContextMenu, ContextMenuSettings, DetailsView, DetailsViewSettings, FileManager, NavigationPane, NavigationPaneSettings, SearchSettings, Toolbar as Toolbar$1, ToolbarSettings, UploadSettings } from '@syncfusion/ej2-filemanager';
 
@@ -449,6 +449,11 @@ var readOnlyMode = 'readOnlyMode';
  * @deprecated
  */
 var pasteClean = 'pasteClean';
+/**
+ * @hidden
+ * @deprecated
+ */
+var enterHandler = 'enterHandler';
 /**
  * @hidden
  * @deprecated
@@ -1351,14 +1356,14 @@ var tools = {
     'numberformatlist': {
         'id': 'NumberFormatList',
         'icon': 'e-order-list',
-        'tooltip': 'NumberFormatList',
+        'tooltip': 'Number Format List',
         'command': 'NumberFormatList',
         'subCommand': 'NumberFormatList'
     },
     'bulletformatlist': {
         'id': 'BulletFormatList',
         'icon': 'e-unorder-list',
-        'tooltip': 'BulletFormatList',
+        'tooltip': 'Bullet Format List',
         'command': 'BulletFormatList',
         'subCommand': 'BulletFormatList'
     },
@@ -1532,7 +1537,7 @@ var tools = {
     },
     'dimension': {
         'id': 'Dimension',
-        'icon': 'e-dimension',
+        'icon': 'e-img-dimension',
         'tooltip': 'Change Size',
         'command': 'Images',
         'subCommand': 'Dimension'
@@ -2492,11 +2497,19 @@ function toObjectLowerCase(obj) {
 function getEditValue(value, rteObj) {
     var val;
     if (value !== null && value !== '') {
-        val = rteObj.enableHtmlEncode ? updateTextNode(decode(value)) : updateTextNode(value);
+        val = rteObj.enableHtmlEncode ? updateTextNode(decode(value), rteObj) : updateTextNode(value, rteObj);
         rteObj.setProperties({ value: val }, true);
     }
     else {
-        val = rteObj.enableHtmlEncode ? '&lt;p&gt;&lt;br/&gt;&lt;/p&gt;' : '<p><br/></p>';
+        if (rteObj.enterKey === 'DIV') {
+            val = rteObj.enableHtmlEncode ? '&lt;div&gt;&lt;br/&gt;&lt;/div&gt;' : '<div><br/></div>';
+        }
+        else if (rteObj.enterKey === 'BR') {
+            val = rteObj.enableHtmlEncode ? '&lt;br/&gt;' : '<br/>';
+        }
+        else {
+            val = rteObj.enableHtmlEncode ? '&lt;p&gt;&lt;br/&gt;&lt;/p&gt;' : '<p><br/></p>';
+        }
     }
     return val;
 }
@@ -2505,7 +2518,7 @@ function getEditValue(value, rteObj) {
  * @returns {string} - returns the string
  * @hidden
  */
-function updateTextNode(value) {
+function updateTextNode(value, rteObj) {
     var tempNode = document.createElement('div');
     var resultElm = document.createElement('div');
     var childNodes = tempNode.childNodes;
@@ -2514,20 +2527,25 @@ function updateTextNode(value) {
     if (childNodes.length > 0) {
         var isPreviousInlineElem = void 0;
         var previousParent = void 0;
-        var paraElm = void 0;
+        var insertElem = void 0;
         while (tempNode.firstChild) {
-            if ((tempNode.firstChild.nodeName === '#text' &&
+            if (rteObj.enterKey !== 'BR' && ((tempNode.firstChild.nodeName === '#text' &&
                 (tempNode.firstChild.textContent.indexOf('\n') < 0 || tempNode.firstChild.textContent.trim() !== '')) ||
-                inlineNode.indexOf(tempNode.firstChild.nodeName.toLocaleLowerCase()) >= 0) {
+                inlineNode.indexOf(tempNode.firstChild.nodeName.toLocaleLowerCase()) >= 0)) {
                 if (!isPreviousInlineElem) {
-                    paraElm = createElement('p');
-                    resultElm.appendChild(paraElm);
-                    paraElm.appendChild(tempNode.firstChild);
+                    if (rteObj.enterKey === 'DIV') {
+                        insertElem = createElement('div');
+                    }
+                    else {
+                        insertElem = createElement('p');
+                    }
+                    resultElm.appendChild(insertElem);
+                    insertElem.appendChild(tempNode.firstChild);
                 }
                 else {
                     previousParent.appendChild(tempNode.firstChild);
                 }
-                previousParent = paraElm;
+                previousParent = insertElem;
                 isPreviousInlineElem = true;
             }
             else if (tempNode.firstChild.nodeName === '#text' && (tempNode.firstChild.textContent === '\n' ||
@@ -2552,13 +2570,34 @@ function updateTextNode(value) {
     }
     return resultElm.innerHTML;
 }
+/**
+ * @param {IRichTextEditor} rteObj - specifies the rte object
+ * @returns {string} - returns the value based on enter configuration.
+ * @hidden
+ */
+function getDefaultValue(rteObj) {
+    var currentVal;
+    if (rteObj.enterKey === 'DIV') {
+        currentVal = rteObj.enableHtmlEncode ? '&lt;div&gt;&lt;br/&gt;&lt;/div&gt;' : '<div><br/></div>';
+    }
+    else if (rteObj.enterKey === 'BR') {
+        currentVal = rteObj.enableHtmlEncode ? '&lt;br/&gt;' : '<br/>';
+    }
+    else {
+        currentVal = rteObj.enableHtmlEncode ? '&lt;p&gt;&lt;br/&gt;&lt;/p&gt;' : '<p><br/></p>';
+    }
+    return currentVal;
+}
 /**
  * @param {string} value - specifies the value
  * @returns {boolean} - returns the boolean value
  * @hidden
  */
 function isEditableValueEmpty(value) {
-    return (value === '<p><br></p>' || value === '&lt;p&gt;&lt;br&gt;&lt;/p&gt;' || value === '') ? true : false;
+    return (value === '<p><br></p>' || value === '&lt;p&gt;&lt;br&gt;&lt;/p&gt;'
+        || value === '<div><br></div>' || value === '&lt;div&gt;&lt;br&gt;&lt;/div&gt;'
+        || value === '<br>' || value === '&lt;br&gt;'
+        || value === '') ? true : false;
 }
 /**
  * @param {string} value - specifies the string value
@@ -5292,8 +5331,7 @@ var BaseQuickToolbar = /** @__PURE__ @class */ (function () {
      */
     BaseQuickToolbar.prototype.showPopup = function (x, y, target) {
         var _this = this;
-        var eventArgs = isBlazor() ? { cancel: false, targetElement: target } :
-            { popup: this.popupObj, cancel: false, targetElement: target };
+        var eventArgs = { popup: this.popupObj, cancel: false, targetElement: target };
         this.parent.trigger(beforeQuickToolbarOpen, eventArgs, function (beforeQuickToolbarArgs) {
             if (!beforeQuickToolbarArgs.cancel) {
                 var editPanelTop = void 0;
@@ -5420,7 +5458,7 @@ var BaseQuickToolbar = /** @__PURE__ @class */ (function () {
             this.colorPickerObj.destroyColorPicker();
             removeClass([this.element], [CLS_POP]);
             detach(element);
-            var args = isBlazor() ? { element: this.popupObj.element } : this.popupObj;
+            var args = this.popupObj;
             this.parent.trigger(quickToolbarClose, args);
         }
     };
@@ -5530,7 +5568,7 @@ var PopupRenderer = /** @__PURE__ @class */ (function () {
         this.parent = parent;
     }
     PopupRenderer.prototype.quickToolbarOpen = function () {
-        var args = isBlazor() ? { element: this.popupObj.element } : this.popupObj;
+        var args = this.popupObj;
         this.parent.trigger(quickToolbarOpen, args);
     };
     /**
@@ -6820,10 +6858,6 @@ var Formatter = /** @__PURE__ @class */ (function () {
                     itemCollection: value
                 };
                 extend(args, args, items, true);
-                if (isBlazor()) {
-                    delete args.item;
-                    delete args.itemCollection;
-                }
                 self.trigger(actionBegin, args, function (actionBeginArgs) {
                     if (actionBeginArgs.cancel) {
                         if (action_1 === 'paste' || action_1 === 'cut' || action_1 === 'copy') {
@@ -6835,10 +6869,16 @@ var Formatter = /** @__PURE__ @class */ (function () {
             var isTableModule = isNullOrUndefined(self.tableModule) ? true : self.tableModule ?
                 self.tableModule.ensureInsideTableList : false;
             if ((event.which === 9 && isTableModule) || event.which !== 9) {
+                if (event.which === 13 && self.editorMode === 'HTML') {
+                    value = {
+                        'enterAction': self.enterKey
+                    };
+                }
                 this.editorManager.observer.notify((event.type === 'keydown' ? KEY_DOWN : KEY_UP), {
                     event: event,
                     callBack: this.onSuccess.bind(this, self),
-                    value: value
+                    value: value,
+                    enterAction: self.enterKey
                 });
             }
         }
@@ -6866,7 +6906,7 @@ var Formatter = /** @__PURE__ @class */ (function () {
                     else {
                         _this.editorManager.observer.notify(checkUndo, { subCommand: actionBeginArgs.item.subCommand });
                         _this.editorManager.execCommand(actionBeginArgs.item.command, actionBeginArgs.item.subCommand, event, _this.onSuccess.bind(_this, self), actionBeginArgs.item.value, actionBeginArgs.item.subCommand === 'Pre' && args.name === 'dropDownSelect' ?
-                            { name: args.name } : value, ('#' + self.getID() + ' iframe'));
+                            { name: args.name } : value, ('#' + self.getID() + ' iframe'), self.enterKey);
                     }
                 }
             });
@@ -10258,8 +10298,8 @@ var DOMNode = /** @__PURE__ @class */ (function () {
             this.replaceWith(start, this.marker(className, this.encode(start.textContent)));
         }
         else if (start.tagName === 'BR') {
-            this.replaceWith(start, this.marker(markerClassName.startSelection, this.encode(start.textContent)));
-            var markerStart = range.startContainer.querySelector('.' + markerClassName.startSelection);
+            this.replaceWith(start, this.marker(className, this.encode(start.textContent)));
+            var markerStart = range.startContainer.querySelector('.' + className);
             markerStart.appendChild(start);
         }
         else {
@@ -10501,7 +10541,7 @@ var Lists = /** @__PURE__ @class */ (function () {
         var olListStartRegex = [/^[1]+[.]+$/, /^[i]+[.]+$/, /^[a]+[.]+$/];
         if (!isNullOrUndefined(range.startContainer.textContent.slice(0, range.startOffset))) {
             for (var i = 0; i < olListStartRegex.length; i++) {
-                if (olListStartRegex[i].test(range.startContainer.textContent.slice(0, range.startOffset).trim())) {
+                if (olListStartRegex[i].test(range.startContainer.textContent.replace(/\u200B/g, '').slice(0, range.startOffset).trim())) {
                     return true;
                 }
             }
@@ -10529,8 +10569,8 @@ var Lists = /** @__PURE__ @class */ (function () {
                 this.applyListsHandler({ subCommand: 'OL', callBack: e.callBack });
                 e.event.preventDefault();
             }
-            else if (range.startContainer.textContent.slice(0, range.startOffset).trim() === '*' ||
-                range.startContainer.textContent.slice(0, range.startOffset).trim() === '-') {
+            else if (range.startContainer.textContent.replace(/\u200B/g, '').slice(0, range.startOffset).trim() === '*' ||
+                range.startContainer.textContent.replace(/\u200B/g, '').slice(0, range.startOffset).trim() === '-') {
                 range.startContainer.textContent = range.startContainer.textContent.slice(range.startOffset, range.startContainer.textContent.length);
                 this.applyListsHandler({ subCommand: 'UL', callBack: e.callBack });
                 e.event.preventDefault();
@@ -10551,15 +10591,24 @@ var Lists = /** @__PURE__ @class */ (function () {
             var startNodeParent = startNode.parentElement;
             if (isNullOrUndefined(startNodeParent.parentElement.closest('UL')) && isNullOrUndefined(startNodeParent.parentElement.closest('OL'))) {
                 if (!isNullOrUndefined(startNode.nextElementSibling)) {
-                    //startNode.classList.add('innerNode');
                     var nearBlockNode = this.parent.domNode.blockParentNode(startNode);
                     this.parent.nodeCutter.GetSpliceNode(range, nearBlockNode);
                 }
-                var paraTag = createElement('p');
-                paraTag.innerHTML = '<br>';
-                this.parent.domNode.insertAfter(paraTag, startNodeParent);
+                var insertTag = void 0;
+                if (e.enterAction === 'DIV') {
+                    insertTag = createElement('div');
+                    insertTag.innerHTML = '<br>';
+                }
+                else if (e.enterAction === 'P') {
+                    insertTag = createElement('p');
+                    insertTag.innerHTML = '<br>';
+                }
+                else {
+                    insertTag = createElement('br');
+                }
+                this.parent.domNode.insertAfter(insertTag, startNodeParent);
                 e.event.preventDefault();
-                this.parent.nodeSelection.setCursorPoint(this.parent.currentDocument, paraTag, 0);
+                this.parent.nodeSelection.setCursorPoint(this.parent.currentDocument, insertTag, 0);
                 if (startNodeParent.textContent === '') {
                     detach(startNodeParent);
                 }
@@ -10856,6 +10905,66 @@ var Lists = /** @__PURE__ @class */ (function () {
         this.currentAction = e.subCommand = this.currentAction === 'NumberFormatList' ? 'OL' : this.currentAction === 'BulletFormatList' ? 'UL' : this.currentAction;
         this.domNode.setMarker(this.saveSelection);
         var listsNodes = this.domNode.blockNodes();
+        if (e.enterAction === 'BR') {
+            this.setSelectionBRConfig();
+            var allSelectedNode = this.parent.nodeSelection.getSelectedNodes(this.parent.currentDocument);
+            var selectedNodes = this.parent.nodeSelection.getSelectionNodes(allSelectedNode);
+            var currentFormatNodes = [];
+            if (selectedNodes.length === 0) {
+                selectedNodes.push(listsNodes[0]);
+            }
+            for (var i = 0; i < selectedNodes.length; i++) {
+                var currentNode = selectedNodes[i];
+                var previousCurrentNode = void 0;
+                while (!this.parent.domNode.isBlockNode(currentNode) && currentNode !== this.parent.editableElement) {
+                    previousCurrentNode = currentNode;
+                    currentNode = currentNode.parentElement;
+                }
+                if (this.parent.domNode.isBlockNode(currentNode) && currentNode === this.parent.editableElement) {
+                    currentFormatNodes.push(previousCurrentNode);
+                }
+            }
+            for (var i = 0; i < currentFormatNodes.length; i++) {
+                if (!this.parent.domNode.isBlockNode(currentFormatNodes[i])) {
+                    var currentNode = currentFormatNodes[i];
+                    var previousNode = currentNode;
+                    while (currentNode === this.parent.editableElement) {
+                        previousNode = currentNode;
+                        currentNode = currentNode.parentElement;
+                    }
+                    var tempElem = void 0;
+                    if (this.parent.domNode.isBlockNode(previousNode.parentElement) &&
+                        previousNode.parentElement === this.parent.editableElement) {
+                        tempElem = createElement('p');
+                        previousNode.parentElement.insertBefore(tempElem, previousNode);
+                        tempElem.appendChild(previousNode);
+                    }
+                    else {
+                        tempElem = previousNode;
+                    }
+                    var preNode = tempElem.previousSibling;
+                    while (!isNullOrUndefined(preNode) && preNode.nodeName !== 'BR' &&
+                        !this.parent.domNode.isBlockNode(preNode)) {
+                        tempElem.firstChild.parentElement.insertBefore(preNode, tempElem.firstChild);
+                        preNode = tempElem.previousSibling;
+                    }
+                    if (!isNullOrUndefined(preNode) && preNode.nodeName === 'BR') {
+                        detach(preNode);
+                    }
+                    var postNode = tempElem.nextSibling;
+                    while (!isNullOrUndefined(postNode) && postNode.nodeName !== 'BR' &&
+                        !this.parent.domNode.isBlockNode(postNode)) {
+                        tempElem.appendChild(postNode);
+                        postNode = tempElem.nextSibling;
+                    }
+                    if (!isNullOrUndefined(postNode) && postNode.nodeName === 'BR') {
+                        detach(postNode);
+                    }
+                }
+            }
+            this.setSelectionBRConfig();
+            listsNodes = this.parent.domNode.blockNodes();
+        }
         for (var i = 0; i < listsNodes.length; i++) {
             if (listsNodes[i].tagName === 'TABLE' && !range.collapsed) {
                 listsNodes.splice(i, 1);
@@ -10876,6 +10985,16 @@ var Lists = /** @__PURE__ @class */ (function () {
             });
         }
     };
+    Lists.prototype.setSelectionBRConfig = function () {
+        var startElem = this.parent.editableElement.querySelector('.' + markerClassName.startSelection);
+        var endElem = this.parent.editableElement.querySelector('.' + markerClassName.endSelection);
+        if (isNullOrUndefined(endElem)) {
+            this.parent.nodeSelection.setCursorPoint(this.parent.currentDocument, startElem, 0);
+        }
+        else {
+            this.parent.nodeSelection.setSelectionText(this.parent.currentDocument, startElem, endElem, 0, 0);
+        }
+    };
     Lists.prototype.applyLists = function (elements, type, selector, item) {
         if (this.isRevert(elements, type) && isNullOrUndefined(item)) {
             this.revertList(elements);
@@ -11220,6 +11339,7 @@ var InsertMethods = /** @__PURE__ @class */ (function () {
  */
 var NodeCutter = /** @__PURE__ @class */ (function () {
     function NodeCutter() {
+        this.enterAction = 'P';
         this.position = -1;
         this.nodeSelection = new NodeSelection();
     }
@@ -11453,7 +11573,7 @@ var Formats = /** @__PURE__ @class */ (function () {
         if (e.event.which === 13 && range.startContainer === endCon && endCon.nodeType !== 3) {
             var pTag = createElement('p');
             pTag.innerHTML = '<br>';
-            if (lastChild && lastChild.nodeName === 'BR' && (lastChild.previousSibling && lastChild.previousSibling.nodeName === 'TABLE')) {
+            if (!isNullOrUndefined(lastChild) && lastChild && lastChild.nodeName === 'BR' && (lastChild.previousSibling && lastChild.previousSibling.nodeName === 'TABLE')) {
                 endCon.replaceChild(pTag, lastChild);
                 this.parent.nodeSelection.setCursorPoint(this.parent.currentDocument, pTag, 0);
             }
@@ -11496,7 +11616,7 @@ var Formats = /** @__PURE__ @class */ (function () {
                 var startParent = range.startContainer;
                 if (!isNullOrUndefined(lastEmpty) && !isNullOrUndefined(lastBeforeBr) && isNullOrUndefined(lastEmpty.nextSibling) &&
                     lastEmpty.nodeName === 'BR' && lastBeforeBr.nodeName === 'BR') {
-                    this.paraFocus(range.startContainer);
+                    this.paraFocus(range.startContainer, e.enterAction);
                 }
                 else if ((startParent.textContent.charCodeAt(0) === 8203 &&
                     startParent.textContent.length === 1) || startParent.textContent.length === 0) {
@@ -11539,11 +11659,21 @@ var Formats = /** @__PURE__ @class */ (function () {
             range.deleteContents();
         }
     };
-    Formats.prototype.paraFocus = function (referNode) {
-        var pTag = createElement('p');
-        pTag.innerHTML = '<br>';
-        this.parent.domNode.insertAfter(pTag, referNode);
-        this.parent.nodeSelection.setCursorPoint(this.parent.currentDocument, pTag, 0);
+    Formats.prototype.paraFocus = function (referNode, enterAction) {
+        var insertTag;
+        if (enterAction === 'DIV') {
+            insertTag = createElement('div');
+            insertTag.innerHTML = '<br>';
+        }
+        else if (enterAction === 'BR') {
+            insertTag = createElement('br');
+        }
+        else {
+            insertTag = createElement('p');
+            insertTag.innerHTML = '<br>';
+        }
+        this.parent.domNode.insertAfter(insertTag, referNode);
+        this.parent.nodeSelection.setCursorPoint(this.parent.currentDocument, insertTag, 0);
         detach(referNode.lastChild);
     };
     Formats.prototype.isNotEndCursor = function (preElem, range) {
@@ -11625,6 +11755,66 @@ var Formats = /** @__PURE__ @class */ (function () {
         var save = this.parent.nodeSelection.save(range, this.parent.currentDocument);
         this.parent.domNode.setMarker(save);
         var formatsNodes = this.parent.domNode.blockNodes();
+        if (e.enterAction === 'BR') {
+            this.setSelectionBRConfig();
+            var allSelectedNode = this.parent.nodeSelection.getSelectedNodes(this.parent.currentDocument);
+            var selectedNodes = this.parent.nodeSelection.getSelectionNodes(allSelectedNode);
+            var currentFormatNodes = [];
+            if (selectedNodes.length === 0) {
+                selectedNodes.push(formatsNodes[0]);
+            }
+            for (var i = 0; i < selectedNodes.length; i++) {
+                var currentNode = selectedNodes[i];
+                var previousCurrentNode = void 0;
+                while (!this.parent.domNode.isBlockNode(currentNode) && currentNode !== this.parent.editableElement) {
+                    previousCurrentNode = currentNode;
+                    currentNode = currentNode.parentElement;
+                }
+                if (this.parent.domNode.isBlockNode(currentNode) && currentNode === this.parent.editableElement) {
+                    currentFormatNodes.push(previousCurrentNode);
+                }
+            }
+            for (var i = 0; i < currentFormatNodes.length; i++) {
+                if (!this.parent.domNode.isBlockNode(currentFormatNodes[i])) {
+                    var currentNode = currentFormatNodes[i];
+                    var previousNode = currentNode;
+                    while (currentNode === this.parent.editableElement) {
+                        previousNode = currentNode;
+                        currentNode = currentNode.parentElement;
+                    }
+                    var tempElem = void 0;
+                    if (this.parent.domNode.isBlockNode(previousNode.parentElement) &&
+                        previousNode.parentElement === this.parent.editableElement) {
+                        tempElem = createElement('div');
+                        previousNode.parentElement.insertBefore(tempElem, previousNode);
+                        tempElem.appendChild(previousNode);
+                    }
+                    else {
+                        tempElem = previousNode;
+                    }
+                    var preNode = tempElem.previousSibling;
+                    while (!isNullOrUndefined(preNode) && preNode.nodeName !== 'BR' &&
+                        !this.parent.domNode.isBlockNode(preNode)) {
+                        tempElem.firstChild.parentElement.insertBefore(preNode, tempElem.firstChild);
+                        preNode = tempElem.previousSibling;
+                    }
+                    if (!isNullOrUndefined(preNode) && preNode.nodeName === 'BR') {
+                        detach(preNode);
+                    }
+                    var postNode = tempElem.nextSibling;
+                    while (!isNullOrUndefined(postNode) && postNode.nodeName !== 'BR' &&
+                        !this.parent.domNode.isBlockNode(postNode)) {
+                        tempElem.appendChild(postNode);
+                        postNode = tempElem.nextSibling;
+                    }
+                    if (!isNullOrUndefined(postNode) && postNode.nodeName === 'BR') {
+                        detach(postNode);
+                    }
+                }
+            }
+            this.setSelectionBRConfig();
+            formatsNodes = this.parent.domNode.blockNodes();
+        }
         for (var i = 0; i < formatsNodes.length; i++) {
             var parentNode = void 0;
             var replaceHTML = void 0;
@@ -11683,6 +11873,16 @@ var Formats = /** @__PURE__ @class */ (function () {
             });
         }
     };
+    Formats.prototype.setSelectionBRConfig = function () {
+        var startElem = this.parent.editableElement.querySelector('.' + markerClassName.startSelection);
+        var endElem = this.parent.editableElement.querySelector('.' + markerClassName.endSelection);
+        if (isNullOrUndefined(endElem)) {
+            this.parent.nodeSelection.setCursorPoint(this.parent.currentDocument, startElem, 0);
+        }
+        else {
+            this.parent.nodeSelection.setSelectionText(this.parent.currentDocument, startElem, endElem, 0, 0);
+        }
+    };
     Formats.prototype.preFormatMerge = function () {
         var preNodes = this.parent.editableElement.querySelectorAll('PRE');
         if (!isNullOrUndefined(preNodes)) {
@@ -11816,7 +12016,7 @@ var InsertHtml = /** @__PURE__ @class */ (function () {
         }
         else {
             range.deleteContents();
-            if (isCursor && range.startContainer.textContent === '') {
+            if (isCursor && range.startContainer.textContent === '' && range.startContainer.nodeName !== 'BR') {
                 range.startContainer.innerHTML = '';
             }
             if (Browser.isIE) {
@@ -11835,7 +12035,12 @@ var InsertHtml = /** @__PURE__ @class */ (function () {
                 }
             }
             else {
-                range.insertNode(node);
+                if (range.startContainer.nodeName === 'BR') {
+                    range.startContainer.parentElement.insertBefore(node, range.startContainer);
+                }
+                else {
+                    range.insertNode(node);
+                }
             }
             if (node.nodeType !== 3 && node.childNodes.length > 0) {
                 nodeSelection.setSelectionText(docElement, node, node, 1, 1);
@@ -12047,6 +12252,9 @@ var InsertHtml = /** @__PURE__ @class */ (function () {
                 range.setStart(editNode.firstElementChild, editNode.firstElementChild.textContent.length);
                 range.setEnd(editNode.firstElementChild, editNode.firstElementChild.textContent.length);
             }
+            if (blockNode.nodeName === 'BODY' && range.startContainer === range.endContainer && range.startContainer.nodeType === 1) {
+                blockNode = range.startContainer;
+            }
             if (blockNode.nodeName === 'TD' || blockNode.nodeName === 'TH') {
                 var tempSpan = createElement('span', { className: 'tempSpan' });
                 range.insertNode(tempSpan);
@@ -12904,8 +13112,10 @@ var ImageCommand = /** @__PURE__ @class */ (function () {
         var selectNode = e.item.selectNode[0];
         selectNode.style.height = '';
         selectNode.style.width = '';
-        selectNode.width = e.item.width;
-        selectNode.height = e.item.height;
+        e.item.width !== 'auto' ? selectNode.style.width = formatUnit(e.item.width) :
+            selectNode.removeAttribute('width');
+        e.item.height !== 'auto' ? selectNode.style.height = formatUnit(e.item.height) :
+            selectNode.removeAttribute('height');
         this.callBack(e);
     };
     ImageCommand.prototype.imageCaption = function (e) {
@@ -12914,59 +13124,65 @@ var ImageCommand = /** @__PURE__ @class */ (function () {
     };
     ImageCommand.prototype.imageJustifyLeft = function (e) {
         var selectNode = e.item.selectNode[0];
-        selectNode.removeAttribute('class');
-        addClass([selectNode], 'e-rte-image');
-        if (!isNullOrUndefined(closest(selectNode, '.' + CLASS_CAPTION))) {
-            removeClass([closest(selectNode, '.' + CLASS_CAPTION)], CLASS_IMAGE_RIGHT);
-            addClass([closest(selectNode, '.' + CLASS_CAPTION)], CLASS_IMAGE_LEFT);
-        }
-        if (selectNode.parentElement.nodeName === 'A') {
-            removeClass([selectNode.parentElement], CLASS_IMAGE_RIGHT);
-            addClass([selectNode.parentElement], CLASS_IMAGE_LEFT);
-            addClass([selectNode], CLASS_IMAGE_LEFT);
-        }
-        else {
-            addClass([selectNode], CLASS_IMAGE_LEFT);
+        if (!isNullOrUndefined(selectNode)) {
+            selectNode.removeAttribute('class');
+            addClass([selectNode], 'e-rte-image');
+            if (!isNullOrUndefined(closest(selectNode, '.' + CLASS_CAPTION))) {
+                removeClass([closest(selectNode, '.' + CLASS_CAPTION)], CLASS_IMAGE_RIGHT);
+                addClass([closest(selectNode, '.' + CLASS_CAPTION)], CLASS_IMAGE_LEFT);
+            }
+            if (selectNode.parentElement.nodeName === 'A') {
+                removeClass([selectNode.parentElement], CLASS_IMAGE_RIGHT);
+                addClass([selectNode.parentElement], CLASS_IMAGE_LEFT);
+                addClass([selectNode], CLASS_IMAGE_LEFT);
+            }
+            else {
+                addClass([selectNode], CLASS_IMAGE_LEFT);
+            }
+            this.callBack(e);
         }
-        this.callBack(e);
     };
     ImageCommand.prototype.imageJustifyCenter = function (e) {
         var selectNode = e.item.selectNode[0];
-        selectNode.removeAttribute('class');
-        addClass([selectNode], 'e-rte-image');
-        if (!isNullOrUndefined(closest(selectNode, '.' + CLASS_CAPTION))) {
-            removeClass([closest(selectNode, '.' + CLASS_CAPTION)], CLASS_IMAGE_LEFT);
-            removeClass([closest(selectNode, '.' + CLASS_CAPTION)], CLASS_IMAGE_RIGHT);
-            addClass([closest(selectNode, '.' + CLASS_CAPTION)], CLASS_IMAGE_CENTER);
-        }
-        if (selectNode.parentElement.nodeName === 'A') {
-            removeClass([selectNode.parentElement], CLASS_IMAGE_LEFT);
-            removeClass([selectNode.parentElement], CLASS_IMAGE_RIGHT);
-            addClass([selectNode.parentElement], CLASS_IMAGE_CENTER);
-            addClass([selectNode], CLASS_IMAGE_CENTER);
-        }
-        else {
-            addClass([selectNode], CLASS_IMAGE_CENTER);
+        if (!isNullOrUndefined(selectNode)) {
+            selectNode.removeAttribute('class');
+            addClass([selectNode], 'e-rte-image');
+            if (!isNullOrUndefined(closest(selectNode, '.' + CLASS_CAPTION))) {
+                removeClass([closest(selectNode, '.' + CLASS_CAPTION)], CLASS_IMAGE_LEFT);
+                removeClass([closest(selectNode, '.' + CLASS_CAPTION)], CLASS_IMAGE_RIGHT);
+                addClass([closest(selectNode, '.' + CLASS_CAPTION)], CLASS_IMAGE_CENTER);
+            }
+            if (selectNode.parentElement.nodeName === 'A') {
+                removeClass([selectNode.parentElement], CLASS_IMAGE_LEFT);
+                removeClass([selectNode.parentElement], CLASS_IMAGE_RIGHT);
+                addClass([selectNode.parentElement], CLASS_IMAGE_CENTER);
+                addClass([selectNode], CLASS_IMAGE_CENTER);
+            }
+            else {
+                addClass([selectNode], CLASS_IMAGE_CENTER);
+            }
+            this.callBack(e);
         }
-        this.callBack(e);
     };
     ImageCommand.prototype.imageJustifyRight = function (e) {
         var selectNode = e.item.selectNode[0];
-        selectNode.removeAttribute('class');
-        addClass([selectNode], 'e-rte-image');
-        if (!isNullOrUndefined(closest(selectNode, '.' + CLASS_CAPTION))) {
-            removeClass([closest(selectNode, '.' + CLASS_CAPTION)], CLASS_IMAGE_LEFT);
-            addClass([closest(selectNode, '.' + CLASS_CAPTION)], CLASS_IMAGE_RIGHT);
-        }
-        if (selectNode.parentElement.nodeName === 'A') {
-            removeClass([selectNode.parentElement], CLASS_IMAGE_LEFT);
-            addClass([selectNode.parentElement], CLASS_IMAGE_RIGHT);
-            addClass([selectNode], CLASS_IMAGE_RIGHT);
-        }
-        else {
-            addClass([selectNode], CLASS_IMAGE_RIGHT);
+        if (!isNullOrUndefined(selectNode)) {
+            selectNode.removeAttribute('class');
+            addClass([selectNode], 'e-rte-image');
+            if (!isNullOrUndefined(closest(selectNode, '.' + CLASS_CAPTION))) {
+                removeClass([closest(selectNode, '.' + CLASS_CAPTION)], CLASS_IMAGE_LEFT);
+                addClass([closest(selectNode, '.' + CLASS_CAPTION)], CLASS_IMAGE_RIGHT);
+            }
+            if (selectNode.parentElement.nodeName === 'A') {
+                removeClass([selectNode.parentElement], CLASS_IMAGE_LEFT);
+                addClass([selectNode.parentElement], CLASS_IMAGE_RIGHT);
+                addClass([selectNode], CLASS_IMAGE_RIGHT);
+            }
+            else {
+                addClass([selectNode], CLASS_IMAGE_RIGHT);
+            }
+            this.callBack(e);
         }
-        this.callBack(e);
     };
     ImageCommand.prototype.imageInline = function (e) {
         var selectNode = e.item.selectNode[0];
@@ -13056,7 +13272,7 @@ var TableCommand = /** @__PURE__ @class */ (function () {
         }
         var tdWid = parseInt(e.item.width.width, 10) > 100 ?
             100 / e.item.columns : parseInt(e.item.width.width, 10) / e.item.columns;
-        for (var i = 0; i < e.item.row; i++) {
+        for (var i = 0; i < e.item.rows; i++) {
             var row = createElement('tr');
             for (var j = 0; j < e.item.columns; j++) {
                 var cell = createElement('td');
@@ -13072,9 +13288,19 @@ var TableCommand = /** @__PURE__ @class */ (function () {
         this.removeEmptyNode();
         e.item.selection.setSelectionText(this.parent.currentDocument, table.querySelector('td'), table.querySelector('td'), 0, 0);
         if (table.nextElementSibling === null) {
-            var emptyPara = createElement('p');
-            emptyPara.appendChild(createElement('br'));
-            this.insertAfter(emptyPara, table);
+            var insertElem = void 0;
+            if (e.enterAction === 'DIV') {
+                insertElem = createElement('div');
+                insertElem.appendChild(createElement('br'));
+            }
+            else if (e.enterAction === 'BR') {
+                insertElem = createElement('br');
+            }
+            else {
+                insertElem = createElement('p');
+                insertElem.appendChild(createElement('br'));
+            }
+            this.insertAfter(insertElem, table);
         }
         table.querySelector('td').classList.add('e-cell-select');
         if (e.callBack) {
@@ -13213,16 +13439,16 @@ var TableCommand = /** @__PURE__ @class */ (function () {
         var curRow = closest(selectedCell, 'tr');
         var curCell;
         var allRows = closest((curRow), 'table').rows;
-        var colIndex = Array.prototype.slice.call(curRow.querySelectorAll('th,td')).indexOf(selectedCell);
-        var previousWidth = parseInt(e.item.width, 10) / (curRow.querySelectorAll('td,th').length);
-        var currentWidth = parseInt(e.item.width, 10) / (curRow.querySelectorAll('td,th').length + 1);
+        var colIndex = Array.prototype.slice.call(curRow.querySelectorAll(':scope > td, :scope > th')).indexOf(selectedCell);
+        var previousWidth = parseInt(e.item.width, 10) / (curRow.querySelectorAll(':scope > td, :scope > th').length);
+        var currentWidth = parseInt(e.item.width, 10) / (curRow.querySelectorAll(':scope > td, :scope > th').length + 1);
         var currentTabElm = closest(curRow, 'table');
         var thTdElm = closest(curRow, 'table').querySelectorAll('th,td');
         for (var i = 0; i < thTdElm.length; i++) {
             thTdElm[i].dataset.oldWidth = (thTdElm[i].offsetWidth / currentTabElm.offsetWidth * 100) + "%";
         }
         for (var i = 0; i < allRows.length; i++) {
-            curCell = allRows[i].querySelectorAll('th,td')[colIndex];
+            curCell = allRows[i].querySelectorAll(':scope > td, :scope > th')[colIndex];
             var colTemplate = curCell.cloneNode(true);
             colTemplate.innerHTML = '';
             colTemplate.appendChild(createElement('br'));
@@ -13755,7 +13981,7 @@ var TableCommand = /** @__PURE__ @class */ (function () {
         // eslint-disable-next-line
         var _this = this;
         var colspan = 0;
-        var allRows = _this.curTable.querySelectorAll('tr');
+        var allRows = _this.curTable.rows;
         for (var i = 0; i <= allRows.length - 1; i++) {
             var ele = allRows[i];
             var index = 0;
@@ -14156,7 +14382,8 @@ var IsFormatted = /** @__PURE__ @class */ (function () {
         'sup',
         'tt',
         'u',
-        'var'
+        'var',
+        'del'
     ];
     return IsFormatted;
 }());
@@ -14179,7 +14406,8 @@ var SelectionCommands = /** @__PURE__ @class */ (function () {
      * @hidden
      * @deprecated
      */
-    SelectionCommands.applyFormat = function (docElement, format, endNode, value, selector) {
+    SelectionCommands.applyFormat = function (docElement, format, endNode, enterAction, value, selector) {
+        this.enterAction = enterAction;
         var validFormats = ['bold', 'italic', 'underline', 'strikethrough', 'superscript',
             'subscript', 'uppercase', 'lowercase', 'fontcolor', 'fontname', 'fontsize', 'backgroundcolor'];
         if (validFormats.indexOf(format) > -1) {
@@ -14255,7 +14483,7 @@ var SelectionCommands = /** @__PURE__ @class */ (function () {
                 save.restore();
             }
             if (isSubSup) {
-                this.applyFormat(docElement, format, endNode);
+                this.applyFormat(docElement, format, endNode, enterAction);
             }
         }
     };
@@ -14275,6 +14503,10 @@ var SelectionCommands = /** @__PURE__ @class */ (function () {
                 cursorNodes[0].firstElementChild.tagName.toLowerCase() === 'br')) {
                 cursorNodes[0].innerHTML = '';
             }
+            if (cursorNodes.length === 1 && range.startOffset === 0 && (cursorNodes[0].nodeName === 'BR' ||
+                cursorNodes[0].nextSibling.nodeName === 'BR')) {
+                detach(cursorNodes[0].nodeName === '#text' ? cursorNodes[0].nextSibling : cursorNodes[0]);
+            }
             cursorNode = this.getInsertNode(docElement, range, format, value).firstChild;
         }
         return cursorNode;
@@ -14490,10 +14722,12 @@ var SelectionCommands = /** @__PURE__ @class */ (function () {
         return nodes[index];
     };
     SelectionCommands.applyStyles = function (nodes, index, element) {
-        nodes[index] = (index === (nodes.length - 1)) || nodes[index].nodeName === 'BR' ?
-            InsertMethods.Wrap(nodes[index], element)
-            : InsertMethods.WrapBefore(nodes[index], element, true);
-        nodes[index] = this.getChildNode(nodes[index], element);
+        if (!(nodes[index].nodeName === 'BR' && this.enterAction === 'BR')) {
+            nodes[index] = (index === (nodes.length - 1)) || nodes[index].nodeName === 'BR' ?
+                InsertMethods.Wrap(nodes[index], element)
+                : InsertMethods.WrapBefore(nodes[index], element, true);
+            nodes[index] = this.getChildNode(nodes[index], element);
+        }
         return nodes[index];
     };
     SelectionCommands.getInsertNode = function (docElement, range, format, value) {
@@ -14588,6 +14822,7 @@ var SelectionCommands = /** @__PURE__ @class */ (function () {
             ele.setAttribute('style', styles);
         }
     };
+    SelectionCommands.enterAction = 'P';
     return SelectionCommands;
 }());
 
@@ -14618,12 +14853,12 @@ var SelectionBasedExec = /** @__PURE__ @class */ (function () {
             'subscript', 'uppercase', 'lowercase'];
         if (e.event.ctrlKey && validFormats.indexOf(e.event.action) > -1) {
             e.event.preventDefault();
-            SelectionCommands.applyFormat(this.parent.currentDocument, e.event.action, this.parent.editableElement);
+            SelectionCommands.applyFormat(this.parent.currentDocument, e.event.action, this.parent.editableElement, e.enterAction);
             this.callBack(e, e.event.action);
         }
     };
     SelectionBasedExec.prototype.applySelection = function (e) {
-        SelectionCommands.applyFormat(this.parent.currentDocument, e.subCommand.toLocaleLowerCase(), this.parent.editableElement, e.value, e.selector);
+        SelectionCommands.applyFormat(this.parent.currentDocument, e.subCommand.toLocaleLowerCase(), this.parent.editableElement, e.enterAction, e.value, e.selector);
         this.callBack(e, e.subCommand);
     };
     SelectionBasedExec.prototype.callBack = function (event, action) {
@@ -14706,7 +14941,9 @@ var ClearFormat$1 = /** @__PURE__ @class */ (function () {
      * @hidden
      * @deprecated
      */
-    ClearFormat.clear = function (docElement, endNode, selector) {
+    ClearFormat.clear = function (docElement, endNode, enterAction, selector) {
+        this.domNode = new DOMNode(endNode, docElement);
+        this.defaultTag = enterAction === 'P' ? this.defaultTag : 'div';
         var nodeSelection = new NodeSelection();
         var nodeCutter = new NodeCutter();
         var range = nodeSelection.getRange(docElement);
@@ -14851,12 +15088,12 @@ var ClearFormat$1 = /** @__PURE__ @class */ (function () {
                         && this.IGNORE_PARENT_TAGS.indexOf(parentNodes[index1].childNodes[0].nodeName.toLocaleLowerCase()) > -1)
                     && !(parentNodes[index1].childNodes.length === 1
                         && parentNodes[index1].childNodes[0].nodeName.toLocaleLowerCase() === 'p')) {
-                    InsertMethods.Wrap(parentNodes[index1], docElement.createElement('p'));
+                    InsertMethods.Wrap(parentNodes[index1], docElement.createElement(this.defaultTag));
                 }
                 var childNodes = InsertMethods.unwrap(parentNodes[index1]);
                 if (childNodes.length === 1
                     && childNodes[0].parentNode.nodeName.toLocaleLowerCase() === 'p') {
-                    InsertMethods.Wrap(parentNodes[index1], docElement.createElement('p'));
+                    InsertMethods.Wrap(parentNodes[index1], docElement.createElement(this.defaultTag));
                     InsertMethods.unwrap(parentNodes[index1]);
                 }
                 for (var index2 = 0; index2 < childNodes.length; index2++) {
@@ -14874,13 +15111,13 @@ var ClearFormat$1 = /** @__PURE__ @class */ (function () {
                     }
                     else if (this.BLOCK_TAGS.indexOf(childNodes[index2].nodeName.toLocaleLowerCase()) > -1 &&
                         childNodes[index2].nodeName.toLocaleLowerCase() === 'p') {
-                        InsertMethods.Wrap(childNodes[index2], docElement.createElement('p'));
+                        InsertMethods.Wrap(childNodes[index2], docElement.createElement(this.defaultTag));
                         InsertMethods.unwrap(childNodes[index2]);
                     }
                 }
             }
             else {
-                InsertMethods.Wrap(parentNodes[index1], docElement.createElement('p'));
+                InsertMethods.Wrap(parentNodes[index1], docElement.createElement(this.defaultTag));
                 InsertMethods.unwrap(parentNodes[index1]);
             }
         }
@@ -14889,10 +15126,16 @@ var ClearFormat$1 = /** @__PURE__ @class */ (function () {
     // eslint-disable-next-line
     endNode) {
         for (var index = 0; index < textNodes.length; index++) {
-            if (textNodes[index].parentNode &&
-                IsFormatted.inlineTags.indexOf(textNodes[index].parentNode.nodeName.toLocaleLowerCase()) > -1) {
-                nodeCutter.GetSpliceNode(range, textNodes[index].parentNode);
-                this.removeInlineParent(textNodes[index].parentNode);
+            var currentInlineNode = textNodes[index];
+            var currentNode = void 0;
+            while (!this.domNode.isBlockNode(currentInlineNode)) {
+                currentNode = currentInlineNode;
+                currentInlineNode = currentInlineNode.parentElement;
+            }
+            if (currentNode &&
+                IsFormatted.inlineTags.indexOf(currentNode.nodeName.toLocaleLowerCase()) > -1) {
+                nodeCutter.GetSpliceNode(range, currentNode);
+                this.removeInlineParent(currentNode);
             }
         }
     };
@@ -14915,6 +15158,7 @@ var ClearFormat$1 = /** @__PURE__ @class */ (function () {
     ClearFormat.NONVALID_PARENT_TAGS = ['thead', 'tbody', 'ul', 'ol', 'table', 'tfoot', 'tr'];
     ClearFormat.IGNORE_PARENT_TAGS = ['ul', 'ol', 'table'];
     ClearFormat.NONVALID_TAGS = ['thead', 'tbody', 'figcaption', 'td', 'tr', 'th', 'tfoot', 'figcaption', 'li'];
+    ClearFormat.defaultTag = 'p';
     return ClearFormat;
 }());
 
@@ -14944,14 +15188,14 @@ var ClearFormatExec = /** @__PURE__ @class */ (function () {
     ClearFormatExec.prototype.onKeyDown = function (e) {
         switch (e.event.action) {
             case 'clear-format':
-                this.applyClear({ subCommand: 'ClearFormat', callBack: e.callBack });
+                this.applyClear({ subCommand: 'ClearFormat', callBack: e.callBack, enterAction: e.enterAction });
                 e.event.preventDefault();
                 break;
         }
     };
     ClearFormatExec.prototype.applyClear = function (e) {
         if (e.subCommand === 'ClearFormat') {
-            ClearFormat$1.clear(this.parent.currentDocument, this.parent.editableElement, e.selector);
+            ClearFormat$1.clear(this.parent.currentDocument, this.parent.editableElement, e.enterAction, e.selector);
             if (e.callBack) {
                 e.callBack({
                     requestType: e.subCommand,
@@ -15932,15 +16176,15 @@ var EditorManager = /** @__PURE__ @class */ (function () {
      * @deprecated
      */
     /* eslint-enable */
-    EditorManager.prototype.execCommand = function (command, value, event, callBack, text, exeValue, selector) {
+    EditorManager.prototype.execCommand = function (command, value, event, callBack, text, exeValue, selector, enterAction) {
         switch (command.toLocaleLowerCase()) {
             case 'lists':
                 this.observer.notify(LIST_TYPE, { subCommand: value, event: event, callBack: callBack,
-                    selector: selector, item: exeValue });
+                    selector: selector, item: exeValue, enterAction: enterAction });
                 break;
             case 'formats':
                 this.observer.notify(FORMAT_TYPE, { subCommand: value, event: event, callBack: callBack,
-                    selector: selector, exeValue: exeValue
+                    selector: selector, exeValue: exeValue, enterAction: enterAction
                 });
                 break;
             case 'alignments':
@@ -15969,7 +16213,7 @@ var EditorManager = /** @__PURE__ @class */ (function () {
             case 'table':
                 switch (value.toString().toLocaleLowerCase()) {
                     case 'createtable':
-                        this.observer.notify(TABLE, { item: exeValue, event: event, callBack: callBack });
+                        this.observer.notify(TABLE, { item: exeValue, event: event, callBack: callBack, enterAction: enterAction });
                         break;
                     case 'insertrowbefore':
                     case 'insertrowafter':
@@ -16011,7 +16255,7 @@ var EditorManager = /** @__PURE__ @class */ (function () {
             case 'style':
             case 'effects':
             case 'casing':
-                this.observer.notify(SELECTION_TYPE, { subCommand: value, event: event, callBack: callBack, value: text, selector: selector });
+                this.observer.notify(SELECTION_TYPE, { subCommand: value, event: event, callBack: callBack, value: text, selector: selector, enterAction: enterAction });
                 break;
             case 'inserthtml':
                 this.observer.notify(INSERTHTML_TYPE, { subCommand: value, callBack: callBack, value: text });
@@ -16020,7 +16264,7 @@ var EditorManager = /** @__PURE__ @class */ (function () {
                 this.observer.notify(INSERT_TEXT_TYPE, { subCommand: value, callBack: callBack, value: text });
                 break;
             case 'clear':
-                this.observer.notify(CLEAR_TYPE, { subCommand: value, event: event, callBack: callBack, selector: selector });
+                this.observer.notify(CLEAR_TYPE, { subCommand: value, event: event, callBack: callBack, selector: selector, enterAction: enterAction });
                 break;
             case 'actions':
                 this.observer.notify(ACTION, { subCommand: value, event: event, callBack: callBack, selector: selector });
@@ -16598,10 +16842,10 @@ var IframeContentRender = /** @__PURE__ @class */ (function (_super) {
             rteContent + '</body></html>';
         var iFrameContent = IFRAMEHEADER + iFrameBodyContent;
         var iframe = this.parent.createElement('iframe', {
-            innerHTML: iFrameContent,
             id: this.parent.getID() + '_rte-view',
             className: 'e-rte-content',
-            styles: 'display:block;'
+            styles: 'display:block;',
+            attrs: { 'srcdoc': iFrameContent }
         });
         this.setPanel(iframe);
         rteObj.element.appendChild(iframe);
@@ -16906,33 +17150,40 @@ var HtmlEditor = /** @__PURE__ @class */ (function () {
     HtmlEditor.prototype.onKeyDown = function (e) {
         var _this = this;
         var currentRange;
+        var args = e.args;
         if (Browser.info.name === 'chrome') {
             currentRange = this.parent.getRange();
             this.backSpaceCleanup(e, currentRange);
             this.deleteCleanup(e, currentRange);
         }
-        if (e.args.keyCode === 9 && this.parent.enableTabKey) {
-            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)) {
-                e.args.preventDefault();
-                if (!e.args.shiftKey) {
-                    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();
+        if (args.keyCode === 9 && this.parent.enableTabKey) {
+            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)) {
+                    args.preventDefault();
+                    if (!args.shiftKey) {
+                        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();
+                    }
                 }
             }
         }
         if (e.args.action === 'space' ||
-            e.args.action === 'enter') {
+            e.args.action === 'enter' ||
+            e.args.keyCode === 13) {
             this.spaceLink(e.args);
+            if (this.parent.editorMode === 'HTML' && !((this.parent.shiftEnterKey === 'BR' && e.args.shiftKey))) {
+                this.parent.notify(enterHandler, { args: e.args });
+            }
         }
         if (e.args.action === 'space') {
             var currentRange_1 = this.parent.getRange();
@@ -16974,10 +17225,11 @@ var HtmlEditor = /** @__PURE__ @class */ (function () {
             this.oldRangeElement = null;
             this.deleteRangeElement = null;
             this.deleteOldRangeElement = null;
-            e.args.preventDefault();
+            args.preventDefault();
         }
     };
     HtmlEditor.prototype.isOrderedList = function (editorValue) {
+        editorValue = editorValue.replace(/\u200B/g, '');
         var olListStartRegex = [/^[1]+[.]+$/, /^[i]+[.]+$/, /^[a]+[.]+$/];
         if (!isNullOrUndefined(editorValue)) {
             for (var i = 0; i < olListStartRegex.length; i++) {
@@ -16989,6 +17241,7 @@ var HtmlEditor = /** @__PURE__ @class */ (function () {
         return false;
     };
     HtmlEditor.prototype.isUnOrderedList = function (editorValue) {
+        editorValue = editorValue.replace(/\u200B/g, '');
         var ulListStartRegex = [/^[*]$/, /^[-]$/];
         if (!isNullOrUndefined(editorValue)) {
             for (var i = 0; i < ulListStartRegex.length; i++) {
@@ -17174,7 +17427,7 @@ var HtmlEditor = /** @__PURE__ @class */ (function () {
             var contentInnerElem = '';
             for (var i = 0; i < enterSplitText.length; i++) {
                 if (enterSplitText[i].trim() === '') {
-                    contentInnerElem += '<p><br></p>';
+                    contentInnerElem += getDefaultValue(this.parent);
                 }
                 else {
                     var contentWithSpace = '';
@@ -17603,7 +17856,7 @@ var PasteCleanup = /** @__PURE__ @class */ (function () {
         var contentInnerElem = '';
         for (var i = 0; i < enterSplitText.length; i++) {
             if (enterSplitText[i].trim() === '') {
-                contentInnerElem += '<p><br></p>';
+                contentInnerElem += getDefaultValue(this.parent);
             }
             else {
                 var contentWithSpace = this.makeSpace(enterSplitText[i]);
@@ -17937,7 +18190,7 @@ var PasteCleanup = /** @__PURE__ @class */ (function () {
                             dialog.hide();
                             _this.parent.height = isHeight ? preRTEHeight : _this.parent.height;
                             isHeight = false;
-                            var argument = isBlazor() ? null : dialog;
+                            var argument = dialog;
                             _this.dialogRenderObj.close(argument);
                             dialog.destroy();
                             _this.selectFormatting(value, args, keepChecked, cleanChecked);
@@ -17955,7 +18208,7 @@ var PasteCleanup = /** @__PURE__ @class */ (function () {
                             dialog.hide();
                             _this.parent.height = isHeight ? preRTEHeight : _this.parent.height;
                             isHeight = false;
-                            var args_1 = isBlazor() ? null : dialog;
+                            var args_1 = dialog;
                             _this.dialogRenderObj.close(args_1);
                             dialog.destroy();
                         }
@@ -18376,7 +18629,7 @@ var Resize = /** @__PURE__ @class */ (function () {
         }
         this.wireResizeEvents();
         this.parent.notify(resizeInitialized, {});
-        var args = isBlazor() ? { requestType: 'editor' } : { event: e, requestType: 'editor' };
+        var args = { event: e, requestType: 'editor' };
         this.parent.trigger(resizeStart, args, function (resizeStartArgs) {
             if (resizeStartArgs.cancel) {
                 _this.unwireResizeEvents();
@@ -18385,7 +18638,7 @@ var Resize = /** @__PURE__ @class */ (function () {
     };
     Resize.prototype.performResize = function (e) {
         var _this = this;
-        var args = isBlazor() ? { requestType: 'editor' } : { event: e, requestType: 'editor' };
+        var args = { event: e, requestType: 'editor' };
         this.parent.trigger(onResize, args, function (resizingArgs) {
             if (resizingArgs.cancel) {
                 _this.unwireResizeEvents();
@@ -18409,7 +18662,7 @@ var Resize = /** @__PURE__ @class */ (function () {
     Resize.prototype.stopResize = function (e) {
         this.parent.refreshUI();
         this.unwireResizeEvents();
-        var args = isBlazor() ? { requestType: 'editor' } : { event: e, requestType: 'editor' };
+        var args = { event: e, requestType: 'editor' };
         this.parent.trigger(resizeStop, args);
     };
     Resize.prototype.getEventType = function (e) {
@@ -18998,9 +19251,17 @@ var Render = /** @__PURE__ @class */ (function () {
                     var childNodes = this.parent.contentModule.getEditPanel().childNodes;
                     if ((childNodes.length === 0) ||
                         (childNodes.length === 1 && childNodes[0].childNodes.length === 0 && ((childNodes[0].tagName === 'BR') ||
-                            (childNodes[0].tagName === 'P' && childNodes[0].textContent === '')))) {
+                            ((childNodes[0].tagName === 'P' || childNodes[0].tagName === 'DIV') && childNodes[0].textContent === '')))) {
                         var node = this.parent.contentModule.getEditPanel();
-                        node.innerHTML = '<p><br/></p>';
+                        if (this.parent.enterKey === 'DIV') {
+                            node.innerHTML = '<div><br/></div>';
+                        }
+                        else if (this.parent.enterKey === 'BR') {
+                            node.innerHTML = '<br/>';
+                        }
+                        else {
+                            node.innerHTML = '<p><br/></p>';
+                        }
                         this.parent.formatter.editorManager.nodeSelection.setCursorPoint(this.parent.contentModule.getDocument(), node.childNodes[0], 0);
                     }
                     break;
@@ -19297,7 +19558,7 @@ var Link = /** @__PURE__ @class */ (function () {
                 }
                 _this.dialogObj.destroy();
                 detach(_this.dialogObj.element);
-                var args = isBlazor() ? null : _this.dialogObj;
+                var args = _this.dialogObj;
                 _this.dialogRenderObj.close(args);
                 _this.dialogObj = null;
             }
@@ -19389,7 +19650,8 @@ var Link = /** @__PURE__ @class */ (function () {
             proxy.parent.formatter.saveData();
         }
         var argsValue;
-        if (this.args.code === 'KeyK') {
+        if (!isNullOrUndefined(this.args) &&
+            this.args.code === 'KeyK') {
             var originalEvent = this.args;
             extend(this.args, { item: { command: 'Links', subCommand: 'CreateLink' }, originalEvent: originalEvent }, true);
             var argsVal = {
@@ -19519,6 +19781,7 @@ var Link = /** @__PURE__ @class */ (function () {
 var Image = /** @__PURE__ @class */ (function () {
     function Image(parent, serviceLocator) {
         this.isImgUploaded = false;
+        this.isAllowedTypes = true;
         this.pageX = null;
         this.pageY = null;
         this.deletedImg = [];
@@ -19639,7 +19902,7 @@ var Image = /** @__PURE__ @class */ (function () {
         if (Browser.isDevice) {
             removeClass([e.target.parentElement], 'e-mob-span');
         }
-        var args = isBlazor() ? { requestType: 'images' } : { event: e, requestType: 'images' };
+        var args = { event: e, requestType: 'images' };
         this.parent.trigger(resizeStop, args);
         /* eslint-disable */
         var pageX = this.getPointX(e);
@@ -19693,7 +19956,7 @@ var Image = /** @__PURE__ @class */ (function () {
                 addClass([this.imgResizeDiv], 'e-mob-span');
             }
             else {
-                var args = isBlazor() ? { requestType: 'images' } : { event: e, requestType: 'images' };
+                var args = { event: e, requestType: 'images' };
                 this.parent.trigger(resizeStart, args, function (resizeStartArgs) {
                     if (resizeStartArgs.cancel) {
                         _this.cancelResizeAction();
@@ -19828,6 +20091,12 @@ var Image = /** @__PURE__ @class */ (function () {
                 img.style.height = null;
                 img.removeAttribute('height');
             }
+            else if (img.style.width === '' && img.style.height !== '') {
+                img.style.height = expectedY + 'px';
+            }
+            else if (img.style.width !== '' && img.style.height === '') {
+                img.style.width = ((width / height * expectedY) + width / height).toString() + 'px';
+            }
             else if (img.style.width !== '') {
                 img.style.width = (width / height * expectedY) + 'px';
                 img.style.height = expectedY + 'px';
@@ -19876,7 +20145,7 @@ var Image = /** @__PURE__ @class */ (function () {
     };
     Image.prototype.imgDupMouseMove = function (width, height, e) {
         var _this = this;
-        var args = isBlazor() ? { requestType: 'images' } : { event: e, requestType: 'images' };
+        var args = { event: e, requestType: 'images' };
         this.parent.trigger(onResize, args, function (resizingArgs) {
             if (resizingArgs.cancel) {
                 _this.cancelResizeAction();
@@ -20703,7 +20972,7 @@ var Image = /** @__PURE__ @class */ (function () {
             isModal: Browser.isDevice,
             buttons: [{
                     click: this.insertImageUrl.bind(selectObj),
-                    buttonModel: { content: imgInsert, cssClass: 'e-flat e-insertImage', isPrimary: true }
+                    buttonModel: { content: imgInsert, cssClass: 'e-flat e-insertImage', isPrimary: true, disabled: true }
                 },
                 {
                     click: function (e) {
@@ -20829,12 +21098,23 @@ var Image = /** @__PURE__ @class */ (function () {
     };
     // eslint-disable-next-line
     Image.prototype.imageUrlPopup = function (e) {
+        var _this = this;
         var imgUrl = this.parent.createElement('div', { className: 'imgUrl' });
         var placeUrl = this.i10n.getConstant('imageUrl');
         this.inputUrl = this.parent.createElement('input', {
             className: 'e-input e-img-url',
             attrs: { placeholder: placeUrl, spellcheck: 'false' }
         });
+        this.inputUrl.addEventListener('input', function () {
+            if (!isNullOrUndefined(_this.inputUrl)) {
+                if (_this.inputUrl.value.length === 0) {
+                    _this.dialogObj.getButtons(0).element.disabled = true;
+                }
+                else {
+                    _this.dialogObj.getButtons(0).element.removeAttribute('disabled');
+                }
+            }
+        });
         imgUrl.appendChild(this.inputUrl);
         return imgUrl;
     };
@@ -20885,42 +21165,58 @@ var Image = /** @__PURE__ @class */ (function () {
         }
     };
     Image.prototype.imgsizeInput = function (e) {
+        var _this = this;
         var selectNode = e.selectNode[0];
         var imgHeight = this.i10n.getConstant('imageHeight');
         var imgWidth = this.i10n.getConstant('imageWidth');
         var imgSizeWrap = this.parent.createElement('div', { className: 'e-img-sizewrap' });
-        var widthVal = (selectNode.getAttribute('width') === 'auto' ||
-            isNullOrUndefined(selectNode.getAttribute('width'))) ? selectNode.width : selectNode.getClientRects()[0].width;
-        var heightVal = (selectNode.getAttribute('height') === 'auto' ||
-            isNullOrUndefined(selectNode.getAttribute('height'))) ? selectNode.height : selectNode.getClientRects()[0].height;
+        var widthVal = isNullOrUndefined(this.changedWidthValue) && (selectNode.style.width.toString() === 'auto' ||
+            selectNode.style.width !== "") ? selectNode.style.width : !isNullOrUndefined(this.changedWidthValue) ?
+            this.changedWidthValue : (parseInt(selectNode.getClientRects()[0].width.toString())).toString();
+        var heightVal = isNullOrUndefined(this.changedHeightValue) && (selectNode.style.height.toString() === 'auto' ||
+            selectNode.style.height !== "") ? selectNode.style.height : !isNullOrUndefined(this.changedHeightValue) ?
+            this.changedHeightValue : (parseInt(selectNode.getClientRects()[0].height.toString())).toString();
+        this.changedWidthValue = null;
+        this.changedHeightValue = null;
         var content = '<div class="e-rte-label"><label>' + imgWidth +
-            '</label></div><div class="e-rte-field"><input type="text" data-role ="none" id="imgwidth" class="e-img-width" value=' +
+            '</label></div><div class="e-rte-field"><input type="text" id="imgwidth" class="e-img-width" value=' +
             widthVal
             + ' /></div>' +
             '<div class="e-rte-label">' + '<label>' + imgHeight + '</label></div><div class="e-rte-field"> ' +
-            '<input type="text" data-role ="none" id="imgheight" class="e-img-height" value=' +
+            '<input type="text" id="imgheight" class="e-img-height" value=' +
             heightVal
             + ' /></div>';
         var contentElem = parseHtml(content);
         imgSizeWrap.appendChild(contentElem);
-        var widthNum = new NumericTextBox({
-            format: '###.### px', min: this.parent.insertImageSettings.minWidth,
-            max: this.parent.getInsertImgMaxWidth(),
-            enableRtl: this.parent.enableRtl, locale: this.parent.locale
+        var widthNum = new TextBox({
+            value: formatUnit(widthVal),
+            enableRtl: this.parent.enableRtl,
+            input: function (e) {
+                _this.inputWidthValue = formatUnit(_this.inputValue(e.value));
+            }
         });
-        widthNum.isStringTemplate = true;
         widthNum.createElement = this.parent.createElement;
         widthNum.appendTo(imgSizeWrap.querySelector('#imgwidth'));
-        var heightNum = new NumericTextBox({
-            format: '###.### px', min: this.parent.insertImageSettings.minHeight,
-            max: this.parent.insertImageSettings.maxHeight,
-            enableRtl: this.parent.enableRtl, locale: this.parent.locale
+        var heightNum = new TextBox({
+            value: formatUnit(heightVal),
+            enableRtl: this.parent.enableRtl,
+            input: function (e) {
+                _this.inputHeightValue = formatUnit(_this.inputValue(e.value));
+            }
         });
-        heightNum.isStringTemplate = true;
         heightNum.createElement = this.parent.createElement;
         heightNum.appendTo(imgSizeWrap.querySelector('#imgheight'));
         return imgSizeWrap;
     };
+    Image.prototype.inputValue = function (value) {
+        if (value === 'auto' || value.indexOf('%') !== -1 || value.indexOf('px') !== -1
+            || value.match(/(\d+)/)) {
+            return value;
+        }
+        else {
+            return "auto";
+        }
+    };
     Image.prototype.insertSize = function (e) {
         e.selection.restore();
         var proxy = e.selfImage;
@@ -20928,8 +21224,10 @@ var Image = /** @__PURE__ @class */ (function () {
             proxy.parent.formatter.saveData();
         }
         var dialogEle = proxy.dialogObj.element;
-        var width = parseFloat(dialogEle.querySelector('.e-img-width').value);
-        var height = parseFloat(dialogEle.parentElement.querySelector('.e-img-height').value);
+        this.changedWidthValue = this.inputWidthValue;
+        this.changedHeightValue = this.inputHeightValue;
+        var width = dialogEle.querySelector('.e-img-width').value;
+        var height = dialogEle.parentElement.querySelector('.e-img-height').value;
         proxy.parent.formatter.process(this.parent, e.args, e.args, {
             width: width, height: height, selectNode: e.selectNode,
             subCommand: e.args.item.subCommand
@@ -21039,6 +21337,10 @@ var Image = /** @__PURE__ @class */ (function () {
                                     }
                                 };
                                 proxy.inputUrl.setAttribute('disabled', 'true');
+                                if (isNullOrUndefined(proxy.parent.insertImageSettings.saveUrl) && _this.isAllowedTypes
+                                    && !isNullOrUndefined(_this.dialogObj)) {
+                                    _this.dialogObj.getButtons(0).element.removeAttribute('disabled');
+                                }
                             });
                             reader_1.readAsDataURL(selectArgs.filesData[0].rawFile);
                         }
@@ -21094,6 +21396,9 @@ var Image = /** @__PURE__ @class */ (function () {
                         };
                         proxy.inputUrl.setAttribute('disabled', 'true');
                     }
+                    if (e.operation === 'upload' && !isNullOrUndefined(_this.dialogObj)) {
+                        _this.dialogObj.getButtons(0).element.removeAttribute('disabled');
+                    }
                 });
             },
             failure: function (e) {
@@ -21103,11 +21408,11 @@ var Image = /** @__PURE__ @class */ (function () {
                 // eslint-disable-next-line
                 _this.parent.trigger(imageRemoving, e, function (e) {
                     proxy.isImgUploaded = false;
+                    _this.dialogObj.getButtons(0).element.disabled = true;
                     proxy.inputUrl.removeAttribute('disabled');
                     if (proxy.uploadUrl) {
                         proxy.uploadUrl.url = '';
                     }
-                    _this.dialogObj.getButtons(0).element.removeAttribute('disabled');
                 });
             }
         });
@@ -21120,9 +21425,10 @@ var Image = /** @__PURE__ @class */ (function () {
         if (this.uploadObj.allowedExtensions) {
             if (this.uploadObj.allowedExtensions.toLocaleLowerCase().indexOf(('.' + e.type).toLocaleLowerCase()) === -1) {
                 this.dialogObj.getButtons(0).element.setAttribute('disabled', 'disabled');
+                this.isAllowedTypes = false;
             }
             else {
-                this.dialogObj.getButtons(0).element.removeAttribute('disabled');
+                this.isAllowedTypes = true;
             }
         }
     };
@@ -21792,7 +22098,21 @@ var ViewSource = /** @__PURE__ @class */ (function () {
             baseToolbar: this.parent.getBaseToolbarObject()
         });
         var serializeValue = this.parent.serializeValue(editHTML.value);
-        var value = (serializeValue === null || serializeValue === '') ? '<p><br/></p>' : serializeValue;
+        var value;
+        if (serializeValue === null || serializeValue === '') {
+            if (this.parent.enterKey === 'DIV') {
+                value = '<div><br/></div>';
+            }
+            else if (this.parent.enterKey === 'BR') {
+                value = '<br/>';
+            }
+            else {
+                value = '<p><br/></p>';
+            }
+        }
+        else {
+            value = serializeValue;
+        }
         if (this.parent.iframeSettings.enable) {
             editHTML.parentElement.style.display = 'none';
             editHTML.style.display = 'none';
@@ -21824,9 +22144,13 @@ var ViewSource = /** @__PURE__ @class */ (function () {
     };
     ViewSource.prototype.getTextAreaValue = function () {
         return (this.contentModule.getEditPanel().innerHTML === '<p><br></p>') ||
+            (this.contentModule.getEditPanel().innerHTML === '<div><br></div>') ||
+            (this.contentModule.getEditPanel().innerHTML === '<br>') ||
             (this.contentModule.getEditPanel().childNodes.length === 1 &&
-                this.contentModule.getEditPanel().childNodes[0].tagName === 'P' &&
-                this.contentModule.getEditPanel().innerHTML.length === 7) ? '' : this.parent.value;
+                (this.contentModule.getEditPanel().childNodes[0].tagName === 'P' &&
+                    this.contentModule.getEditPanel().innerHTML.length === 7) ||
+                (this.contentModule.getEditPanel().childNodes[0].tagName === 'DIV' &&
+                    this.contentModule.getEditPanel().innerHTML.length === 11)) ? '' : this.parent.value;
     };
     /**
      * getPanel method
@@ -21965,6 +22289,7 @@ var Table = /** @__PURE__ @class */ (function () {
                 break;
             case 'Dashed':
             case 'Alternate':
+            case 'Custom':
                 this.tableStyles(args, item.subCommand);
                 break;
             case 'Merge':
@@ -22088,6 +22413,13 @@ var Table = /** @__PURE__ @class */ (function () {
                 table.classList.add(CLS_TB_ALT_BOR);
             /* eslint-enable */
         }
+        if (args.args && args.args.item.cssClass) {
+            var classList = args.args.item.cssClass.split(' ');
+            for (var i = 0; i < classList.length; i++) {
+                (table.classList.contains(classList[i])) ? table.classList.remove(classList[i]) :
+                    table.classList.add(classList[i]);
+            }
+        }
         this.parent.formatter.saveData();
         this.parent.formatter.editorManager.nodeSelection.restore();
     };
@@ -22304,7 +22636,7 @@ var Table = /** @__PURE__ @class */ (function () {
             selectionObj.selection = proxy.parent.formatter.editorManager.nodeSelection.save(range, proxy.contentModule.getDocument());
         }
         var value = {
-            row: row, columns: col, width: {
+            rows: row, columns: col, width: {
                 minWidth: proxy.parent.tableSettings.minWidth,
                 maxWidth: proxy.parent.tableSettings.maxWidth,
                 width: proxy.parent.tableSettings.width
@@ -22503,7 +22835,7 @@ var Table = /** @__PURE__ @class */ (function () {
                 EventHandler.add(this.helper, Browser.touchStartEvent, this.resizeStart, this);
             }
             else {
-                var args = isBlazor() ? { requestType: 'Table' } : { event: e, requestType: 'Table' };
+                var args = { event: e, requestType: 'Table' };
                 this.parent.trigger(resizeStart, args, function (resizeStartArgs) {
                     if (resizeStartArgs.cancel) {
                         _this.cancelResizeAction();
@@ -22580,7 +22912,7 @@ var Table = /** @__PURE__ @class */ (function () {
         var mouseY = (this.parent.enableRtl) ? -(pageY - this.pageY) : (pageY - this.pageY);
         this.pageX = pageX;
         this.pageY = pageY;
-        var args = isBlazor() ? { requestType: 'table' } : { event: e, requestType: 'table' };
+        var args = { event: e, requestType: 'table' };
         this.parent.trigger(onResize, args, function (resizingArgs) {
             if (resizingArgs.cancel) {
                 _this.cancelResizeAction();
@@ -22667,7 +22999,7 @@ var Table = /** @__PURE__ @class */ (function () {
             this.pageY = null;
             this.moveEle = null;
         }
-        var args = isBlazor() ? { requestType: 'table' } : { event: e, requestType: 'table' };
+        var args = { event: e, requestType: 'table' };
         this.parent.trigger(resizeStop, args);
         this.parent.formatter.saveData();
     };
@@ -23772,6 +24104,294 @@ var InlineMode = /** @__PURE__ @class */ (function (_super) {
     return InlineMode;
 }(ChildProperty));
 
+/**
+ * `EnterKey` module is used to handle enter key press actions.
+ */
+var EnterKeyAction = /** @__PURE__ @class */ (function () {
+    function EnterKeyAction(parent) {
+        this.parent = parent;
+        this.addEventListener();
+    }
+    EnterKeyAction.prototype.addEventListener = function () {
+        this.parent.on(enterHandler, this.enterHandler, this);
+        this.parent.on(destroy, this.destroy, this);
+    };
+    EnterKeyAction.prototype.destroy = function () {
+        this.removeEventListener();
+    };
+    EnterKeyAction.prototype.removeEventListener = function () {
+        this.parent.off(enterHandler, this.enterHandler);
+        this.parent.off(destroy, this.destroy);
+    };
+    EnterKeyAction.prototype.getRangeNode = function () {
+        this.range = this.parent.getRange();
+        this.startNode = this.range.startContainer.nodeName === '#text' ? this.range.startContainer.parentElement :
+            this.range.startContainer;
+        this.endNode = this.range.endContainer.nodeName === '#text' ? this.range.endContainer.parentElement :
+            this.range.endContainer;
+    };
+    EnterKeyAction.prototype.enterHandler = function (e) {
+        var _this = this;
+        this.getRangeNode();
+        if (e.args.which === 13 && e.args.code === 'Enter') {
+            if (isNullOrUndefined(this.startNode.closest('LI')) && isNullOrUndefined(this.endNode.closest('LI')) && isNullOrUndefined(this.startNode.closest('TABLE')) &&
+                isNullOrUndefined(this.endNode.closest('TABLE')) && isNullOrUndefined(this.startNode.closest('PRE')) && isNullOrUndefined(this.endNode.closest('PRE'))) {
+                var shiftKey_1 = e.args.shiftKey;
+                var actionBeginArgs = {
+                    cancel: false,
+                    name: actionBegin,
+                    requestType: shiftKey_1 ? 'ShiftEnterAction' : 'EnterAction',
+                    originalEvent: e.args
+                };
+                this.parent.trigger(actionBegin, actionBeginArgs, function (actionBeginArgs) {
+                    if (!actionBeginArgs.cancel) {
+                        if (!(_this.range.startOffset === _this.range.endOffset && _this.range.startContainer === _this.range.endContainer)) {
+                            _this.range.deleteContents();
+                            if (_this.range.startContainer.nodeName === '#text' && _this.range.startContainer.textContent.length === 0 &&
+                                _this.range.startContainer.parentElement !== _this.parent.inputElement) {
+                                if (_this.parent.enterKey === 'BR') {
+                                    _this.range.startContainer.parentElement.innerHTML = '&#8203;';
+                                }
+                                else {
+                                    _this.range.startContainer.parentElement.innerHTML = '<br>';
+                                }
+                            }
+                            else if (_this.range.startContainer === _this.parent.inputElement && _this.range.startContainer.innerHTML === '') {
+                                _this.range.startContainer.innerHTML = '<br>';
+                                var focusElem = _this.range.startContainer.childNodes[_this.range.startOffset];
+                                _this.parent.formatter.editorManager.nodeSelection.setCursorPoint(_this.parent.contentModule.getDocument(), focusElem, 0);
+                            }
+                            else if (_this.parent.inputElement === _this.range.startContainer) {
+                                var focusElem = _this.range.startContainer.childNodes[_this.range.startOffset];
+                                if (focusElem.nodeName === '#text' && focusElem.textContent.length === 0) {
+                                    _this.parent.formatter.editorManager.nodeSelection.setCursorPoint(_this.parent.contentModule.getDocument(), focusElem, focusElem.previousSibling.textContent.length);
+                                }
+                                else {
+                                    _this.parent.formatter.editorManager.nodeSelection.setCursorPoint(_this.parent.contentModule.getDocument(), focusElem, focusElem.textContent.length >= 0 ? 0 : 1);
+                                    if (focusElem.previousSibling.textContent.length === 0) {
+                                        detach(focusElem.previousSibling);
+                                    }
+                                    else if (focusElem.textContent.length === 0) {
+                                        var currentFocusElem = focusElem.previousSibling.lastChild;
+                                        var finalFocusElem = void 0;
+                                        while (currentFocusElem.nodeName !== '#text') {
+                                            finalFocusElem = currentFocusElem;
+                                            currentFocusElem = currentFocusElem.lastChild;
+                                        }
+                                        _this.parent.formatter.editorManager.nodeSelection.setCursorPoint(_this.parent.contentModule.getDocument(), currentFocusElem, currentFocusElem.textContent.length);
+                                        detach(focusElem);
+                                    }
+                                    else if (_this.parent.enterKey !== 'BR' &&
+                                        focusElem.previousSibling.textContent.length !== 0 && focusElem.textContent.length !== 0) {
+                                        e.args.preventDefault();
+                                        return;
+                                    }
+                                }
+                                _this.getRangeNode();
+                            }
+                        }
+                        if (_this.range.startContainer === _this.range.endContainer && _this.range.startOffset === 0 &&
+                            _this.range.startOffset == _this.range.endOffset && _this.range.startContainer === _this.parent.inputElement) {
+                            _this.parent.formatter.editorManager.nodeSelection.setCursorPoint(_this.parent.contentModule.getDocument(), _this.range.startContainer.childNodes[_this.range.startOffset], _this.range.startOffset);
+                            _this.getRangeNode();
+                        }
+                        if (_this.parent.enterKey === 'P' || _this.parent.enterKey === 'DIV' ||
+                            (_this.parent.shiftEnterKey === 'P' && shiftKey_1) ||
+                            (_this.parent.shiftEnterKey === 'DIV' && shiftKey_1)) {
+                            var nearBlockNode = _this.parent.formatter.editorManager.domNode.blockParentNode(_this.startNode);
+                            var isImageNode = false;
+                            if (_this.range.startOffset === 0 && _this.range.endOffset === 0 && !(!isNullOrUndefined(_this.range.startContainer.previousSibling) && _this.range.startContainer.previousSibling.nodeName === 'IMG')) {
+                                var isNearBlockLengthZero = void 0;
+                                var newElem = void 0;
+                                if (_this.range.startContainer.nodeName === 'IMG') {
+                                    newElem = _this.createInsertElement(shiftKey_1);
+                                    isImageNode = true;
+                                    isNearBlockLengthZero = false;
+                                }
+                                else {
+                                    if (nearBlockNode.textContent.length !== 0) {
+                                        newElem = _this.parent.formatter.editorManager.nodeCutter.SplitNode(_this.range, nearBlockNode, false).cloneNode(true);
+                                        isNearBlockLengthZero = false;
+                                    }
+                                    else {
+                                        newElem = _this.parent.formatter.editorManager.nodeCutter.SplitNode(_this.range, nearBlockNode, true).cloneNode(true);
+                                        isNearBlockLengthZero = true;
+                                    }
+                                }
+                                var insertElem = _this.createInsertElement(shiftKey_1);
+                                while (newElem.firstChild) {
+                                    insertElem.appendChild(newElem.firstChild);
+                                }
+                                nearBlockNode.parentElement.insertBefore(insertElem, nearBlockNode);
+                                if (!isNearBlockLengthZero) {
+                                    var currentFocusElem = insertElem;
+                                    var finalFocusElem = void 0;
+                                    while (!isNullOrUndefined(currentFocusElem) && currentFocusElem.nodeName !== '#text') {
+                                        finalFocusElem = currentFocusElem;
+                                        currentFocusElem = currentFocusElem.lastChild;
+                                    }
+                                    finalFocusElem.innerHTML = '<br>';
+                                    if (!isImageNode) {
+                                        detach(nearBlockNode);
+                                    }
+                                }
+                            }
+                            else if (nearBlockNode.textContent.length === 0 && !(!isNullOrUndefined(nearBlockNode.childNodes[0]) && nearBlockNode.childNodes[0].nodeName === 'IMG')) {
+                                if (!isNullOrUndefined(nearBlockNode.children[0]) && nearBlockNode.children[0].tagName !== 'BR') {
+                                    var newElem = _this.parent.formatter.editorManager.nodeCutter.SplitNode(_this.range, nearBlockNode, false).cloneNode(true);
+                                    _this.parent.formatter.editorManager.domNode.insertAfter(newElem, nearBlockNode);
+                                    _this.parent.formatter.editorManager.nodeSelection.setCursorPoint(_this.parent.contentModule.getDocument(), newElem, newElem.textContent.length >= 0 ? 0 : 1);
+                                }
+                                else {
+                                    var insertElem = _this.createInsertElement(shiftKey_1);
+                                    insertElem.innerHTML = '<br>';
+                                    _this.parent.formatter.editorManager.domNode.insertAfter(insertElem, nearBlockNode);
+                                    _this.parent.formatter.editorManager.nodeSelection.setCursorPoint(_this.parent.contentModule.getDocument(), insertElem, 0);
+                                }
+                            }
+                            else {
+                                var newElem = _this.parent.formatter.editorManager.nodeCutter.SplitNode(_this.range, nearBlockNode, true);
+                                if (!isNullOrUndefined(newElem.childNodes[0]) && newElem.childNodes[0].nodeName === '#text' &&
+                                    newElem.childNodes[0].textContent.length === 0) {
+                                    detach(newElem.childNodes[0]);
+                                }
+                                if (newElem.textContent.trim().length === 0) {
+                                    var brElm = _this.parent.createElement('br');
+                                    _this.startNode.appendChild(brElm);
+                                    _this.parent.formatter.editorManager.nodeSelection.setCursorPoint(_this.parent.contentModule.getDocument(), _this.startNode, 0);
+                                }
+                                if (((_this.parent.enterKey === 'P' || _this.parent.enterKey === 'DIV') && !shiftKey_1) || ((_this.parent.shiftEnterKey === 'DIV' ||
+                                    _this.parent.shiftEnterKey === 'P') && shiftKey_1)) {
+                                    var insertElm = _this.createInsertElement(shiftKey_1);
+                                    while (newElem.firstChild) {
+                                        insertElm.appendChild(newElem.firstChild);
+                                    }
+                                    _this.parent.formatter.editorManager.domNode.insertAfter(insertElm, newElem);
+                                    detach(newElem);
+                                    _this.parent.formatter.editorManager.nodeSelection.setCursorPoint(_this.parent.contentModule.getDocument(), insertElm, insertElm.textContent.length >= 0 ? 0 : 1);
+                                }
+                            }
+                            e.args.preventDefault();
+                        }
+                        if (_this.parent.enterKey === 'BR' && !shiftKey_1) {
+                            var currentParent = void 0;
+                            if (!_this.parent.formatter.editorManager.domNode.isBlockNode(_this.startNode)) {
+                                var currentNode = _this.startNode;
+                                var previousNode = currentNode;
+                                while (!_this.parent.formatter.editorManager.domNode.isBlockNode(currentNode)) {
+                                    previousNode = currentNode;
+                                    currentNode = currentNode.parentElement;
+                                }
+                                currentParent = currentNode === _this.parent.inputElement ?
+                                    previousNode : currentNode;
+                            }
+                            else {
+                                currentParent = _this.startNode;
+                            }
+                            var isEmptyBrInserted = false;
+                            if (currentParent !== _this.parent.inputElement &&
+                                _this.parent.formatter.editorManager.domNode.isBlockNode(currentParent) &&
+                                _this.range.startOffset === _this.range.endOffset &&
+                                _this.range.startOffset === currentParent.textContent.length) {
+                                var outerBRElem = _this.parent.createElement('br');
+                                _this.parent.formatter.editorManager.domNode.insertAfter(outerBRElem, currentParent);
+                                _this.parent.formatter.editorManager.nodeSelection.setCursorPoint(_this.parent.contentModule.getDocument(), outerBRElem, 0);
+                            }
+                            else if (!isNullOrUndefined(currentParent) && currentParent !== _this.parent.inputElement && currentParent.nodeName !== 'BR') {
+                                if (currentParent.textContent.trim().length === 0 || (currentParent.textContent.trim().length === 1 &&
+                                    currentParent.textContent.charCodeAt(0) === 8203)) {
+                                    var newElem = _this.parent.formatter.editorManager.nodeCutter.SplitNode(_this.range, currentParent, true).cloneNode(true);
+                                    _this.parent.formatter.editorManager.domNode.insertAfter(newElem, currentParent);
+                                    var outerBRElem = _this.parent.createElement('br');
+                                    newElem.parentElement.insertBefore(outerBRElem, newElem);
+                                    _this.parent.formatter.editorManager.nodeSelection.setCursorPoint(_this.parent.contentModule.getDocument(), newElem, 0);
+                                }
+                                else {
+                                    var newElem = void 0;
+                                    var focusElem = void 0;
+                                    var outerBRElem = _this.parent.createElement('br');
+                                    if (_this.range.startOffset === 0 && _this.range.endOffset === 0 &&
+                                        !isNullOrUndefined(currentParent.previousSibling) && currentParent.previousSibling.nodeName === 'BR') {
+                                        focusElem = _this.range.startContainer;
+                                        newElem = _this.parent.formatter.editorManager.nodeCutter.SplitNode(_this.range, currentParent, false).cloneNode(true);
+                                        _this.parent.formatter.editorManager.domNode.insertAfter(outerBRElem, currentParent);
+                                        _this.insertFocusContent();
+                                        var currentFocusElem = outerBRElem.nextSibling;
+                                        var finalFocusElem = void 0;
+                                        while (!isNullOrUndefined(currentFocusElem) && currentFocusElem.nodeName !== '#text') {
+                                            finalFocusElem = currentFocusElem;
+                                            currentFocusElem = currentFocusElem.lastChild;
+                                        }
+                                        _this.parent.formatter.editorManager.nodeSelection.setCursorPoint(_this.parent.contentModule.getDocument(), currentFocusElem, 0);
+                                        isEmptyBrInserted = true;
+                                    }
+                                    else {
+                                        newElem = _this.parent.formatter.editorManager.nodeCutter.SplitNode(_this.range, currentParent, true);
+                                        newElem.parentElement.insertBefore(outerBRElem, newElem);
+                                        _this.insertFocusContent();
+                                    }
+                                }
+                            }
+                            else {
+                                var brElm = _this.parent.createElement('br');
+                                if (_this.startNode.nodeName === 'BR' && _this.endNode.nodeName === 'BR' && _this.range.startOffset === 0 && _this.range.startOffset === _this.range.endOffset) {
+                                    _this.parent.formatter.editorManager.domNode.insertAfter(brElm, _this.startNode);
+                                    isEmptyBrInserted = true;
+                                }
+                                else {
+                                    if (_this.startNode === _this.parent.inputElement && !isNullOrUndefined(_this.range.startContainer.previousSibling) &&
+                                        _this.range.startContainer.previousSibling.nodeName === 'BR' && _this.range.startContainer.textContent.length === 0) {
+                                        isEmptyBrInserted = true;
+                                    }
+                                    _this.range.insertNode(brElm);
+                                }
+                                if (isEmptyBrInserted || (!isNullOrUndefined(brElm.nextElementSibling) && brElm.nextElementSibling.tagName === 'BR') || (!isNullOrUndefined(brElm.nextSibling) && brElm.nextSibling.textContent.length > 0)) {
+                                    _this.parent.formatter.editorManager.nodeSelection.setCursorPoint(_this.parent.contentModule.getDocument(), !isNullOrUndefined(brElm.nextSibling) ? brElm.nextSibling : brElm, 0);
+                                    isEmptyBrInserted = false;
+                                }
+                                else {
+                                    var brElm2 = _this.parent.createElement('br');
+                                    _this.range.insertNode(brElm2);
+                                    _this.parent.formatter.editorManager.nodeSelection.setCursorPoint(_this.parent.contentModule.getDocument(), brElm, 0);
+                                }
+                            }
+                            e.args.preventDefault();
+                        }
+                        if (_this.range.startContainer.nodeName === '#text') {
+                            _this.range.startContainer.parentElement.scrollIntoView(false);
+                        }
+                        else {
+                            _this.range.startContainer.scrollIntoView(false);
+                        }
+                        _this.parent.trigger(actionComplete, { requestType: shiftKey_1 ? 'ShiftEnterAction' : 'EnterAction', args: e.args });
+                    }
+                });
+            }
+        }
+    };
+    EnterKeyAction.prototype.insertFocusContent = function () {
+        if (this.range.startContainer.textContent.length === 0) {
+            if (this.range.startContainer.nodeName === '#text') {
+                this.range.startContainer.parentElement.innerHTML = '&#8203;';
+            }
+            else {
+                this.range.startContainer.innerHTML = '&#8203;';
+            }
+        }
+    };
+    EnterKeyAction.prototype.createInsertElement = function (shiftKey) {
+        var insertElem;
+        if ((this.parent.enterKey === 'DIV' && !shiftKey) || (this.parent.shiftEnterKey === 'DIV' && shiftKey)) {
+            insertElem = this.parent.createElement('div');
+        }
+        else if ((this.parent.enterKey === 'P' && !shiftKey) || (this.parent.shiftEnterKey === 'P' && shiftKey)) {
+            insertElem = this.parent.createElement('p');
+        }
+        return insertElem;
+    };
+    return EnterKeyAction;
+}());
+
 var __extends$4 = (undefined && undefined.__extends) || (function () {
     var extendStatics = function (d, b) {
         extendStatics = Object.setPrototypeOf ||
@@ -23953,9 +24573,7 @@ var RichTextEditor = /** @__PURE__ @class */ (function (_super) {
             this.htmlAttributes = { 'tabindex': this.element.getAttribute('tabindex') };
             this.element.removeAttribute('tabindex');
         }
-        if (!this.isBlazor()) {
-            this.element.innerHTML = '';
-        }
+        this.element.innerHTML = '';
         var invalidAttr = ['class', 'style', 'id', 'ejs-for'];
         var htmlAttr = {};
         for (var a = 0; a < this.element.attributes.length; a++) {
@@ -23973,23 +24591,10 @@ var RichTextEditor = /** @__PURE__ @class */ (function (_super) {
             var rteOuterWrapper = this.createElement('div', {
                 className: this.element.getAttribute('class')
             });
-            if (!this.isBlazor()) {
-                this.element.innerHTML = '';
-            }
+            this.element.innerHTML = '';
             this.element.parentElement.insertBefore(rteOuterWrapper, this.element);
-            if (isBlazor()) {
-                rteOuterWrapper.appendChild(this.element);
-                this.valueContainer = this.createElement('textarea', {
-                    id: this.element.id + '-value'
-                });
-            }
-            else {
-                this.valueContainer = this.element;
-            }
+            this.valueContainer = this.element;
             removeClass([this.valueContainer], this.element.getAttribute('class').split(' '));
-            if (this.isBlazor()) {
-                addClass([this.element], CLS_RTE_HIDDEN);
-            }
             this.element = rteOuterWrapper;
         }
         else {
@@ -24206,12 +24811,7 @@ var RichTextEditor = /** @__PURE__ @class */ (function (_super) {
         }
         this.setContentHeight();
         if (this.value !== null) {
-            if (!this.isBlazor()) {
-                this.valueContainer.defaultValue = this.value;
-            }
-            else {
-                this.defaultResetValue = this.value;
-            }
+            this.valueContainer.defaultValue = this.value;
         }
         // eslint-disable-next-line
         (!this.enabled) ? this.unWireEvents() : this.eventInitializer();
@@ -24314,7 +24914,7 @@ var RichTextEditor = /** @__PURE__ @class */ (function (_super) {
         this.notify(keyUp, { member: 'keyup', args: e });
         if (e.code === 'KeyX' && e.which === 88 && e.keyCode === 88 && e.ctrlKey && (this.inputElement.innerHTML === '' ||
             this.inputElement.innerHTML === '<br>')) {
-            this.inputElement.innerHTML = getEditValue('<p><br></p>', this);
+            this.inputElement.innerHTML = getEditValue(getDefaultValue(this), this);
         }
         var allowedKeys = e.which === 32 || e.which === 13 || e.which === 8 || e.which === 46;
         if (((e.key !== 'shift' && !e.ctrlKey) && e.key && e.key.length === 1 || allowedKeys) || (this.editorMode === 'Markdown'
@@ -24326,7 +24926,10 @@ var RichTextEditor = /** @__PURE__ @class */ (function (_super) {
             this.notify(toolbarRefresh, { args: e });
         }
         if (!isNullOrUndefined(this.placeholder)) {
-            this.setPlaceHolder();
+            if (!(e.key === 'Enter' && e.keyCode === 13) && (this.inputElement.innerHTML === '<p><br></p>' || this.inputElement.innerHTML === '<div><br></div>' ||
+                this.inputElement.innerHTML === '<br>')) {
+                this.setPlaceHolder();
+            }
         }
     };
     /**
@@ -24555,22 +25158,16 @@ var RichTextEditor = /** @__PURE__ @class */ (function (_super) {
         }
         this.unWireEvents();
         if (this.originalElement.tagName === 'TEXTAREA') {
-            if (isBlazor()) {
-                detach(this.valueContainer);
-                this.valueContainer = this.element.querySelector('.e-blazor-hidden.e-control.e-richtexteditor');
-            }
             this.element.parentElement.insertBefore(this.valueContainer, this.element);
             this.valueContainer.id = this.getID();
             this.valueContainer.removeAttribute('name');
             detach(this.element);
             if (this.originalElement.innerHTML.trim() !== '') {
-                if (!isBlazor()) {
-                    this.valueContainer.value = this.originalElement.innerHTML.trim();
-                    this.setProperties({ value: (!isNullOrUndefined(this.initialValue) ? this.initialValue : null) }, true);
-                }
+                this.valueContainer.value = this.originalElement.innerHTML.trim();
+                this.setProperties({ value: (!isNullOrUndefined(this.initialValue) ? this.initialValue : null) }, true);
             }
             else {
-                this.valueContainer.value = !this.isBlazor() ? this.valueContainer.defaultValue : this.defaultResetValue;
+                this.valueContainer.value = this.valueContainer.defaultValue;
             }
             this.element = this.valueContainer;
             for (var i = 0; i < this.originalElement.classList.length; i++) {
@@ -24646,12 +25243,7 @@ var RichTextEditor = /** @__PURE__ @class */ (function (_super) {
      * @returns {Element} - specifies the element.
      */
     RichTextEditor.prototype.getContent = function () {
-        if (this.iframeSettings.enable && isBlazor()) {
-            return this.inputElement;
-        }
-        else {
-            return this.contentModule.getPanel();
-        }
+        return this.contentModule.getPanel();
     };
     /**
      * Returns the text content as string.
@@ -24723,10 +25315,23 @@ var RichTextEditor = /** @__PURE__ @class */ (function (_super) {
         for (var _i = 0, _a = Object.keys(newProp); _i < _a.length; _i++) {
             var prop = _a[_i];
             switch (prop) {
+                case 'enterKey':
                 case 'value': {
-                    var nVal = newProp[prop];
+                    var nVal = void 0;
+                    if (prop === 'enterKey') {
+                        if (this.value === null || this.value === '<div><br></div>' || this.value === '<p><br></p>' ||
+                            this.value === '<br>') {
+                            nVal = null;
+                        }
+                        else {
+                            nVal = this.value;
+                        }
+                    }
+                    else {
+                        nVal = newProp[prop];
+                    }
                     var val = this.editorMode === 'HTML' ? getEditValue(nVal, this) : nVal;
-                    if (!isNullOrUndefined(nVal) && nVal !== '') {
+                    if ((!isNullOrUndefined(nVal) && nVal !== '') || prop === 'enterKey') {
                         this.value = this.serializeValue(((this.enableHtmlEncode) ? this.encode(decode(val)) : val));
                     }
                     this.updatePanelValue();
@@ -24892,7 +25497,18 @@ var RichTextEditor = /** @__PURE__ @class */ (function (_super) {
                 getTextArea.value = '';
             }
             if (this.editorMode === 'HTML') {
-                this.inputElement.innerHTML = '<p><br/></p>';
+                if (this.enterKey === 'DIV') {
+                    this.inputElement.innerHTML = '<div><br/></div>';
+                }
+                else if (this.enterKey === 'BR') {
+                    this.inputElement.innerHTML = '<br/>';
+                }
+                else {
+                    this.inputElement.innerHTML = '<p><br/></p>';
+                    if (value === '' && this.formatter && this.inputElement) {
+                        this.formatter.editorManager.nodeSelection.setCursorPoint(this.contentModule.getDocument(), this.inputElement.firstElementChild, this.inputElement.firstElementChild.childElementCount);
+                    }
+                }
             }
             else {
                 this.inputElement.value = '';
@@ -24940,10 +25556,9 @@ var RichTextEditor = /** @__PURE__ @class */ (function (_super) {
                     });
                 }
                 this.placeHolderWrapper.innerHTML = this.placeholder;
-                if (this.inputElement.textContent.length === 0 &&
-                    !isNullOrUndefined(this.inputElement.firstChild) && this.inputElement.firstChild.nodeName === 'P' &&
-                    !isNullOrUndefined(this.inputElement.firstChild.firstChild) && this.inputElement.firstChild.firstChild.nodeName === 'BR' &&
-                    this.inputElement.innerHTML !== '<p><br></p><p><br></p>') {
+                if (this.inputElement.textContent.length === 0 && !isNullOrUndefined(this.inputElement.firstChild) && (this.inputElement.firstChild.nodeName === 'BR' ||
+                    ((this.inputElement.firstChild.nodeName === 'P' || this.inputElement.firstChild.nodeName === 'DIV') && !isNullOrUndefined(this.inputElement.firstChild.firstChild) &&
+                        this.inputElement.firstChild.firstChild.nodeName === 'BR'))) {
                     this.placeHolderWrapper.style.display = 'block';
                 }
                 else {
@@ -25105,6 +25720,7 @@ var RichTextEditor = /** @__PURE__ @class */ (function (_super) {
         var rendererFactory = this.serviceLocator.getService('rendererFactory');
         this.contentModule = rendererFactory.getRenderer(RenderType.Content);
         this.fullScreenModule = new FullScreen(this);
+        this.enterKeyModule = new EnterKeyAction(this);
         this.renderModule.render();
         this.inputElement = this.contentModule.getEditPanel();
         this.setHeight(this.height);
@@ -25174,9 +25790,6 @@ var RichTextEditor = /** @__PURE__ @class */ (function (_super) {
         styleEle.rel = 'stylesheet';
         return styleEle;
     };
-    RichTextEditor.prototype.isBlazor = function () {
-        return (!isBlazor() ? false : true);
-    };
     RichTextEditor.prototype.setValue = function () {
         if (this.valueTemplate) {
             if (typeof this.valueTemplate === 'string') {
@@ -25483,7 +26096,8 @@ var RichTextEditor = /** @__PURE__ @class */ (function (_super) {
             this.isFocusOut = false;
             addClass([this.element], [CLS_FOCUS]);
             if (this.editorMode === 'HTML') {
-                this.cloneValue = (this.inputElement.innerHTML === '<p><br></p>') ? null : this.enableHtmlEncode ?
+                this.cloneValue = (this.inputElement.innerHTML === '<p><br></p>' || this.inputElement.innerHTML === '<div><br></div>' ||
+                    this.inputElement.innerHTML === '<br>') ? null : this.enableHtmlEncode ?
                     this.encode(decode(this.inputElement.innerHTML)) : this.inputElement.innerHTML;
             }
             else {
@@ -25532,7 +26146,8 @@ var RichTextEditor = /** @__PURE__ @class */ (function (_super) {
         }
         var getTextArea = this.element.querySelector('.e-rte-srctextarea');
         if (this.editorMode === 'HTML') {
-            value = (this.inputElement.innerHTML === '<p><br></p>') ? null : this.enableHtmlEncode ?
+            value = (this.inputElement.innerHTML === '<p><br></p>' || this.inputElement.innerHTML === '<div><br></div>' ||
+                this.inputElement.innerHTML === '<br>') ? null : this.enableHtmlEncode ?
                 this.encode(decode(this.inputElement.innerHTML)) : this.inputElement.innerHTML;
             if (getTextArea && getTextArea.style.display === 'block') {
                 value = getTextArea.value;
@@ -25716,7 +26331,7 @@ var RichTextEditor = /** @__PURE__ @class */ (function (_super) {
     };
     RichTextEditor.prototype.resetHandler = function () {
         var defaultValue = this.valueContainer.defaultValue.trim();
-        this.setProperties({ value: defaultValue === '' ? null : (this.isBlazor() ? this.defaultResetValue : defaultValue) });
+        this.setProperties({ value: defaultValue === '' ? null : defaultValue });
     };
     /**
      * @returns {void}
@@ -25932,6 +26547,12 @@ var RichTextEditor = /** @__PURE__ @class */ (function (_super) {
     __decorate$1([
         Property(null)
     ], RichTextEditor.prototype, "value", void 0);
+    __decorate$1([
+        Property('P')
+    ], RichTextEditor.prototype, "enterKey", void 0);
+    __decorate$1([
+        Property('BR')
+    ], RichTextEditor.prototype, "shiftEnterKey", void 0);
     __decorate$1([
         Property(30)
     ], RichTextEditor.prototype, "undoRedoSteps", void 0);
@@ -26129,5 +26750,5 @@ var RichTextEditor = /** @__PURE__ @class */ (function (_super) {
  * Rich Text Editor component exported items
  */
 
-export { Toolbar$2 as Toolbar, KeyboardEvents$1 as KeyboardEvents, BaseToolbar, BaseQuickToolbar, QuickToolbar, Count, ColorPickerInput, MarkdownToolbarStatus, ExecCommandCallBack, ToolbarAction, MarkdownEditor, HtmlEditor, PasteCleanup, Resize, DropDownButtons, FileManager$1 as FileManager, FullScreen, setAttributes, HtmlToolbarStatus, XhtmlValidation, HTMLFormatter, Formatter, MarkdownFormatter, ContentRender, Render, ToolbarRenderer, Link, Image, ViewSource, Table, DialogRenderer, IframeContentRender, MarkdownRender, PopupRenderer, RichTextEditor, RenderType, ToolbarType, DialogType, executeGroup, created, destroyed, load, initialLoad, contentChanged, initialEnd, iframeMouseDown, destroy, toolbarClick, toolbarRefresh, refreshBegin, toolbarUpdated, bindOnEnd, renderColorPicker, htmlToolbarClick, markdownToolbarClick, destroyColorPicker, modelChanged, keyUp, keyDown, mouseUp, toolbarCreated, toolbarRenderComplete, enableFullScreen, disableFullScreen, dropDownSelect, beforeDropDownItemRender, execCommandCallBack, imageToolbarAction, linkToolbarAction, windowResize, resizeStart, onResize, resizeStop, undo, redo, insertLink, unLink, editLink, openLink, actionBegin, actionComplete, updatedToolbarStatus, actionSuccess, updateToolbarItem, insertImage, insertCompleted, imageLeft, imageRight, imageCenter, imageBreak, imageInline, imageLink, imageAlt, imageDelete, imageCaption, imageSize, sourceCode, updateSource, toolbarOpen, beforeDropDownOpen, selectionSave, selectionRestore, expandPopupClick, count, contentFocus, contentBlur, mouseDown, sourceCodeMouseDown, editAreaClick, scroll, contentscroll, colorPickerChanged, tableColorPickerChanged, focusChange, selectAll$1 as selectAll, selectRange, getSelectedHtml, renderInlineToolbar, paste, imgModule, rtlMode, createTable, docClick, tableToolbarAction, checkUndo, readOnlyMode, pasteClean, beforeDialogOpen, clearDialogObj, dialogOpen, beforeDialogClose, dialogClose, beforeQuickToolbarOpen, quickToolbarOpen, quickToolbarClose, popupHide, imageSelected, imageUploading, imageUploadSuccess, imageUploadFailed, imageRemoving, afterImageDelete, drop, xhtmlValidation, beforeImageUpload, resizeInitialized, renderFileManager, beforeImageDrop, dynamicModule, beforePasteCleanup, afterPasteCleanup, updateTbItemsStatus, showLinkDialog, closeLinkDialog, showImageDialog, closeImageDialog, showTableDialog, closeTableDialog, CLS_RTE, CLS_RTL, CLS_CONTENT, CLS_DISABLED, CLS_SCRIPT_SHEET, CLS_STYLE_SHEET, CLS_TOOLBAR, CLS_TB_FIXED, CLS_TB_FLOAT, CLS_TB_ABS_FLOAT, CLS_INLINE, CLS_TB_INLINE, CLS_RTE_EXPAND_TB, CLS_FULL_SCREEN, CLS_QUICK_TB, CLS_POP, CLS_TB_STATIC, CLS_QUICK_POP, CLS_QUICK_DROPDOWN, CLS_IMAGE_POP, CLS_INLINE_POP, CLS_INLINE_DROPDOWN, CLS_DROPDOWN_POPUP, CLS_DROPDOWN_ICONS, CLS_DROPDOWN_ITEMS, CLS_DROPDOWN_BTN, CLS_RTE_CONTENT, CLS_TB_ITEM, CLS_TB_EXTENDED, CLS_TB_WRAP, CLS_POPUP, CLS_SEPARATOR, CLS_MINIMIZE, CLS_MAXIMIZE, CLS_BACK, CLS_SHOW, CLS_HIDE, CLS_VISIBLE, CLS_FOCUS, CLS_RM_WHITE_SPACE, CLS_IMGRIGHT, CLS_IMGLEFT, CLS_IMGCENTER, CLS_IMGBREAK, CLS_CAPTION, CLS_RTE_CAPTION, CLS_CAPINLINE, CLS_IMGINLINE, CLS_COUNT, CLS_WARNING, CLS_ERROR, CLS_ICONS, CLS_ACTIVE, CLS_EXPAND_OPEN, CLS_RTE_ELEMENTS, CLS_TB_BTN, CLS_HR_SEPARATOR, CLS_TB_IOS_FIX, CLS_LIST_PRIMARY_CONTENT, CLS_NUMBERFORMATLIST_TB_BTN, CLS_BULLETFORMATLIST_TB_BTN, CLS_FORMATS_TB_BTN, CLS_FONT_NAME_TB_BTN, CLS_FONT_SIZE_TB_BTN, CLS_FONT_COLOR_TARGET, CLS_BACKGROUND_COLOR_TARGET, CLS_COLOR_CONTENT, CLS_FONT_COLOR_DROPDOWN, CLS_BACKGROUND_COLOR_DROPDOWN, CLS_COLOR_PALETTE, CLS_FONT_COLOR_PICKER, CLS_BACKGROUND_COLOR_PICKER, CLS_RTE_READONLY, CLS_TABLE_SEL, CLS_TB_DASH_BOR, CLS_TB_ALT_BOR, CLS_TB_COL_RES, CLS_TB_ROW_RES, CLS_TB_BOX_RES, CLS_RTE_HIDDEN, CLS_RTE_PASTE_KEEP_FORMAT, CLS_RTE_PASTE_REMOVE_FORMAT, CLS_RTE_PASTE_PLAIN_FORMAT, CLS_RTE_PASTE_OK, CLS_RTE_PASTE_CANCEL, CLS_RTE_DIALOG_MIN_HEIGHT, CLS_RTE_RES_HANDLE, CLS_RTE_RES_EAST, CLS_RTE_IMAGE, CLS_RESIZE, CLS_IMG_FOCUS, CLS_RTE_DRAG_IMAGE, CLS_RTE_UPLOAD_POPUP, CLS_POPUP_OPEN, CLS_IMG_RESIZE, CLS_DROPAREA, CLS_IMG_INNER, CLS_UPLOAD_FILES, CLS_RTE_DIALOG_UPLOAD, CLS_RTE_RES_CNT, CLS_CUSTOM_TILE, CLS_NOCOLOR_ITEM, CLS_TABLE, CLS_TABLE_BORDER, CLS_RTE_TABLE_RESIZE, CLS_RTE_FIXED_TB_EXPAND, CLS_RTE_TB_ENABLED, getIndex, hasClass, getDropDownValue, isIDevice, getFormattedFontSize, pageYOffset, getTooltipText, setToolbarStatus, getCollection, getTBarItemsIndex, updateUndoRedoStatus, dispatchEvent, parseHtml, getTextNodesUnder, toObjectLowerCase, getEditValue, updateTextNode, isEditableValueEmpty, decode, sanitizeHelper, convertToBlob, getLocaleFontFormat, updateDropDownFontFormatLocale, ServiceLocator, RendererFactory, EditorManager, IMAGE, TABLE, LINK, INSERT_ROW, INSERT_COLUMN, DELETEROW, DELETECOLUMN, REMOVETABLE, TABLEHEADER, TABLE_VERTICAL_ALIGN, TABLE_MERGE, TABLE_VERTICAL_SPLIT, TABLE_HORIZONTAL_SPLIT, TABLE_MOVE, ALIGNMENT_TYPE, INDENT_TYPE, DEFAULT_TAG, BLOCK_TAGS, IGNORE_BLOCK_TAGS, TABLE_BLOCK_TAGS, SELECTION_TYPE, INSERTHTML_TYPE, INSERT_TEXT_TYPE, CLEAR_TYPE, CLASS_IMAGE_RIGHT, CLASS_IMAGE_LEFT, CLASS_IMAGE_CENTER, CLASS_IMAGE_BREAK, CLASS_CAPTION, CLASS_RTE_CAPTION, CLASS_CAPTION_INLINE, CLASS_IMAGE_INLINE, Lists, markerClassName, DOMNode, Alignments, Indents, Formats, LinkCommand, InsertMethods, InsertTextExec, InsertHtmlExec, InsertHtml, IsFormatted, MsWordPaste, NodeCutter, ImageCommand, SelectionCommands, SelectionBasedExec, ClearFormatExec, UndoRedoManager, TableCommand, statusCollection, ToolbarStatus, NodeSelection, MarkdownParser, LISTS_COMMAND, selectionCommand, LINK_COMMAND, CLEAR_COMMAND, MD_TABLE, ClearFormat, MDLists, MDFormats, MarkdownSelection, UndoRedoCommands, MDSelectionFormats, MDLink, MDTable, markdownFormatTags, markdownSelectionTags, markdownListsTags, htmlKeyConfig, markdownKeyConfig, pasteCleanupGroupingTags, listConversionFilters, selfClosingTags, KEY_DOWN, ACTION, FORMAT_TYPE, KEY_DOWN_HANDLER, LIST_TYPE, KEY_UP_HANDLER, KEY_UP, MODEL_CHANGED_PLUGIN, MODEL_CHANGED, MS_WORD_CLEANUP_PLUGIN, MS_WORD_CLEANUP, ON_BEGIN, SPACE_ACTION };
+export { Toolbar$2 as Toolbar, KeyboardEvents$1 as KeyboardEvents, BaseToolbar, BaseQuickToolbar, QuickToolbar, Count, ColorPickerInput, MarkdownToolbarStatus, ExecCommandCallBack, ToolbarAction, MarkdownEditor, HtmlEditor, PasteCleanup, Resize, DropDownButtons, FileManager$1 as FileManager, FullScreen, setAttributes, HtmlToolbarStatus, XhtmlValidation, HTMLFormatter, Formatter, MarkdownFormatter, ContentRender, Render, ToolbarRenderer, Link, Image, ViewSource, Table, DialogRenderer, IframeContentRender, MarkdownRender, PopupRenderer, RichTextEditor, RenderType, ToolbarType, DialogType, executeGroup, created, destroyed, load, initialLoad, contentChanged, initialEnd, iframeMouseDown, destroy, toolbarClick, toolbarRefresh, refreshBegin, toolbarUpdated, bindOnEnd, renderColorPicker, htmlToolbarClick, markdownToolbarClick, destroyColorPicker, modelChanged, keyUp, keyDown, mouseUp, toolbarCreated, toolbarRenderComplete, enableFullScreen, disableFullScreen, dropDownSelect, beforeDropDownItemRender, execCommandCallBack, imageToolbarAction, linkToolbarAction, windowResize, resizeStart, onResize, resizeStop, undo, redo, insertLink, unLink, editLink, openLink, actionBegin, actionComplete, updatedToolbarStatus, actionSuccess, updateToolbarItem, insertImage, insertCompleted, imageLeft, imageRight, imageCenter, imageBreak, imageInline, imageLink, imageAlt, imageDelete, imageCaption, imageSize, sourceCode, updateSource, toolbarOpen, beforeDropDownOpen, selectionSave, selectionRestore, expandPopupClick, count, contentFocus, contentBlur, mouseDown, sourceCodeMouseDown, editAreaClick, scroll, contentscroll, colorPickerChanged, tableColorPickerChanged, focusChange, selectAll$1 as selectAll, selectRange, getSelectedHtml, renderInlineToolbar, paste, imgModule, rtlMode, createTable, docClick, tableToolbarAction, checkUndo, readOnlyMode, pasteClean, enterHandler, beforeDialogOpen, clearDialogObj, dialogOpen, beforeDialogClose, dialogClose, beforeQuickToolbarOpen, quickToolbarOpen, quickToolbarClose, popupHide, imageSelected, imageUploading, imageUploadSuccess, imageUploadFailed, imageRemoving, afterImageDelete, drop, xhtmlValidation, beforeImageUpload, resizeInitialized, renderFileManager, beforeImageDrop, dynamicModule, beforePasteCleanup, afterPasteCleanup, updateTbItemsStatus, showLinkDialog, closeLinkDialog, showImageDialog, closeImageDialog, showTableDialog, closeTableDialog, CLS_RTE, CLS_RTL, CLS_CONTENT, CLS_DISABLED, CLS_SCRIPT_SHEET, CLS_STYLE_SHEET, CLS_TOOLBAR, CLS_TB_FIXED, CLS_TB_FLOAT, CLS_TB_ABS_FLOAT, CLS_INLINE, CLS_TB_INLINE, CLS_RTE_EXPAND_TB, CLS_FULL_SCREEN, CLS_QUICK_TB, CLS_POP, CLS_TB_STATIC, CLS_QUICK_POP, CLS_QUICK_DROPDOWN, CLS_IMAGE_POP, CLS_INLINE_POP, CLS_INLINE_DROPDOWN, CLS_DROPDOWN_POPUP, CLS_DROPDOWN_ICONS, CLS_DROPDOWN_ITEMS, CLS_DROPDOWN_BTN, CLS_RTE_CONTENT, CLS_TB_ITEM, CLS_TB_EXTENDED, CLS_TB_WRAP, CLS_POPUP, CLS_SEPARATOR, CLS_MINIMIZE, CLS_MAXIMIZE, CLS_BACK, CLS_SHOW, CLS_HIDE, CLS_VISIBLE, CLS_FOCUS, CLS_RM_WHITE_SPACE, CLS_IMGRIGHT, CLS_IMGLEFT, CLS_IMGCENTER, CLS_IMGBREAK, CLS_CAPTION, CLS_RTE_CAPTION, CLS_CAPINLINE, CLS_IMGINLINE, CLS_COUNT, CLS_WARNING, CLS_ERROR, CLS_ICONS, CLS_ACTIVE, CLS_EXPAND_OPEN, CLS_RTE_ELEMENTS, CLS_TB_BTN, CLS_HR_SEPARATOR, CLS_TB_IOS_FIX, CLS_LIST_PRIMARY_CONTENT, CLS_NUMBERFORMATLIST_TB_BTN, CLS_BULLETFORMATLIST_TB_BTN, CLS_FORMATS_TB_BTN, CLS_FONT_NAME_TB_BTN, CLS_FONT_SIZE_TB_BTN, CLS_FONT_COLOR_TARGET, CLS_BACKGROUND_COLOR_TARGET, CLS_COLOR_CONTENT, CLS_FONT_COLOR_DROPDOWN, CLS_BACKGROUND_COLOR_DROPDOWN, CLS_COLOR_PALETTE, CLS_FONT_COLOR_PICKER, CLS_BACKGROUND_COLOR_PICKER, CLS_RTE_READONLY, CLS_TABLE_SEL, CLS_TB_DASH_BOR, CLS_TB_ALT_BOR, CLS_TB_COL_RES, CLS_TB_ROW_RES, CLS_TB_BOX_RES, CLS_RTE_HIDDEN, CLS_RTE_PASTE_KEEP_FORMAT, CLS_RTE_PASTE_REMOVE_FORMAT, CLS_RTE_PASTE_PLAIN_FORMAT, CLS_RTE_PASTE_OK, CLS_RTE_PASTE_CANCEL, CLS_RTE_DIALOG_MIN_HEIGHT, CLS_RTE_RES_HANDLE, CLS_RTE_RES_EAST, CLS_RTE_IMAGE, CLS_RESIZE, CLS_IMG_FOCUS, CLS_RTE_DRAG_IMAGE, CLS_RTE_UPLOAD_POPUP, CLS_POPUP_OPEN, CLS_IMG_RESIZE, CLS_DROPAREA, CLS_IMG_INNER, CLS_UPLOAD_FILES, CLS_RTE_DIALOG_UPLOAD, CLS_RTE_RES_CNT, CLS_CUSTOM_TILE, CLS_NOCOLOR_ITEM, CLS_TABLE, CLS_TABLE_BORDER, CLS_RTE_TABLE_RESIZE, CLS_RTE_FIXED_TB_EXPAND, CLS_RTE_TB_ENABLED, getIndex, hasClass, getDropDownValue, isIDevice, getFormattedFontSize, pageYOffset, getTooltipText, setToolbarStatus, getCollection, getTBarItemsIndex, updateUndoRedoStatus, dispatchEvent, parseHtml, getTextNodesUnder, toObjectLowerCase, getEditValue, updateTextNode, getDefaultValue, isEditableValueEmpty, decode, sanitizeHelper, convertToBlob, getLocaleFontFormat, updateDropDownFontFormatLocale, ServiceLocator, RendererFactory, EditorManager, IMAGE, TABLE, LINK, INSERT_ROW, INSERT_COLUMN, DELETEROW, DELETECOLUMN, REMOVETABLE, TABLEHEADER, TABLE_VERTICAL_ALIGN, TABLE_MERGE, TABLE_VERTICAL_SPLIT, TABLE_HORIZONTAL_SPLIT, TABLE_MOVE, ALIGNMENT_TYPE, INDENT_TYPE, DEFAULT_TAG, BLOCK_TAGS, IGNORE_BLOCK_TAGS, TABLE_BLOCK_TAGS, SELECTION_TYPE, INSERTHTML_TYPE, INSERT_TEXT_TYPE, CLEAR_TYPE, CLASS_IMAGE_RIGHT, CLASS_IMAGE_LEFT, CLASS_IMAGE_CENTER, CLASS_IMAGE_BREAK, CLASS_CAPTION, CLASS_RTE_CAPTION, CLASS_CAPTION_INLINE, CLASS_IMAGE_INLINE, Lists, markerClassName, DOMNode, Alignments, Indents, Formats, LinkCommand, InsertMethods, InsertTextExec, InsertHtmlExec, InsertHtml, IsFormatted, MsWordPaste, NodeCutter, ImageCommand, SelectionCommands, SelectionBasedExec, ClearFormatExec, UndoRedoManager, TableCommand, statusCollection, ToolbarStatus, NodeSelection, MarkdownParser, LISTS_COMMAND, selectionCommand, LINK_COMMAND, CLEAR_COMMAND, MD_TABLE, ClearFormat, MDLists, MDFormats, MarkdownSelection, UndoRedoCommands, MDSelectionFormats, MDLink, MDTable, markdownFormatTags, markdownSelectionTags, markdownListsTags, htmlKeyConfig, markdownKeyConfig, pasteCleanupGroupingTags, listConversionFilters, selfClosingTags, KEY_DOWN, ACTION, FORMAT_TYPE, KEY_DOWN_HANDLER, LIST_TYPE, KEY_UP_HANDLER, KEY_UP, MODEL_CHANGED_PLUGIN, MODEL_CHANGED, MS_WORD_CLEANUP_PLUGIN, MS_WORD_CLEANUP, ON_BEGIN, SPACE_ACTION };
 //# sourceMappingURL=ej2-richtexteditor.es5.js.map