@syncfusion/ej2-richtexteditor 19.4.40 → 19.4.47

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

@@ -10512,7 +10512,8 @@ class Lists {
             range.startContainer.parentElement.closest('LI');
         const endNode = range.endContainer.nodeName === 'LI' ? range.endContainer :
             range.endContainer.parentElement.closest('LI');
-        if (!isNullOrUndefined(startNode) && !isNullOrUndefined(endNode) && startNode === endNode && startNode.tagName === 'LI' && startNode.textContent.trim() === '') {
+        if (!isNullOrUndefined(startNode) && !isNullOrUndefined(endNode) && startNode === endNode && startNode.tagName === 'LI' &&
+            startNode.textContent.trim() === '' && startNode.querySelectorAll('IMG').length === 0) {
             if (startNode.textContent.charCodeAt(0) === 65279) {
                 startNode.textContent = '';
             }
@@ -15851,8 +15852,10 @@ class MsWordPaste {
             this.listContents = [];
             this.getListContent(listNodes[i]);
             let type;
+            let listStyleType;
             if (!isNullOrUndefined(this.listContents[0])) {
                 type = this.listContents[0].trim().length > 1 ? 'ol' : 'ul';
+                listStyleType = this.getlistStyleType(this.listContents[0], type);
                 const tempNode = [];
                 for (let j = 1; j < this.listContents.length; j++) {
                     tempNode.push(this.listContents[j]);
@@ -15869,7 +15872,7 @@ class MsWordPaste {
                     }
                 }
                 collection.push({ listType: type, content: tempNode, nestedLevel: level, class: currentClassName,
-                    listStyle: currentListStyle });
+                    listStyle: currentListStyle, listStyleTypeName: listStyleType });
             }
         }
         stNode = listNodes.shift();
@@ -15893,6 +15896,45 @@ class MsWordPaste {
             }
         }
     }
