@syncfusion/ej2-richtexteditor 23.1.40 → 23.1.43

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

@@ -3363,10 +3363,10 @@ class ToolbarRenderer {
         if (!this.parent.enabled) {
             return;
         }
+        this.parent.trigger('toolbarClick', args);
         if (!this.parent.readonly || isNullOrUndefined(args.item)) {
             this.parent.notify(toolbarClick, args);
         }
-        this.parent.trigger('toolbarClick', args);
     }
     dropDownSelected(args) {
         this.parent.notify(dropDownSelect, args);
@@ -3554,6 +3554,7 @@ class ToolbarRenderer {
                     args.cancel = true;
                     return;
                 }
+                proxy.parent.notify(selectionRestore, {});
                 const element = (args.event) ? args.event.target : null;
                 proxy.currentElement = dropDown.element;
                 proxy.currentDropdown = dropDown;
@@ -3580,6 +3581,12 @@ class ToolbarRenderer {
         }
         args.element.tabIndex = -1;
         dropDown.element.removeAttribute('type');
+        dropDown.element.onmousedown = () => {
+            proxy.parent.notify(selectionSave, {});
+        };
+        dropDown.element.onkeydown = () => {
+            proxy.parent.notify(selectionSave, {});
+        };
         return dropDown;
     }
     // eslint-disable-next-line
