@syncfusion/ej2-richtexteditor 23.1.40 → 23.1.41

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

@@ -3550,6 +3550,7 @@ var ToolbarRenderer = /** @__PURE__ @class */ (function () {
                     args.cancel = true;
                     return;
                 }
+                proxy.parent.notify(selectionRestore, {});
                 var element = (args.event) ? args.event.target : null;
                 proxy.currentElement = dropDown.element;
                 proxy.currentDropdown = dropDown;
@@ -3576,6 +3577,12 @@ var ToolbarRenderer = /** @__PURE__ @class */ (function () {
         }
         args.element.tabIndex = -1;
         dropDown.element.removeAttribute('type');
+        dropDown.element.onmousedown = function () {
+            proxy.parent.notify(selectionSave, {});
+        };
+        dropDown.element.onkeydown = function () {
+            proxy.parent.notify(selectionSave, {});
+        };
         return dropDown;
     };
     // eslint-disable-next-line
@@ -7894,20 +7901,20 @@ var Formatter = /** @__PURE__ @class */ (function () {
         }
         if (isNullOrUndefined(args)) {
             var action_1 = event.action;
+            args = {};
+            var items = {
+                originalEvent: event, cancel: false,
+                requestType: action_1 || (event.key + 'Key'),
+                itemCollection: value
+            };
+            extend(args, args, items, true);
             if (action_1 !== 'tab' && action_1 !== 'enter' && action_1 !== 'space' && action_1 !== 'escape') {
-                args = {};
                 if (self.editorMode === 'Markdown' && action_1 === 'insert-table') {
                     value = {
                         'headingText': self.localeObj.getConstant('TableHeadingText'),
                         'colText': self.localeObj.getConstant('TableColText')
                     };
                 }
-                var items = {
-                    originalEvent: event, cancel: false,
-                    requestType: action_1 || (event.key + 'Key'),
-                    itemCollection: value
-                };
-                extend(args, args, items, true);
                 self.trigger(actionBegin, args, function (actionBeginArgs) {
                     if (actionBeginArgs.cancel) {
                         if (action_1 === 'paste' || action_1 === 'cut' || action_1 === 'copy') {
@@ -7916,20 +7923,22 @@ var Formatter = /** @__PURE__ @class */ (function () {
                     }
                 });
             }
-            var isTableModule = isNullOrUndefined(self.tableModule) ? true : self.tableModule ?
-                self.tableModule.ensureInsideTableList : false;
-            if ((event.which === 9 && isTableModule) || event.which !== 9) {
-                if (event.which === 13 && self.editorMode === 'HTML') {
-                    value = {
-                        'enterAction': self.enterKey
-                    };
+            if (!args.cancel) {
+                var isTableModule = isNullOrUndefined(self.tableModule) ? true : self.tableModule ?
+                    self.tableModule.ensureInsideTableList : false;
+                if ((event.which === 9 && isTableModule) || event.which !== 9) {
+                    if (event.which === 13 && self.editorMode === 'HTML') {
+                        value = {
+                            'enterAction': self.enterKey
+                        };
+                    }
+                    this.editorManager.observer.notify((event.type === 'keydown' ? KEY_DOWN : KEY_UP), {
+                        event: event,
+                        callBack: this.onSuccess.bind(this, self),
+                        value: value,
+                        enterAction: self.enterKey
+                    });
                 }
-                this.editorManager.observer.notify((event.type === 'keydown' ? KEY_DOWN : KEY_UP), {
-                    event: event,
-                    callBack: this.onSuccess.bind(this, self),
-                    value: value,
-                    enterAction: self.enterKey
-                });
             }
         }
         else if (!isNullOrUndefined(args) && args.item.command && args.item.subCommand && ((args.item.command !== args.item.subCommand
@@ -12659,7 +12668,7 @@ var NodeCutter = /** @__PURE__ @class */ (function () {
                 node = parent_1.childNodes[index];
                 fragment = this.spliceEmptyNode(fragment, false);
                 if (fragment && fragment.childNodes.length > 0) {
-                    var isEmpty = (fragment.childNodes.length === 1 && fragment.childNodes[0].nodeName !== 'IMG'
+                    var isEmpty = (fragment.childNodes.length === 1 && fragment.childNodes[0].nodeName !== 'IMG' && !(fragment.querySelectorAll('img').length > 0)
                         && this.isRteElm(fragment) && fragment.textContent === '') ? true : false;
                     if (!isEmpty) {
                         if (node) {
@@ -13529,6 +13538,10 @@ var InsertHtml = /** @__PURE__ @class */ (function () {
             : lastSelectionNode.previousSibling) : lastSelectionNode;
         while (!isNullOrUndefined(lastSelectionNode) && lastSelectionNode.nodeName !== '#text' && lastSelectionNode.nodeName !== 'IMG' &&
             lastSelectionNode.nodeName !== 'BR' && lastSelectionNode.nodeName !== 'HR') {
+            if (!isNullOrUndefined(lastSelectionNode.lastChild) && (lastSelectionNode.lastChild.nodeName === 'P' && lastSelectionNode.lastChild.innerHTML === '')) {
+                var lineBreak = createElement('br');
+                lastSelectionNode.lastChild.appendChild(lineBreak);
+            }
             lastSelectionNode = lastSelectionNode.lastChild;
         }
         lastSelectionNode = isNullOrUndefined(lastSelectionNode) ? node : lastSelectionNode;
@@ -17855,8 +17868,10 @@ var MsWordPaste = /** @__PURE__ @class */ (function () {
                     else {
                         continue;
                     }
-                    isCroppedImage = this.extractCropValue('cropl', fullImg[i]) > 0 &&
-                        this.extractCropValue('cropt', fullImg[i]) > 0 ? true : false;
+                    isCroppedImage = ((this.extractCropValue('cropl', fullImg[i]) > 0 &&
+                        this.extractCropValue('cropt', fullImg[i]) > 0) ||
+                        (this.extractCropValue('cropr', fullImg[i]) > 0 &&
+                            this.extractCropValue('cropb', fullImg[i]))) ? true : false;
                     if (isCroppedImage) {
                         goalWidth = this.extractCropValue('wgoal', fullImg[i]);
                         goalHeight = this.extractCropValue('hgoal', fullImg[i]);
@@ -17883,7 +17898,7 @@ var MsWordPaste = /** @__PURE__ @class */ (function () {
     };
     MsWordPaste.prototype.extractCropValue = function (crop, rtfData) {
         // eslint-disable-next-line security/detect-non-literal-regexp
-        var result = new RegExp('\\\\pic' + crop + '(\\-?\\d+)\\\\').exec(rtfData.replace('\r\n\\', '\\'))[1];
+        var result = new RegExp('\\\\pic' + crop + '(\\-?\\d+)\\\\').exec(rtfData.replace(/\r\n\\/g, '\\'))[1];
         return parseInt(result, 10);
     };
     MsWordPaste.prototype.removeClassName = function (elm) {
@@ -19251,10 +19266,15 @@ var FormatPainterActions = /** @__PURE__ @class */ (function () {
         return this.INVALID_TAGS.indexOf(node.tagName) > -1;
     };
     FormatPainterActions.prototype.findCurrentContext = function (parentElem) {
-        if (closest(parentElem, 'p')) {
+        var closestParagraph = closest(parentElem, 'p');
+        var closestList = closest(parentElem, 'li');
+        if (closestParagraph && !closestList) {
             return 'Text';
         }
         else if (closest(parentElem, 'li')) {
+            if (!isNullOrUndefined(closestParagraph) && !isNullOrUndefined(closestList) && closestParagraph.textContent.trim() !== closestList.textContent.trim()) {
+                return 'Text';
+            }
             return 'List';
         }
         else if (closest(parentElem, 'td') || closest(parentElem, 'tr') || closest(parentElem, 'th')) {
@@ -19312,7 +19332,7 @@ var FormatPainterActions = /** @__PURE__ @class */ (function () {
         var cloneElementNode = isNullOrUndefined(cloneListParentNode) ? element : element.firstChild;
         for (var index = 0; index < nodes.length; index++) {
             if (this.INVALID_TAGS.indexOf(nodes[index].nodeName) > -1 ||
-                nodes[index].querySelectorAll('a,img,audio,video,iframe').length > 0) {
+                nodes[index].querySelectorAll('img,audio,video,iframe').length > 0) {
                 continue;
             }
             var cloneParentNode = cloneElementNode.cloneNode(false);
@@ -20332,7 +20352,7 @@ var HtmlEditor = /** @__PURE__ @class */ (function () {
                             detach(currentChildNode[i]);
                             i--;
                         }
-                        if (focusNode.textContent.replace(regEx, '') === currentChildNode[i].textContent) {
+                        if (!isNullOrUndefined(currentChildNode[i]) && focusNode.textContent.replace(regEx, '') === currentChildNode[i].textContent) {
                             pointer = focusNode.textContent.length > 1 ?
                                 (focusNode.textContent === currentChildNode[i].textContent ? pointer :
                                     pointer - (focusNode.textContent.length - focusNode.textContent.replace(regEx, '').length)) :
@@ -31724,7 +31744,7 @@ var EnterKeyAction = /** @__PURE__ @class */ (function () {
                                     }
                                     _this.parent.formatter.editorManager.nodeSelection.setCursorPoint(_this.parent.contentModule.getDocument(), insertElem.nextElementSibling, 0);
                                 }
-                                else if (nearBlockNode.textContent.length === 0 && !(!isNullOrUndefined(nearBlockNode.childNodes[0]) && nearBlockNode.childNodes[0].nodeName === 'IMG')) {
+                                else if (nearBlockNode.textContent.length === 0 && !(!isNullOrUndefined(nearBlockNode.childNodes[0]) && nearBlockNode.childNodes[0].nodeName === 'IMG') && !(nearBlockNode.querySelectorAll('img').length > 0)) {
                                     if (!isNullOrUndefined(nearBlockNode.children[0]) && nearBlockNode.children[0].tagName !== 'BR') {
                                         var newElem = _this.parent.formatter.editorManager.nodeCutter.SplitNode(_this.range, nearBlockNode, false).cloneNode(true);
                                         _this.parent.formatter.editorManager.domNode.insertAfter(newElem, nearBlockNode);
@@ -32690,13 +32710,13 @@ var RichTextEditor = /** @__PURE__ @class */ (function (_super) {
                 this.formatter.editorManager.nodeSelection.setCursorPoint(this.contentModule.getDocument(), range.startContainer, range.startOffset);
             }
         }
-        var notFormatPainterCopy = !isNullOrUndefined(e.action) && e.action !== 'format-copy';
-        if (this.formatter.getUndoRedoStack().length === 0 && notFormatPainterCopy) {
+        var notFormatPainterCopy = isNullOrUndefined(e.action) ? true : (e.action !== 'format-copy' ? true : false);
+        if (this.formatter.getUndoRedoStack().length === 0 && notFormatPainterCopy && !(e.altKey || e.shiftKey || (e.altKey && e.shiftKey && e.which == 67))) {
             this.formatter.saveData();
         }
         if (e.action !== 'insert-link' &&
             e.action !== 'format-copy' && e.action !== 'format-paste' &&
-            (!e.target || (e.target.classList.contains('e-mention') && e.code !== 'Tab')) &&
+            (!e.target || !(e.target.classList.contains('e-mention') && e.code === 'Tab')) &&
             (e.action && e.action !== 'paste' && e.action !== 'space'
                 || e.which === 9 || (e.code === 'Backspace' && e.which === 8))) {
             var FormatPainterEscapeAction = false;