@syncfusion/ej2-richtexteditor 19.3.53 → 19.4.40

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

@@ -2965,7 +2965,7 @@ class ToolbarRenderer {
      * @hidden
      * @deprecated
      */
-    renderColorPickerDropDown(args, item, colorPicker) {
+    renderColorPickerDropDown(args, item, colorPicker, defaultColor) {
         // eslint-disable-next-line
         const proxy = this;
         let css = CLS_RTE_ELEMENTS + ' ' + CLS_TB_BTN + ((this.parent.inlineMode) ? (' ' + CLS_INLINE_DROPDOWN) : '');
@@ -2973,8 +2973,9 @@ class ToolbarRenderer {
         const content = proxy.parent.createElement('span', { className: CLS_COLOR_CONTENT });
         const inlineEle = proxy.parent.createElement('span', { className: args.cssClass });
         let range;
+        let initialBackgroundColor = (isNullOrUndefined(defaultColor)) ? proxy.parent.backgroundColor.default : defaultColor;
         inlineEle.style.borderBottomColor = (item === 'backgroundcolor') ?
-            proxy.parent.backgroundColor.default : proxy.parent.fontColor.default;
+            initialBackgroundColor : proxy.parent.fontColor.default;
         content.appendChild(inlineEle);
         const dropDown = new DropDownButton({
             target: colorPicker.element.parentElement, cssClass: css,
@@ -3592,11 +3593,6 @@ class DropDownButtons {
         for (const prop of Object.keys(newProp)) {
             switch (prop) {
                 case 'fontFamily':
-                    if (this.parent.inlineMode.enable) {
-                        if (!isNullOrUndefined(this.parent.fontFamily.default)) {
-                            this.getEditNode().style.fontFamily = this.parent.fontFamily.default;
-                        }
-                    }
                     if (this.fontNameDropDown) {
                         for (const fontFamily$$1 of Object.keys(newProp.fontFamily)) {
                             switch (fontFamily$$1) {
@@ -3627,11 +3623,6 @@ class DropDownButtons {
                     }
                     break;
                 case 'fontSize':
-                    if (this.parent.inlineMode) {
-                        if (!isNullOrUndefined(this.parent.fontSize.default)) {
-                            this.getEditNode().style.fontSize = this.parent.fontSize.default;
-                        }
-                    }
                     if (this.fontSizeDropDown) {
                         for (const fontSize$$1 of Object.keys(newProp.fontSize)) {
                             switch (fontSize$$1) {
@@ -4997,7 +4988,7 @@ class ColorPickerInput {
                             target: (targetID)
                         };
                         this.backgroundColorPicker = this.toolbarRenderer.renderColorPicker(options, 'backgroundcolor');
-                        this.backgroundColorDropDown = this.toolbarRenderer.renderColorPickerDropDown(options, 'backgroundcolor', this.backgroundColorPicker);
+                        this.backgroundColorDropDown = this.toolbarRenderer.renderColorPickerDropDown(options, 'backgroundcolor', this.backgroundColorPicker, this.defaultColorPicker);
                         break;
                     }
                 }
@@ -5032,6 +5023,7 @@ class ColorPickerInput {
         if (this.backgroundColorDropDown && !this.backgroundColorDropDown.isDestroyed) {
             const innerEle = this.backgroundColorDropDown.element.querySelector('.e-rte-color-content');
             if (innerEle) {
+                this.defaultColorPicker = innerEle.children[0].style.borderBottomColor;
                 detach(innerEle);
             }
             this.backgroundColorDropDown.destroy();
@@ -5660,6 +5652,11 @@ class QuickToolbar {
         this.parent.isBlur = false;
         this.parent.isRTE = true;
     }
+    keyUpQT(e) {
+        if (e.which == 27) {
+            this.hideQuickToolbars();
+        }
+    }
     renderQuickToolbars() {
         if (this.linkQTBar || this.imageQTBar || this.textQTBar || this.tableQTBar) {
             return;
@@ -5674,15 +5671,19 @@ class QuickToolbar {
         this.renderFactory.addRenderer(RenderType.TableToolbar, this.tableQTBar);
         if (this.linkQTBar) {
             EventHandler.add(this.linkQTBar.element, 'mousedown', this.onMouseDown, this);
+            EventHandler.add(this.linkQTBar.element, 'keyup', this.keyUpQT, this);
         }
         if (this.imageQTBar) {
             EventHandler.add(this.imageQTBar.element, 'mousedown', this.onMouseDown, this);
+            EventHandler.add(this.imageQTBar.element, 'keyup', this.keyUpQT, this);
         }
         if (this.textQTBar) {
             EventHandler.add(this.textQTBar.element, 'mousedown', this.onMouseDown, this);
+            EventHandler.add(this.textQTBar.element, 'keyup', this.keyUpQT, this);
         }
         if (this.tableQTBar) {
             EventHandler.add(this.tableQTBar.element, 'mousedown', this.onMouseDown, this);
+            EventHandler.add(this.tableQTBar.element, 'keyup', this.keyUpQT, this);
         }
     }
     renderInlineQuickToolbar() {
@@ -5691,6 +5692,7 @@ class QuickToolbar {
             this.inlineQTBar = this.createQTBar('Inline', 'MultiRow', this.parent.toolbarSettings.items, RenderType.InlineToolbar);
             this.renderFactory.addRenderer(RenderType.InlineToolbar, this.inlineQTBar);
             EventHandler.add(this.inlineQTBar.element, 'mousedown', this.onMouseDown, this);
+            EventHandler.add(this.inlineQTBar.element, 'keyup', this.keyUpQT, this);
         }
     }
     /**
@@ -5704,7 +5706,7 @@ class QuickToolbar {
      * @deprecated
      */
     showInlineQTBar(x, y, target) {
-        if (this.parent.readonly) {
+        if (this.parent.readonly || target.tagName.toLowerCase() === "img") {
             return;
         }
         this.inlineQTBar.showPopup(x, y, target);
@@ -5843,22 +5845,27 @@ class QuickToolbar {
     destroy() {
         if (this.linkQTBar) {
             EventHandler.remove(this.linkQTBar.element, 'mousedown', this.onMouseDown);
+            EventHandler.remove(this.linkQTBar.element, 'keyup', this.keyUpQT);
             this.linkQTBar.destroy();
         }
         if (this.textQTBar) {
             EventHandler.remove(this.textQTBar.element, 'mousedown', this.onMouseDown);
+            EventHandler.remove(this.textQTBar.element, 'keyup', this.keyUpQT);
             this.textQTBar.destroy();
         }
         if (this.imageQTBar) {
             EventHandler.remove(this.imageQTBar.element, 'mousedown', this.onMouseDown);
+            EventHandler.remove(this.imageQTBar.element, 'keyup', this.keyUpQT);
             this.imageQTBar.destroy();
         }
         if (this.tableQTBar) {
             EventHandler.remove(this.tableQTBar.element, 'mousedown', this.onMouseDown);
+            EventHandler.remove(this.tableQTBar.element, 'keyup', this.keyUpQT);
             this.tableQTBar.destroy();
         }
         if (this.inlineQTBar) {
             EventHandler.remove(this.inlineQTBar.element, 'mousedown', this.onMouseDown);
+            EventHandler.remove(this.inlineQTBar.element, 'keyup', this.keyUpQT);
             if (isIDevice()) {
                 EventHandler.remove(document, 'selectionchange', this.selectionChangeHandler);
             }
@@ -6838,7 +6845,7 @@ class Formatter {
             || ((args.item.subCommand === 'FontName' || args.item.subCommand === 'FontSize') && args.name === 'dropDownSelect')
             || ((args.item.subCommand === 'BackgroundColor' || args.item.subCommand === 'FontColor')
                 && args.name === 'colorPickerChanged'))) {
-            extend(args, args, { requestType: args.item.subCommand, cancel: false, itemCollection: value }, true);
+            extend(args, args, { requestType: args.item.subCommand, cancel: false, itemCollection: value, selectType: args.name }, true);
             self.trigger(actionBegin, args, (actionBeginArgs) => {
                 if (!actionBeginArgs.cancel) {
                     if (this.getUndoRedoStack().length === 0 && actionBeginArgs.item.command !== 'Links'
@@ -6856,8 +6863,8 @@ class Formatter {
                     }
                     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'), self.enterKey);
+                        this.editorManager.execCommand(actionBeginArgs.item.command, actionBeginArgs.item.subCommand, event, this.onSuccess.bind(this, self), actionBeginArgs.item.value, actionBeginArgs.item.subCommand === 'Pre' && actionBeginArgs.selectType === 'dropDownSelect' ?
+                            { name: actionBeginArgs.selectType } : value, ('#' + self.getID() + ' iframe'), self.enterKey);
                     }
                 }
             });
@@ -9328,7 +9335,8 @@ class NodeSelection {
             || range.startContainer;
         const endNode = range.endContainer.childNodes[(range.endOffset > 0) ? (range.endOffset - 1) : range.endOffset]
             || range.endContainer;
-        if (startNode === endNode && startNode.childNodes.length === 0) {
+        if ((startNode === endNode || (startNode.nodeName === 'BR' && startNode === range.endContainer.childNodes[range.endOffset])) &&
+            startNode.childNodes.length === 0) {
             return [startNode];
         }
         if (range.startOffset === range.endOffset && range.startOffset !== 0 && range.startContainer.nodeName === 'PRE') {
@@ -10460,8 +10468,9 @@ class Lists {
     testCurrentList(range) {
         const olListStartRegex = [/^[1]+[.]+$/, /^[i]+[.]+$/, /^[a]+[.]+$/];
         if (!isNullOrUndefined(range.startContainer.textContent.slice(0, range.startOffset))) {
+            const currentContent = range.startContainer.textContent.replace(/\u200B/g, '').slice(0, range.startOffset).trim();
             for (let i = 0; i < olListStartRegex.length; i++) {
-                if (olListStartRegex[i].test(range.startContainer.textContent.replace(/\u200B/g, '').slice(0, range.startOffset).trim())) {
+                if (olListStartRegex[i].test(currentContent) && currentContent.length === 2) {
                     return true;
                 }
             }
@@ -12182,7 +12191,15 @@ class InsertHtml {
                 tempSpan.parentNode.replaceChild(node, tempSpan);
             }
             else {
-                const splitedElm = nodeCutter.GetSpliceNode(range, blockNode);
+                let currentNode = nodes[nodes.length - 1];
+                let splitedElm;
+                if ((currentNode.nodeName === 'BR' || currentNode.nodeName === 'HR') && !isNullOrUndefined(currentNode.parentElement) &&
+                    currentNode.parentElement.textContent.trim().length === 0 && !node.classList.contains('pasteContent')) {
+                    splitedElm = currentNode;
+                }
+                else {
+                    splitedElm = nodeCutter.GetSpliceNode(range, blockNode);
+                }
                 splitedElm.parentNode.replaceChild(node, splitedElm);
             }
         }
@@ -14471,6 +14488,9 @@ class SelectionCommands {
     }
     static removeFormat(nodes, index, formatNode, isCursor, isFormat, isFontStyle, range, nodeCutter, format, value, domSelection, endNode, domNode) {
         let splitNode = null;
+        let startText = range.startContainer.nodeName === '#text' ?
+            range.startContainer.textContent.substring(range.startOffset, range.startContainer.textContent.length) :
+            range.startContainer.textContent;
         if (!(range.startContainer === range.endContainer && range.startOffset === 0
             && range.endOffset === range.startContainer.length)) {
             const nodeIndex = [];
@@ -14570,11 +14590,13 @@ class SelectionCommands {
             for (let num = 0; num < child.length; num++) {
                 if (child[num].nodeType !== 3 || (child[num].textContent && child[num].textContent.trim().length > 0)) {
                     child[num] = InsertMethods.Wrap(child[num], this.GetFormatNode(format, value, formatNodeTagName, formatNodeStyles));
-                    if (num === 0) {
-                        range.setStartBefore(child[num]);
-                    }
-                    else if (num === child.length - 1) {
-                        range.setEndAfter(child[num]);
+                    if (child[num].textContent === startText) {
+                        if (num === 0) {
+                            range.setStartBefore(child[num]);
+                        }
+                        else if (num === child.length - 1) {
+                            range.setEndAfter(child[num]);
+                        }
                     }
                 }
             }
@@ -15246,7 +15268,16 @@ class UndoRedoManager {
      * @deprecated
      */
     saveData(e) {
-        const range = new NodeSelection().getRange(this.parent.currentDocument);
+        let range = new NodeSelection().getRange(this.parent.currentDocument);
+        let currentContainer = range.startContainer;
+        for (let i = currentContainer.childNodes.length - 1; i >= 0; i--) {
+            if (!isNullOrUndefined(currentContainer.childNodes[i]) && currentContainer.childNodes[i].nodeName === '#text' &&
+                currentContainer.childNodes[i].textContent.length === 0 && currentContainer.childNodes[i].nodeName !== 'IMG' &&
+                currentContainer.childNodes[i].nodeName !== 'BR' && currentContainer.childNodes[i].nodeName && 'HR') {
+                detach(currentContainer.childNodes[i]);
+            }
+        }
+        range = new NodeSelection().getRange(this.parent.currentDocument);
         const save = new NodeSelection().save(range, this.parent.currentDocument);
         const htmlText = this.parent.editableElement.innerHTML;
         const changEle = { text: htmlText, range: save };
@@ -15396,7 +15427,7 @@ class MsWordPaste {
         this.parent.observer.on(MS_WORD_CLEANUP_PLUGIN, this.wordCleanup, this);
     }
     wordCleanup(e) {
-        const wordPasteStyleConfig = e.allowedStylePropertiesArray;
+        const wordPasteStyleConfig = !isNullOrUndefined(e.allowedStylePropertiesArray) ? e.allowedStylePropertiesArray : [];
         let listNodes = [];
         let tempHTMLContent = e.args.clipboardData.getData('text/HTML');
         const rtfData = e.args.clipboardData.getData('text/rtf');
@@ -16915,7 +16946,7 @@ class XhtmlValidation {
             this.ImageTags();
             this.removeTags();
             this.RemoveUnsupported();
-            this.currentElement.innerHTML = this.selfEncloseValidation(this.currentElement.innerHTML, this.currentElement.innerText === '\n' ?
+            this.currentElement.innerHTML = this.selfEncloseValidation(this.currentElement.innerHTML, this.currentElement.innerText === "\n" ?
                 this.currentElement.innerText.length : this.currentElement.innerText.trim().length);
             this.parent.setProperties({ value: this.currentElement.innerHTML }, true);
         }
@@ -17199,7 +17230,7 @@ class HtmlEditor {
             e.args.action === 'enter' ||
             e.args.keyCode === 13) {
             this.spaceLink(e.args);
-            if (this.parent.editorMode === 'HTML' && !((this.parent.shiftEnterKey === 'BR' && e.args.shiftKey))) {
+            if (this.parent.editorMode === 'HTML' && !this.parent.readonly) {
                 this.parent.notify(enterHandler, { args: e.args });
             }
         }
@@ -17476,7 +17507,7 @@ class HtmlEditor {
             const divElement = this.parent.createElement('div');
             divElement.setAttribute('class', 'pasteContent');
             divElement.style.display = 'inline';
-            divElement.innerHTML = contentInnerElem;
+            divElement.innerHTML = contentInnerElem.replace('&para', '&amp;para');
             const paraElem = divElement.querySelectorAll('span, p');
             for (let i = 0; i < paraElem.length; i++) {
                 const splitTextContent = paraElem[i].innerHTML.split(' ');
@@ -20076,7 +20107,7 @@ class Image {
             left: elem.offsetLeft
         };
     }
-    setAspectRatio(img, expectedX, expectedY) {
+    setAspectRatio(img, expectedX, expectedY, e) {
         if (isNullOrUndefined(img.width)) {
             return;
         }
@@ -20100,10 +20131,14 @@ class Image {
                 img.style.height = expectedY + 'px';
             }
             else if (img.style.width !== '' && img.style.height === '') {
-                img.style.width = ((width / height * expectedY) + width / height).toString() + 'px';
+                let currentWidth = ((width / height * expectedY) + width / height) < (this.parent.inputElement.getBoundingClientRect().right - 32) ?
+                    ((width / height * expectedY) + width / height) : (this.parent.inputElement.getBoundingClientRect().right - 32);
+                img.style.width = currentWidth.toString() + 'px';
             }
             else if (img.style.width !== '') {
-                img.style.width = (width / height * expectedY) + 'px';
+                let currentWidth = (width / height * expectedY) < (this.parent.inputElement.getBoundingClientRect().right - 32) ?
+                    (width / height * expectedY) : (this.parent.inputElement.getBoundingClientRect().right - 32);
+                img.style.width = currentWidth + 'px';
                 img.style.height = expectedY + 'px';
             }
             else {
@@ -20126,7 +20161,7 @@ class Image {
                 img.style.height = (height / width * expectedX) + 'px';
             }
             else {
-                img.setAttribute('width', expectedX.toString());
+                img.setAttribute('width', this.resizeBtnStat.botRight ? (this.getPointX(e.event) - img.getBoundingClientRect().left).toString() : expectedX.toString());
             }
         }
         else {
@@ -20166,7 +20201,7 @@ class Image {
                     return;
                 }
                 this.imgEle.parentElement.style.cursor = 'pointer';
-                this.setAspectRatio(this.imgEle, parseInt(width, 10), parseInt(height, 10));
+                this.setAspectRatio(this.imgEle, parseInt(width, 10), parseInt(height, 10), args);
                 this.resizeImgDupPos(this.imgEle);
                 this.imgResizePos(this.imgEle, this.imgResizeDiv);
                 this.parent.setContentHeight('', false);
@@ -20211,7 +20246,7 @@ class Image {
     }
     resizeImgDupPos(e) {
         this.imgDupPos = {
-            width: (e.style.height !== '') ? this.imgEle.style.width : e.width + 'px',
+            width: (e.style.width !== '') ? this.imgEle.style.width : e.width + 'px',
             height: (e.style.height !== '') ? this.imgEle.style.height : e.height + 'px'
         };
     }
@@ -20379,6 +20414,27 @@ class Image {
                     const src = this.deletedImg[i].src;
                     this.imageRemovePost(src);
                 }
+                if (range.startContainer.nodeType === 3) {
+                    if (originalEvent.code === 'Backspace') {
+                        if (range.startContainer.previousElementSibling && range.startOffset === 0 &&
+                            range.startContainer.previousElementSibling.classList.contains(CLS_CAPTION) &&
+                            range.startContainer.previousElementSibling.classList.contains(CLS_CAPINLINE)) {
+                            detach(range.startContainer.previousElementSibling);
+                        }
+                    }
+                    else {
+                        if (range.startContainer.nextElementSibling &&
+                            range.endContainer.textContent.length === range.endOffset &&
+                            range.startContainer.nextElementSibling.classList.contains(CLS_CAPTION) &&
+                            range.startContainer.nextElementSibling.classList.contains(CLS_CAPINLINE)) {
+                            detach(range.startContainer.nextElementSibling);
+                        }
+                    }
+                }
+                else if ((range.startContainer.nodeType === 1 &&
+                    range.startContainer.querySelector('.' + CLS_CAPTION + '.' + CLS_CAPINLINE))) {
+                    detach(range.startContainer.querySelector('.' + CLS_CAPTION + '.' + CLS_CAPINLINE));
+                }
                 break;
             case 'insert-image':
                 this.openDialog(true, originalEvent, save, selectNodeEle, selectParentEle);
@@ -20583,7 +20639,7 @@ class Image {
             const target = args.target;
             this.contentModule = this.rendererFactory.getRenderer(RenderType.Content);
             const isPopupOpen = this.quickToolObj.imageQTBar.element.classList.contains('e-rte-pop');
-            if (target.nodeName === 'IMG' && this.parent.quickToolbarModule && this.parent.getRange().startOffset === this.parent.getRange().endOffset) {
+            if (target.nodeName === 'IMG' && this.parent.quickToolbarModule) {
                 if (isPopupOpen) {
                     return;
                 }
@@ -20822,6 +20878,9 @@ class Image {
     imageRemovePost(src) {
         const proxy = this;
         let absoluteUrl = '';
+        if (isNullOrUndefined(this.parent.insertImageSettings.removeUrl) || this.parent.insertImageSettings.removeUrl === '') {
+            return;
+        }
         if (src.indexOf('http://') > -1 || src.indexOf('https://') > -1) {
             absoluteUrl = src;
         }
@@ -21658,6 +21717,7 @@ class Image {
         imageTag.addEventListener('load', () => {
             this.parent.trigger(actionComplete, e);
         });
+        detach(parentElement);
     }
     /**
      * Rendering uploader and popup for drag and drop
@@ -21692,6 +21752,9 @@ class Image {
                 this.popupObj.destroy();
                 detach(this.popupObj.element);
                 this.popupObj = null;
+                if (!this.parent.inlineMode.enable) {
+                    this.parent.toolbarModule.baseToolbar.toolbarObj.disable(false);
+                }
             }
         });
         this.popupObj.element.style.display = 'none';
@@ -21723,6 +21786,10 @@ class Image {
                 isUploading = false;
                 detach(imageElement);
                 this.popupObj.close();
+                this.quickToolObj.imageQTBar.hidePopup();
+                setTimeout(() => {
+                    this.uploadObj.destroy();
+                }, 900);
             },
             beforeUpload: (args) => {
                 if (this.parent.isServerRendered) {
@@ -21734,6 +21801,9 @@ class Image {
                         if (beforeUploadArgs.cancel) {
                             return;
                         }
+                        if (!this.parent.inlineMode.enable) {
+                            this.parent.toolbarModule.baseToolbar.toolbarObj.disable(true);
+                        }
                         /* eslint-disable */
                         this.uploadObj.currentRequestHeader = beforeUploadArgs.currentRequest ?
                             beforeUploadArgs.currentRequest : this.uploadObj.currentRequestHeader;
@@ -21746,6 +21816,9 @@ class Image {
                 }
                 else {
                     this.parent.trigger(beforeImageUpload, args);
+                    if (!this.parent.inlineMode.enable) {
+                        this.parent.toolbarModule.baseToolbar.toolbarObj.disable(true);
+                    }
                 }
             },
             uploading: (e) => {
@@ -21788,6 +21861,9 @@ class Image {
                 }, 900);
             },
             success: (e) => {
+                if (e.operation === "cancel") {
+                    return;
+                }
                 isUploading = false;
                 this.parent.inputElement.contentEditable = 'true';
                 const args = {
@@ -24027,9 +24103,20 @@ class EnterKeyAction {
     }
     enterHandler(e) {
         this.getRangeNode();
+        let isTableEnter = true;
+        if (!isNullOrUndefined(this.startNode.closest('TABLE')) && !isNullOrUndefined(this.endNode.closest('TABLE'))) {
+            isTableEnter = false;
+            let curElement = this.startNode;
+            let blockElement = curElement;
+            while (!this.parent.formatter.editorManager.domNode.isBlockNode(curElement)) {
+                blockElement = curElement;
+                curElement = curElement.parentElement;
+            }
+            isTableEnter = blockElement.tagName === 'TD' ? false : true;
+        }
         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'))) {
+            if (isNullOrUndefined(this.startNode.closest('LI')) && isNullOrUndefined(this.endNode.closest('LI')) && isTableEnter &&
+                isNullOrUndefined(this.startNode.closest('PRE')) && isNullOrUndefined(this.endNode.closest('PRE'))) {
                 const shiftKey = e.args.shiftKey;
                 const actionBeginArgs = {
                     cancel: false,
@@ -24087,12 +24174,32 @@ class EnterKeyAction {
                             this.parent.formatter.editorManager.nodeSelection.setCursorPoint(this.parent.contentModule.getDocument(), this.range.startContainer.childNodes[this.range.startOffset], 0);
                             this.getRangeNode();
                         }
-                        if (this.parent.enterKey === 'P' || this.parent.enterKey === 'DIV' ||
+                        if ((this.parent.enterKey === 'P' && !shiftKey) || (this.parent.enterKey === 'DIV' && !shiftKey) ||
                             (this.parent.shiftEnterKey === 'P' && shiftKey) ||
                             (this.parent.shiftEnterKey === 'DIV' && shiftKey)) {
-                            const nearBlockNode = this.parent.formatter.editorManager.domNode.blockParentNode(this.startNode);
+                            let nearBlockNode;
+                            if (isTableEnter && this.parent.formatter.editorManager.domNode.isBlockNode(this.startNode)) {
+                                nearBlockNode = this.startNode;
+                            }
+                            else {
+                                nearBlockNode = this.parent.formatter.editorManager.domNode.blockParentNode(this.startNode);
+                            }
                             let isImageNode = false;
-                            if (this.range.startOffset === 0 && this.range.endOffset === 0 && !(!isNullOrUndefined(this.range.startContainer.previousSibling) && this.range.startContainer.previousSibling.nodeName === 'IMG')) {
+                            let isFocusedFirst = false;
+                            if (this.range.startOffset != 0 && this.range.endOffset != 0 && this.range.startContainer === this.range.endContainer &&
+                                !(!isNullOrUndefined(nearBlockNode.childNodes[0]) && nearBlockNode.childNodes[0].nodeName === 'IMG')) {
+                                let startNodeText = this.range.startContainer.textContent;
+                                let splitFirstText = startNodeText.substring(0, this.range.startOffset);
+                                if (splitFirstText.charCodeAt(this.range.startOffset - 1) != 160 && splitFirstText.trim().length === 0) {
+                                    isFocusedFirst = true;
+                                }
+                            }
+                            else if (this.range.startOffset === 0 && this.range.endOffset === 0) {
+                                isFocusedFirst = true;
+                            }
+                            if (((this.range.startOffset === 0 && this.range.endOffset === 0) || isFocusedFirst) &&
+                                !(!isNullOrUndefined(this.range.startContainer.previousSibling) &&
+                                    (this.range.startContainer.previousSibling.nodeName === 'IMG' || this.range.startContainer.previousSibling.nodeName === 'BR'))) {
                                 let isNearBlockLengthZero;
                                 let newElem;
                                 if (this.range.startContainer.nodeName === 'IMG') {
@@ -24101,7 +24208,7 @@ class EnterKeyAction {
                                     isNearBlockLengthZero = false;
                                 }
                                 else {
-                                    if (nearBlockNode.textContent.length !== 0) {
+                                    if (nearBlockNode.textContent.trim().length !== 0) {
                                         newElem = this.parent.formatter.editorManager.nodeCutter.SplitNode(this.range, nearBlockNode, false).cloneNode(true);
                                         isNearBlockLengthZero = false;
                                     }
@@ -24150,7 +24257,18 @@ class EnterKeyAction {
                                 }
                                 if (newElem.textContent.trim().length === 0) {
                                     const brElm = this.parent.createElement('br');
-                                    this.startNode.appendChild(brElm);
+                                    if (this.startNode.nodeName === 'A') {
+                                        let startParentElem = this.startNode.parentElement;
+                                        this.startNode.parentElement.insertBefore(brElm, this.startNode);
+                                        detach(this.startNode);
+                                        this.startNode = startParentElem;
+                                    }
+                                    else {
+                                        this.startNode.appendChild(brElm);
+                                    }
+                                    if (newElem.childNodes[0].textContent === '\n') {
+                                        detach(newElem.childNodes[0]);
+                                    }
                                     this.parent.formatter.editorManager.nodeSelection.setCursorPoint(this.parent.contentModule.getDocument(), this.startNode, 0);
                                 }
                                 if (((this.parent.enterKey === 'P' || this.parent.enterKey === 'DIV') && !shiftKey) || ((this.parent.shiftEnterKey === 'DIV' ||
@@ -24161,12 +24279,13 @@ class EnterKeyAction {
                                     }
                                     this.parent.formatter.editorManager.domNode.insertAfter(insertElm, newElem);
                                     detach(newElem);
-                                    this.parent.formatter.editorManager.nodeSelection.setCursorPoint(this.parent.contentModule.getDocument(), this.parent.formatter.editorManager.domNode.isBlockNode(this.startNode) ? insertElm : this.startNode, 0);
+                                    this.parent.formatter.editorManager.nodeSelection.setCursorPoint(this.parent.contentModule.getDocument(), this.parent.formatter.editorManager.domNode.isBlockNode(this.startNode) ?
+                                        insertElm : this.startNode, 0);
                                 }
                             }
                             e.args.preventDefault();
                         }
-                        if (this.parent.enterKey === 'BR' && !shiftKey) {
+                        if ((this.parent.enterKey === 'BR' && !shiftKey) || (this.parent.shiftEnterKey === 'BR' && shiftKey)) {
                             let currentParent;
                             if (!this.parent.formatter.editorManager.domNode.isBlockNode(this.startNode)) {
                                 let currentNode = this.startNode;
@@ -24181,11 +24300,16 @@ class EnterKeyAction {
                             else {
                                 currentParent = this.startNode;
                             }
-                            let isEmptyBrInserted = false;
+                            let currentParentLastChild = currentParent.lastChild;
+                            while (!isNullOrUndefined(currentParentLastChild) && !(currentParentLastChild.nodeName === '#text')) {
+                                currentParentLastChild = currentParentLastChild.lastChild;
+                            }
+                            const isLastNodeLength = this.range.startContainer === currentParentLastChild ?
+                                this.range.startContainer.textContent.length : currentParent.textContent.length;
                             if (currentParent !== this.parent.inputElement &&
                                 this.parent.formatter.editorManager.domNode.isBlockNode(currentParent) &&
                                 this.range.startOffset === this.range.endOffset &&
-                                this.range.startOffset === currentParent.textContent.length) {
+                                this.range.startOffset === isLastNodeLength) {
                                 const 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);
@@ -24212,37 +24336,15 @@ class EnterKeyAction {
                                             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();
+                                        this.insertBRElement();
                                     }
                                 }
                             }
                             else {
-                                const 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 {
-                                    const brElm2 = this.parent.createElement('br');
-                                    this.range.insertNode(brElm2);
-                                    this.parent.formatter.editorManager.nodeSelection.setCursorPoint(this.parent.contentModule.getDocument(), brElm, 0);
-                                }
+                                this.insertBRElement();
                             }
                             e.args.preventDefault();
                         }
@@ -24252,6 +24354,30 @@ class EnterKeyAction {
             }
         }
     }
+    insertBRElement() {
+        let isEmptyBrInserted = false;
+        const 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 {
+            const brElm2 = this.parent.createElement('br');
+            this.range.insertNode(brElm2);
+            this.parent.formatter.editorManager.nodeSelection.setCursorPoint(this.parent.contentModule.getDocument(), brElm, 0);
+        }
+    }
     insertFocusContent() {
         if (this.range.startContainer.textContent.length === 0) {
             if (this.range.startContainer.nodeName === '#text') {
@@ -25649,7 +25775,7 @@ let RichTextEditor = class RichTextEditor extends Component {
                 this.setProperties({ value: this.valueTemplate });
             }
             else {
-                const compiledTemplate = compile(this.valueTemplate)('', this, 'valueTemplate');
+                const compiledTemplate = compile(this.valueTemplate)("", this, 'valueTemplate');
                 for (let i = 0; i < compiledTemplate.length; i++) {
                     const item = compiledTemplate[i];
                     append([item], this.element);