@syncfusion/ej2-richtexteditor 19.3.55 → 19.4.47

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();
@@ -5714,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);
@@ -6853,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'
@@ -6871,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);
                     }
                 }
             });
@@ -9343,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') {
@@ -10475,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;
                 }
             }
@@ -10518,7 +10512,8 @@ class Lists {
             range.startContainer.parentElement.closest('LI');
         const endNode = range.endContainer.nodeName === 'LI' ? range.endContainer :
             range.endContainer.parentElement.closest('LI');
-        if (!isNullOrUndefined(startNode) && !isNullOrUndefined(endNode) && startNode === endNode && startNode.tagName === 'LI' && startNode.textContent.trim() === '') {
+        if (!isNullOrUndefined(startNode) && !isNullOrUndefined(endNode) && startNode === endNode && startNode.tagName === 'LI' &&
+            startNode.textContent.trim() === '' && startNode.querySelectorAll('IMG').length === 0) {
             if (startNode.textContent.charCodeAt(0) === 65279) {
                 startNode.textContent = '';
             }
@@ -12197,7 +12192,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);
             }
         }
@@ -14486,6 +14489,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 = [];
@@ -14585,11 +14591,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]);
+                        }
                     }
                 }
             }
@@ -15261,7 +15269,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 };
@@ -15411,7 +15428,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');
@@ -15835,8 +15852,10 @@ class MsWordPaste {
             this.listContents = [];
             this.getListContent(listNodes[i]);
             let type;
+            let listStyleType;
             if (!isNullOrUndefined(this.listContents[0])) {
                 type = this.listContents[0].trim().length > 1 ? 'ol' : 'ul';
+                listStyleType = this.getlistStyleType(this.listContents[0], type);
                 const tempNode = [];
                 for (let j = 1; j < this.listContents.length; j++) {
                     tempNode.push(this.listContents[j]);
@@ -15853,7 +15872,7 @@ class MsWordPaste {
                     }
                 }
                 collection.push({ listType: type, content: tempNode, nestedLevel: level, class: currentClassName,
-                    listStyle: currentListStyle });
+                    listStyle: currentListStyle, listStyleTypeName: listStyleType });
             }
         }
         stNode = listNodes.shift();
@@ -15877,6 +15896,45 @@ class MsWordPaste {
             }
         }
     }
