@syncfusion/ej2-richtexteditor 20.4.43 → 20.4.48

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

@@ -1457,7 +1457,7 @@ let tools = {
     },
     'fontcolor': {
         'id': 'FontColor',
-        'icon': 'e-font-color',
+        'icon': 'e-rte-font-color',
         'tooltip': 'Font Color',
         'command': 'Font',
         'subCommand': 'FontColor',
@@ -3330,6 +3330,8 @@ class ToolbarRenderer {
             target: colorPicker.element.parentElement, cssClass: css,
             enablePersistence: this.parent.enablePersistence, enableRtl: this.parent.enableRtl,
             beforeOpen: (dropDownArgs) => {
+                colorPicker.inline = true;
+                colorPicker.dataBind();
                 if (proxy.parent.readonly || !proxy.parent.enabled) {
                     dropDownArgs.cancel = true;
                     return;
@@ -3496,7 +3498,7 @@ class ToolbarRenderer {
         const colorPicker = new ColorPicker({
             enablePersistence: this.parent.enablePersistence,
             enableRtl: this.parent.enableRtl,
-            inline: true,
+            inline: false,
             value: '#fff',
             created: () => {
                 const value = (item === 'backgroundcolor') ? proxy.parent.backgroundColor.default : proxy.parent.fontColor.default;
@@ -11182,7 +11184,7 @@ class Lists {
             range.startContainer.parentElement.closest('LI');
         const endNode = range.endContainer.nodeName === 'LI' ? range.endContainer :
             range.endContainer.parentElement.closest('LI');
-        // Checks for Image, Audio , Video Element inside List Element 
+        // Checks for Image, Audio , Video Element inside List Element
         let hasMediaElem = false;
         if (!isNullOrUndefined(startNode)) {
             const videoElemList = startNode.querySelectorAll('.e-video-clickelem');
@@ -11809,6 +11811,11 @@ class Lists {
                 }
                 node.parentNode.removeChild(node);
             }
+            else if (!isNullOrUndefined(node.getAttribute('level'))) {
+                if (node.tagName === node.previousElementSibling.tagName) {
+                    node.previousElementSibling.lastChild.append(node);
+                }
+            }
         }
     }
     findUnSelected(temp, elements) {
@@ -13002,7 +13009,7 @@ class InsertHtml {
                         detach(currentNode.nextSibling);
                     }
                 }
-                else if (currentNode.nodeName === '#text' && !isNullOrUndefined(currentNode.parentElement) &&
+                else if ((currentNode.nodeName === '#text' || currentNode.nodeName === "BR") && !isNullOrUndefined(currentNode.parentElement) &&
                     (currentNode.parentElement.nodeName === 'LI' || (blockNode === editNode && currentNode.parentElement === blockNode)) &&
                     currentNode.parentElement.textContent.trim().length > 0) {
                     splitedElm = currentNode;
@@ -15622,14 +15629,17 @@ class SelectionCommands {
                         isSubSup = formatNode === null ? false : true;
                     }
                 }
+                else if ((format === 'fontsize' || format === 'fontname' || format === 'fontcolor' || format === 'backgroundcolor') && range.startContainer.parentElement === endNode) {
+                    formatNode = null;
+                }
                 if (index === 0 && formatNode === null) {
                     isFormat = true;
                 }
                 if (formatNode !== null && (!isFormat || isFontStyle)) {
                     nodes[index] = this.removeFormat(nodes, index, formatNode, isCursor, isFormat, isFontStyle, range, nodeCutter, format, value, domSelection, endNode, domNode);
                 }
-                else {
-                    nodes[index] = this.insertFormat(docElement, nodes, index, formatNode, isCursor, isFormat, isFontStyle, range, nodeCutter, format, value);
+                else if (range.startContainer.parentElement !== endNode || (range.commonAncestorContainer === endNode || nodes.length === 1)) {
+                    nodes[index] = this.insertFormat(docElement, nodes, index, formatNode, isCursor, isFormat, isFontStyle, range, nodeCutter, format, value, domNode, endNode);
                 }
                 domSelection = this.applySelection(nodes, domSelection, nodeCutter, index, isCollapsed);
             }
@@ -15884,10 +15894,24 @@ class SelectionCommands {
         }
         return nodes[index];
     }
-    static insertFormat(docElement, nodes, index, formatNode, isCursor, isFormat, isFontStyle, range, nodeCutter, format, value) {
+    static insertFormat(docElement, nodes, index, formatNode, isCursor, isFormat, isFontStyle, range, nodeCutter, format, value, domNode, endNode) {
+        let rootElementNode;
         if (!isCursor) {
             if ((formatNode === null && isFormat) || isFontStyle) {
                 if (nodes[index].nodeName !== 'BR') {
+                    if (format === 'fontsize' || format === 'fontname' || format === 'fontcolor' || format === 'backgroundcolor') {
+                        let rangeNode = nodes[index];
+                        while (rangeNode && !domNode.isBlockNode(rangeNode) && rangeNode !== endNode) {
+                            if (domNode.isBlockNode(rangeNode.parentElement)) {
+                                rootElementNode = rangeNode;
+                            }
+                            rangeNode = rangeNode.parentElement;
+                        }
+                        if (rootElementNode && rootElementNode.nodeType !== 3) {
+                            nodeCutter.SplitNode(range, rootElementNode, true).cloneNode(true);
+                            nodeCutter.SplitNode(range, rootElementNode, false).cloneNode(false);
+                        }
+                    }
                     nodes[index] = nodeCutter.GetSpliceNode(range, nodes[index]);
                     nodes[index].textContent = nodeCutter.TrimLineBreak(nodes[index].textContent);
                 }
@@ -15897,24 +15921,47 @@ class SelectionCommands {
                 }
                 else if (!(isFontStyle === true && value === '')) {
                     const element = this.GetFormatNode(format, value);
-                    if (format === 'fontsize' || format === 'fontcolor') {
-                        let liElement = nodes[index].parentElement;
-                        let parentElement = nodes[index].parentElement;
-                        while (!isNullOrUndefined(parentElement) && parentElement.tagName.toLowerCase() !== 'li') {
-                            parentElement = parentElement.parentElement;
-                            liElement = parentElement;
+                    if (format === 'fontsize' || format === 'fontcolor' || format === 'fontname' || format === 'backgroundcolor') {
+                        if (format !== 'fontname' && format !== 'backgroundcolor') {
+                            let liElement = nodes[index].parentElement;
+                            let parentElement = nodes[index].parentElement;
+                            while (!isNullOrUndefined(parentElement) && parentElement.tagName.toLowerCase() !== 'li' && parentElement !== endNode) {
+                                parentElement = parentElement.parentElement;
+                                liElement = parentElement;
+                            }
+                            if (!isNullOrUndefined(liElement) && liElement.tagName.toLowerCase() === 'li' &&
+                                liElement.textContent.trim() === nodes[index].textContent.trim()) {
+                                if (format === 'fontsize') {
+                                    liElement.style.fontSize = value;
+                                }
+                                else {
+                                    liElement.style.color = value;
+                                    liElement.style.textDecoration = 'inherit';
+                                }
+                            }
                         }
-                        if (!isNullOrUndefined(liElement) && liElement.tagName.toLowerCase() === 'li' &&
-                            liElement.textContent.trim() === nodes[index].textContent.trim()) {
-                            if (format === 'fontsize') {
-                                liElement.style.fontSize = value;
+                        if (rootElementNode && rootElementNode.nodeType !== 3) {
+                            const save = new NodeSelection();
+                            save.save(range, docElement);
+                            domNode.setMarker(save);
+                            var cloneNode = rootElementNode.cloneNode(true);
+                            element.appendChild(cloneNode);
+                            domNode.replaceWith(rootElementNode, element.outerHTML);
+                            const currentStartNode = endNode.querySelector('.e-editor-select-start');
+                            const currrentEndNode = endNode.querySelector('.e-editor-select-end');
+                            if (index === 0) {
+                                nodes[index] = currentStartNode ? currentStartNode.lastChild : nodes[index];
                             }
-                            else {
-                                liElement.style.color = value;
-                                liElement.style.textDecoration = 'inherit';
+                            if (range.startContainer.parentElement === endNode) {
+                                if (nodes.length > 1) {
+                                    nodes[nodes.length - 1] = currrentEndNode ? currrentEndNode.lastChild : nodes[index];
+                                }
                             }
+                            domNode.saveMarker(save, null);
+                        }
+                        else {
+                            nodes[index] = this.applyStyles(nodes, index, element);
                         }
-                        nodes[index] = this.applyStyles(nodes, index, element);
                         if (format === 'fontsize') {
                             const bg = closest(nodes[index].parentElement, 'span[style*=' + 'background-color' + ']');
                             if (!isNullOrUndefined(bg)) {
@@ -21963,7 +22010,6 @@ class Image {
         if (!isNullOrUndefined(this.parent.formatter.editorManager.nodeSelection) &&
             originalEvent.code !== 'KeyK') {
             range = this.parent.formatter.editorManager.nodeSelection.getRange(this.parent.contentModule.getDocument());
-            save = this.parent.formatter.editorManager.nodeSelection.save(range, this.parent.contentModule.getDocument());
             selectNodeEle = this.parent.formatter.editorManager.nodeSelection.getNodeCollection(range);
             selectParentEle = this.parent.formatter.editorManager.nodeSelection.getParentNodeCollection(range);
             if (!originalEvent.ctrlKey && originalEvent.key && (originalEvent.key.length === 1 || originalEvent.action === 'enter') &&
@@ -21982,6 +22028,8 @@ class Image {
         }
         if (originalEvent.keyCode === 8 || originalEvent.keyCode === 46) {
             if (selectNodeEle && selectNodeEle[0].nodeName === 'IMG' && selectNodeEle.length < 1) {
+                if (!isNullOrUndefined(this.parent.formatter.editorManager.nodeSelection))
+                    save = this.parent.formatter.editorManager.nodeSelection.save(range, this.parent.contentModule.getDocument());
                 originalEvent.preventDefault();
                 const event = {
                     selectNode: selectNodeEle, selection: save, selectParent: selectParentEle,
@@ -22040,6 +22088,8 @@ class Image {
                 }
                 break;
             case 'insert-image':
+                if (!isNullOrUndefined(this.parent.formatter.editorManager.nodeSelection))
+                    save = this.parent.formatter.editorManager.nodeSelection.save(range, this.parent.contentModule.getDocument());
                 this.openDialog(true, originalEvent, save, selectNodeEle, selectParentEle);
                 originalEvent.preventDefault();
                 break;
@@ -23811,7 +23861,6 @@ class Audio {
         if (!isNullOrUndefined(this.parent.formatter.editorManager.nodeSelection) &&
             originalEvent.code !== 'KeyK') {
             range = this.parent.formatter.editorManager.nodeSelection.getRange(this.parent.contentModule.getDocument());
-            save = this.parent.formatter.editorManager.nodeSelection.save(range, this.parent.contentModule.getDocument());
             selectNodeEle = this.parent.formatter.editorManager.nodeSelection.getNodeCollection(range);
             selectParentEle = this.parent.formatter.editorManager.nodeSelection.getParentNodeCollection(range);
             if (!originalEvent.ctrlKey && originalEvent.key && (originalEvent.key.length === 1 || originalEvent.action === 'enter') &&
@@ -23827,6 +23876,8 @@ class Audio {
         }
         if (originalEvent.keyCode === 8 || originalEvent.keyCode === 46) {
             if (selectNodeEle && this.isAudioElem(selectNodeEle[0]) && selectNodeEle.length < 1) {
+                if (!isNullOrUndefined(this.parent.formatter.editorManager.nodeSelection))
+                    save = this.parent.formatter.editorManager.nodeSelection.save(range, this.parent.contentModule.getDocument());
                 originalEvent.preventDefault();
                 const event = {
                     selectNode: selectNodeEle, selection: save, selectParent: selectParentEle,
@@ -23875,6 +23926,8 @@ class Audio {
                 }
                 break;
             case 'insert-audio':
+                if (!isNullOrUndefined(this.parent.formatter.editorManager.nodeSelection))
+                    save = this.parent.formatter.editorManager.nodeSelection.save(range, this.parent.contentModule.getDocument());
                 this.openDialog(true, originalEvent, save, selectNodeEle, selectParentEle);
                 originalEvent.preventDefault();
                 break;
@@ -25108,7 +25161,6 @@ class Video {
         if (!isNullOrUndefined(this.parent.formatter.editorManager.nodeSelection) &&
             originalEvent.code !== 'KeyK') {
             range = this.parent.formatter.editorManager.nodeSelection.getRange(this.parent.contentModule.getDocument());
-            save = this.parent.formatter.editorManager.nodeSelection.save(range, this.parent.contentModule.getDocument());
             selectNodeEle = this.parent.formatter.editorManager.nodeSelection.getNodeCollection(range);
             selectParentEle = this.parent.formatter.editorManager.nodeSelection.getParentNodeCollection(range);
             if (!originalEvent.ctrlKey && originalEvent.key && (originalEvent.key.length === 1 || originalEvent.action === 'enter') &&
@@ -25128,6 +25180,8 @@ class Video {
         }
         if (originalEvent.keyCode === 8 || originalEvent.keyCode === 46) {
             if (selectNodeEle && (selectNodeEle[0].nodeName === 'VIDEO' || this.isEmbedVidElem(selectNodeEle[0])) && selectNodeEle.length < 1) {
+                if (!isNullOrUndefined(this.parent.formatter.editorManager.nodeSelection))
+                    save = this.parent.formatter.editorManager.nodeSelection.save(range, this.parent.contentModule.getDocument());
                 originalEvent.preventDefault();
                 const event = {
                     selectNode: selectNodeEle, selection: save, selectParent: selectParentEle,
@@ -25180,6 +25234,8 @@ class Video {
                 }
                 break;
             case 'insert-video':
+                if (!isNullOrUndefined(this.parent.formatter.editorManager.nodeSelection))
+                    save = this.parent.formatter.editorManager.nodeSelection.save(range, this.parent.contentModule.getDocument());
                 this.openDialog(true, originalEvent, save, selectNodeEle, selectParentEle);
                 originalEvent.preventDefault();
                 break;
@@ -26363,14 +26419,15 @@ class Table {
         }
         if (!isNullOrUndefined(this.parent.formatter.editorManager.nodeSelection) && this.contentModule
             && event.code !== 'KeyK') {
+            let selection;
             const range = this.parent.formatter.editorManager.nodeSelection.getRange(this.parent.contentModule.getDocument());
-            const selection = this.parent.formatter.editorManager.
-                nodeSelection.save(range, this.contentModule.getDocument());
             let ele = this.parent.formatter.editorManager.nodeSelection.getParentNodeCollection(range)[0];
             ele = (ele && ele.tagName !== 'TD' && ele.tagName !== 'TH') ? ele.parentElement : ele;
             if ((event.keyCode === 8 || event.keyCode === 46) ||
                 (event.ctrlKey && event.keyCode === 88)) {
                 if (ele && ele.tagName === 'TBODY') {
+                    if (!isNullOrUndefined(this.parent.formatter.editorManager.nodeSelection) && this.contentModule)
+                        selection = this.parent.formatter.editorManager.nodeSelection.save(range, this.contentModule.getDocument());
                     event.preventDefault();
                     proxy.removeTable(selection, event, true);
                 }
@@ -26384,6 +26441,8 @@ class Table {
                 ele = !isNullOrUndefined(closestTd) && this.parent.inputElement.contains(closestTd) ? closestTd : ele;
             }
             if (ele && (ele.tagName === 'TD' || ele.tagName === 'TH')) {
+                if (!isNullOrUndefined(this.parent.formatter.editorManager.nodeSelection) && this.contentModule)
+                    selection = this.parent.formatter.editorManager.nodeSelection.save(range, this.contentModule.getDocument());
                 switch (event.keyCode) {
                     case 9:
                     case 37:
@@ -29687,6 +29746,10 @@ let RichTextEditor = class RichTextEditor extends Component {
         if (this.isDestroyed || !this.isRendered) {
             return;
         }
+        if (!isNullOrUndefined(this.timeInterval)) {
+            clearInterval(this.timeInterval);
+            this.timeInterval = null;
+        }
         if (this.element.offsetParent === null) {
             if (!isNullOrUndefined(this.toolbarModule)) {
                 this.toolbarModule.destroy();
@@ -29696,10 +29759,6 @@ let RichTextEditor = class RichTextEditor extends Component {
         }
         this.notify(destroy, {});
         this.destroyDependentModules();
-        if (!isNullOrUndefined(this.timeInterval)) {
-            clearInterval(this.timeInterval);
-            this.timeInterval = null;
-        }
         this.unWireEvents();
         if (this.originalElement.tagName === 'TEXTAREA') {
             this.element.parentElement.insertBefore(this.valueContainer, this.element);