@syncfusion/ej2-richtexteditor 21.2.8 → 21.2.10

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

@@ -5849,7 +5849,7 @@ class BaseQuickToolbar {
      * @deprecated
      */
     showPopup(x, y, target) {
-        const eventArgs = { popup: this.popupObj, cancel: false, targetElement: target };
+        const eventArgs = { popup: this.popupObj, cancel: false, targetElement: target, positionX: x, positionY: y };
         this.parent.trigger(beforeQuickToolbarOpen, eventArgs, (beforeQuickToolbarArgs) => {
             if (!beforeQuickToolbarArgs.cancel) {
                 let editPanelTop;
@@ -5889,8 +5889,8 @@ class BaseQuickToolbar {
                     });
                     this.tooltip.appendTo(this.element);
                 }
-                this.popupObj.position.X = x + 20;
-                this.popupObj.position.Y = y + 20;
+                this.popupObj.position.X = beforeQuickToolbarArgs.positionX + 20;
+                this.popupObj.position.Y = beforeQuickToolbarArgs.positionY + 20;
                 this.popupObj.dataBind();
                 this.popupObj.element.classList.add('e-popup-open');
                 this.dropDownButtons.renderDropDowns({
@@ -17143,7 +17143,7 @@ class MsWordPaste {
                 imgElem[i].getAttribute('v:shapes').indexOf('Picture') < 0 &&
                 imgElem[i].getAttribute('v:shapes').indexOf('圖片') < 0 &&
                 imgElem[i].getAttribute('v:shapes').indexOf('Grafik') < 0 &&
-                imgElem[i].getAttribute('v:shapes').indexOf('Image') < 0 &&
+                imgElem[i].getAttribute('v:shapes').toLowerCase().indexOf('image') < 0 &&
                 imgElem[i].getAttribute('v:shapes').indexOf('Graphic') < 0) {
                 detach(imgElem[i]);
             }
@@ -17726,12 +17726,31 @@ class MsWordPaste {
                     temp.style.listStyleType = collection[index].listStyleTypeName;
                 }
                 else {
-                    root.appendChild(temp = createElement(collection[index].listType));
-                    prevList = createElement('li');
-                    prevList.appendChild(pElement);
-                    temp.appendChild(prevList);
-                    temp.setAttribute('level', collection[index].nestedLevel.toString());
-                    temp.style.listStyleType = collection[index].listStyleTypeName;
+                    if (collection[index].nestedLevel > pLevel && isNormalList) {
+                        let initialNode;
+                        initialNode = createElement(collection[index].listType);
+                        prevList = createElement('li');
+                        initialNode.appendChild(prevList);
+                        initialNode.style.listStyleType = 'none';
+                        for (let j = 0; j < collection[index].nestedLevel - 1; j++) {
+                            prevList.appendChild(temp = createElement(collection[index].listType));
+                            prevList = createElement('li');
+                            temp.appendChild(prevList);
+                            temp.style.listStyleType = 'none';
+                        }
+                        prevList.appendChild(pElement);
+                        root.appendChild(initialNode);
+                        temp.setAttribute('level', collection[index].nestedLevel.toString());
+                        temp.style.listStyleType = collection[index].listStyleTypeName;
+                    }
+                    else {
+                        root.appendChild(temp = createElement(collection[index].listType));
+                        prevList = createElement('li');
+                        prevList.appendChild(pElement);
+                        temp.appendChild(prevList);
+                        temp.setAttribute('level', collection[index].nestedLevel.toString());
+                        temp.style.listStyleType = collection[index].listStyleTypeName;
+                    }
                 }
             }
             else if (collection[index].nestedLevel === 1) {
@@ -19477,9 +19496,10 @@ class HtmlEditor {
             range.startContainer.nodeName === '#text' ? range.startContainer.parentElement !== this.parent.inputElement ? range.startContainer.parentElement.classList.add('currentStartMark')
                 : isRootParent = true : range.startContainer.classList.add('currentStartMark');
             if (range.startContainer.textContent.charCodeAt(0) === 8203) {
-                pointer = range.startOffset === 0 ? range.startOffset :
-                    range.startContainer.textContent.replace(regEx, '').trim().length !== 0 ? range.startOffset - 1 : 0;
+                const previousLength = range.startContainer.textContent.length;
+                const previousRange = range.startOffset;
                 range.startContainer.textContent = range.startContainer.textContent.replace(regEx, '');
+                pointer = previousRange === 0 ? previousRange : previousRange - (previousLength - range.startContainer.textContent.length);
                 this.parent.formatter.editorManager.nodeSelection.setCursorPoint(this.parent.contentModule.getDocument(), range.startContainer, pointer);
             }
             const previousLength = this.parent.inputElement.innerHTML.length;
@@ -19499,7 +19519,10 @@ class HtmlEditor {
                             i--;
                         }
                         if (focusNode.textContent.replace(regEx, '') === currentChildNode[i].textContent) {
-                            pointer = focusNode.textContent.length > 1 ? focusNode.textContent.length - 1 : focusNode.textContent.length;
+                            pointer = focusNode.textContent.length > 1 ?
+                                (focusNode.textContent === currentChildNode[i].textContent ? pointer :
+                                    pointer - (focusNode.textContent.length - focusNode.textContent.replace(regEx, '').length)) :
+                                focusNode.textContent.length;
                             focusNode = currentChildNode[i];
                         }
                     }
@@ -19689,9 +19712,14 @@ class HtmlEditor {
                         ? this.oldRangeElement.lastElementChild.lastElementChild :
                         this.oldRangeElement.lastElementChild;
                 }
+                let lastNode = this.oldRangeElement.lastChild;
+                while (lastNode.nodeType !== 3 && lastNode.nodeName !== '#text' &&
+                    lastNode.nodeName !== 'BR') {
+                    lastNode = lastNode.lastChild;
+                }
                 this.parent.formatter.editorManager.nodeSelection.setCursorPoint(this.parent.contentModule.getDocument(), 
                 // eslint-disable-next-line
-                this.oldRangeElement, this.oldRangeElement.childNodes.length);
+                lastNode, lastNode.textContent.length);
                 if (this.oldRangeElement.querySelectorAll('BR').length === 1) {
                     detach(this.oldRangeElement.querySelector('BR'));
                 }