@syncfusion/ej2-richtexteditor 20.3.56 → 20.3.60

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

@@ -1978,8 +1978,8 @@ let videoAlignItems = [
     { iconCss: 'e-icons e-justify-right', command: 'Videos', subCommand: 'JustifyRight' },
 ];
 let displayLocale = [
-    { locale: 'imageLayoutOptionDropDownInline', value: 'Inline' },
-    { locale: 'imageLayoutOptionDropDownBreak', value: 'Break' }
+    { locale: 'imageDisplayDropDownInline', value: 'Inline' },
+    { locale: 'imageDisplayDropDownBreak', value: 'Break' }
 ];
 let audioLayoutOptionLocale = [
     { locale: 'audioLayoutOptionDropDownInline', value: 'Inline' },
@@ -12960,7 +12960,8 @@ class InsertHtml {
                     }
                 }
                 else if (currentNode.nodeName === '#text' && !isNullOrUndefined(currentNode.parentElement) &&
-                    currentNode.parentElement.nodeName === 'LI' && currentNode.parentElement.textContent.trim().length > 0) {
+                    (currentNode.parentElement.nodeName === 'LI' || (blockNode === editNode && currentNode.parentElement === blockNode)) &&
+                    currentNode.parentElement.textContent.trim().length > 0) {
                     splitedElm = currentNode;
                     if (currentNode.parentElement.nodeName === 'LI' && !isNullOrUndefined(currentNode.nextSibling) &&
                         currentNode.nextSibling.nodeName === 'BR') {
@@ -15567,6 +15568,15 @@ class SelectionCommands {
                         isSubSup = formatNode === null ? false : true;
                     }
                 }
+                else if (formatNode.textContent !== nodes[index].textContent && formatNode.nodeName === 'SPAN' && formatNode.style[0] === 'font-size') {
+                    let currentParentElem = nodes[index].parentElement.textContent !== nodes[index].textContent ? nodes[index] : nodes[index].parentElement;
+                    let isSameTextContent = true;
+                    while (currentParentElem.textContent !== nodes[index].textContent && nodes[index].style[0] !== format && currentParentElem.nodeName === 'SPAN') {
+                        isSameTextContent = currentParentElem.textContent === currentParentElem.parentElement.textContent;
+                        currentParentElem = !isNullOrUndefined(currentParentElem.parentElement) && isSameTextContent ? currentParentElem.parentElement : currentParentElem;
+                    }
+                    formatNode = currentParentElem;
+                }
                 if (index === 0 && formatNode === null) {
                     isFormat = true;
                 }
@@ -15858,7 +15868,33 @@ class SelectionCommands {
                                 liElement.style.textDecoration = 'inherit';
                             }
                         }
