@syncfusion/ej2-richtexteditor 20.4.44 → 20.4.49

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;
@@ -13007,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;
@@ -15627,7 +15629,7 @@ class SelectionCommands {
                         isSubSup = formatNode === null ? false : true;
                     }
                 }
-                else if ((format === 'fontsize' || format === 'fontname' || format === 'fontcolor') && range.startContainer.parentElement === endNode) {
+                else if ((format === 'fontsize' || format === 'fontname' || format === 'fontcolor' || format === 'backgroundcolor') && range.startContainer.parentElement === endNode) {
                     formatNode = null;
                 }
                 if (index === 0 && formatNode === null) {
@@ -15740,6 +15742,7 @@ class SelectionCommands {
         const startText = range.startContainer.nodeName === '#text' ?
             range.startContainer.textContent.substring(range.startOffset, range.startContainer.textContent.length) :
             range.startContainer.textContent;
+        const nodeText = nodes[index].textContent;
         if (!(range.startContainer === range.endContainer && range.startOffset === 0
             && range.endOffset === range.startContainer.length)) {
             const nodeIndex = [];
@@ -15878,8 +15881,25 @@ class SelectionCommands {
                     parentElement = parentElement.parentElement;
                     liElement = parentElement;
                 }
+                let num = index;
+                let liChildContent = '';
+                while (num >= 0 && !isNullOrUndefined(liElement) && liElement.tagName.toLowerCase() === 'li' && liElement.textContent.replace('/\u200B/g', '').trim().includes(nodes[num].textContent.trim())) {
+                    liChildContent = ' ' + nodes[num].textContent.trim() + liChildContent;
+                    num--;
+                }
+                let isNestedList = false;
+                let nestedListCount = 0;
+                let isNestedListItem = false;
+                if (!isNullOrUndefined(liElement) && liElement.childNodes) {
+                    for (let num = 0; num < liElement.childNodes.length; num++) {
+                        if (liElement.childNodes[num].nodeName === ('OL' || 'UL')) {
+                            nestedListCount++;
+                            isNestedList = true;
+                        }
+                    }
+                }
                 if (!isNullOrUndefined(liElement) && liElement.tagName.toLowerCase() === 'li' &&
-                    liElement.textContent.trim() === nodes[index].textContent.trim()) {
+                    liElement.textContent.split('\u200B').join('').trim() === liChildContent.split('\u200B').join('').trim()) {
                     if (format === 'fontsize') {
                         liElement.style.fontSize = value;
                     }
@@ -15888,26 +15908,49 @@ class SelectionCommands {
                         liElement.style.textDecoration = 'inherit';
                     }
                 }
+                else if (!isNullOrUndefined(liElement) && liElement.tagName.toLowerCase() === 'li' && isNestedList) {
+                    if (isNestedList && nestedListCount > 0) {
+                        for (let num = 0; num < liElement.childNodes.length; num++) {
+                            if (nodes[index].textContent === liElement.childNodes[num].textContent && nodes[index].textContent === nodeText && liElement.textContent.replace('/\u200B/g', '').trim().includes(liChildContent.split('\u200B').join('').trim())) {
+                                isNestedListItem = true;
+                            }
+                        }
+                    }
+                    if (isNestedListItem) {
+                        for (let num = 0; num < liElement.childNodes.length; num++) {
+                            if (liElement.childNodes[num].nodeName === ('OL' || 'UL')) {
+                                liElement.childNodes[num].style.fontSize = 'initial';
+                            }
+                        }
+                        if (format === 'fontsize') {
+                            liElement.style.fontSize = value;
+                        }
+                        else {
+                            liElement.style.color = value;
+                            liElement.style.textDecoration = 'inherit';
+                        }
+                    }
+                }
             }
         }
         return nodes[index];
     }
     static insertFormat(docElement, nodes, index, formatNode, isCursor, isFormat, isFontStyle, range, nodeCutter, format, value, domNode, endNode) {
-        let rootBlockNode;
+        let rootElementNode;
         if (!isCursor) {
             if ((formatNode === null && isFormat) || isFontStyle) {
                 if (nodes[index].nodeName !== 'BR') {
-                    if (format === 'fontsize' || format === 'fontname' || format === 'fontcolor') {
+                    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)) {
-                                rootBlockNode = rangeNode;
+                                rootElementNode = rangeNode;
                             }
                             rangeNode = rangeNode.parentElement;
                         }
-                        if (rootBlockNode && rootBlockNode.nodeType !== 3) {
-                            nodeCutter.SplitNode(range, rootBlockNode, true).cloneNode(true);
-                            nodeCutter.SplitNode(range, rootBlockNode, false).cloneNode(false);
+                        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]);
@@ -15919,11 +15962,11 @@ class SelectionCommands {
                 }
                 else if (!(isFontStyle === true && value === '')) {
                     const element = this.GetFormatNode(format, value);
-                    if (format === 'fontsize' || format === 'fontcolor' || format === 'fontname') {
-                        if (format !== 'fontname') {
+                    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') {
+                            while (!isNullOrUndefined(parentElement) && parentElement.tagName.toLowerCase() !== 'li' && parentElement !== endNode) {
                                 parentElement = parentElement.parentElement;
                                 liElement = parentElement;
                             }
@@ -15938,13 +15981,13 @@ class SelectionCommands {
                                 }
                             }
                         }
-                        if (rootBlockNode && rootBlockNode.nodeType !== 3) {
+                        if (rootElementNode && rootElementNode.nodeType !== 3) {
                             const save = new NodeSelection();
                             save.save(range, docElement);
                             domNode.setMarker(save);
-                            var cloneNode = rootBlockNode.cloneNode(true);
+                            var cloneNode = rootElementNode.cloneNode(true);
                             element.appendChild(cloneNode);
-                            domNode.replaceWith(rootBlockNode, element.outerHTML);
+                            domNode.replaceWith(rootElementNode, element.outerHTML);
                             const currentStartNode = endNode.querySelector('.e-editor-select-start');
                             const currrentEndNode = endNode.querySelector('.e-editor-select-end');
                             if (index === 0) {
@@ -16755,6 +16798,15 @@ class MsWordPaste {
             if (pattern4.test(tempHTMLContent)) {
                 this.addTableBorderClass(elm);
             }
+            // Removing the margin for list items 
+            const liChildren = elm.querySelectorAll('li');
+            if (liChildren.length > 0) {
+                for (let i = 0; i < liChildren.length; i++) {
+                    if (!isNullOrUndefined(liChildren[i].style.marginLeft)) {
+                        liChildren[i].style.marginLeft = '';
+                    }
+                }
+            }
             e.callBack(elm.innerHTML);
         }
         else {
@@ -17160,9 +17212,25 @@ class MsWordPaste {
             this.getListContent(listNodes[i]);
             let type;
             let listStyleType;
+            let startAttr;
             if (!isNullOrUndefined(this.listContents[0])) {
                 type = this.listContents[0].trim().length > 1 ? 'ol' : 'ul';
                 listStyleType = this.getlistStyleType(this.listContents[0], type);
+                if (type === 'ol' && listNodes[i - 1] === null) {
+                    const startString = this.listContents[0].split('.')[0];
+                    const listTypes = ['A', 'a', 'I', 'i', 'α', '1'];
+                    if (listTypes.indexOf(startString) === -1) {
+                        if (listStyleType === 'decimal') {
+                            // Bug in getlistStyleType() list style stype is returned as decimal for nested list with start attribute
+                            if (!isNaN(parseInt(startString))) {
+                                startAttr = parseInt(startString);
+                            }
+                        }
+                        else if (listStyleType === 'upper-alpha' || listStyleType === 'lower-alpha') {
+                            startAttr = parseInt(startString.toLowerCase()) - 96;
+                        }
+                    }
+                }
                 const tempNode = [];
                 for (let j = 1; j < this.listContents.length; j++) {
                     tempNode.push(this.listContents[j]);
@@ -17179,7 +17247,7 @@ class MsWordPaste {
                     }
                 }
                 collection.push({ listType: type, content: tempNode, nestedLevel: level, class: currentClassName,
-                    listStyle: currentListStyle, listStyleTypeName: listStyleType });
+                    listStyle: currentListStyle, listStyleTypeName: listStyleType, start: startAttr });
             }
         }
         stNode = listNodes.shift();
@@ -17343,6 +17411,9 @@ class MsWordPaste {
             prevList.setAttribute('style', (!isNullOrUndefined(currentStyle) ? currentStyle : ''));
             pLevel = collection[index].nestedLevel;
             listCount++;
+            if (!isNullOrUndefined(collection[index].start)) {
+                temp.setAttribute('start', collection[index].start.toString());
+            }
         }
         return root;
     }