@syncfusion/ej2-richtexteditor 23.2.7 → 24.1.41-569421

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

@@ -3,12 +3,12 @@ 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 } from './../../common/util';
+import { updateTextNode, nestedListCleanUp } from './../../common/util';
 /**
  * Insert a HTML Node or Text
  *
  * @hidden
-
+ * @deprecated
  */
 var InsertHtml = /** @class */ (function () {
     function InsertHtml() {
@@ -59,6 +59,10 @@ 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);
@@ -82,7 +86,12 @@ var InsertHtml = /** @class */ (function () {
                     lasNode.textContent.length : lasNode.childNodes.length);
                 range = nodeSelection.getRange(docElement);
             }
-            range.extractContents();
+            if (range.startContainer.parentElement.closest('ol,ul') !== null && range.endContainer.parentElement.closest('ol,ul') !== null) {
+                nestedListCleanUp(range);
+            }
+            else {
+                range.extractContents();
+            }
             if (insertNode.tagName === 'TABLE') {
                 this.removeEmptyElements(editNode);
             }
@@ -119,6 +128,9 @@ var InsertHtml = /** @class */ (function () {
                         InsertMethods.AppendBefore(node, parentNode.firstChild, false);
                     }
                 }
+                else if (isNOU(preNode.previousSibling) && insertNode.tagName === 'TABLE') {
+                    parentNode.prepend(node);
+                }
                 else {
                     parentNode.appendChild(node);
                 }
@@ -204,19 +216,21 @@ var InsertHtml = /** @class */ (function () {
             || (node.nodeName.toLowerCase() === 'table' && closestParentNode &&
                 CONSTANT.TABLE_BLOCK_TAGS.indexOf(closestParentNode.tagName.toLocaleLowerCase()) === -1))) {
             preNode = nodeCutter.GetSpliceNode(range, closestParentNode);
-            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;
+            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;
+                }
             }
         }
         var containsBlockNode = false;