+    getlistStyleType(listContent, type) {
+        let currentListClass;
+        if (type === 'ol') {
+            switch (listContent.split('.')[0]) {
+                case "A":
+                    currentListClass = "upper-alpha";
+                    break;
+                case "a":
+                    currentListClass = "lower-alpha";
+                    break;
+                case "I":
+                    currentListClass = "upper-roman";
+                    break;
+                case "i":
+                    currentListClass = "lower-roman";
+                    break;
+                case "α":
+                    currentListClass = "lower-greek";
+                    break;
+                default:
+                    currentListClass = "decimal";
+                    break;
+            }
+        }
+        else {
+            switch (listContent.split('.')[0]) {
+                case "o":
+                    currentListClass = "circle";
+                    break;
+                case "§":
+                    currentListClass = "square";
+                    break;
+                default:
+                    currentListClass = "disc";
+                    break;
+            }
+        }
+        return currentListClass;
+    }
     makeConversion(collection) {
         const root = createElement('div');
         let temp;
@@ -15893,7 +15951,7 @@ class MsWordPaste {
                 prevList.appendChild(pElement);
                 temp.appendChild(prevList);
                 temp.setAttribute('level', collection[index].nestedLevel.toString());
-                temp.style.listStyle = this.getListStyle(collection[index].listType, collection[index].nestedLevel);
+                temp.style.listStyleType = collection[index].listStyleTypeName;
             }
             else if (collection[index].nestedLevel === pLevel) {
                 if (prevList.parentElement.tagName.toLowerCase() === collection[index].listType) {
@@ -15902,6 +15960,7 @@ class MsWordPaste {
                 }
                 else {
                     temp = createElement(collection[index].listType);
+                    temp.style.listStyleType = collection[index].listStyleTypeName;
                     prevList.parentElement.parentElement.appendChild(temp);
                     prevList = createElement('li');
                     prevList.appendChild(pElement);
@@ -15913,14 +15972,15 @@ class MsWordPaste {
                 if (!isNullOrUndefined(prevList)) {
                     for (let j = 0; j < collection[index].nestedLevel - pLevel; j++) {
                         prevList.appendChild(temp = createElement(collection[index].listType));
-                        prevList = createElement('li', { styles: 'list-style-type: none;' });
+                        prevList = createElement('li');
+                        if (j != collection[index].nestedLevel - pLevel - 1 && collection[index].nestedLevel - pLevel > 1) {
+                            prevList.style.listStyleType = "none";
+                        }
                         temp.appendChild(prevList);
                     }
                     prevList.appendChild(pElement);
                     temp.setAttribute('level', collection[index].nestedLevel.toString());
-                    temp.style.listStyle = this.getListStyle(collection[index].listType, collection[index].nestedLevel);
-                    temp.childNodes[0].style.listStyle =
-                        this.getListStyle(collection[index].listType, collection[index].nestedLevel);
+                    temp.style.listStyleType = collection[index].listStyleTypeName;
                 }
                 else {
                     root.appendChild(temp = createElement(collection[index].listType));
@@ -15928,7 +15988,7 @@ class MsWordPaste {
                     prevList.appendChild(pElement);
                     temp.appendChild(prevList);
                     temp.setAttribute('level', collection[index].nestedLevel.toString());
-                    temp.style.listStyle = this.getListStyle(collection[index].listType, collection[index].nestedLevel);
+                    temp.style.listStyleType = collection[index].listStyleTypeName;
                 }
             }
             else if (collection[index].nestedLevel === 1) {
@@ -15937,12 +15997,12 @@ class MsWordPaste {
                 }
                 else {
                     root.appendChild(temp = createElement(collection[index].listType));
+                    temp.style.listStyleType = collection[index].listStyleTypeName;
                 }
                 prevList = createElement('li');
                 prevList.appendChild(pElement);
                 temp.appendChild(prevList);
                 temp.setAttribute('level', collection[index].nestedLevel.toString());
-                temp.style.listStyle = this.getListStyle(collection[index].listType, collection[index].nestedLevel);
             }
             else {
                 elem = prevList;
@@ -15963,7 +16023,7 @@ class MsWordPaste {
                             prevList.appendChild(pElement);
                             temp.appendChild(prevList);
                             temp.setAttribute('level', collection[index].nestedLevel.toString());
-                            temp.style.listStyle = this.getListStyle(collection[index].listType, collection[index].nestedLevel);
+                            temp.style.listStyleType = collection[index].listStyleTypeName;
                             break;
                         }
                     }
@@ -15972,21 +16032,12 @@ class MsWordPaste {
             }
             prevList.setAttribute('class', collection[index].class);
             const currentStyle = prevList.getAttribute('style');
-            prevList.setAttribute('style', (!isNullOrUndefined(currentStyle) ? currentStyle : '') + collection[index].listStyle);
+            prevList.setAttribute('style', (!isNullOrUndefined(currentStyle) ? currentStyle : ''));
             pLevel = collection[index].nestedLevel;
             listCount++;
         }
         return root;
     }
-    getListStyle(listType, nestedLevel) {
-        nestedLevel = (nestedLevel > 0) ? nestedLevel - 1 : nestedLevel;
-        if (listType === 'ol') {
-            return (nestedLevel < this.olData.length ? this.olData[nestedLevel] : this.olData[0]);
-        }
-        else {
-            return (nestedLevel < this.ulData.length ? this.ulData[nestedLevel] : this.ulData[0]);
-        }
-    }
     getListContent(elem) {
         let pushContent = '';
         const firstChild = elem.firstElementChild;
@@ -16930,7 +16981,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);
         }
@@ -17214,7 +17265,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 });
             }
         }
