@syncfusion/ej2-richtexteditor 24.1.41-569421 → 24.1.41-581025

package/src/editor-manager/plugin/format-painter-actions.js

@@ -174,7 +174,7 @@ var FormatPainterActions = /** @class */ (function () {
     };
     FormatPainterActions.prototype.copyAction = function () {
         var copyCollection = [];
-        var range = this.parent.nodeSelection.getRange(this.parent.currentDocument);
+        var range = this.parent.nodeSelection.getRange(document);
         var domSelection = this.parent.nodeSelection;
         var nodes = range.collapsed ? domSelection.getSelectionNodeCollection(range) :
             domSelection.getSelectionNodeCollectionBr(range);
@@ -363,14 +363,6 @@ var FormatPainterActions = /** @class */ (function () {
         var range = this.parent.nodeSelection.getRange(docElement);
         var isCollapsed = range.collapsed;
         var blockNodes = this.parent.domNode.blockNodes();
-        var isListCopied = this.isListCopied();
-        if (isListCopied) {
-            for (var i = 0; i < blockNodes.length; i++) {
-                if (closest(blockNodes[i], 'li')) {
-                    blockNodes[i] = closest(blockNodes[i], 'li');
-                }
-            }
-        }
         var isFullNodeSelected = false;
         if (blockNodes.length === 1) {
             isFullNodeSelected = blockNodes[0].textContent.trim() === range.toString().trim();
@@ -379,16 +371,6 @@ var FormatPainterActions = /** @class */ (function () {
             this.insertBlockNode(clonedElem, range, docElement, blockNodes);
         }
     };
-    FormatPainterActions.prototype.isListCopied = function () {
-        var isListCopied = false;
-        for (var i = 0; i < this.copyCollection.length; i++) {
-            if (this.copyCollection[i].tagName === 'OL' || this.copyCollection[i].tagName === 'UL') {
-                isListCopied = true;
-                break;
-            }
-        }
-        return isListCopied;
-    };
     FormatPainterActions.prototype.insertBlockNode = function (element, range, docElement, nodes) {
         var domSelection = this.parent.nodeSelection;
         var saveSelection = domSelection.save(range, docElement);

package/src/editor-manager/plugin/formats.d.ts

@@ -18,7 +18,6 @@ export declare class Formats {
     private addEventListener;
     private getParentNode;
     private onKeyUp;
-    private getBlockParent;
     private onKeyDown;
     private removeCodeContent;
     private deleteContent;

package/src/editor-manager/plugin/formats.js

@@ -52,14 +52,6 @@ var Formats = /** @class */ (function () {
             }
         }
     };
-    Formats.prototype.getBlockParent = function (node, endNode) {
-        var currentParent;
-        while (node != endNode) {
-            currentParent = node;
-            node = node.parentElement;
-        }
-        return currentParent;
-    };
     Formats.prototype.onKeyDown = function (e) {
         if (e.event.which === 13) {
             var range = this.parent.nodeSelection.getRange(this.parent.currentDocument);
@@ -69,8 +61,6 @@ var Formats = /** @class */ (function () {
                 ? range.endContainer : range.endContainer.parentElement;
             var preElem = closest(startCon, 'pre');
             var endPreElem = closest(endCon, 'pre');
-            var blockquoteEle = closest(startCon, 'blockquote');
-            var endBlockquoteEle = closest(endCon, 'blockquote');
             var liParent = !isNOU(preElem) && !isNOU(preElem.parentElement) && preElem.parentElement.tagName === 'LI';
             if (liParent) {
                 return;
@@ -82,17 +72,6 @@ var Formats = /** @class */ (function () {
                 range = this.parent.nodeSelection.getRange(this.parent.currentDocument);
                 this.parent.nodeSelection.setCursorPoint(this.parent.currentDocument, endCon, 0);
             }
-            if (e.event.which === 13 && ((!isNOU(blockquoteEle) && !isNOU(endBlockquoteEle)) || (!isNOU(blockquoteEle) && isNOU(endBlockquoteEle)))) {
-                var startParent = this.getBlockParent(range.startContainer, blockquoteEle);
-                if ((startParent.textContent.charCodeAt(0) === 8203 &&
-                    startParent.textContent.length === 1) || startParent.textContent.length === 0) {
-                    if (isNOU(startParent.nextSibling) && ((startParent.previousSibling.textContent.charCodeAt(0) === 8203 &&
-                        startParent.previousSibling.textContent.length === 1) || startParent.previousSibling.textContent.length === 0)) {
-                        e.event.preventDefault();
-                        this.paraFocus(startParent.parentElement); //Revert from blockquotes while pressing enter key
-                    }
-                }
-            }
             if (e.event.which === 13 && !isNOU(preElem) && !isNOU(endPreElem)) {
                 e.event.preventDefault();
                 this.deleteContent(range);
@@ -242,7 +221,7 @@ var Formats = /** @class */ (function () {
         }
         var save = this.parent.nodeSelection.save(range, this.parent.currentDocument);
         this.parent.domNode.setMarker(save);
-        var formatsNodes = this.parent.domNode.blockNodes(true);
+        var formatsNodes = this.parent.domNode.blockNodes();
         if (e.enterAction === 'BR') {
             this.setSelectionBRConfig();
             var allSelectedNode = this.parent.nodeSelection.getSelectedNodes(this.parent.currentDocument);
@@ -316,7 +295,7 @@ var Formats = /** @class */ (function () {
                 replaceHTML = parentNode.innerHTML;
             }
             if ((e.subCommand.toLowerCase() === parentNode.tagName.toLowerCase() &&
-                (e.subCommand.toLowerCase() !== 'pre' && e.subCommand.toLowerCase() !== 'blockquote' ||
+                (e.subCommand.toLowerCase() !== 'pre' ||
                     (!isNOU(e.exeValue) && e.exeValue.name === 'dropDownSelect'))) ||
                 isNOU(parentNode.parentNode) ||
                 (parentNode.tagName === 'TABLE' && e.subCommand.toLowerCase() === 'pre')) {
@@ -325,21 +304,7 @@ var Formats = /** @class */ (function () {
             this.cleanFormats(parentNode, e.subCommand);
             var replaceNode = (e.subCommand.toLowerCase() === 'pre' && parentNode.tagName.toLowerCase() === 'pre') ?
                 'p' : e.subCommand;
-            var isToggleBlockquoteList = e.subCommand.toLowerCase() === parentNode.tagName.toLowerCase() &&
-                e.subCommand.toLowerCase() === 'blockquote' && this.parent.domNode.isList(parentNode.firstElementChild);
-            var isToggleBlockquote = e.subCommand.toLowerCase() === parentNode.tagName.toLowerCase()
-                && e.subCommand.toLowerCase() === 'blockquote';
-            var replaceTag = void 0;
-            if (isToggleBlockquoteList) {
-                replaceTag = replaceHTML.replace(/>\s+</g, '><');
-            }
-            else if (isToggleBlockquote) {
-                var tagWrap = (e.enterAction == 'BR' || e.enterAction == 'P') ? 'P' : e.enterAction;
-                replaceTag = this.parent.domNode.createTagString(tagWrap, parentNode, replaceHTML.replace(/>\s+</g, '><'));
-            }
-            else {
-                replaceTag = this.parent.domNode.createTagString(replaceNode, parentNode, replaceHTML.replace(/>\s+</g, '><'));
-            }
+            var replaceTag = this.parent.domNode.createTagString(replaceNode, parentNode, replaceHTML.replace(/>\s+</g, '><'));
             if (parentNode.tagName === 'LI') {
                 parentNode.innerHTML = '';
                 parentNode.insertAdjacentHTML('beforeend', replaceTag);

package/src/editor-manager/plugin/image.js

@@ -79,6 +79,7 @@ var ImageCommand = /** @class */ (function () {
         }
     };
     ImageCommand.prototype.createImage = function (e) {
+        var _this = this;
         var isReplaced = false;
         e.item.url = isNOU(e.item.url) || e.item.url === 'undefined' ? e.item.src : e.item.url;
         if (!isNOU(e.item.selectParent) && e.item.selectParent[0].tagName === 'IMG') {
@@ -108,18 +109,21 @@ var ImageCommand = /** @class */ (function () {
             var selectedNode = this.parent.nodeSelection.getSelectedNodes(this.parent.currentDocument)[0];
             var imgElm_1 = (e.value === 'Replace' || isReplaced) ? e.item.selectParent[0] :
                 (Browser.isIE ? selectedNode.previousSibling : selectedNode.previousElementSibling);
-            var imageInstance_1 = this;
-            var onImageLoadEvent_1 = function () {
-                e.callBack({
-                    requestType: (e.value === 'Replace') ? (e.item.subCommand = 'Replace', "Replace") : 'Images',
-                    editorMode: 'HTML',
-                    event: e.event,
-                    range: imageInstance_1.parent.nodeSelection.getRange(imageInstance_1.parent.currentDocument),
-                    elements: [imgElm_1]
-                });
-                imgElm_1.removeEventListener('load', onImageLoadEvent_1);
-            };
-            imgElm_1.addEventListener('load', onImageLoadEvent_1);
+            imgElm_1.addEventListener('load', function () {
+                if (e.value !== 'Replace' || !isReplaced) {
+                    e.callBack({
+                        requestType: 'Images',
+                        editorMode: 'HTML',
+                        event: e.event,
+                        range: _this.parent.nodeSelection.getRange(_this.parent.currentDocument),
+                        elements: [imgElm_1]
+                    });
+                }
+            });
+        }
+        if (e.value === 'Replace') {
+            e.item.subCommand = 'Replace';
+            this.callBack(e);
         }
     };
     ImageCommand.prototype.setStyle = function (imgElement, e, imgReplace) {

package/src/editor-manager/plugin/indents.js

@@ -81,7 +81,7 @@ var Indents = /** @class */ (function () {
                 isRtl ? (parentNode.style.marginRight = indentsValue) : (parentNode.style.marginLeft = indentsValue);
             }
             else {
-                indentsValue = (marginLeftOrRight === '' || marginLeftOrRight === '0px' || marginLeftOrRight === '0in') ? '' : parseInt(marginLeftOrRight, null) - this.indentValue + 'px';
+                indentsValue = (marginLeftOrRight === '' || marginLeftOrRight === '0px') ? '' : parseInt(marginLeftOrRight, null) - this.indentValue + 'px';
                 isRtl ? (parentNode.style.marginRight = indentsValue) : (parentNode.style.marginLeft = indentsValue);
                 /* eslint-enable */
             }

package/src/editor-manager/plugin/inserthtml.d.ts

@@ -26,5 +26,4 @@ export declare class InsertHtml {
     private static findDetachEmptyElem;
     private static removeEmptyElements;
     private static closestEle;
-    private static insertTableInList;
 }

package/src/editor-manager/plugin/inserthtml.js

@@ -3,7 +3,7 @@ import { NodeCutter } from './nodecutter';
 import * as CONSTANT from './../base/constant';
 import { detach, Browser, isNullOrUndefined as isNOU, createElement, closest } from '@syncfusion/ej2-base';
 import { InsertMethods } from './insert-methods';
-import { updateTextNode, nestedListCleanUp } from './../../common/util';
+import { updateTextNode } from './../../common/util';
 /**
  * Insert a HTML Node or Text
  *
@@ -59,10 +59,6 @@ var InsertHtml = /** @class */ (function () {
         var isCollapsed = range.collapsed;
         var nodes = this.getNodeCollection(range, nodeSelection, node);
         var closestParentNode = (node.nodeName.toLowerCase() === 'table') ? this.closestEle(nodes[0].parentNode, editNode) : nodes[0];
-        if (closestParentNode && closestParentNode.nodeName === 'LI' && node.nodeName.toLowerCase() === 'table') {
-            this.insertTableInList(range, node, closestParentNode, nodes[0], nodeCutter);
-            return;
-        }
         if (isExternal || (!isNOU(node) && !isNOU(node.classList) &&
             node.classList.contains('pasteContent'))) {
             this.pasteInsertHTML(nodes, node, range, nodeSelection, nodeCutter, docElement, isCollapsed, closestParentNode, editNode, enterAction);
@@ -86,12 +82,7 @@ var InsertHtml = /** @class */ (function () {
                     lasNode.textContent.length : lasNode.childNodes.length);
                 range = nodeSelection.getRange(docElement);
             }
-            if (range.startContainer.parentElement.closest('ol,ul') !== null && range.endContainer.parentElement.closest('ol,ul') !== null) {
-                nestedListCleanUp(range);
-            }
-            else {
-                range.extractContents();
-            }
+            range.extractContents();
             if (insertNode.tagName === 'TABLE') {
                 this.removeEmptyElements(editNode);
             }
@@ -216,21 +207,19 @@ var InsertHtml = /** @class */ (function () {
             || (node.nodeName.toLowerCase() === 'table' && closestParentNode &&
                 CONSTANT.TABLE_BLOCK_TAGS.indexOf(closestParentNode.tagName.toLocaleLowerCase()) === -1))) {
             preNode = nodeCutter.GetSpliceNode(range, closestParentNode);
-            if (!isNOU(preNode)) {
-                sibNode = isNOU(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 = isNOU(lasNode) ? preNode : lasNode;
-                    nodeSelection.setSelectionText(docElement, preNode, lasNode, 0, (lasNode.nodeType === 3) ?
-                        lasNode.textContent.length : lasNode.childNodes.length);
-                    range = nodeSelection.getRange(docElement);
-                    isSingleNode = false;
-                }
+            sibNode = isNOU(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 = isNOU(lasNode) ? preNode : lasNode;
+                nodeSelection.setSelectionText(docElement, preNode, lasNode, 0, (lasNode.nodeType === 3) ?
+                    lasNode.textContent.length : lasNode.childNodes.length);
+                range = nodeSelection.getRange(docElement);
+                isSingleNode = false;
             }
         }
         var containsBlockNode = false;
@@ -254,17 +243,12 @@ var InsertHtml = /** @class */ (function () {
                     preNode.parentNode.replaceChild(fragment, preNode);
                 }
                 else {
-                    var startContainerParent = range.startContainer.parentNode;
-                    // Get the index of the start container among its siblings
-                    var startIndex = Array.prototype.indexOf.call(startContainerParent.childNodes, range.startContainer);
                     range.deleteContents();
-                    range.setStart(startContainerParent, startIndex);
-                    range.setEnd(startContainerParent, startIndex);
                     if (!isNOU(lasNode)) {
                         detach(lasNode);
                     }
                     // eslint-disable-next-line
-                    !isNOU(sibNode) ? (sibNode.parentNode === editNode ? sibNode.appendChild(fragment) : sibNode.parentNode.appendChild(fragment)) : range.insertNode(fragment);
+                    !isNOU(sibNode) ? sibNode.parentNode.appendChild(fragment) : editNode.appendChild(fragment);
                 }
             }
             else {
@@ -304,9 +288,6 @@ var InsertHtml = /** @class */ (function () {
                 var paraElm = void 0;
                 var previousParent = void 0;
                 if (!this.contentsDeleted) {
-                    if (!isCollapsed && range.startContainer.parentElement.textContent.length === 0 && range.startContainer.nodeName === 'BR' && range.startContainer.parentElement.nodeName === 'P') {
-                        editNode.removeChild(range.startContainer.parentElement);
-                    }
                     range.deleteContents();
                 }
                 while (node.firstChild) {
@@ -427,7 +408,7 @@ var InsertHtml = /** @class */ (function () {
             if (blockNode.nodeName === 'BODY' && range.startContainer === range.endContainer && range.startContainer.nodeType === 1) {
                 blockNode = range.startContainer;
             }
-            if (blockNode.closest('LI') && blockNode.nodeName !== 'TD' && blockNode.nodeName !== 'TH' && blockNode.nodeName !== 'TR' && node && node.firstElementChild &&
+            if (blockNode.closest('LI') && node && node.firstElementChild &&
                 ((node).firstElementChild.tagName === 'OL' || node.firstElementChild.tagName === 'UL')) {
                 var liNode = void 0;
                 while (node.firstElementChild.lastElementChild && node.firstElementChild.lastElementChild.tagName === 'LI') {
@@ -466,12 +447,6 @@ var InsertHtml = /** @class */ (function () {
                     }
                     if (!range.collapsed) {
                         range.deleteContents();
-                        var value = range.startContainer;
-                        if (!isNOU(value) && value.nodeName === 'LI' && !isNOU(value.parentElement) && (value.parentElement.nodeName === 'OL' || value.parentElement.nodeName === 'UL') && value.textContent.trim() === '') {
-                            value.parentElement.querySelectorAll('li').forEach(function (item) {
-                                item.remove();
-                            });
-                        }
                     }
                     range.insertNode(node);
                     this.contentsDeleted = true;
@@ -498,15 +473,7 @@ var InsertHtml = /** @class */ (function () {
     };
     InsertHtml.imageFocus = function (node, nodeSelection, docElement) {
         var focusNode = document.createTextNode(' ');
-        if (node.parentNode && node.parentNode.nodeName === 'A') {
-            var anchorTag = node.parentNode;
-            var parentNode = anchorTag.parentNode;
-            parentNode.insertBefore(focusNode, anchorTag.nextSibling);
-            parentNode.insertBefore(node, focusNode);
-        }
-        else {
-            node.parentNode.insertBefore(focusNode, node.nextSibling);
-        }
+        node.parentNode.insertBefore(focusNode, node.nextSibling);
         nodeSelection.setSelectionText(docElement, node.nextSibling, node.nextSibling, 0, 0);
     };
     // eslint-disable-next-line
@@ -561,9 +528,6 @@ var InsertHtml = /** @class */ (function () {
     };
     InsertHtml.closestEle = function (element, editNode) {
         var el = element;
-        if (closest(el, 'li')) {
-            return closest(el, 'li');
-        }
         while (el && el.nodeType === 1) {
             if (el.parentNode === editNode ||
                 (!isNOU(el.parentNode.tagName) &&
@@ -574,30 +538,6 @@ var InsertHtml = /** @class */ (function () {
         }
         return null;
     };
-    InsertHtml.insertTableInList = function (range, insertNode, parentNode, currentNode, nodeCutter) {
-        if (range.collapsed) {
-            var isStart = range.startOffset === 0;
-            var isEnd = range.startContainer.textContent.trimEnd().length === range.startOffset;
-            if (isStart || isEnd) {
-                if (isStart) {
-                    InsertMethods.AppendBefore(insertNode, currentNode, false);
-                }
-                else {
-                    InsertMethods.AppendBefore(insertNode, currentNode, true);
-                }
-            }
-            else {
-                var preNode = nodeCutter.SplitNode(range, parentNode, true);
-                var sibNode = preNode.previousSibling;
-                sibNode.appendChild(insertNode);
-            }
-        }
-        else {
-            range.deleteContents();
-            parentNode.appendChild(insertNode);
-        }
-        insertNode.classList.add('ignore-table');
-    };
     /**
      * Insert method
      *

package/src/editor-manager/plugin/link.js

@@ -54,8 +54,7 @@ var LinkCommand = /** @class */ (function () {
             }
             if (!isNOU(e.item.text) && e.item.text !== '') {
                 linkText = anchorEle.innerText;
-                anchorEle.firstChild.nodeName === '#text' ? anchorEle.innerText = e.item.text :
-                    anchorEle.firstChild.innerText = e.item.text;
+                anchorEle.innerText = e.item.text;
             }
             if (!isNOU(e.item.target)) {
                 anchorEle.setAttribute('target', e.item.target);
@@ -71,8 +70,7 @@ var LinkCommand = /** @class */ (function () {
             }
             else {
                 var startIndex = e.item.action === 'Paste' ? anchorEle.childNodes[0].textContent.length : 0;
-                var endIndex = anchorEle.firstChild.nodeName === '#text' ? anchorEle.childNodes[0].textContent.length : anchorEle.childNodes.length;
-                e.item.selection.setSelectionText(this.parent.currentDocument, anchorEle.childNodes[0], anchorEle.childNodes[0], startIndex, endIndex);
+                e.item.selection.setSelectionText(this.parent.currentDocument, anchorEle.childNodes[0], anchorEle.childNodes[0], startIndex, anchorEle.childNodes[0].textContent.length);
             }
         }
         else {
@@ -196,7 +194,7 @@ var LinkCommand = /** @class */ (function () {
         for (var i = 0, j_2 = 0, k = 0; i <= finalinlineNodes.length; i++) {
             if (i === 0) {
                 finalinlineNodes[i].parentNode.insertBefore(anchorNodes[j_2], finalinlineNodes[i].nextSibling);
-                if (this.parent.domNode.blockNodes().length === 1 && anchorNodes.length === 1) {
+                if (this.parent.domNode.blockNodes().length === 1) {
                     this.parent.nodeSelection.setSelectionNode(this.parent.currentDocument, anchorNodes[j_2]);
                 }
                 removeNodes[k] = finalinlineNodes[i];
@@ -232,9 +230,6 @@ var LinkCommand = /** @class */ (function () {
         if (!isNOU(e.item.target)) {
             anchorEle.setAttribute('target', e.item.target);
         }
-        if (!isNOU(e.item.ariaLabel)) {
-            anchorEle.setAttribute('aria-label', e.item.ariaLabel);
-        }
         return anchorEle;
     };
     LinkCommand.prototype.getSelectionNodes = function (nodeCollection) {