@syncfusion/ej2-richtexteditor 19.3.57 → 19.4.38

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

@@ -3592,11 +3592,6 @@ class DropDownButtons {
         for (const prop of Object.keys(newProp)) {
             switch (prop) {
                 case 'fontFamily':
-                    if (this.parent.inlineMode.enable) {
-                        if (!isNullOrUndefined(this.parent.fontFamily.default)) {
-                            this.getEditNode().style.fontFamily = this.parent.fontFamily.default;
-                        }
-                    }
                     if (this.fontNameDropDown) {
                         for (const fontFamily$$1 of Object.keys(newProp.fontFamily)) {
                             switch (fontFamily$$1) {
@@ -3627,11 +3622,6 @@ class DropDownButtons {
                     }
                     break;
                 case 'fontSize':
-                    if (this.parent.inlineMode) {
-                        if (!isNullOrUndefined(this.parent.fontSize.default)) {
-                            this.getEditNode().style.fontSize = this.parent.fontSize.default;
-                        }
-                    }
                     if (this.fontSizeDropDown) {
                         for (const fontSize$$1 of Object.keys(newProp.fontSize)) {
                             switch (fontSize$$1) {
@@ -15270,7 +15260,16 @@ class UndoRedoManager {
      * @deprecated
      */
     saveData(e) {
-        const range = new NodeSelection().getRange(this.parent.currentDocument);
+        let range = new NodeSelection().getRange(this.parent.currentDocument);
+        let currentContainer = range.startContainer;
+        for (let i = currentContainer.childNodes.length - 1; i >= 0; i--) {
+            if (!isNullOrUndefined(currentContainer.childNodes[i]) && currentContainer.childNodes[i].nodeName === '#text' &&
+                currentContainer.childNodes[i].textContent.length === 0 && currentContainer.childNodes[i].nodeName !== 'IMG' &&
+                currentContainer.childNodes[i].nodeName !== 'BR' && currentContainer.childNodes[i].nodeName && 'HR') {
+                detach(currentContainer.childNodes[i]);
+            }
+        }
+        range = new NodeSelection().getRange(this.parent.currentDocument);
         const save = new NodeSelection().save(range, this.parent.currentDocument);
         const htmlText = this.parent.editableElement.innerHTML;
         const changEle = { text: htmlText, range: save };
@@ -15420,7 +15419,7 @@ class MsWordPaste {
         this.parent.observer.on(MS_WORD_CLEANUP_PLUGIN, this.wordCleanup, this);
     }
     wordCleanup(e) {
-        const wordPasteStyleConfig = e.allowedStylePropertiesArray;
+        const wordPasteStyleConfig = !isNullOrUndefined(e.allowedStylePropertiesArray) ? e.allowedStylePropertiesArray : [];
         let listNodes = [];
         let tempHTMLContent = e.args.clipboardData.getData('text/HTML');
         const rtfData = e.args.clipboardData.getData('text/rtf');
@@ -16939,7 +16938,7 @@ class XhtmlValidation {
             this.ImageTags();
             this.removeTags();
             this.RemoveUnsupported();
-            this.currentElement.innerHTML = this.selfEncloseValidation(this.currentElement.innerHTML, this.currentElement.innerText === '\n' ?
+            this.currentElement.innerHTML = this.selfEncloseValidation(this.currentElement.innerHTML, this.currentElement.innerText === "\n" ?
                 this.currentElement.innerText.length : this.currentElement.innerText.trim().length);
             this.parent.setProperties({ value: this.currentElement.innerHTML }, true);
         }
@@ -17223,7 +17222,7 @@ class HtmlEditor {
             e.args.action === 'enter' ||
             e.args.keyCode === 13) {
             this.spaceLink(e.args);
-            if (this.parent.editorMode === 'HTML') {
+            if (this.parent.editorMode === 'HTML' && !this.parent.readonly) {
                 this.parent.notify(enterHandler, { args: e.args });
             }
         }
@@ -24096,9 +24095,20 @@ class EnterKeyAction {
     }
     enterHandler(e) {
         this.getRangeNode();
+        let isTableEnter = true;
+        if (!isNullOrUndefined(this.startNode.closest('TABLE')) && !isNullOrUndefined(this.endNode.closest('TABLE'))) {
+            isTableEnter = false;
+            let curElement = this.startNode;
+            let blockElement = curElement;
+            while (!this.parent.formatter.editorManager.domNode.isBlockNode(curElement)) {
+                blockElement = curElement;
+                curElement = curElement.parentElement;
+            }
+            isTableEnter = blockElement.tagName === 'TD' ? false : true;
+        }
         if (e.args.which === 13 && e.args.code === 'Enter') {
-            if (isNullOrUndefined(this.startNode.closest('LI')) && isNullOrUndefined(this.endNode.closest('LI')) && isNullOrUndefined(this.startNode.closest('TABLE')) &&
-                isNullOrUndefined(this.endNode.closest('TABLE')) && isNullOrUndefined(this.startNode.closest('PRE')) && isNullOrUndefined(this.endNode.closest('PRE'))) {
+            if (isNullOrUndefined(this.startNode.closest('LI')) && isNullOrUndefined(this.endNode.closest('LI')) && isTableEnter &&
+                isNullOrUndefined(this.startNode.closest('PRE')) && isNullOrUndefined(this.endNode.closest('PRE'))) {
                 const shiftKey = e.args.shiftKey;
                 const actionBeginArgs = {
                     cancel: false,
@@ -24159,10 +24169,29 @@ class EnterKeyAction {
                         if ((this.parent.enterKey === 'P' && !shiftKey) || (this.parent.enterKey === 'DIV' && !shiftKey) ||
                             (this.parent.shiftEnterKey === 'P' && shiftKey) ||
                             (this.parent.shiftEnterKey === 'DIV' && shiftKey)) {
-                            const nearBlockNode = this.parent.formatter.editorManager.domNode.blockParentNode(this.startNode);
+                            let nearBlockNode;
+                            if (isTableEnter && this.parent.formatter.editorManager.domNode.isBlockNode(this.startNode)) {
+                                nearBlockNode = this.startNode;
+                            }
+                            else {
+                                nearBlockNode = this.parent.formatter.editorManager.domNode.blockParentNode(this.startNode);
+                            }
                             let isImageNode = false;
-                            if (this.range.startOffset === 0 && this.range.endOffset === 0 && !(!isNullOrUndefined(this.range.startContainer.previousSibling) &&
-                                (this.range.startContainer.previousSibling.nodeName === 'IMG' || this.range.startContainer.previousSibling.nodeName === 'BR'))) {
+                            let isFocusedFirst = false;
+                            if (this.range.startOffset != 0 && this.range.endOffset != 0 && this.range.startContainer === this.range.endContainer &&
+                                !(!isNullOrUndefined(nearBlockNode.childNodes[0]) && nearBlockNode.childNodes[0].nodeName === 'IMG')) {
+                                let startNodeText = this.range.startContainer.textContent;
+                                let splitFirstText = startNodeText.substring(0, this.range.startOffset);
+                                if (splitFirstText.charCodeAt(this.range.startOffset - 1) != 160 && splitFirstText.trim().length === 0) {
+                                    isFocusedFirst = true;
+                                }
+                            }
+                            else if (this.range.startOffset === 0 && this.range.endOffset === 0) {
+                                isFocusedFirst = true;
+                            }
+                            if (((this.range.startOffset === 0 && this.range.endOffset === 0) || isFocusedFirst) &&
+                                !(!isNullOrUndefined(this.range.startContainer.previousSibling) &&
+                                    (this.range.startContainer.previousSibling.nodeName === 'IMG' || this.range.startContainer.previousSibling.nodeName === 'BR'))) {
                                 let isNearBlockLengthZero;
                                 let newElem;
                                 if (this.range.startContainer.nodeName === 'IMG') {
@@ -24171,7 +24200,7 @@ class EnterKeyAction {
                                     isNearBlockLengthZero = false;
                                 }
                                 else {
-                                    if (nearBlockNode.textContent.length !== 0) {
+                                    if (nearBlockNode.textContent.trim().length !== 0) {
                                         newElem = this.parent.formatter.editorManager.nodeCutter.SplitNode(this.range, nearBlockNode, false).cloneNode(true);
                                         isNearBlockLengthZero = false;
                                     }
@@ -24220,7 +24249,18 @@ class EnterKeyAction {
                                 }
                                 if (newElem.textContent.trim().length === 0) {
                                     const brElm = this.parent.createElement('br');
-                                    this.startNode.appendChild(brElm);
+                                    if (this.startNode.nodeName === 'A') {
+                                        let startParentElem = this.startNode.parentElement;
+                                        this.startNode.parentElement.insertBefore(brElm, this.startNode);
+                                        detach(this.startNode);
+                                        this.startNode = startParentElem;
+                                    }
+                                    else {
+                                        this.startNode.appendChild(brElm);
+                                    }
+                                    if (newElem.childNodes[0].textContent === '\n') {
+                                        detach(newElem.childNodes[0]);
+                                    }
                                     this.parent.formatter.editorManager.nodeSelection.setCursorPoint(this.parent.contentModule.getDocument(), this.startNode, 0);
                                 }
                                 if (((this.parent.enterKey === 'P' || this.parent.enterKey === 'DIV') && !shiftKey) || ((this.parent.shiftEnterKey === 'DIV' ||
@@ -24231,7 +24271,8 @@ class EnterKeyAction {
                                     }
                                     this.parent.formatter.editorManager.domNode.insertAfter(insertElm, newElem);
                                     detach(newElem);
-                                    this.parent.formatter.editorManager.nodeSelection.setCursorPoint(this.parent.contentModule.getDocument(), this.parent.formatter.editorManager.domNode.isBlockNode(this.startNode) ? insertElm : this.startNode, 0);
+                                    this.parent.formatter.editorManager.nodeSelection.setCursorPoint(this.parent.contentModule.getDocument(), this.parent.formatter.editorManager.domNode.isBlockNode(this.startNode) ?
+                                        insertElm : this.startNode, 0);
                                 }
                             }
                             e.args.preventDefault();
@@ -25726,7 +25767,7 @@ let RichTextEditor = class RichTextEditor extends Component {
                 this.setProperties({ value: this.valueTemplate });
             }
             else {
-                const compiledTemplate = compile(this.valueTemplate)('', this, 'valueTemplate');
+                const compiledTemplate = compile(this.valueTemplate)("", this, 'valueTemplate');
                 for (let i = 0; i < compiledTemplate.length; i++) {
                     const item = compiledTemplate[i];
                     append([item], this.element);