+    getlistStyleType(listContent, type) {
+        let currentListClass;
+        if (type === 'ol') {
+            switch (listContent.split('.')[0]) {
+                case "A":
+                    currentListClass = "upper-alpha";
+                    break;
+                case "a":
+                    currentListClass = "lower-alpha";
+                    break;
+                case "I":
+                    currentListClass = "upper-roman";
+                    break;
+                case "i":
+                    currentListClass = "lower-roman";
+                    break;
+                case "α":
+                    currentListClass = "lower-greek";
+                    break;
+                default:
+                    currentListClass = "decimal";
+                    break;
+            }
+        }
+        else {
+            switch (listContent.split('.')[0]) {
+                case "o":
+                    currentListClass = "circle";
+                    break;
+                case "§":
+                    currentListClass = "square";
+                    break;
+                default:
+                    currentListClass = "disc";
+                    break;
+            }
+        }
+        return currentListClass;
+    }
     makeConversion(collection) {
         const root = createElement('div');
         let temp;
@@ -15909,7 +15951,7 @@ class MsWordPaste {
                 prevList.appendChild(pElement);
                 temp.appendChild(prevList);
                 temp.setAttribute('level', collection[index].nestedLevel.toString());
-                temp.style.listStyle = this.getListStyle(collection[index].listType, collection[index].nestedLevel);
+                temp.style.listStyleType = collection[index].listStyleTypeName;
             }
             else if (collection[index].nestedLevel === pLevel) {
                 if (prevList.parentElement.tagName.toLowerCase() === collection[index].listType) {
@@ -15918,6 +15960,7 @@ class MsWordPaste {
                 }
                 else {
                     temp = createElement(collection[index].listType);
+                    temp.style.listStyleType = collection[index].listStyleTypeName;
                     prevList.parentElement.parentElement.appendChild(temp);
                     prevList = createElement('li');
                     prevList.appendChild(pElement);
@@ -15929,14 +15972,15 @@ class MsWordPaste {
                 if (!isNullOrUndefined(prevList)) {
                     for (let j = 0; j < collection[index].nestedLevel - pLevel; j++) {
                         prevList.appendChild(temp = createElement(collection[index].listType));
-                        prevList = createElement('li', { styles: 'list-style-type: none;' });
+                        prevList = createElement('li');
+                        if (j != collection[index].nestedLevel - pLevel - 1 && collection[index].nestedLevel - pLevel > 1) {
+                            prevList.style.listStyleType = "none";
+                        }
                         temp.appendChild(prevList);
                     }
                     prevList.appendChild(pElement);
                     temp.setAttribute('level', collection[index].nestedLevel.toString());
-                    temp.style.listStyle = this.getListStyle(collection[index].listType, collection[index].nestedLevel);
-                    temp.childNodes[0].style.listStyle =
-                        this.getListStyle(collection[index].listType, collection[index].nestedLevel);
+                    temp.style.listStyleType = collection[index].listStyleTypeName;
                 }
                 else {
                     root.appendChild(temp = createElement(collection[index].listType));
@@ -15944,7 +15988,7 @@ class MsWordPaste {
                     prevList.appendChild(pElement);
                     temp.appendChild(prevList);
                     temp.setAttribute('level', collection[index].nestedLevel.toString());
-                    temp.style.listStyle = this.getListStyle(collection[index].listType, collection[index].nestedLevel);
+                    temp.style.listStyleType = collection[index].listStyleTypeName;
                 }
             }
             else if (collection[index].nestedLevel === 1) {
@@ -15953,12 +15997,12 @@ class MsWordPaste {
                 }
                 else {
                     root.appendChild(temp = createElement(collection[index].listType));
+                    temp.style.listStyleType = collection[index].listStyleTypeName;
                 }
                 prevList = createElement('li');
                 prevList.appendChild(pElement);
                 temp.appendChild(prevList);
                 temp.setAttribute('level', collection[index].nestedLevel.toString());
-                temp.style.listStyle = this.getListStyle(collection[index].listType, collection[index].nestedLevel);
             }
             else {
                 elem = prevList;
@@ -15979,7 +16023,7 @@ class MsWordPaste {
                             prevList.appendChild(pElement);
                             temp.appendChild(prevList);
                             temp.setAttribute('level', collection[index].nestedLevel.toString());
-                            temp.style.listStyle = this.getListStyle(collection[index].listType, collection[index].nestedLevel);
+                            temp.style.listStyleType = collection[index].listStyleTypeName;
                             break;
                         }
                     }
@@ -15988,21 +16032,12 @@ class MsWordPaste {
             }
             prevList.setAttribute('class', collection[index].class);
             const currentStyle = prevList.getAttribute('style');
-            prevList.setAttribute('style', (!isNullOrUndefined(currentStyle) ? currentStyle : '') + collection[index].listStyle);
+            prevList.setAttribute('style', (!isNullOrUndefined(currentStyle) ? currentStyle : ''));
             pLevel = collection[index].nestedLevel;
             listCount++;
         }
         return root;
     }
-    getListStyle(listType, nestedLevel) {
-        nestedLevel = (nestedLevel > 0) ? nestedLevel - 1 : nestedLevel;
-        if (listType === 'ol') {
-            return (nestedLevel < this.olData.length ? this.olData[nestedLevel] : this.olData[0]);
-        }
-        else {
-            return (nestedLevel < this.ulData.length ? this.ulData[nestedLevel] : this.ulData[0]);
-        }
-    }
     getListContent(elem) {
         let pushContent = '';
         const firstChild = elem.firstElementChild;
@@ -17310,7 +17345,8 @@ class HtmlEditor {
             if (this.rangeElement.tagName === 'OL' || this.rangeElement.tagName === 'UL') {
                 const liElement = this.getRangeLiNode(currentRange.startContainer);
                 if (liElement.previousElementSibling && liElement.previousElementSibling.childElementCount > 0) {
-                    this.oldRangeElement = liElement.previousElementSibling.lastElementChild;
+                    this.oldRangeElement = liElement.previousElementSibling.lastElementChild.nodeName === 'BR' ?
+                        liElement.previousElementSibling : liElement.previousElementSibling.lastElementChild;
                     if (!isNullOrUndefined(liElement.lastElementChild)) {
                         this.rangeElement = liElement.lastElementChild;
                         isLiElement = true;
@@ -20246,7 +20282,8 @@ class Image {
     }
     resizeImgDupPos(e) {
         this.imgDupPos = {
-            width: (e.style.width !== '') ? this.imgEle.style.width : e.width + 'px',
+            width: (e.style.width !== '' && (this.parent.insertImageSettings &&
+                !this.parent.insertImageSettings.resizeByPercent)) ? this.imgEle.style.width : e.width + 'px',
             height: (e.style.height !== '') ? this.imgEle.style.height : e.height + 'px'
         };
     }
@@ -23915,7 +23952,7 @@ __decorate$2([
     Property(null)
 ], PasteCleanupSettings.prototype, "deniedAttrs", void 0);
 __decorate$2([
-    Property(['background', 'background-color', 'border', 'border-bottom', 'border-left', 'border-radius', 'border-right', 'border-style', 'border-top', 'border-width', 'clear', 'color', 'cursor', 'direction', 'display', 'float', 'font', 'font-family', 'font-size', 'font-weight', 'font-style', 'height', 'left', 'line-height', 'margin', 'margin-top', 'margin-left', 'margin-right', 'margin-bottom', 'max-height', 'max-width', 'min-height', 'min-width', 'overflow', 'overflow-x', 'overflow-y', 'padding', 'padding-bottom', 'padding-left', 'padding-right', 'padding-top', 'position', 'right', 'table-layout', 'text-align', 'text-decoration', 'text-indent', 'top', 'vertical-align', 'visibility', 'white-space', 'width'])
+    Property(['background', 'background-color', 'border', 'border-bottom', 'border-left', 'border-radius', 'border-right', 'border-style', 'border-top', 'border-width', 'clear', 'color', 'cursor', 'direction', 'display', 'float', 'font', 'font-family', 'font-size', 'font-weight', 'font-style', 'height', 'left', 'line-height', 'list-style-type', 'margin', 'margin-top', 'margin-left', 'margin-right', 'margin-bottom', 'max-height', 'max-width', 'min-height', 'min-width', 'overflow', 'overflow-x', 'overflow-y', 'padding', 'padding-bottom', 'padding-left', 'padding-right', 'padding-top', 'position', 'right', 'table-layout', 'text-align', 'text-decoration', 'text-indent', 'top', 'vertical-align', 'visibility', 'white-space', 'width'])
 ], PasteCleanupSettings.prototype, "allowedStyleProps", void 0);
 __decorate$2([
     Property(null)
@@ -24310,9 +24347,11 @@ class EnterKeyAction {
                                 this.parent.formatter.editorManager.domNode.isBlockNode(currentParent) &&
                                 this.range.startOffset === this.range.endOffset &&
                                 this.range.startOffset === isLastNodeLength) {
-                                const outerBRElem = this.parent.createElement('br');
-                                this.parent.formatter.editorManager.domNode.insertAfter(outerBRElem, currentParent);
-                                this.parent.formatter.editorManager.nodeSelection.setCursorPoint(this.parent.contentModule.getDocument(), outerBRElem, 0);
+                                const focusBRElem = this.parent.createElement('br');
+                                const lineBreakBRElem = this.parent.createElement('br');
+                                this.parent.formatter.editorManager.domNode.insertAfter(focusBRElem, this.range.startContainer);
+                                this.parent.formatter.editorManager.domNode.insertAfter(lineBreakBRElem, this.range.startContainer);
+                                this.parent.formatter.editorManager.nodeSelection.setCursorPoint(this.parent.contentModule.getDocument(), focusBRElem, 0);
                             }
                             else if (!isNullOrUndefined(currentParent) && currentParent !== this.parent.inputElement && currentParent.nodeName !== 'BR') {
                                 if (currentParent.textContent.trim().length === 0 || (currentParent.textContent.trim().length === 1 &&
@@ -26170,7 +26209,7 @@ let RichTextEditor = class RichTextEditor extends Component {
             this.isRTE = false;
         }
         this.notify(docClick, { args: e });
-        if (e.detail > 3) {
+        if (Browser.info.name !== 'msie' && e.detail > 3) {
             e.preventDefault();
         }
     }