@syncfusion/ej2-richtexteditor 25.1.37 → 25.1.38

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

@@ -3945,9 +3945,11 @@ class ToolbarRenderer {
                             for (let index = 0; index < args.element.childNodes.length; index++) {
                                 if (currentListStyle === args.element.childNodes[index].innerHTML.split(' ').join('').toLocaleLowerCase()) {
                                     addClass([args.element.childNodes[index]], 'e-active');
+                                    break;
                                 }
-                                else if (currentListStyle === '') {
+                                else if (currentListStyle === '' && args.element.childNodes[index].innerHTML !== 'None') {
                                     addClass([args.element.childNodes[index]], 'e-active');
+                                    break;
                                 }
                             }
                         }
@@ -7065,6 +7067,10 @@ class QuickToolbar {
     }
     keyDownHandler(e) {
         const preventHide = e.args.altKey;
+        if (this.parent.inlineMode.enable && e.args.metaKey && e.args.keyCode === 65) {
+            this.showInlineQTBar(this.offsetX, this.offsetY, e.args.target);
+            return;
+        }
         if (!preventHide) {
             if ((this.parent.inlineMode.enable && (!Browser.isDevice || isIDevice()))
                 && !isNullOrUndefined(select('.' + CLS_INLINE_POP, document))) {
@@ -12407,6 +12413,7 @@ class Lists {
         endNode = endNode.nodeName === 'BR' ? endNode.parentElement : endNode;
         startNode = startNode.nodeName !== 'LI' && !isNullOrUndefined(startNode.closest('LI')) ? startNode.closest('LI') : startNode;
         endNode = endNode.nodeName !== 'LI' && endNode.nodeName !== '#text' && !isNullOrUndefined(endNode.closest('LI')) ? endNode.closest('LI') : endNode;
+        const parentList = (range.startContainer.nodeName === '#text') ? range.startContainer.parentElement.closest('li') : range.startContainer.closest('li');
         if (((range.commonAncestorContainer.nodeName === 'OL' || range.commonAncestorContainer.nodeName === 'UL' || range.commonAncestorContainer.nodeName === 'LI') &&
             isNullOrUndefined(endNode.nextElementSibling) && endNode.textContent.length === range.endOffset &&
             isNullOrUndefined(startNode.previousElementSibling) && range.startOffset === 0) ||
@@ -12423,6 +12430,12 @@ class Lists {
             }
             e.event.preventDefault();
         }
+        else if (!isNullOrUndefined(parentList) && parentList.textContent === range.startContainer.textContent && parentList.closest('li').previousElementSibling === null) {
+            range.deleteContents();
+            this.parent.editableElement.querySelectorAll('li:empty').forEach((e) => e.remove());
+            this.parent.editableElement.querySelectorAll('ol:empty').forEach((e) => e.remove());
+            e.event.preventDefault();
+        }
     }
     onKeyUp() {
         if (!isNullOrUndefined(this.commonLIParent) && !isNullOrUndefined(this.commonLIParent.querySelector('.removeList'))) {
@@ -12462,7 +12475,7 @@ class Lists {
         if (e.event.which === 8) {
             this.backspaceList(e);
         }
-        if (e.event.which === 46 && e.event.action === 'delete') {
+        if ((e.event.which === 46 && e.event.action === 'delete') || (e.event.which === 88 && e.event.action === 'cut')) {
             const range = this.parent.nodeSelection.getRange(this.parent.currentDocument);
             const commonAncestor = range.commonAncestorContainer;
             const startEle = range.startContainer;
@@ -13051,18 +13064,19 @@ class Lists {
                     if (DEFAULT_TAG && 0 === element.querySelectorAll(BLOCK_TAGS.join(', ')).length) {
                         const wrapperclass = isNullOrUndefined(className) ? ' class="e-rte-wrap-inner"' :
                             ' class="' + className + ' e-rte-wrap-inner"';
-                        let parentElement = parentNode;
-                        if (!isNullOrUndefined(parentElement.style.listStyleType)) {
-                            parentNode.style.removeProperty("list-style-type");
-                        }
-                        if (!isNullOrUndefined(parentElement.style.listStyleImage)) {
-                            parentNode.style.removeProperty("list-style-image");
-                        }
-                        if (parentElement.style.length === 0) {
-                            parentNode.removeAttribute("style");
+                        const parentElement = parentNode;
+                        if (elements.length === parentElement.querySelectorAll('li').length) {
+                            if (!isNullOrUndefined(parentElement.style.listStyleType)) {
+                                parentNode.style.removeProperty('list-style-type');
+                            }
+                            if (!isNullOrUndefined(parentElement.style.listStyleImage)) {
+                                parentNode.style.removeProperty('list-style-image');
+                            }
+                            if (parentElement.style.length === 0) {
+                                parentNode.removeAttribute('style');
+                            }
                         }
-                        const wrapper = '<' + DEFAULT_TAG + wrapperclass +
-                            this.domNode.attributes(parentElement) + '></' + DEFAULT_TAG + '>';
+                        const wrapper = '<' + DEFAULT_TAG + wrapperclass + '></' + DEFAULT_TAG + '>';
                         if (e.enterAction !== 'BR') {
                             this.domNode.wrapInner(element, this.domNode.parseHTMLFragment(wrapper));
                         }
@@ -14015,25 +14029,22 @@ class InsertHtml {
             TABLE_BLOCK_TAGS.indexOf(closestParentNode.tagName.toLocaleLowerCase()) !== -1))
             || (node.nodeName.toLowerCase() === 'table' && closestParentNode &&
                 TABLE_BLOCK_TAGS.indexOf(closestParentNode.tagName.toLocaleLowerCase()) === -1))) {
-            if (isCollapsed) {
-                preNode = nodeCutter.SplitNode(range, closestParentNode, true);
-            }
-            else {
-                preNode = nodeCutter.SplitNode(range, closestParentNode, false);
-            }
-            sibNode = isNullOrUndefined(preNode.previousSibling) ? preNode.parentNode.previousSibling : preNode.previousSibling;
-            if (nodes.length === 1) {
-                nodeSelection.setSelectionContents(docElement, preNode);
-                range = nodeSelection.getRange(docElement);
-                isSingleNode = true;
-            }
-            else {
-                lasNode = nodeCutter.GetSpliceNode(range, nodes[nodes.length - 1].parentElement);
-                lasNode = isNullOrUndefined(lasNode) ? preNode : lasNode;
-                nodeSelection.setSelectionText(docElement, preNode, lasNode, 0, (lasNode.nodeType === 3) ?
-                    lasNode.textContent.length : lasNode.childNodes.length);
-                range = nodeSelection.getRange(docElement);
-                isSingleNode = false;
+            preNode = nodeCutter.GetSpliceNode(range, closestParentNode);
+            if (!isNullOrUndefined(preNode)) {
+                sibNode = isNullOrUndefined(preNode.previousSibling) ? preNode.parentNode.previousSibling : preNode.previousSibling;
+                if (nodes.length === 1) {
+                    nodeSelection.setSelectionContents(docElement, preNode);
+                    range = nodeSelection.getRange(docElement);
+                    isSingleNode = true;
+                }
+                else {
+                    lasNode = nodeCutter.GetSpliceNode(range, nodes[nodes.length - 1].parentElement);
+                    lasNode = isNullOrUndefined(lasNode) ? preNode : lasNode;
+                    nodeSelection.setSelectionText(docElement, preNode, lasNode, 0, (lasNode.nodeType === 3) ?
+                        lasNode.textContent.length : lasNode.childNodes.length);
+                    range = nodeSelection.getRange(docElement);
+                    isSingleNode = false;
+                }
             }
         }
         let containsBlockNode = false;
@@ -21465,9 +21476,6 @@ class HtmlEditor {
     }
     onSelectionRestore(e) {
         this.parent.isBlur = false;
-        if (isNullOrUndefined(this.saveSelection) || isNullOrUndefined(closest(this.saveSelection.range.startContainer.parentElement, ".e-img-caption")) ? true : !(closest(this.saveSelection.range.startContainer.parentElement, ".e-img-caption").getAttribute("contenteditable") == "false")) {
-            this.contentRenderer.getEditPanel().focus();
-        }
         if (isNullOrUndefined(e.items) || e.items) {
             this.saveSelection.restore();
         }