@syncfusion/ej2-richtexteditor 19.3.55 → 19.3.57

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

@@ -5714,7 +5714,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 +6853,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 +6871,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 +9343,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') {
@@ -12197,7 +12198,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);
             }
         }
@@ -17214,7 +17223,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.notify(enterHandler, { args: e.args });
             }
         }
@@ -17491,7 +17500,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', '&para');
             const paraElem = divElement.querySelectorAll('span, p');
             for (let i = 0; i < paraElem.length; i++) {
                 const splitTextContent = paraElem[i].innerHTML.split(' ');
@@ -20115,10 +20124,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 {
@@ -20226,7 +20239,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'
         };
     }
@@ -20394,6 +20407,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 +20632,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 +20871,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 +21710,7 @@ class Image {
         imageTag.addEventListener('load', () => {
             this.parent.trigger(actionComplete, e);
         });
+        detach(parentElement);
     }
     /**
      * Rendering uploader and popup for drag and drop
@@ -21707,6 +21745,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 +21779,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 +21794,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 +21809,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 +21854,9 @@ class Image {
                 }, 900);
             },
             success: (e) => {
+                if (e.operation === "cancel") {
+                    return;
+                }
                 isUploading = false;
                 this.parent.inputElement.contentEditable = 'true';
                 const args = {
@@ -24102,12 +24156,13 @@ 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 isImageNode = false;
-                            if (this.range.startOffset === 0 && this.range.endOffset === 0 && !(!isNullOrUndefined(this.range.startContainer.previousSibling) && this.range.startContainer.previousSibling.nodeName === 'IMG')) {
+                            if (this.range.startOffset === 0 && this.range.endOffset === 0 && !(!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') {
@@ -24181,7 +24236,7 @@ class EnterKeyAction {
                             }
                             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,11 +24251,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);
@@ -24227,37 +24287,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 +24305,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') {