@@ -4799,6 +4806,7 @@ class ToolbarAction {
  */
 class Toolbar$2 {
     constructor(parent, serviceLocator) {
+        this.tools = {};
         this.parent = parent;
         this.isToolbar = false;
         this.locator = serviceLocator;
@@ -7836,20 +7844,20 @@ class Formatter {
         }
         if (isNullOrUndefined(args)) {
             const action = event.action;
+            args = {};
+            const items = {
+                originalEvent: event, cancel: false,
+                requestType: action || (event.key + 'Key'),
+                itemCollection: value
+            };
+            extend(args, args, items, true);
             if (action !== 'tab' && action !== 'enter' && action !== 'space' && action !== 'escape') {
-                args = {};
                 if (self.editorMode === 'Markdown' && action === 'insert-table') {
                     value = {
                         'headingText': self.localeObj.getConstant('TableHeadingText'),
                         'colText': self.localeObj.getConstant('TableColText')
                     };
                 }
-                const items = {
-                    originalEvent: event, cancel: false,
-                    requestType: action || (event.key + 'Key'),
-                    itemCollection: value
-                };
-                extend(args, args, items, true);
                 self.trigger(actionBegin, args, (actionBeginArgs) => {
                     if (actionBeginArgs.cancel) {
                         if (action === 'paste' || action === 'cut' || action === 'copy') {
@@ -7858,20 +7866,22 @@ class Formatter {
                     }
                 });
             }
-            const 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) {
+                const 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
@@ -12565,7 +12575,7 @@ class NodeCutter {
                 node = parent.childNodes[index];
                 fragment = this.spliceEmptyNode(fragment, false);
                 if (fragment && fragment.childNodes.length > 0) {
-                    const isEmpty = (fragment.childNodes.length === 1 && fragment.childNodes[0].nodeName !== 'IMG'
+                    const 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) {
@@ -13431,6 +13441,11 @@ class InsertHtml {
             : 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 === '')) {
+                const lineBreak = createElement('br');
+                lastSelectionNode.lastChild.appendChild(lineBreak);
+            }
             lastSelectionNode = lastSelectionNode.lastChild;
         }
         lastSelectionNode = isNullOrUndefined(lastSelectionNode) ? node : lastSelectionNode;
@@ -13897,7 +13912,7 @@ class LinkCommand {
             for (let i = 0; i < blockNodes.length; i++) {
                 const linkNode = blockNodes[i].querySelectorAll('a');
                 for (let j = 0; j < linkNode.length; j++) {
-                    if (document.getSelection().containsNode(linkNode[j], true)) {
+                    if (this.parent.currentDocument.getSelection().containsNode(linkNode[j], true)) {
                         linkNode[j].outerHTML = linkNode[j].innerHTML;
                     }
                 }
@@ -17729,8 +17744,10 @@ class MsWordPaste {
                     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]);
@@ -17757,7 +17774,7 @@ class MsWordPaste {
     }
     extractCropValue(crop, rtfData) {
         // eslint-disable-next-line security/detect-non-literal-regexp
-        const result = new RegExp('\\\\pic' + crop + '(\\-?\\d+)\\\\').exec(rtfData.replace('\r\n\\', '\\'))[1];
+        const result = new RegExp('\\\\pic' + crop + '(\\-?\\d+)\\\\').exec(rtfData.replace(/\r\n\\/g, '\\').replace(/\n/g, '\\'))[1];
         return parseInt(result, 10);
     }
     removeClassName(elm) {
@@ -17796,6 +17813,10 @@ class MsWordPaste {
         return removableElement;
     }
     removeUnwantedElements(elm) {
+        let styleElm = elm.querySelector('style');
+        if (!isNullOrUndefined(styleElm)) {
+            detach(styleElm);
+        }
         let innerElement = elm.innerHTML;
         for (let i = 0; i < this.removableElements.length; i++) {
             // eslint-disable-next-line security/detect-non-literal-regexp
@@ -18093,10 +18114,8 @@ class MsWordPaste {
                 }
                 if (!isNullOrUndefined(listNodes[i].getAttribute('style'))) {
                     listNodes[i].setAttribute('style', listNodes[i].getAttribute('style').replace('text-align:start;', ''));
-                    if (listNodes[i].style.textAlign !== '') {
-                        listNodes[i].setAttribute('style', 'text-align:' + listNodes[i].style.textAlign);
-                        currentListStyle = listNodes[i].getAttribute('style');
-                    }
+                    listNodes[i].style.textIndent = '';
+                    currentListStyle = listNodes[i].getAttribute('style');
                 }
                 collection.push({
                     listType: type, content: tempNode, nestedLevel: level, class: currentClassName,
@@ -18304,8 +18323,7 @@ class MsWordPaste {
                 }
             }
             prevList.setAttribute('class', collection[index].class);
-            const currentStyle = prevList.getAttribute('style');
-            prevList.setAttribute('style', (!isNullOrUndefined(currentStyle) ? currentStyle : ''));
+            prevList.setAttribute('style', (!isNullOrUndefined(collection[index].listStyle) ? collection[index].listStyle : ''));
             pLevel = collection[index].nestedLevel;
             listCount++;
             if (!isNullOrUndefined(collection[index].start)) {
@@ -18748,7 +18766,7 @@ class EmojiPickerAction {
     }
     emojiInsert(args) {
         const node = document.createTextNode(args.value);
-        const selection = window.getSelection();
+        const selection = this.parent.currentDocument.getSelection();
         const range = selection.getRangeAt(0);
         const cursorPos = range.startOffset;
         for (let i = cursorPos - 1; i >= cursorPos - 15; i--) {
@@ -19119,10 +19137,15 @@ class FormatPainterActions {
         return this.INVALID_TAGS.indexOf(node.tagName) > -1;
     }
     findCurrentContext(parentElem) {
-        if (closest(parentElem, 'p')) {
+        const closestParagraph = closest(parentElem, 'p');
+        const 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')) {
@@ -19180,7 +19203,7 @@ class FormatPainterActions {
         const cloneElementNode = isNullOrUndefined(cloneListParentNode) ? element : element.firstChild;
         for (let 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;
             }
             const cloneParentNode = cloneElementNode.cloneNode(false);
@@ -20258,7 +20281,7 @@ class HtmlEditor {
                             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)) :
@@ -22815,7 +22838,7 @@ class EmojiPicker {
         }
         else if (isNullOrUndefined(args.x) && isNullOrUndefined(args.y) && !this.parent.inlineMode.enable && isNullOrUndefined(this.parent.quickToolbarSettings.text)) {
             target = this.parent.inputElement;
-            if (window.getSelection().rangeCount > 0) {
+            if (this.parent.contentModule.getDocument().getSelection().rangeCount > 0) {
                 const coordinates = this.getCoordinates();
                 xValue = coordinates.left;
                 yValue = coordinates.top;
@@ -22823,7 +22846,7 @@ class EmojiPicker {
         }
         else if (isNullOrUndefined(args.x) && isNullOrUndefined(args.y) && (this.parent.inlineMode.enable || !isNullOrUndefined(this.parent.quickToolbarSettings.text))) {
             this.parent.notify(hidePopup, {});
-            if (window.getSelection().rangeCount > 0) {
+            if (this.parent.contentModule.getDocument().getSelection().rangeCount > 0) {
                 const coordinates = this.getCoordinates();
                 xValue = coordinates.left;
                 yValue = coordinates.top;
@@ -23412,7 +23435,7 @@ class EmojiPicker {
     }
     onkeyPress(e) {
         const originalEvent = e.args;
-        const selection = window.getSelection();
+        const selection = this.parent.contentModule.getDocument().getSelection();
         if (selection.rangeCount <= 0) {
             return;
         }
@@ -23442,7 +23465,10 @@ class EmojiPicker {
     }
     onkeyUp(e) {
         const originalEvent = e.args;
-        const selection = window.getSelection();
+        const selection = this.parent.contentModule.getDocument().getSelection();
+        if (selection.rangeCount <= 0) {
+            return;
+        }
         const range = selection.getRangeAt(0);
         const cursorPos = range.startOffset;
         // eslint-disable-next-line
@@ -23465,7 +23491,7 @@ class EmojiPicker {
     }
     getCoordinates() {
         let coordinates;
-        const selection = window.getSelection();
+        const selection = this.parent.contentModule.getDocument().getSelection();
         const range = selection.getRangeAt(0);
         let firstChild;
         if (range.startContainer.nodeName === 'P' || range.startContainer.nodeName === 'DIV') {
@@ -25636,7 +25662,7 @@ class Image$1 {
             }
         }
         if (target.tagName !== 'IMG') {
-            let items = this.contentModule.getEditPanel().querySelectorAll('img');
+            const items = this.contentModule.getEditPanel().querySelectorAll('img');
             for (let i = 0; i < items.length; i++) {
                 removeClass([items[i]], 'e-img-focus');
                 removeClass([items[i]], 'e-resize');
@@ -31440,7 +31466,7 @@ class EnterKeyAction {
                                     }
                                     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') {
                                         const newElem = this.parent.formatter.editorManager.nodeCutter.SplitNode(this.range, nearBlockNode, false).cloneNode(true);
                                         this.parent.formatter.editorManager.domNode.insertAfter(newElem, nearBlockNode);
@@ -32378,13 +32404,14 @@ let RichTextEditor = class RichTextEditor extends Component {
                 this.formatter.editorManager.nodeSelection.setCursorPoint(this.contentModule.getDocument(), range.startContainer, range.startOffset);
             }
         }
-        const notFormatPainterCopy = !isNullOrUndefined(e.action) && e.action !== 'format-copy';
-        if (this.formatter.getUndoRedoStack().length === 0 && notFormatPainterCopy) {
+        const 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))) {
             let FormatPainterEscapeAction = false;
@@ -33495,8 +33522,8 @@ let RichTextEditor = class RichTextEditor extends Component {
             }
             else {
                 if (target === 'windowResize' && heightPercent) {
-                    // cntEle hide the borderBottom of RichTextEditor. so removed the 2px of cntEle height. 
-                    heightValue = parseInt(heightValue) - 2 + 'px';
+                    //cntEle hide the borderBottom of RichTextEditor. so removed the 2px of cntEle height.
+                    heightValue = parseInt(heightValue, 10) - 2 + 'px';
                 }
                 setStyleAttribute(cntEle, { height: heightValue, marginTop: topValue + 'px' });
             }
@@ -33520,7 +33547,7 @@ let RichTextEditor = class RichTextEditor extends Component {
      * @public
      */
     getHtml() {
-        const htmlValue = this.contentModule.getEditPanel().innerHTML;
+        const htmlValue = this.removeResizeElement(this.contentModule.getEditPanel().innerHTML);
         return (this.enableXhtml && (htmlValue === '<p><br></p>' || htmlValue === '<div><br></div>' ||
             htmlValue === '<br>') ? null : this.serializeValue(htmlValue));
     }
@@ -33531,7 +33558,7 @@ let RichTextEditor = class RichTextEditor extends Component {
      * @public
      */
     getXhtml() {
-        let currentValue = this.value;
+        let currentValue = this.removeResizeElement(this.value);
         if (!isNullOrUndefined(currentValue) && this.enableXhtml) {
             currentValue = this.htmlEditorModule.xhtmlValidation.selfEncloseValidation(currentValue);
         }
@@ -33772,14 +33799,11 @@ let RichTextEditor = class RichTextEditor extends Component {
     }
     getUpdatedValue() {
         let value;
-        if (!isNullOrUndefined(this.tableModule)) {
-            this.tableModule.removeResizeElement();
-        }
         const getTextArea = this.element.querySelector('.e-rte-srctextarea');
         if (this.editorMode === 'HTML') {
             value = (this.inputElement.innerHTML === '<p><br></p>' || this.inputElement.innerHTML === '<div><br></div>' ||
                 this.inputElement.innerHTML === '<br>') ? null : this.enableHtmlEncode ?
-                this.encode(decode(this.inputElement.innerHTML)) : this.inputElement.innerHTML;
+                this.encode(decode(this.removeResizeElement(this.inputElement.innerHTML))) : this.inputElement.innerHTML;
             if (getTextArea && getTextArea.style.display === 'block') {
                 value = getTextArea.value;
             }
@@ -33788,6 +33812,9 @@ let RichTextEditor = class RichTextEditor extends Component {
             value = this.inputElement.value === '' ? null :
                 this.inputElement.value;
         }
+        if (value != null && !this.enableHtmlEncode) {
+            value = this.removeResizeElement(value);
+        }
         return value;
     }
     updateValueOnIdle() {
@@ -33803,6 +33830,17 @@ let RichTextEditor = class RichTextEditor extends Component {
         clearTimeout(this.idleInterval);
         this.idleInterval = setTimeout(this.updateValueOnIdle.bind(this), 0);
     }
+    removeResizeElement(value) {
+        let valueElementWrapper = document.createElement("div");
+        valueElementWrapper.innerHTML = value;
+        let item = valueElementWrapper.querySelectorAll('.e-column-resize, .e-row-resize, .e-table-box, .e-table-rhelper, .e-img-resize');
+        if (item.length > 0) {
+            for (let i = 0; i < item.length; i++) {
+                detach(item[i]);
+            }
+        }
+        return valueElementWrapper.innerHTML;
+    }
     updateStatus(e) {
         if (!isNullOrUndefined(e.html) || !isNullOrUndefined(e.markdown)) {
             const status = this.formatter.editorManager.undoRedoManager.getUndoStatus();
@@ -33851,6 +33889,7 @@ let RichTextEditor = class RichTextEditor extends Component {
             this.notify(focusChange, {});
             const value = this.getUpdatedValue();
             this.setProperties({ value: value });
+            this.valueContainer.value = this.value;
             this.notify(toolbarRefresh, { args: e, documentNode: document });
             this.isValueChangeBlurhandler = true;
             this.invokeChangeEvent();