-                        nodes[index] = this.applyStyles(nodes, index, element);
+                        let enterType = isNullOrUndefined(this.enterAction) ? 'P' : this.enterAction.toString();
+                        const currentNode = nodes[index];
+                        let isNestedNode = !isNullOrUndefined(currentNode) && nodes[index].nodeName === '#text' && nodes[index].parentElement.nodeName !== enterType;
+                        let currentParentElem = currentNode.parentElement.textContent !== currentNode.textContent ? currentNode : currentNode.parentElement;
+                        if (isNestedNode) {
+                            let isSameTextContent = true;
+                            isNestedNode = false;
+                            while (!isNullOrUndefined(currentParentElem) && isSameTextContent && currentParentElem.parentElement.nodeName !== enterType
+                                && (currentParentElem.nodeName === 'SPAN' && (currentParentElem.style.textDecoration === 'line-through' || 'underline')
+                                    || currentParentElem.nodeName === 'SPAN' && (currentParentElem.style[0] === 'background-color' || 'font-family' || 'color')
+                                    || (currentParentElem.nodeName === 'EM' || 'STRONG' || 'SUB' || 'SUP'))) {
+                                isSameTextContent = currentParentElem.textContent === currentParentElem.parentElement.textContent;
+                                currentParentElem = !isNullOrUndefined(currentParentElem.parentElement) && isSameTextContent ? currentParentElem.parentElement : currentParentElem;
+                            }
+                            if (!isNullOrUndefined(currentParentElem) && currentParentElem.childNodes.length > 0) {
+                                let nodeList = currentParentElem.querySelectorAll('span,strong,em,sub,sup');
+                                isNestedNode = nodeList.length > 0 && isSameTextContent;
+                            }
+                        }
+                        if (isNestedNode) {
+                            let nodeList = [];
+                            nodeList[0] = currentParentElem;
+                            this.applyStyles(nodeList, index, element);
+                        }
+                        else {
+                            nodes[index] = this.applyStyles(nodes, index, element);
+                        }
                         if (format === 'fontsize') {
                             const bg = closest(nodes[index].parentElement, 'span[style*=' + 'background-color' + ']');
                             if (!isNullOrUndefined(bg)) {
@@ -16818,7 +16854,9 @@ class MsWordPaste {
         for (let i = 0; i < allElements.length; i++) {
             if (allElements[i].children.length === 0 && allElements[i].innerHTML === '&nbsp;' &&
                 (allElements[i].innerHTML === '&nbsp;' && !allElements[i].closest('li')) &&
-                !allElements[i].closest('td')) {
+                !allElements[i].closest('td') && (allElements[i].nodeName !== 'SPAN' ||
+                allElements[i].nodeName === 'SPAN' && (isNullOrUndefined(allElements[i].previousElementSibling) &&
+                    isNullOrUndefined(allElements[i].nextElementSibling)))) {
                 const detachableElement = this.findDetachElem(allElements[i]);
                 const brElement = createElement('br');
                 if (!isNullOrUndefined(detachableElement.parentElement)) {
@@ -16924,8 +16962,7 @@ class MsWordPaste {
                                 }
                             }
                         }
-                        values[i] = valueSplit.join(';') + ';';
-                        const changedValue = styleProperty + values[i];
+                        const changedValue = styleProperty + valueSplit.join(';') + ';';
                         resultElem[j].setAttribute('style', changedValue);
                     }
                     else {
@@ -18612,6 +18649,11 @@ class HtmlEditor {
         if (e.args.code === 'Backspace' && e.args.keyCode === 8 && currentRange.startOffset === 0 &&
             currentRange.endOffset === 0 && this.parent.getSelection().length === 0 && currentRange.startContainer.textContent.length > 0 &&
             currentRange.startContainer.parentElement.tagName !== 'TD' && currentRange.startContainer.parentElement.tagName !== 'TH') {
+            let checkNode = currentRange.startContainer.nodeName === '#text' ? currentRange.startContainer.parentElement : currentRange.startContainer;
+            if (!this.parent.formatter.editorManager.domNode.isBlockNode(checkNode) &&
+                !isNullOrUndefined(checkNode.previousSibling) && checkNode.previousSibling.nodeName === 'BR') {
+                return;
+            }
             this.rangeElement = this.getRootBlockNode(currentRange.startContainer);
             if (this.rangeElement.tagName === 'OL' || this.rangeElement.tagName === 'UL') {
                 const liElement = this.getRangeLiNode(currentRange.startContainer);
@@ -28334,7 +28376,8 @@ class EnterKeyAction {
                                     }
                                     else {
                                         if ((nearBlockNode.textContent.trim().length !== 0 ||
-                                            nearBlockNode.childNodes[0].nodeName === 'IMG')) {
+                                            nearBlockNode.childNodes[0].nodeName === 'IMG' ||
+                                            (nearBlockNode.textContent.trim() === '' && nearBlockNode.querySelectorAll('img').length > 0))) {
                                             if ((this.range.startOffset === this.range.endOffset && this.range.startOffset != 0)) {
                                                 newElem = this.parent.formatter.editorManager.nodeCutter.SplitNode(this.range, nearBlockNode, false).cloneNode(true);
                                             }
@@ -28363,9 +28406,15 @@ class EnterKeyAction {
                                     if (!isNearBlockLengthZero) {
                                         let currentFocusElem = insertElem;
                                         let finalFocusElem;
-                                        while (!isNullOrUndefined(currentFocusElem) && currentFocusElem.nodeName !== '#text') {
+                                        if (this.range.startOffset === this.range.endOffset && this.range.startOffset != 0) {
+                                            while (!isNullOrUndefined(currentFocusElem) && currentFocusElem.nodeName !== '#text' &&
+                                                currentFocusElem.nodeName !== 'BR') {
+                                                finalFocusElem = currentFocusElem;
+                                                currentFocusElem = currentFocusElem.lastChild;
+                                            }
+                                        }
+                                        else {
                                             finalFocusElem = currentFocusElem;
-                                            currentFocusElem = currentFocusElem.lastChild;
                                         }
                                         finalFocusElem.innerHTML = '<br>';
                                         if (!isImageNode) {