@syncfusion/ej2-richtexteditor 20.1.48 → 20.1.52

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

@@ -4232,7 +4232,7 @@ class Toolbar$2 {
             if ((parent.bottom < (floatOffset + tbHeight + topValue)) || parent.bottom < 0 || parent.top > floatOffset + topValue) {
                 isFloat = false;
             }
-            else if (parent.top < floatOffset) {
+            else if (parent.top < floatOffset || parent.top < floatOffset + topValue) {
                 isFloat = true;
             }
         }
@@ -11360,7 +11360,7 @@ class NodeCutter {
                 fragment = this.spliceEmptyNode(fragment, true);
                 if (fragment && fragment.childNodes.length > 0) {
                     const isEmpty = (fragment.childNodes.length === 1 && fragment.childNodes[0].nodeName !== 'IMG'
-                        && this.isImgElm(fragment) && fragment.textContent.trim() === '') ? true : false;
+                        && this.isImgElm(fragment) && fragment.textContent === '') ? true : false;
                     if (!isEmpty) {
                         if (node) {
                             InsertMethods.AppendBefore(fragment, node, true);
@@ -11411,7 +11411,7 @@ class NodeCutter {
         else if (len > -1) {
             this.spliceEmptyNode(fragment.childNodes[0], isStart);
         }
-        else if (fragment.nodeType !== 3 && fragment.nodeType !== 11) {
+        else if (fragment.nodeType !== 3 && fragment.nodeType !== 11 && fragment.nodeName !== 'IMG') {
             fragment.parentNode.removeChild(fragment);
         }
         return fragment;
@@ -12233,7 +12233,8 @@ class InsertHtml {
                 tempSpan.parentNode.replaceChild(node, tempSpan);
             }
             else {
-                let currentNode = nodes[nodes.length - 1];
+                const nodeSelection = new NodeSelection();
+                let currentNode = this.getNodeCollection(range, nodeSelection, node)[this.getNodeCollection(range, nodeSelection, node).length - 1];
                 let splitedElm;
                 if ((currentNode.nodeName === 'BR' || currentNode.nodeName === 'HR') && !isNullOrUndefined(currentNode.parentElement) &&
                     currentNode.parentElement.textContent.trim().length === 0) {
@@ -13311,11 +13312,11 @@ class TableCommand {
         for (let i = 0; i < emptyUl.length; i++) {
             detach(emptyUl[i]);
         }
-        let emptyLiChild = this.parent.editableElement.querySelectorAll('li *:empty');
+        let emptyLiChild = this.parent.editableElement.querySelectorAll('li *:empty:not(img)');
         for (let i = 0; i < emptyLiChild.length; i++) {
             detach(emptyLiChild[i]);
             if (emptyLiChild.length === i + 1) {
-                emptyLiChild = this.parent.editableElement.querySelectorAll('li *:empty');
+                emptyLiChild = this.parent.editableElement.querySelectorAll('li *:empty:not(img)');
                 i = -1;
             }
         }
@@ -14398,12 +14399,18 @@ class SelectionCommands {
             let preventRestore = false;
             const isFontStyle = (['fontcolor', 'fontname', 'fontsize', 'backgroundcolor'].indexOf(format) > -1);
             if (range.collapsed) {
+                let currentFormatNode = isFormatted.getFormattedNode(range.startContainer, format, endNode);
+                let currentSelector = !isNullOrUndefined(currentFormatNode) ?
+                    (currentFormatNode.getAttribute('style') === null ? currentFormatNode.nodeName :
+                        currentFormatNode.nodeName + `[style='` + currentFormatNode.getAttribute('style') + `']`) : null;
                 if (nodes.length > 0) {
                     isCollapsed = true;
                     range = nodeCutter.GetCursorRange(docElement, range, nodes[0]);
                 }
-                else if (range.startContainer.nodeType === 3 && range.startContainer.parentElement.childElementCount > 0 &&
-                    range.startOffset > 0 && range.startContainer.parentElement.firstElementChild.tagName.toLowerCase() !== 'br') {
+                else if (range.startContainer.nodeType === 3 && ((range.startContainer.parentElement.childElementCount > 0 &&
+                    range.startOffset > 0 && range.startContainer.parentElement.firstElementChild.tagName.toLowerCase() !== 'br') ||
+                    !isNullOrUndefined(currentFormatNode) && currentFormatNode === (range.startContainer.parentElement.closest(currentSelector)) &&
+                        ((range.startContainer.parentElement.closest(currentSelector)).textContent.replace(new RegExp(String.fromCharCode(8203), 'g'), '').trim().length != 0))) {
                     isCollapsed = true;
                     range = nodeCutter.GetCursorRange(docElement, range, range.startContainer);
                     nodes.push(range.startContainer);
@@ -15327,7 +15334,7 @@ class UndoRedoManager {
      */
     saveData(e) {
         let range = new NodeSelection().getRange(this.parent.currentDocument);
-        let currentContainer = range.startContainer;
+        let currentContainer = this.parent.editableElement === range.startContainer.parentElement ? range.startContainer.parentElement : 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' &&
@@ -16158,7 +16165,7 @@ class InsertTextExec {
     }
     insertText(e) {
         const node = document.createTextNode(e.value);
-        InsertHtml.Insert(this.parent.currentDocument, node);
+        InsertHtml.Insert(this.parent.currentDocument, node, this.parent.editableElement);
         if (e.callBack) {
             e.callBack({
                 requestType: e.subCommand,
@@ -20311,14 +20318,10 @@ class Image {
                 img.style.height = null;
                 img.removeAttribute('height');
             }
-            else if (img.style.width !== '') {
+            else {
                 img.style.width = expectedX + 'px';
                 img.style.height = expectedX + 'px';
             }
-            else {
-                img.setAttribute('width', expectedX.toString());
-                img.setAttribute('height', expectedX.toString());
-            }
         }
     }
     pixToPerc(expected, parentEle) {
@@ -23223,7 +23226,7 @@ class Table {
                         EventHandler.remove(this.contentModule.getEditPanel(), 'mouseover', this.resizeHelper);
                     }
                     const widthType = this.curTable.style.width.indexOf('%') > -1;
-                    this.curTable.style.width = widthType ? this.convertPixelToPercentage(tableWidth + mouseX, rteWidth) + '%'
+                    this.curTable.style.width = widthType && !this.curTable.closest('TD') ? this.convertPixelToPercentage(tableWidth + mouseX, rteWidth) + '%'
                         : tableWidth + mouseX + 'px';
                     this.curTable.style.height = tableHeight + mouseY + 'px';
                     tableReBox.classList.add('e-rbox-select');
@@ -24530,8 +24533,9 @@ class EnterKeyAction {
     }
     removeBRElement(currentElement) {
         if (Browser.userAgent.indexOf('Firefox') != -1 &&
-            this.range.endOffset === currentElement.textContent.length &&
-            currentElement.lastChild.nodeName === 'BR') {
+            this.range.endOffset === currentElement.textContent.length && (currentElement.textContent.length !== 0 ||
+            currentElement.querySelectorAll('BR').length > 1) &&
+            !isNullOrUndefined(currentElement.lastChild) && currentElement.lastChild.nodeName === 'BR') {
             detach(currentElement.lastChild);
         }
     }
@@ -25255,6 +25259,10 @@ let RichTextEditor = class RichTextEditor extends Component {
                 ? 0 : e.clipboardData.getData('text/plain').length;
             const totalLength = (currentLength - selectionLength) + pastedContentLength;
             if (this.editorMode === 'Markdown') {
+                const args = { requestType: 'Paste', editorMode: this.editorMode, event: e };
+                setTimeout(() => {
+                    this.formatter.onSuccess(this, args);
+                }, 0);
                 if (!(this.maxLength === -1 || totalLength <= this.maxLength)) {
                     e.preventDefault();
                 }