@syncfusion/ej2-richtexteditor 19.4.52 → 19.4.55

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

@@ -10828,7 +10828,15 @@ class Lists {
         return isNested;
     }
     applyListsHandler(e) {
-        const range = this.parent.nodeSelection.getRange(this.parent.currentDocument);
+        let range = this.parent.nodeSelection.getRange(this.parent.currentDocument);
+        if (range.startContainer === range.endContainer && range.startContainer === this.parent.editableElement &&
+            range.startOffset === range.endOffset && range.startOffset === 0 &&
+            this.parent.editableElement.textContent.length === 0 && (this.parent.editableElement.childNodes[0].nodeName != 'TABLE' &&
+            this.parent.editableElement.childNodes[0].nodeName != 'IMG')) {
+            const focusNode = range.startContainer.childNodes[0];
+            this.parent.nodeSelection.setSelectionText(this.parent.currentDocument, focusNode, focusNode, 0, 0);
+            range = this.parent.nodeSelection.getRange(this.parent.currentDocument);
+        }
         this.saveSelection = this.parent.nodeSelection.save(range, this.parent.currentDocument);
         this.currentAction = e.subCommand;
         this.currentAction = e.subCommand = this.currentAction === 'NumberFormatList' ? 'OL' : this.currentAction === 'BulletFormatList' ? 'UL' : this.currentAction;
@@ -12196,7 +12204,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 {
@@ -12358,7 +12366,12 @@ class LinkCommand {
         }
         else {
             const domSelection = new NodeSelection();
-            const range = domSelection.getRange(this.parent.currentDocument);
+            let range = domSelection.getRange(this.parent.currentDocument);
+            if (range.endContainer.nodeName === '#text' && range.startContainer.textContent.length === (range.endOffset + 1) &&
+                range.endContainer.textContent.charAt(range.endOffset) === ' ' && range.endContainer.nextSibling.nodeName === 'A') {
+                domSelection.setSelectionText(this.parent.currentDocument, range.startContainer, range.endContainer, range.startOffset, range.endOffset + 1);
+                range = domSelection.getRange(this.parent.currentDocument);
+            }
             const text = isNullOrUndefined(e.item.text) ? true : e.item.text.replace(/ /g, '').localeCompare(range.toString()
                 .replace(/\n/g, ' ').replace(/ /g, '')) < 0;
             if (e.event && e.event.type === 'keydown' && (e.event.keyCode === 32
@@ -13012,7 +13025,12 @@ class ImageCommand {
     removeImage(e) {
         if (closest(e.item.selectNode[0], 'a')) {
             if (e.item.selectNode[0].parentElement.nodeName === 'A' && !isNullOrUndefined(e.item.selectNode[0].parentElement.innerText)) {
-                detach(e.item.selectNode[0]);
+                if (!isNullOrUndefined(closest(e.item.selectNode[0], '.' + CLASS_CAPTION))) {
+                    detach(closest(e.item.selectNode[0], '.' + CLASS_CAPTION));
+                }
+                else {
+                    detach(e.item.selectNode[0]);
+                }
             }
             else {
                 detach(closest(e.item.selectNode[0], 'a'));
@@ -14413,6 +14431,7 @@ class SelectionCommands {
     }
     static insertCursorNode(docElement, domSelection, range, isFormatted, nodeCutter, format, value, endNode) {
         const cursorNodes = domSelection.getNodeCollection(range);
+        const domNode = new DOMNode(endNode, docElement);
         const cursorFormat = (cursorNodes.length > 0) ?
             (cursorNodes.length > 1 && range.startContainer === range.endContainer) ?
                 this.getCursorFormat(isFormatted, cursorNodes, format, endNode) :
@@ -14420,11 +14439,16 @@ class SelectionCommands {
         let cursorNode = null;
         if (cursorFormat) {
             cursorNode = cursorNodes[0];
-            if (cursorFormat.firstChild.textContent.charCodeAt(0) === 8203) {
+            if (cursorFormat.firstChild.textContent.charCodeAt(0) === 8203 && cursorFormat.firstChild.nodeType === 3) {
                 const regEx = new RegExp(String.fromCharCode(8203), 'g');
                 let emptySpaceNode;
                 if (cursorFormat.firstChild === cursorNode) {
-                    cursorNode.textContent = cursorNode.textContent.replace(regEx, '');
+                    cursorNode.textContent = (cursorFormat.parentElement && (domNode.isBlockNode(cursorFormat.parentElement) &&
+                        cursorFormat.parentElement.textContent.length <= 1 ? cursorFormat.parentElement.childElementCount > 1 :
+                        cursorFormat.childElementCount === 0) &&
+                        (cursorFormat.parentElement.textContent.length > 1 ||
+                            cursorFormat.parentElement.firstChild && cursorFormat.parentElement.firstChild.nodeType === 1) ?
+                        cursorNode.textContent : cursorNode.textContent.replace(regEx, ''));
                     emptySpaceNode = cursorNode;
                     
                 }
@@ -17138,6 +17162,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');
@@ -17223,7 +17248,9 @@ class HtmlEditor {
                 this.parent.formatter.editorManager.nodeSelection.setCursorPoint(this.parent.contentModule.getDocument(), range.startContainer, pointer);
             }
             if (!isNullOrUndefined(range.startContainer.previousSibling) && !isNullOrUndefined(range.startContainer.previousSibling.parentElement) &&
-                range.startContainer.parentElement === range.startContainer.previousSibling.parentElement && range.startContainer.previousSibling.textContent.charCodeAt(0) === 8203) {
+                range.startContainer.parentElement === range.startContainer.previousSibling.parentElement &&
+                range.startContainer.previousSibling.textContent.charCodeAt(0) === 8203 &&
+                range.startContainer.previousSibling.textContent.length <= 1) {
                 range.startContainer.previousSibling.textContent = range.startContainer.previousSibling.textContent.replace(regEx, '');
             }
             if (range.endContainer.textContent.charCodeAt(range.endOffset) === 8203) {
@@ -17310,7 +17337,9 @@ class HtmlEditor {
             this.oldRangeElement = null;
             this.deleteRangeElement = null;
             this.deleteOldRangeElement = null;
-            args.preventDefault();
+            if (!this.isImageDelete) {
+                args.preventDefault();
+            }
         }
     }
     isOrderedList(editorValue) {
@@ -17434,7 +17463,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 +18051,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 +18131,7 @@ class PasteCleanup {
                         if (beforeUploadArgs.cancel) {
                             return;
                         }
+                        this.toolbarEnableDisable(true);
                         /* eslint-disable */
                         uploadObj.currentRequestHeader = beforeUploadArgs.currentRequest ?
                             beforeUploadArgs.currentRequest : uploadObj.currentRequestHeader;
@@ -18100,6 +18143,7 @@ class PasteCleanup {
                 }
                 else {
                     this.parent.trigger(beforeImageUpload, args);
+                    this.toolbarEnableDisable(true);
                 }
             },
             // eslint-disable-next-line
@@ -18171,6 +18215,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 +
@@ -21674,7 +21719,8 @@ class Image {
         if (activePopupElement) {
             activePopupElement.classList.add(CLS_HIDE);
         }
-        if (e.dataTransfer.files.length > 0) { //For external image drag and drop
+        const imgElement = this.parent.inputElement.ownerDocument.querySelector('.' + CLS_RTE_DRAG_IMAGE);
+        if (e.dataTransfer.files.length > 0 && imgElement === null) { //For external image drag and drop
             if (e.dataTransfer.files.length > 1) {
                 return;
             }
@@ -21697,7 +21743,6 @@ class Image {
         }
         else { //For internal image drag and drop
             const range = this.parent.formatter.editorManager.nodeSelection.getRange(this.parent.contentModule.getDocument());
-            const imgElement = this.parent.inputElement.ownerDocument.querySelector('.' + CLS_RTE_DRAG_IMAGE);
             if (imgElement && imgElement.tagName === 'IMG') {
                 if (imgElement.nextElementSibling) {
                     if (imgElement.nextElementSibling.classList.contains(CLS_IMG_INNER)) {
@@ -22819,7 +22864,7 @@ class Table {
             return;
         }
         const target = e.target || e.targetTouches[0].target;
-        const closestTable = closest(target, 'table');
+        const closestTable = closest(target, 'table.e-rte-table');
         if (!isNullOrUndefined(this.curTable) && !isNullOrUndefined(closestTable) && closestTable !== this.curTable) {
             this.removeResizeElement();
             this.removeHelper(e);
@@ -24237,6 +24282,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 +24386,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 +24448,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 +24911,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 +24944,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 :