@syncfusion/ej2-richtexteditor 19.4.38 → 19.4.40

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

@@ -2965,7 +2965,7 @@ class ToolbarRenderer {
      * @hidden
      * @deprecated
      */
-    renderColorPickerDropDown(args, item, colorPicker) {
+    renderColorPickerDropDown(args, item, colorPicker, defaultColor) {
         // eslint-disable-next-line
         const proxy = this;
         let css = CLS_RTE_ELEMENTS + ' ' + CLS_TB_BTN + ((this.parent.inlineMode) ? (' ' + CLS_INLINE_DROPDOWN) : '');
@@ -2973,8 +2973,9 @@ class ToolbarRenderer {
         const content = proxy.parent.createElement('span', { className: CLS_COLOR_CONTENT });
         const inlineEle = proxy.parent.createElement('span', { className: args.cssClass });
         let range;
+        let initialBackgroundColor = (isNullOrUndefined(defaultColor)) ? proxy.parent.backgroundColor.default : defaultColor;
         inlineEle.style.borderBottomColor = (item === 'backgroundcolor') ?
-            proxy.parent.backgroundColor.default : proxy.parent.fontColor.default;
+            initialBackgroundColor : proxy.parent.fontColor.default;
         content.appendChild(inlineEle);
         const dropDown = new DropDownButton({
             target: colorPicker.element.parentElement, cssClass: css,
@@ -4987,7 +4988,7 @@ class ColorPickerInput {
                             target: (targetID)
                         };
                         this.backgroundColorPicker = this.toolbarRenderer.renderColorPicker(options, 'backgroundcolor');
-                        this.backgroundColorDropDown = this.toolbarRenderer.renderColorPickerDropDown(options, 'backgroundcolor', this.backgroundColorPicker);
+                        this.backgroundColorDropDown = this.toolbarRenderer.renderColorPickerDropDown(options, 'backgroundcolor', this.backgroundColorPicker, this.defaultColorPicker);
                         break;
                     }
                 }
@@ -5022,6 +5023,7 @@ class ColorPickerInput {
         if (this.backgroundColorDropDown && !this.backgroundColorDropDown.isDestroyed) {
             const innerEle = this.backgroundColorDropDown.element.querySelector('.e-rte-color-content');
             if (innerEle) {
+                this.defaultColorPicker = innerEle.children[0].style.borderBottomColor;
                 detach(innerEle);
             }
             this.backgroundColorDropDown.destroy();
@@ -10466,8 +10468,9 @@ class Lists {
     testCurrentList(range) {
         const olListStartRegex = [/^[1]+[.]+$/, /^[i]+[.]+$/, /^[a]+[.]+$/];
         if (!isNullOrUndefined(range.startContainer.textContent.slice(0, range.startOffset))) {
+            const currentContent = range.startContainer.textContent.replace(/\u200B/g, '').slice(0, range.startOffset).trim();
             for (let i = 0; i < olListStartRegex.length; i++) {
-                if (olListStartRegex[i].test(range.startContainer.textContent.replace(/\u200B/g, '').slice(0, range.startOffset).trim())) {
+                if (olListStartRegex[i].test(currentContent) && currentContent.length === 2) {
                     return true;
                 }
             }
@@ -14485,6 +14488,9 @@ class SelectionCommands {
     }
     static removeFormat(nodes, index, formatNode, isCursor, isFormat, isFontStyle, range, nodeCutter, format, value, domSelection, endNode, domNode) {
         let splitNode = null;
+        let startText = range.startContainer.nodeName === '#text' ?
+            range.startContainer.textContent.substring(range.startOffset, range.startContainer.textContent.length) :
+            range.startContainer.textContent;
         if (!(range.startContainer === range.endContainer && range.startOffset === 0
             && range.endOffset === range.startContainer.length)) {
             const nodeIndex = [];
@@ -14584,11 +14590,13 @@ class SelectionCommands {
             for (let num = 0; num < child.length; num++) {
                 if (child[num].nodeType !== 3 || (child[num].textContent && child[num].textContent.trim().length > 0)) {
                     child[num] = InsertMethods.Wrap(child[num], this.GetFormatNode(format, value, formatNodeTagName, formatNodeStyles));
-                    if (num === 0) {
-                        range.setStartBefore(child[num]);
-                    }
-                    else if (num === child.length - 1) {
-                        range.setEndAfter(child[num]);
+                    if (child[num].textContent === startText) {
+                        if (num === 0) {
+                            range.setStartBefore(child[num]);
+                        }
+                        else if (num === child.length - 1) {
+                            range.setEndAfter(child[num]);
+                        }
                     }
                 }
             }
@@ -20099,7 +20107,7 @@ class Image {
             left: elem.offsetLeft
         };
     }
-    setAspectRatio(img, expectedX, expectedY) {
+    setAspectRatio(img, expectedX, expectedY, e) {
         if (isNullOrUndefined(img.width)) {
             return;
         }
@@ -20153,7 +20161,7 @@ class Image {
                 img.style.height = (height / width * expectedX) + 'px';
             }
             else {
-                img.setAttribute('width', expectedX.toString());
+                img.setAttribute('width', this.resizeBtnStat.botRight ? (this.getPointX(e.event) - img.getBoundingClientRect().left).toString() : expectedX.toString());
             }
         }
         else {
@@ -20193,7 +20201,7 @@ class Image {
                     return;
                 }
                 this.imgEle.parentElement.style.cursor = 'pointer';
-                this.setAspectRatio(this.imgEle, parseInt(width, 10), parseInt(height, 10));
+                this.setAspectRatio(this.imgEle, parseInt(width, 10), parseInt(height, 10), args);
                 this.resizeImgDupPos(this.imgEle);
                 this.imgResizePos(this.imgEle, this.imgResizeDiv);
                 this.parent.setContentHeight('', false);