@@ -240,12 +254,17 @@ 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.appendChild(fragment) : editNode.appendChild(fragment);
+                    !isNOU(sibNode) ? (sibNode.parentNode === editNode ? sibNode.appendChild(fragment) : sibNode.parentNode.appendChild(fragment)) : range.insertNode(fragment);
                 }
             }
             else {
@@ -285,6 +304,9 @@ 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) {
@@ -296,7 +318,7 @@ var InsertHtml = /** @class */ (function () {
                         (this.inlineNode.indexOf(node.firstChild.nodeName.toLocaleLowerCase()) >= 0 && isFirstTextNode)) {
                         lastSelectionNode = node.firstChild;
                         if (isNOU(node.previousElementSibling)) {
-                            var firstParaElm = createElement('p');
+                            var firstParaElm = enterAction === 'DIV' ? createElement('div') : createElement('p');
                             node.parentElement.insertBefore(firstParaElm, node);
                         }
                         if (node.previousElementSibling.nodeName === 'BR') {
@@ -311,7 +333,7 @@ var InsertHtml = /** @class */ (function () {
                         if (node.firstChild.nodeName === '#text' ||
                             (this.inlineNode.indexOf(node.firstChild.nodeName.toLocaleLowerCase()) >= 0)) {
                             if (!isPreviousInlineElem) {
-                                paraElm = createElement('p');
+                                paraElm = enterAction === 'DIV' ? createElement('div') : createElement('p');
                                 paraElm.appendChild(node.firstChild);
                                 fragment.appendChild(paraElm);
                             }
@@ -405,7 +427,7 @@ var InsertHtml = /** @class */ (function () {
             if (blockNode.nodeName === 'BODY' && range.startContainer === range.endContainer && range.startContainer.nodeType === 1) {
                 blockNode = range.startContainer;
             }
-            if (blockNode.closest('LI') && node && node.firstElementChild &&
+            if (blockNode.closest('LI') && blockNode.nodeName !== 'TD' && blockNode.nodeName !== 'TH' && blockNode.nodeName !== 'TR' && node && node.firstElementChild &&
                 ((node).firstElementChild.tagName === 'OL' || node.firstElementChild.tagName === 'UL')) {
                 var liNode = void 0;
                 while (node.firstElementChild.lastElementChild && node.firstElementChild.lastElementChild.tagName === 'LI') {
@@ -444,6 +466,12 @@ 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;
@@ -470,7 +498,15 @@ var InsertHtml = /** @class */ (function () {
     };
     InsertHtml.imageFocus = function (node, nodeSelection, docElement) {
         var focusNode = document.createTextNode(' ');
-        node.parentNode.insertBefore(focusNode, node.nextSibling);
+        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);
+        }
         nodeSelection.setSelectionText(docElement, node.nextSibling, node.nextSibling, 0, 0);
     };
     // eslint-disable-next-line
@@ -525,6 +561,9 @@ 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) &&
@@ -535,11 +574,35 @@ 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
      *
      * @hidden
-
+     * @deprecated
      */
     InsertHtml.inlineNode = ['a', 'abbr', 'acronym', 'audio', 'b', 'bdi', 'bdo', 'big', 'br', 'button',
         'canvas', 'cite', 'code', 'data', 'datalist', 'del', 'dfn', 'em', 'embed', 'font', 'i', 'iframe', 'img', 'input',

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

@@ -2,7 +2,7 @@
  * Is formatted or not.
  *
  * @hidden
-
+ * @deprecated
  */
 export declare class IsFormatted {
     static inlineTags: string[];
@@ -14,7 +14,7 @@ export declare class IsFormatted {
      * @param {Node} endNode - specifies the end node
      * @returns {Node} - returns the node
      * @hidden
-
+     * @deprecated
      */
     getFormattedNode(node: Node, format: string, endNode: Node): Node;
     private getFormatParent;
@@ -25,7 +25,7 @@ export declare class IsFormatted {
      * @param {Node} node - specifies the node value
      * @returns {boolean} - returns the boolean value
      * @hidden
-
+     * @deprecated
      */
     static isBold(node: Node): boolean;
     /**
@@ -34,7 +34,7 @@ export declare class IsFormatted {
      * @param {Node} node - specifies the node value
      * @returns {boolean} - returns the boolean value
      * @hidden
-
+     * @deprecated
      */
     static isItalic(node: Node): boolean;
     /**
@@ -43,7 +43,7 @@ export declare class IsFormatted {
      * @param {Node} node - specifies the node value
      * @returns {boolean} - returns the boolean value
      * @hidden
-
+     * @deprecated
      */
     static isUnderline(node: Node): boolean;
     /**
@@ -52,7 +52,7 @@ export declare class IsFormatted {
      * @param {Node} node - specifies the node value
      * @returns {boolean} - returns the boolean value
      * @hidden
-
+     * @deprecated
      */
     static isStrikethrough(node: Node): boolean;
     /**
@@ -61,7 +61,7 @@ export declare class IsFormatted {
      * @param {Node} node - specifies the node value
      * @returns {boolean} - returns the boolean value
      * @hidden
-
+     * @deprecated
      */
     static isSuperscript(node: Node): boolean;
     /**
@@ -70,7 +70,7 @@ export declare class IsFormatted {
      * @param {Node} node - specifies the node value
      * @returns {boolean} - returns the boolean value
      * @hidden
-
+     * @deprecated
      */
     static isSubscript(node: Node): boolean;
     private isFontColor;

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

@@ -2,7 +2,7 @@
  * Is formatted or not.
  *
  * @hidden
-
+ * @deprecated
  */
 var IsFormatted = /** @class */ (function () {
     function IsFormatted() {
@@ -15,7 +15,7 @@ var IsFormatted = /** @class */ (function () {
      * @param {Node} endNode - specifies the end node
      * @returns {Node} - returns the node
      * @hidden
-
+     * @deprecated
      */
     IsFormatted.prototype.getFormattedNode = function (node, format, endNode) {
         var parentNode = this.getFormatParent(node, format, endNode);
@@ -62,7 +62,7 @@ var IsFormatted = /** @class */ (function () {
      * @param {Node} node - specifies the node value
      * @returns {boolean} - returns the boolean value
      * @hidden
-
+     * @deprecated
      */
     IsFormatted.isBold = function (node) {
         var validTags = ['strong', 'b'];
@@ -83,7 +83,7 @@ var IsFormatted = /** @class */ (function () {
      * @param {Node} node - specifies the node value
      * @returns {boolean} - returns the boolean value
      * @hidden
-
+     * @deprecated
      */
     IsFormatted.isItalic = function (node) {
         var validTags = ['em', 'i'];
@@ -104,7 +104,7 @@ var IsFormatted = /** @class */ (function () {
      * @param {Node} node - specifies the node value
      * @returns {boolean} - returns the boolean value
      * @hidden
-
+     * @deprecated
      */
     IsFormatted.isUnderline = function (node) {
         var validTags = ['u'];
@@ -128,7 +128,7 @@ var IsFormatted = /** @class */ (function () {
      * @param {Node} node - specifies the node value
      * @returns {boolean} - returns the boolean value
      * @hidden
-
+     * @deprecated
      */
     IsFormatted.isStrikethrough = function (node) {
         var validTags = ['del', 'strike'];
@@ -152,7 +152,7 @@ var IsFormatted = /** @class */ (function () {
      * @param {Node} node - specifies the node value
      * @returns {boolean} - returns the boolean value
      * @hidden
-
+     * @deprecated
      */
     IsFormatted.isSuperscript = function (node) {
         var validTags = ['sup'];
@@ -169,7 +169,7 @@ var IsFormatted = /** @class */ (function () {
      * @param {Node} node - specifies the node value
      * @returns {boolean} - returns the boolean value
      * @hidden
-
+     * @deprecated
      */
     IsFormatted.isSubscript = function (node) {
         var validTags = ['sub'];

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

@@ -3,7 +3,7 @@ import { EditorManager } from './../base/editor-manager';
  * Link internal component
  *
  * @hidden
-
+ * @deprecated
  */
 export declare class LinkCommand {
     private parent;
@@ -12,7 +12,7 @@ export declare class LinkCommand {
      *
      * @param {EditorManager} parent - specifies the editor manager
      * @hidden
-
+     * @deprecated
      */
     constructor(parent: EditorManager);
     private addEventListener;

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

@@ -7,7 +7,7 @@ import { createElement, isNullOrUndefined as isNOU, closest } from '@syncfusion/
  * Link internal component
  *
  * @hidden
-
+ * @deprecated
  */
 var LinkCommand = /** @class */ (function () {
     /**
@@ -15,7 +15,7 @@ var LinkCommand = /** @class */ (function () {
      *
      * @param {EditorManager} parent - specifies the editor manager
      * @hidden
-
+     * @deprecated
      */
     function LinkCommand(parent) {
         this.parent = parent;
@@ -54,7 +54,8 @@ var LinkCommand = /** @class */ (function () {
             }
             if (!isNOU(e.item.text) && e.item.text !== '') {
                 linkText = anchorEle.innerText;
-                anchorEle.innerText = e.item.text;
+                anchorEle.firstChild.nodeName === '#text' ? anchorEle.innerText = e.item.text :
+                    anchorEle.firstChild.innerText = e.item.text;
             }
             if (!isNOU(e.item.target)) {
                 anchorEle.setAttribute('target', e.item.target);
@@ -70,7 +71,8 @@ var LinkCommand = /** @class */ (function () {
             }
             else {
                 var startIndex = e.item.action === 'Paste' ? anchorEle.childNodes[0].textContent.length : 0;
-                e.item.selection.setSelectionText(this.parent.currentDocument, anchorEle.childNodes[0], anchorEle.childNodes[0], startIndex, anchorEle.childNodes[0].textContent.length);
+                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);
             }
         }
         else {
@@ -194,7 +196,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) {
+                if (this.parent.domNode.blockNodes().length === 1 && anchorNodes.length === 1) {
                     this.parent.nodeSelection.setSelectionNode(this.parent.currentDocument, anchorNodes[j_2]);
                 }
                 removeNodes[k] = finalinlineNodes[i];
@@ -230,6 +232,9 @@ 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) {

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

@@ -3,7 +3,7 @@ import { EditorManager } from './../base/editor-manager';
  * Lists internal component
  *
  * @hidden
-
+ * @deprecated
  */
 export declare class Lists {
     private parent;
@@ -18,7 +18,7 @@ export declare class Lists {
      *
      * @param {EditorManager} parent - specifies the parent element
      * @hidden
-
+     * @deprecated
      */
     constructor(parent: EditorManager);
     private addEventListener;