@syncfusion/ej2-richtexteditor 20.4.51 → 20.4.52

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

@@ -16968,7 +16968,10 @@ var MsWordPaste = /** @__PURE__ @class */ (function () {
         this.checkVShape(elm);
         var imgElem = elm.querySelectorAll('img');
         for (var 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]);
             }
         }
@@ -18009,7 +18012,7 @@ var ToolbarStatus = /** @__PURE__ @class */ (function () {
             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);
@@ -18069,8 +18072,12 @@ var ToolbarStatus = /** @__PURE__ @class */ (function () {
             return null;
         }
     };
-    ToolbarStatus.isFontSize = function (node, fontSize) {
+    ToolbarStatus.isFontSize = function (docElement, node, fontSize) {
         var 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;
@@ -27342,12 +27349,14 @@ var Table = /** @__PURE__ @class */ (function () {
                             if ((totalwid - actualwid) > 20 && actualwid > 20) {
                                 var leftColumnWidth = totalwid - actualwid;
                                 var rightColWidth = actualwid;
-                                if (!isNullOrUndefined(_this.curTable.rows[i].cells[_this.colIndex - 1])) {
-                                    _this.curTable.rows[i].cells[_this.colIndex - 1].style.width =
+                                var 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) + '%';
                                 }
                             }
@@ -29005,7 +29014,8 @@ var EnterKeyAction = /** @__PURE__ @class */ (function () {
                             }
                             _this.removeBRElement(currentParent);
                             var 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;
                             }
                             var isLastNodeLength = _this.range.startContainer === currentParentLastChild ?
@@ -29013,7 +29023,8 @@ var EnterKeyAction = /** @__PURE__ @class */ (function () {
                             if (currentParent !== _this.parent.inputElement &&
                                 _this.parent.formatter.editorManager.domNode.isBlockNode(currentParent) &&
                                 _this.range.startOffset === _this.range.endOffset &&
-                                _this.range.startOffset === isLastNodeLength) {
+                                (_this.range.startOffset === isLastNodeLength ||
+                                    (currentParent.textContent.trim().length === 0 && currentParent.lastChild.nodeName === 'IMG'))) {
                                 var focusBRElem = _this.parent.createElement('br');
                                 if (_this.range.startOffset === 0 && _this.range.startContainer.nodeName === 'TABLE') {
                                     _this.range.startContainer.parentElement.insertBefore(focusBRElem, _this.range.startContainer);
@@ -29022,6 +29033,11 @@ var EnterKeyAction = /** @__PURE__ @class */ (function () {
                                     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 {
                                         var lineBreakBRElem = _this.parent.createElement('br');
                                         _this.parent.formatter.editorManager.domNode.insertAfter(focusBRElem, _this.range.startContainer);
@@ -31108,7 +31124,9 @@ var RichTextEditor = /** @__PURE__ @class */ (function (_super) {
         this.notify(windowResize, null);
     };
     RichTextEditor.prototype.scrollHandler = function (e) {
-        this.notify(scroll, { args: e });
+        if (this.element) {
+            this.notify(scroll, { args: e });
+        }
     };
     RichTextEditor.prototype.contentScrollHandler = function (e) {
         this.notify(contentscroll, { args: e });