@syncfusion/ej2-richtexteditor 20.4.50 → 20.4.52

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

@@ -12649,8 +12649,8 @@ class InsertHtml {
         }
         if (range.startContainer.nodeName === 'BR' && range.startOffset === 0 && range.startOffset === range.endOffset &&
             range.startContainer === range.endContainer) {
-            const currentIndex = Array.prototype.slice.call(range.startContainer.parentElement.children).indexOf(range.startContainer);
-            nodeSelection.setSelectionText(docElement, range.startContainer.parentElement, range.startContainer.parentElement, currentIndex + 1, currentIndex + 1);
+            const currentIndex = Array.prototype.slice.call(range.startContainer.parentElement.childNodes).indexOf(range.startContainer);
+            nodeSelection.setSelectionText(docElement, range.startContainer.parentElement, range.startContainer.parentElement, currentIndex, currentIndex);
             range = nodeSelection.getRange(docElement);
         }
         const isCursor = range.startOffset === range.endOffset && range.startOffset === 0 &&
@@ -16842,7 +16842,10 @@ class MsWordPaste {
         this.checkVShape(elm);
         let imgElem = elm.querySelectorAll('img');
         for (let i = 0; i < imgElem.length; i++) {
-            if (!isNullOrUndefined(imgElem[i].getAttribute('v:shapes')) && imgElem[i].getAttribute('v:shapes').indexOf('Picture') < 0 && imgElem[i].getAttribute('v:shapes').indexOf('Image') < 0) {
+            if (!isNullOrUndefined(imgElem[i].getAttribute('v:shapes')) &&
+                imgElem[i].getAttribute('v:shapes').indexOf('Picture') < 0 &&
+                imgElem[i].getAttribute('v:shapes').indexOf('圖片') < 0 &&
+                imgElem[i].getAttribute('v:shapes').indexOf('Image') < 0) {
                 detach(imgElem[i]);
             }
         }
@@ -17862,7 +17865,7 @@ class ToolbarStatus {
             formatCollection.fontname = this.isFontName(docElement, node, fontName);
         }
         if (!formatCollection.fontsize) {
-            formatCollection.fontsize = this.isFontSize(node, fontSize);
+            formatCollection.fontsize = this.isFontSize(docElement, node, fontSize);
         }
         if (!formatCollection.backgroundcolor) {
             formatCollection.backgroundcolor = this.isBackgroundColor(node);
@@ -17922,8 +17925,12 @@ class ToolbarStatus {
             return null;
         }
     }
-    static isFontSize(node, fontSize) {
-        const size = node.style && node.style.fontSize;
+    static isFontSize(docElement, node, fontSize) {
+        let size = node.style && node.style.fontSize;
+        if ((size === null || size === undefined || size === '') && node.nodeType !== 3 &&
+            node.parentElement.classList.contains('e-content')) {
+            size = this.getComputedStyle(docElement, node, 'font-size');
+        }
         if ((size !== null && size !== '' && size !== undefined)
             && (fontSize === null || fontSize === undefined || (fontSize.indexOf(size) > -1))) {
             return size;
@@ -18377,7 +18384,6 @@ class XhtmlValidation {
                 this.currentElement = this.parent.inputElement;
             }
             this.clean(this.currentElement);
-            this.AddRootElement();
             this.ImageTags();
             this.removeTags();
             this.RemoveUnsupported();
@@ -18424,16 +18430,6 @@ class XhtmlValidation {
         }
         return currentValue;
     }
-    AddRootElement() {
-        if ((this.currentElement.childNodes.length === 1 && this.currentElement.firstChild.nodeName !== 'DIV') ||
-            this.currentElement.childNodes.length > 1) {
-            const parentEle = this.parent.createElement('div');
-            while (this.currentElement.childNodes.length > 0) {
-                parentEle.appendChild(this.currentElement.childNodes[0]);
-            }
-            this.currentElement.appendChild(parentEle);
-        }
-    }
     clean(node) {
         for (let n = 0; n < node.childNodes.length; n++) {
             const child = node.childNodes[n];
@@ -19851,7 +19847,7 @@ class PasteCleanup {
         this.radioRender();
         /* eslint-disable */
         if (this.parent.element.offsetHeight < parseInt(this.dialogObj.height.split('px')[0], null)) {
-            this.parent.height = parseInt(this.dialogObj.height.split('px')[0], null) + 40;
+            this.parent.setProperties({ height: parseInt(this.dialogObj.height.split('px')[0], null) + 40 });
             /* eslint-enable */
             isHeight = true;
         }
@@ -27225,12 +27221,14 @@ class Table {
                             if ((totalwid - actualwid) > 20 && actualwid > 20) {
                                 const leftColumnWidth = totalwid - actualwid;
                                 const rightColWidth = actualwid;
-                                if (!isNullOrUndefined(this.curTable.rows[i].cells[this.colIndex - 1])) {
-                                    this.curTable.rows[i].cells[this.colIndex - 1].style.width =
+                                const index = this.curTable.rows[i].cells[i].hasAttribute('colspan') ?
+                                    parseInt(this.curTable.rows[i].cells[i].getAttribute('colspan'), 10) - 1 : this.colIndex;
+                                if (!isNullOrUndefined(this.curTable.rows[i].cells[index - 1])) {
+                                    this.curTable.rows[i].cells[index - 1].style.width =
                                         this.convertPixelToPercentage(leftColumnWidth, tableWidth) + '%';
                                 }
-                                if (!isNullOrUndefined(this.curTable.rows[i].cells[this.colIndex])) {
-                                    this.curTable.rows[i].cells[this.colIndex].style.width =
+                                if (!isNullOrUndefined(this.curTable.rows[i].cells[index])) {
+                                    this.curTable.rows[i].cells[index].style.width =
                                         this.convertPixelToPercentage(rightColWidth, tableWidth) + '%';
                                 }
                             }
@@ -28461,7 +28459,7 @@ class EnterKeyAction {
             isTableEnter = blockElement.tagName === 'TD' || blockElement.tagName === 'TBODY' ? false : true;
         }
         if (e.args.which === 13 && e.args.code === 'Enter') {
-            if (isNullOrUndefined(this.startNode.closest('LI')) && isNullOrUndefined(this.endNode.closest('LI')) && isTableEnter &&
+            if (isNullOrUndefined(this.startNode.closest('LI,UL,OL')) && isNullOrUndefined(this.endNode.closest('LI,UL,OL')) && isTableEnter &&
                 isNullOrUndefined(this.startNode.closest('PRE')) && isNullOrUndefined(this.endNode.closest('PRE'))) {
                 const shiftKey = e.args.shiftKey;
                 const actionBeginArgs = {
@@ -28753,7 +28751,8 @@ class EnterKeyAction {
                             }
                             this.removeBRElement(currentParent);
                             let currentParentLastChild = currentParent.lastChild;
-                            while (!isNullOrUndefined(currentParentLastChild) && !(currentParentLastChild.nodeName === '#text' || currentParentLastChild.nodeName === 'BR')) {
+                            while (!isNullOrUndefined(currentParentLastChild) && !(currentParentLastChild.nodeName === '#text' || currentParentLastChild.nodeName === 'BR'
+                                || currentParentLastChild.nodeName === 'IMG')) {
                                 currentParentLastChild = currentParentLastChild.lastChild;
                             }
                             const isLastNodeLength = this.range.startContainer === currentParentLastChild ?
@@ -28761,8 +28760,9 @@ class EnterKeyAction {
                             if (currentParent !== this.parent.inputElement &&
                                 this.parent.formatter.editorManager.domNode.isBlockNode(currentParent) &&
                                 this.range.startOffset === this.range.endOffset &&
-                                this.range.startOffset === isLastNodeLength) {
-                                const focusBRElem = this.parent.createElement('br');
+                                (this.range.startOffset === isLastNodeLength ||
+                                    (currentParent.textContent.trim().length === 0 && currentParent.lastChild.nodeName === 'IMG'))) {
+                                let focusBRElem = this.parent.createElement('br');
                                 if (this.range.startOffset === 0 && this.range.startContainer.nodeName === 'TABLE') {
                                     this.range.startContainer.parentElement.insertBefore(focusBRElem, this.range.startContainer);
                                 }
@@ -28770,6 +28770,11 @@ class EnterKeyAction {
                                     if (currentParentLastChild.nodeName === 'BR' && currentParent.textContent.length === 0) {
                                         this.parent.formatter.editorManager.domNode.insertAfter(focusBRElem, currentParentLastChild);
                                     }
+                                    else if (this.range.startOffset === 0 && this.range.endOffset === 0 &&
+                                        currentParent.lastChild && currentParent.lastChild.nodeName === 'IMG') {
+                                        currentParentLastChild.parentElement.insertBefore(focusBRElem, currentParentLastChild);
+                                        focusBRElem = currentParentLastChild;
+                                    }
                                     else {
                                         const lineBreakBRElem = this.parent.createElement('br');
                                         this.parent.formatter.editorManager.domNode.insertAfter(focusBRElem, this.range.startContainer);
@@ -29608,6 +29613,7 @@ let RichTextEditor = class RichTextEditor extends Component {
             }
             else {
                 value = this.htmlEditorModule.sanitizeHelper(value);
+                value = this.enableXhtml ? this.htmlEditorModule.xhtmlValidation.selfEncloseValidation(value) : value;
             }
         }
         return value;
@@ -30823,7 +30829,9 @@ let RichTextEditor = class RichTextEditor extends Component {
         this.notify(windowResize, null);
     }
     scrollHandler(e) {
-        this.notify(scroll, { args: e });
+        if (this.element) {
+            this.notify(scroll, { args: e });
+        }
     }
     contentScrollHandler(e) {
         this.notify(contentscroll, { args: e });
@@ -30884,8 +30892,8 @@ let RichTextEditor = class RichTextEditor extends Component {
         }
         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 ?
+            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;
             if (getTextArea && getTextArea.style.display === 'block') {
                 value = getTextArea.value;