@syncfusion/ej2-richtexteditor 19.4.53 → 19.4.54

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

@@ -12196,7 +12196,7 @@ class InsertHtml {
                 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')) {
+                    currentNode.parentElement.textContent.trim().length === 0 && (currentNode.parentElement === editNode || !node.classList.contains('pasteContent'))) {
                     splitedElm = currentNode;
                 }
                 else {
@@ -17138,6 +17138,7 @@ class XhtmlValidation {
 class HtmlEditor {
     constructor(parent, serviceLocator) {
         this.rangeCollection = [];
+        this.isImageDelete = false;
         this.parent = parent;
         this.locator = serviceLocator;
         this.renderFactory = this.locator.getService('rendererFactory');
@@ -17310,7 +17311,9 @@ class HtmlEditor {
             this.oldRangeElement = null;
             this.deleteRangeElement = null;
             this.deleteOldRangeElement = null;
-            args.preventDefault();
+            if (!this.isImageDelete) {
+                args.preventDefault();
+            }
         }
     }
     isOrderedList(editorValue) {
@@ -17434,7 +17437,15 @@ class HtmlEditor {
                     return;
                 }
                 else {
-                    this.parent.formatter.editorManager.nodeSelection.setCursorPoint(this.parent.contentModule.getDocument(), this.deleteRangeElement, this.deleteRangeElement.childNodes.length);
+                    if (currentRange.startOffset === 0 && currentRange.endOffset === 1 &&
+                        this.deleteRangeElement.childNodes[0].nodeName === 'IMG') {
+                        this.parent.formatter.editorManager.nodeSelection.setSelectionText(this.parent.contentModule.getDocument(), this.deleteRangeElement, this.deleteRangeElement, 0, 1);
+                        this.isImageDelete = true;
+                    }
+                    else {
+                        this.parent.formatter.editorManager.nodeSelection.setCursorPoint(this.parent.contentModule.getDocument(), this.deleteRangeElement, this.deleteRangeElement.childNodes.length);
+                        this.isImageDelete = false;
+                    }
                     if (this.deleteRangeElement.querySelector('BR')) {
                         detach(this.deleteRangeElement.querySelector('BR'));
                     }
@@ -18014,6 +18025,11 @@ class PasteCleanup {
             }
         }
     }
+    toolbarEnableDisable(state) {
+        if (!this.parent.inlineMode.enable) {
+            this.parent.toolbarModule.baseToolbar.toolbarObj.disable(state);
+        }
+    }
     uploadMethod(fileList, imgElem) {
         const uploadEle = document.createElement('div');
         document.body.appendChild(uploadEle);
@@ -18089,6 +18105,7 @@ class PasteCleanup {
                         if (beforeUploadArgs.cancel) {
                             return;
                         }
+                        this.toolbarEnableDisable(true);
                         /* eslint-disable */
                         uploadObj.currentRequestHeader = beforeUploadArgs.currentRequest ?
                             beforeUploadArgs.currentRequest : uploadObj.currentRequestHeader;
@@ -18100,6 +18117,7 @@ class PasteCleanup {
                 }
                 else {
                     this.parent.trigger(beforeImageUpload, args);
+                    this.toolbarEnableDisable(true);
                 }
             },
             // eslint-disable-next-line
@@ -18171,6 +18189,7 @@ class PasteCleanup {
         popupObj.close();
         imgElem.style.opacity = '1';
         uploadObj.destroy();
+        this.toolbarEnableDisable(false);
     }
     refreshPopup(imageElement, popupObj) {
         const imgPosition = this.parent.iframeSettings.enable ? this.parent.element.offsetTop +
@@ -24237,6 +24256,7 @@ class EnterKeyAction {
                             else if (this.range.startOffset === 0 && this.range.endOffset === 0) {
                                 isFocusedFirst = true;
                             }
+                            this.removeBRElement(nearBlockNode);
                             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'))) {
@@ -24340,6 +24360,7 @@ class EnterKeyAction {
                             else {
                                 currentParent = this.startNode;
                             }
+                            this.removeBRElement(currentParent);
                             let currentParentLastChild = currentParent.lastChild;
                             while (!isNullOrUndefined(currentParentLastChild) && !(currentParentLastChild.nodeName === '#text' || currentParentLastChild.nodeName === 'BR')) {
                                 currentParentLastChild = currentParentLastChild.lastChild;
@@ -24401,6 +24422,13 @@ class EnterKeyAction {
             }
         }
     }
+    removeBRElement(currentElement) {
+        if (Browser.userAgent.indexOf('Firefox') != -1 &&
+            this.range.endOffset === currentElement.textContent.length &&
+            currentElement.lastChild.nodeName === 'BR') {
+            detach(currentElement.lastChild);
+        }
+    }
     insertBRElement() {
         let isEmptyBrInserted = false;
         const brElm = this.parent.createElement('br');
@@ -24857,6 +24885,27 @@ let RichTextEditor = class RichTextEditor extends Component {
     eventInitializer() {
         this.wireEvents();
     }
+    cleanList(e) {
+        const range = this.getRange();
+        const currentStartContainer = range.startContainer;
+        const currentEndContainer = range.endContainer;
+        let currentStartOffset = range.startOffset;
+        let isSameContainer = currentStartContainer === currentEndContainer ? true : false;
+        let currentEndOffset;
+        const endNode = range.endContainer.nodeName === '#text' ? range.endContainer.parentElement :
+            range.endContainer;
+        let closestLI = closest(endNode, 'LI');
+        if (!isNullOrUndefined(closestLI) && endNode.textContent.length === range.endOffset &&
+            !range.collapsed) {
+            closestLI.textContent = closestLI.textContent.trim();
+            currentEndOffset = closestLI.textContent.length - 1;
+            let currentLastElem = closestLI;
+            while (currentLastElem.nodeName !== '#text') {
+                currentLastElem = currentLastElem.lastChild;
+            }
+            this.formatter.editorManager.nodeSelection.setSelectionText(this.contentModule.getDocument(), isSameContainer ? currentLastElem : currentStartContainer, currentLastElem, currentStartOffset, currentLastElem.textContent.length);
+        }
+    }
     /**
      * For internal use only - keydown the event handler;
      *
@@ -24869,6 +24918,9 @@ let RichTextEditor = class RichTextEditor extends Component {
     keyDown(e) {
         this.notify(keyDown, { member: 'keydown', args: e });
         this.restrict(e);
+        if (this.editorMode === 'HTML') {
+            this.cleanList(e);
+        }
         if (this.editorMode === 'HTML' && ((e.which === 8 && e.code === 'Backspace') || (e.which === 46 && e.code === 'Delete'))) {
             const range = this.getRange();
             const startNode = range.startContainer.nodeName === '#text' ? range.startContainer.parentElement :