@syncfusion/ej2-richtexteditor 20.4.51 → 20.4.52

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

@@ -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;
@@ -27214,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) + '%';
                                 }
                             }
@@ -28742,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 ?
@@ -28750,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);
                                 }
@@ -28759,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);
@@ -30813,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 });