@@ -17294,7 +17345,8 @@ class HtmlEditor {
             if (this.rangeElement.tagName === 'OL' || this.rangeElement.tagName === 'UL') {
                 const liElement = this.getRangeLiNode(currentRange.startContainer);
                 if (liElement.previousElementSibling && liElement.previousElementSibling.childElementCount > 0) {
-                    this.oldRangeElement = liElement.previousElementSibling.lastElementChild;
+                    this.oldRangeElement = liElement.previousElementSibling.lastElementChild.nodeName === 'BR' ?
+                        liElement.previousElementSibling : liElement.previousElementSibling.lastElementChild;
                     if (!isNullOrUndefined(liElement.lastElementChild)) {
                         this.rangeElement = liElement.lastElementChild;
                         isLiElement = true;
@@ -17491,7 +17543,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(' ');
@@ -20091,7 +20143,7 @@ class Image {
             left: elem.offsetLeft
         };
     }
-    setAspectRatio(img, expectedX, expectedY) {
+    setAspectRatio(img, expectedX, expectedY, e) {
         if (isNullOrUndefined(img.width)) {
             return;
         }
@@ -20115,10 +20167,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 {
@@ -20141,7 +20197,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 {
@@ -20181,7 +20237,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);
@@ -20226,7 +20282,8 @@ class Image {
     }
     resizeImgDupPos(e) {
         this.imgDupPos = {
-            width: (e.style.height !== '') ? this.imgEle.style.width : e.width + 'px',
+            width: (e.style.width !== '' && (this.parent.insertImageSettings &&
+                !this.parent.insertImageSettings.resizeByPercent)) ? this.imgEle.style.width : e.width + 'px',
             height: (e.style.height !== '') ? this.imgEle.style.height : e.height + 'px'
         };
     }
@@ -20394,6 +20451,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);
@@ -20598,7 +20676,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;
                 }
@@ -20837,6 +20915,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;
         }
@@ -21673,6 +21754,7 @@ class Image {
         imageTag.addEventListener('load', () => {
             this.parent.trigger(actionComplete, e);
         });
+        detach(parentElement);
     }
     /**
      * Rendering uploader and popup for drag and drop
@@ -21707,6 +21789,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';
@@ -21738,6 +21823,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) {
@@ -21749,6 +21838,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;
@@ -21761,6 +21853,9 @@ class Image {
                 }
                 else {
                     this.parent.trigger(beforeImageUpload, args);
+                    if (!this.parent.inlineMode.enable) {
+                        this.parent.toolbarModule.baseToolbar.toolbarObj.disable(true);
+                    }
                 }
             },
             uploading: (e) => {
@@ -21803,6 +21898,9 @@ class Image {
                 }, 900);
             },
             success: (e) => {
+                if (e.operation === "cancel") {
+                    return;
+                }
                 isUploading = false;
                 this.parent.inputElement.contentEditable = 'true';
                 const args = {
@@ -23854,7 +23952,7 @@ __decorate$2([
     Property(null)
 ], PasteCleanupSettings.prototype, "deniedAttrs", void 0);
 __decorate$2([
-    Property(['background', 'background-color', 'border', 'border-bottom', 'border-left', 'border-radius', 'border-right', 'border-style', 'border-top', 'border-width', 'clear', 'color', 'cursor', 'direction', 'display', 'float', 'font', 'font-family', 'font-size', 'font-weight', 'font-style', 'height', 'left', 'line-height', 'margin', 'margin-top', 'margin-left', 'margin-right', 'margin-bottom', 'max-height', 'max-width', 'min-height', 'min-width', 'overflow', 'overflow-x', 'overflow-y', 'padding', 'padding-bottom', 'padding-left', 'padding-right', 'padding-top', 'position', 'right', 'table-layout', 'text-align', 'text-decoration', 'text-indent', 'top', 'vertical-align', 'visibility', 'white-space', 'width'])
+    Property(['background', 'background-color', 'border', 'border-bottom', 'border-left', 'border-radius', 'border-right', 'border-style', 'border-top', 'border-width', 'clear', 'color', 'cursor', 'direction', 'display', 'float', 'font', 'font-family', 'font-size', 'font-weight', 'font-style', 'height', 'left', 'line-height', 'list-style-type', 'margin', 'margin-top', 'margin-left', 'margin-right', 'margin-bottom', 'max-height', 'max-width', 'min-height', 'min-width', 'overflow', 'overflow-x', 'overflow-y', 'padding', 'padding-bottom', 'padding-left', 'padding-right', 'padding-top', 'position', 'right', 'table-layout', 'text-align', 'text-decoration', 'text-indent', 'top', 'vertical-align', 'visibility', 'white-space', 'width'])
 ], PasteCleanupSettings.prototype, "allowedStyleProps", void 0);
 __decorate$2([
     Property(null)
@@ -24042,9 +24140,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,
@@ -24102,12 +24211,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') {
@@ -24116,7 +24245,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;
                                     }
@@ -24165,7 +24294,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' ||
@@ -24176,12 +24316,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;
@@ -24196,14 +24337,21 @@ 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) {
-                                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);
+                                this.range.startOffset === isLastNodeLength) {
+                                const focusBRElem = this.parent.createElement('br');
+                                const lineBreakBRElem = this.parent.createElement('br');
+                                this.parent.formatter.editorManager.domNode.insertAfter(focusBRElem, this.range.startContainer);
+                                this.parent.formatter.editorManager.domNode.insertAfter(lineBreakBRElem, this.range.startContainer);
+                                this.parent.formatter.editorManager.nodeSelection.setCursorPoint(this.parent.contentModule.getDocument(), focusBRElem, 0);
                             }
                             else if (!isNullOrUndefined(currentParent) && currentParent !== this.parent.inputElement && currentParent.nodeName !== 'BR') {
                                 if (currentParent.textContent.trim().length === 0 || (currentParent.textContent.trim().length === 1 &&
@@ -24227,37 +24375,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();
                         }
@@ -24267,6 +24393,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') {
@@ -25664,7 +25814,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);
@@ -26059,7 +26209,7 @@ let RichTextEditor = class RichTextEditor extends Component {
             this.isRTE = false;
         }
         this.notify(docClick, { args: e });
-        if (e.detail > 3) {
+        if (Browser.info.name !== 'msie' && e.detail > 3) {
             e.preventDefault();
         }
     }