@syncfusion/ej2-richtexteditor 20.1.48 → 20.1.52

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

@@ -4253,7 +4253,7 @@ var Toolbar$2 = /** @__PURE__ @class */ (function () {
             if ((parent_1.bottom < (floatOffset + tbHeight + topValue)) || parent_1.bottom < 0 || parent_1.top > floatOffset + topValue) {
                 isFloat = false;
             }
-            else if (parent_1.top < floatOffset) {
+            else if (parent_1.top < floatOffset || parent_1.top < floatOffset + topValue) {
                 isFloat = true;
             }
         }
@@ -11459,7 +11459,7 @@ var NodeCutter = /** @__PURE__ @class */ (function () {
                 fragment = this.spliceEmptyNode(fragment, true);
                 if (fragment && fragment.childNodes.length > 0) {
                     var 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);
@@ -11510,7 +11510,7 @@ var NodeCutter = /** @__PURE__ @class */ (function () {
         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;
@@ -12336,7 +12336,8 @@ var InsertHtml = /** @__PURE__ @class */ (function () {
                 tempSpan.parentNode.replaceChild(node, tempSpan);
             }
             else {
-                var currentNode = nodes[nodes.length - 1];
+                var nodeSelection = new NodeSelection();
+                var currentNode = this.getNodeCollection(range, nodeSelection, node)[this.getNodeCollection(range, nodeSelection, node).length - 1];
                 var splitedElm = void 0;
                 if ((currentNode.nodeName === 'BR' || currentNode.nodeName === 'HR') && !isNullOrUndefined(currentNode.parentElement) &&
                     currentNode.parentElement.textContent.trim().length === 0) {
@@ -13420,11 +13421,11 @@ var TableCommand = /** @__PURE__ @class */ (function () {
         for (var i = 0; i < emptyUl.length; i++) {
             detach(emptyUl[i]);
         }
-        var emptyLiChild = this.parent.editableElement.querySelectorAll('li *:empty');
+        var emptyLiChild = this.parent.editableElement.querySelectorAll('li *:empty:not(img)');
         for (var 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;
             }
         }
@@ -14516,12 +14517,18 @@ var SelectionCommands = /** @__PURE__ @class */ (function () {
             var preventRestore = false;
             var isFontStyle = (['fontcolor', 'fontname', 'fontsize', 'backgroundcolor'].indexOf(format) > -1);
             if (range.collapsed) {
+                var currentFormatNode = isFormatted.getFormattedNode(range.startContainer, format, endNode);
+                var 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);
@@ -15453,7 +15460,7 @@ var UndoRedoManager = /** @__PURE__ @class */ (function () {
      */
     UndoRedoManager.prototype.saveData = function (e) {
         var range = new NodeSelection().getRange(this.parent.currentDocument);
-        var currentContainer = range.startContainer;
+        var currentContainer = this.parent.editableElement === range.startContainer.parentElement ? range.startContainer.parentElement : range.startContainer;
         for (var 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' &&
@@ -16286,7 +16293,7 @@ var InsertTextExec = /** @__PURE__ @class */ (function () {
     };
     InsertTextExec.prototype.insertText = function (e) {
         var 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,
@@ -20410,14 +20417,10 @@ var Image = /** @__PURE__ @class */ (function () {
                 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());
-            }
         }
     };
     Image.prototype.pixToPerc = function (expected, parentEle) {
@@ -23342,7 +23345,7 @@ var Table = /** @__PURE__ @class */ (function () {
                         EventHandler.remove(_this.contentModule.getEditPanel(), 'mouseover', _this.resizeHelper);
                     }
                     var 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');
@@ -24774,8 +24777,9 @@ var EnterKeyAction = /** @__PURE__ @class */ (function () {
     };
     EnterKeyAction.prototype.removeBRElement = function (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);
         }
     };
@@ -25527,6 +25531,10 @@ var RichTextEditor = /** @__PURE__ @class */ (function (_super) {
                 ? 0 : e.clipboardData.getData('text/plain').length;
             var totalLength = (currentLength - selectionLength) + pastedContentLength;
             if (_this.editorMode === 'Markdown') {
+                var args_1 = { requestType: 'Paste', editorMode: _this.editorMode, event: e };
+                setTimeout(function () {
+                    _this.formatter.onSuccess(_this, args_1);
+                }, 0);
                 if (!(_this.maxLength === -1 || totalLength <= _this.maxLength)) {
                     e.preventDefault();
                 }
@@ -25538,7 +25546,7 @@ var RichTextEditor = /** @__PURE__ @class */ (function (_super) {
                     _this.notify(pasteClean, { args: e });
                 }
                 else {
-                    var args_1 = { requestType: 'Paste', editorMode: _this.editorMode, event: e };
+                    var args_2 = { requestType: 'Paste', editorMode: _this.editorMode, event: e };
                     var value = null;
                     var htmlValue = false;
                     if (e && !isNullOrUndefined(e.clipboardData)) {
@@ -25556,7 +25564,7 @@ var RichTextEditor = /** @__PURE__ @class */ (function (_super) {
                         });
                     }
                     setTimeout(function () {
-                        _this.formatter.onSuccess(_this, args_1);
+                        _this.formatter.onSuccess(_this, args_2);
                     }, 0);
                 }
             }