@syncfusion/ej2-richtexteditor 25.2.4 → 25.2.6

package/src/rich-text-editor/actions/enter-key.js

@@ -39,16 +39,18 @@ var EnterKeyAction = /** @class */ (function () {
         this.getRangeNode();
         var isTableEnter = true;
         this.formatTags = ['h1', 'h2', 'h3', 'h4', 'h5', 'h6', 'blockquote'];
-        var isCursorAtTableEnd = this.range.collapsed && (this.range.startContainer.nodeType === 1) &&
-            this.range.startContainer.isContentEditable &&
-            this.range.startContainer.childNodes[this.range.startOffset - 1] &&
-            this.range.startContainer.childNodes[this.range.startOffset - 1].nodeName === 'TABLE';
-        var isCursorAtTableStart = this.range.collapsed && (this.range.startContainer.nodeType === 1) &&
-            this.range.startContainer.isContentEditable && this.range.startContainer.childNodes[this.range.startOffset] &&
-            this.range.startContainer.childNodes[this.range.startOffset].nodeName === 'TABLE';
-        if (isCursorAtTableEnd || isCursorAtTableStart) {
-            this.handleCursorAtTableSide(e, isCursorAtTableStart, isCursorAtTableEnd);
-            return;
+        var tableImagCursor = this.processedTableImageCursor();
+        if (tableImagCursor.start || tableImagCursor.end) {
+            if (tableImagCursor.startName === 'TABLE' || tableImagCursor.endName === 'TABLE') { // Default browser action prevented and hanled manually.
+                this.handleCursorAtTableSide(e, tableImagCursor.start, tableImagCursor.end);
+                return;
+            }
+        }
+        if (tableImagCursor.start || tableImagCursor.end || this.range.startContainer.nodeName === 'IMG') {
+            if (this.parent.enterKey === 'BR' && (tableImagCursor.startName === 'IMG' || tableImagCursor.endName === 'IMG' || this.range.startContainer.nodeName === 'IMG')) { // Default browser action prevented and hanled manually.
+                this.handleEnterKeyAtImageSide(e, tableImagCursor.start, tableImagCursor.end);
+                return;
+            }
         }
         if (!isNOU(this.startNode.closest('TABLE')) && !isNOU(this.endNode.closest('TABLE'))) {
             isTableEnter = false;
@@ -417,7 +419,6 @@ var EnterKeyAction = /** @class */ (function () {
                                     var outerBRElem = _this.parent.createElement('br');
                                     if (_this.range.startOffset === 0 && _this.range.endOffset === 0 &&
                                         !isNOU(currentParent.previousSibling) && currentParent.previousSibling.nodeName === 'BR' && currentParent.nodeName !== 'P' && currentParent.nodeName !== 'DIV') {
-                                        // eslint-disable-next-line @typescript-eslint/no-unused-vars
                                         newElem = _this.parent.formatter.editorManager.nodeCutter.SplitNode(_this.range, currentParent, false).cloneNode(true);
                                         _this.parent.formatter.editorManager.domNode.insertAfter(outerBRElem, currentParent);
                                         _this.insertFocusContent();
@@ -447,7 +448,7 @@ var EnterKeyAction = /** @class */ (function () {
                             }
                             e.args.preventDefault();
                         }
-                        _this.parent.trigger(events.actionComplete, { requestType: shiftKey_1 ? 'ShiftEnterAction' : 'EnterAction', args: e.args });
+                        _this.triggerActionComplete(e, shiftKey_1);
                     }
                 });
             }
@@ -517,6 +518,9 @@ var EnterKeyAction = /** @class */ (function () {
         }
         return insertElem;
     };
+    EnterKeyAction.prototype.triggerActionComplete = function (e, shiftKey) {
+        this.parent.trigger(events.actionComplete, { requestType: shiftKey ? 'ShiftEnterAction' : 'EnterAction', args: e.args });
+    };
     EnterKeyAction.prototype.handleCursorAtTableSide = function (e, isStart, isEnd) {
         var _this = this;
         if (this.parent.enterKey !== 'BR') {
@@ -547,11 +551,92 @@ var EnterKeyAction = /** @class */ (function () {
                     }
                     _this.parent.formatter.editorManager.nodeSelection.setCursorPoint(_this.parent.contentModule.getDocument(), newElement, 0);
                     e.args.preventDefault();
-                    _this.parent.trigger(events.actionComplete, { requestType: shiftKey_2 ? 'ShiftEnterAction' : 'EnterAction', args: e.args });
+                    _this.triggerActionComplete(e, shiftKey_2);
                 }
             });
         }
     };
+    EnterKeyAction.prototype.handleEnterKeyAtImageSide = function (e, isStart, isEnd) {
+        var _this = this;
+        var actionBeginArgs = {
+            cancel: false,
+            name: events.actionBegin,
+            requestType: e.args.shiftKey ? 'ShiftEnterAction' : 'EnterAction',
+            originalEvent: e.args
+        };
+        var directRange = false;
+        if (this.range.startContainer.nodeName === 'IMG' && this.range.startOffset === 0) {
+            directRange = true;
+        }
+        this.parent.trigger(events.actionBegin, actionBeginArgs, function (actionBeginArgs) {
+            if (!actionBeginArgs.cancel) {
+                if (_this.parent.enterKey === 'BR') {
+                    var newElement = _this.parent.createElement('BR');
+                    var imageElement = void 0;
+                    if (directRange) {
+                        imageElement = _this.range.startContainer;
+                        imageElement.parentElement.insertBefore(newElement, imageElement);
+                        _this.parent.formatter.editorManager.nodeSelection.
+                            setCursorPoint(_this.parent.contentModule.getDocument(), imageElement, 0);
+                    }
+                    if (isStart) {
+                        imageElement = _this.range.startContainer.childNodes[_this.range.startOffset];
+                        imageElement.parentElement.insertBefore(newElement, imageElement);
+                        _this.parent.formatter.editorManager.nodeSelection.
+                            setCursorPoint(_this.parent.contentModule.getDocument(), imageElement, 0);
+                    }
+                    if (isEnd) {
+                        imageElement = _this.range.startContainer.childNodes[_this.range.startOffset - 1];
+                        if (!isNOU(imageElement.nextSibling)) {
+                            imageElement.parentElement.insertBefore(newElement, imageElement.nextSibling);
+                            _this.parent.formatter.editorManager.nodeSelection.setCursorPoint(_this.parent.contentModule.getDocument(), newElement.nextSibling, 0);
+                        }
+                        else if (isNOU(imageElement.nextSibling)) {
+                            imageElement.parentElement.appendChild(newElement);
+                            var brElement = _this.parent.createElement('BR');
+                            imageElement.parentElement.appendChild(brElement);
+                            _this.parent.formatter.editorManager.nodeSelection.setCursorPoint(_this.parent.contentModule.getDocument(), brElement, 0);
+                        }
+                    }
+                    e.args.preventDefault();
+                    _this.triggerActionComplete(e, e.args.shiftKey);
+                }
+            }
+        });
+    };
+    EnterKeyAction.prototype.isTableOrImageStart = function () {
+        var customHandlerElements = ['IMG', 'TABLE'];
+        var startContainer = this.range.startContainer;
+        var startOffset = this.range.startOffset;
+        var isCursorAtStart = this.range.collapsed && (startContainer.nodeType === 1) &&
+            startContainer.isContentEditable && startContainer.childNodes[startOffset] &&
+            (customHandlerElements.indexOf(startContainer.childNodes[startOffset].nodeName) > -1);
+        if (isCursorAtStart) {
+            return { start: isCursorAtStart, startNodeName: startContainer.childNodes[startOffset].nodeName };
+        }
+        else {
+            return { start: false, startNodeName: '' };
+        }
+    };
+    EnterKeyAction.prototype.isTableOrImageEnd = function () {
+        var customHandlerElements = ['IMG', 'TABLE'];
+        var startContainer = this.range.startContainer;
+        var startOffset = this.range.startOffset;
+        var isCursorAtEnd = this.range.collapsed && (startContainer.nodeType === 1) &&
+            startContainer.isContentEditable && startContainer.childNodes[startOffset - 1] &&
+            (customHandlerElements.indexOf(startContainer.childNodes[startOffset - 1].nodeName) > -1);
+        if (isCursorAtEnd) {
+            return { end: isCursorAtEnd, endNodeName: startContainer.childNodes[startOffset - 1].nodeName };
+        }
+        else {
+            return { end: false, endNodeName: '' };
+        }
+    };
+    EnterKeyAction.prototype.processedTableImageCursor = function () {
+        var _a = this.isTableOrImageStart(), start = _a.start, startNodeName = _a.startNodeName;
+        var _b = this.isTableOrImageEnd(), end = _b.end, endNodeName = _b.endNodeName;
+        return { start: start, startName: startNodeName, end: end, endName: endNodeName };
+    };
     return EnterKeyAction;
 }());
 export { EnterKeyAction };

package/src/rich-text-editor/actions/full-screen.js

@@ -25,9 +25,6 @@ var FullScreen = /** @class */ (function () {
             && !isNOU(this.parent.quickToolbarModule)) {
             this.parent.quickToolbarModule.hideQuickToolbars();
         }
-        if (this.parent.showTooltip && !isNOU(document.querySelector('.e-tooltip-wrap'))) {
-            this.parent.notify(events.destroyTooltip, { args: event });
-        }
         this.scrollableParent = getScrollableParent(this.parent.element);
         if (!this.parent.element.classList.contains(classes.CLS_FULL_SCREEN)) {
             var evenArgs = {
@@ -80,9 +77,6 @@ var FullScreen = /** @class */ (function () {
             && !isNOU(this.parent.quickToolbarModule)) {
             this.parent.quickToolbarModule.hideQuickToolbars();
         }
-        if (this.parent.showTooltip && !isNOU(document.querySelector('.e-tooltip-wrap'))) {
-            this.parent.notify(events.destroyTooltip, { args: event });
-        }
         if (this.parent.element.classList.contains(classes.CLS_FULL_SCREEN)) {
             var evenArgs = {
                 cancel: false,

package/src/rich-text-editor/actions/html-editor.d.ts

@@ -106,4 +106,5 @@ export declare class HtmlEditor {
      * @hidden
      */
     private getSelectedHtml;
+    private marginTabAdd;
 }

package/src/rich-text-editor/actions/html-editor.js

@@ -287,25 +287,54 @@ var HtmlEditor = /** @class */ (function () {
             this.deleteCleanup(e, currentRange);
         }
         if (args.keyCode === 9 && this.parent.enableTabKey) {
+            this.parent.formatter.saveData(e);
             if (!isNOU(args.target) && isNullOrUndefined(closest(args.target, '.e-rte-toolbar'))) {
                 var range = this.nodeSelectionObj.getRange(this.contentRenderer.getDocument());
                 var parentNode = this.nodeSelectionObj.getParentNodeCollection(range);
                 if (!((parentNode[0].nodeName === 'LI' || closest(parentNode[0], 'li') ||
-                    closest(parentNode[0], 'table')) && range.startOffset === 0)) {
+                    closest(parentNode[0], 'table')))) {
                     args.preventDefault();
-                    if (!args.shiftKey) {
-                        InsertHtml.Insert(this.contentRenderer.getDocument(), '    ');
-                        this.rangeCollection.push(this.nodeSelectionObj.getRange(this.contentRenderer.getDocument()));
+                    var selection = this.contentRenderer.getDocument().getSelection().getRangeAt(0);
+                    var alignmentNodes = this.parent.formatter.editorManager.domNode.blockNodes();
+                    if (this.parent.enterKey === 'BR') {
+                        if (selection.startOffset !== selection.endOffset && selection.startOffset === 0) {
+                            var save = this.nodeSelectionObj.save(range, this.contentRenderer.getDocument());
+                            this.parent.formatter.editorManager.domNode.setMarker(save);
+                            alignmentNodes = this.parent.formatter.editorManager.domNode.blockNodes();
+                            this.parent.formatter.editorManager.domNode.convertToBlockNodes(alignmentNodes, false);
+                            this.marginTabAdd(args.shiftKey, alignmentNodes);
+                            save = this.parent.formatter.editorManager.domNode.saveMarker(save);
+                            save.restore();
+                        }
+                        else {
+                            InsertHtml.Insert(this.contentRenderer.getDocument(), '    ');
+                            this.rangeCollection.push(this.nodeSelectionObj.getRange(this.contentRenderer.getDocument()));
+                        }
                     }
-                    else if (this.rangeCollection.length > 0 &&
-                        this.rangeCollection[this.rangeCollection.length - 1].startContainer.textContent.length === 4) {
-                        var textCont = this.rangeCollection[this.rangeCollection.length - 1].startContainer;
-                        this.nodeSelectionObj.setSelectionText(this.contentRenderer.getDocument(), textCont, textCont, 0, textCont.textContent.length);
-                        InsertHtml.Insert(this.contentRenderer.getDocument(), document.createTextNode(''));
-                        this.rangeCollection.pop();
+                    else {
+                        if (!args.shiftKey) {
+                            if (selection.startOffset !== selection.endOffset && selection.startOffset === 0) {
+                                this.marginTabAdd(args.shiftKey, alignmentNodes);
+                            }
+                            else {
+                                InsertHtml.Insert(this.contentRenderer.getDocument(), '    ');
+                                this.rangeCollection.push(this.nodeSelectionObj.getRange(this.contentRenderer.getDocument()));
+                            }
+                        }
+                        else if (this.rangeCollection.length > 0 &&
+                            this.rangeCollection[this.rangeCollection.length - 1].startContainer.textContent.length === 4) {
+                            var textCont = this.rangeCollection[this.rangeCollection.length - 1].startContainer;
+                            this.nodeSelectionObj.setSelectionText(this.contentRenderer.getDocument(), textCont, textCont, 0, textCont.textContent.length);
+                            InsertHtml.Insert(this.contentRenderer.getDocument(), document.createTextNode(''));
+                            this.rangeCollection.pop();
+                        }
+                        else {
+                            this.marginTabAdd(args.shiftKey, alignmentNodes);
+                        }
                     }
                 }
             }
+            this.parent.formatter.saveData(e);
         }
         if (e.args.action === 'space' ||
             e.args.action === 'enter' ||
@@ -968,6 +997,30 @@ var HtmlEditor = /** @class */ (function () {
     HtmlEditor.prototype.getSelectedHtml = function (e) {
         e.callBack(this.parent.formatter.editorManager.nodeSelection.getRange(this.parent.contentModule.getDocument()).toString());
     };
+    HtmlEditor.prototype.marginTabAdd = function (val, alignmentNodes) {
+        for (var index = 0; index < alignmentNodes.length; index++) {
+            var element = alignmentNodes[index];
+            if (element.closest('li')) {
+                continue;
+            }
+            if (element.style.marginLeft) {
+                var count = parseInt(element.style.marginLeft, 10);
+                if (val) {
+                    count -= 20;
+                }
+                else {
+                    count += 20;
+                }
+                element.style.marginLeft = count.toString() + 'px';
+                if (element.style.marginLeft === '0px') {
+                    element.removeAttribute('style');
+                }
+            }
+            else if (!val) {
+                element.style.marginLeft = '20px';
+            }
+        }
+    };
     return HtmlEditor;
 }());
 export { HtmlEditor };

package/src/rich-text-editor/actions/paste-clean-up.js

@@ -674,7 +674,8 @@ var PasteCleanup = /** @class */ (function () {
             clipBoardElem = this.allowedStyle(clipBoardElem);
         }
         this.saveSelection.restore();
-        clipBoardElem.innerHTML = this.sanitizeHelper(clipBoardElem.innerHTML);
+        var newText = clipBoardElem.innerHTML.split("&").join("&");
+        clipBoardElem.innerHTML = this.sanitizeHelper(newText);
         var allImg = clipBoardElem.querySelectorAll('img');
         for (var i = 0; i < allImg.length; i++) {
             if (!isNOU(allImg[i].getAttribute('src'))) {

package/src/rich-text-editor/base/rich-text-editor.d.ts

@@ -1330,6 +1330,7 @@ export declare class RichTextEditor extends Component<HTMLElement> implements IN
     updateValueData(): void;
     private removeSheets;
     private updatePanelValue;
+    private listOrderCorrection;
     private setHeight;
     /**
      * setPlaceHolder method

package/src/rich-text-editor/base/rich-text-editor.js

@@ -1425,7 +1425,7 @@ var RichTextEditor = /** @class */ (function (_super) {
         }
     };
     RichTextEditor.prototype.updatePanelValue = function () {
-        var value = this.value;
+        var value = this.listOrderCorrection(this.value);
         value = (this.enableHtmlEncode && this.value) ? decode(value) : value;
         var getTextArea = this.element.querySelector('.' + classes.CLS_RTE_SOURCE_CODE_TXTAREA);
         if (value) {
@@ -1469,6 +1469,17 @@ var RichTextEditor = /** @class */ (function (_super) {
             this.countModule.refresh();
         }
     };
+    RichTextEditor.prototype.listOrderCorrection = function (value) {
+        var valueElementWrapper = this.createElement('div');
+        valueElementWrapper.innerHTML = value;
+        var listElements = valueElementWrapper.querySelectorAll('UL, OL');
+        for (var i = 0; i < listElements.length; i++) {
+            if (!isNOU(listElements[i]) && !isNOU(listElements[i].parentElement) && !isNOU(listElements[i].previousElementSibling) && (listElements[i].parentElement.nodeName === 'UL' || listElements[i].parentElement.nodeName === 'OL')) {
+                listElements[i].previousElementSibling.appendChild(listElements[i]);
+            }
+        }
+        return valueElementWrapper.innerHTML;
+    };
     RichTextEditor.prototype.setHeight = function (height) {
         if (height !== 'auto') {
             this.element.style.height = formatUnit(height);

package/src/rich-text-editor/renderer/image-module.js

@@ -624,13 +624,13 @@ var Image = /** @class */ (function () {
             selectParentEle = this.parent.formatter.editorManager.nodeSelection.getParentNodeCollection(range);
             if (!originalEvent.ctrlKey && originalEvent.key && (originalEvent.key.length === 1 || originalEvent.action === 'enter') &&
                 (!isNOU(selectParentEle[0]) && selectParentEle[0].tagName === 'IMG') && selectParentEle[0].parentElement) {
-                var prev = selectParentEle[0].parentElement.childNodes[0];
                 if (this.contentModule.getEditPanel().querySelector('.e-img-resize')) {
                     this.removeResizeEle();
                 }
-                this.parent.formatter.editorManager.nodeSelection.setSelectionText(this.contentModule.getDocument(), prev, prev, prev.textContent.length, prev.textContent.length);
                 removeClass([selectParentEle[0]], 'e-img-focus');
-                this.quickToolObj.imageQTBar.hidePopup();
+                if (this.quickToolObj && this.quickToolObj.imageQTBar) {
+                    this.quickToolObj.imageQTBar.hidePopup();
+                }
             }
         }
         if (originalEvent.ctrlKey && (originalEvent.keyCode === 89 || originalEvent.keyCode === 90)) {

package/src/rich-text-editor/renderer/toolbar-renderer.js

@@ -462,8 +462,6 @@ var ToolbarRenderer = /** @class */ (function () {
             target: colorPicker.element.parentElement, cssClass: css,
             enablePersistence: this.parent.enablePersistence, enableRtl: this.parent.enableRtl,
             beforeOpen: function (dropDownArgs) {
-                colorPicker.inline = true;
-                colorPicker.dataBind();
                 if (proxy.parent.readonly || !proxy.parent.enabled) {
                     dropDownArgs.cancel = true;
                     return;
@@ -602,14 +600,18 @@ var ToolbarRenderer = /** @class */ (function () {
         var colorPicker = new ColorPicker({
             enablePersistence: this.parent.enablePersistence,
             enableRtl: this.parent.enableRtl,
-            inline: false,
-            value: '#fff',
+            inline: true,
+            value: null,
+            cssClass: ((item === 'backgroundcolor') ? CLS_BACKGROUND_COLOR_PICKER : CLS_FONT_COLOR_PICKER) + ' ' + args.cssClass + ' ' + 'e-rte-picker-init',
             created: function () {
                 var value = (item === 'backgroundcolor') ? proxy.parent.backgroundColor.default : proxy.parent.fontColor.default;
-                colorPicker.setProperties({ value: value });
+                colorPicker.cssClass = ((item === 'backgroundcolor') ? CLS_BACKGROUND_COLOR_PICKER : CLS_FONT_COLOR_PICKER) + ' ' + args.cssClass;
+                colorPicker.value = value;
             },
             mode: ((item === 'backgroundcolor') ? proxy.parent.backgroundColor.mode : proxy.parent.fontColor.mode),
             modeSwitcher: ((item === 'backgroundcolor') ? proxy.parent.backgroundColor.modeSwitcher : proxy.parent.fontColor.modeSwitcher),
+            presetColors: (item === 'backgroundcolor') ? this.parent.backgroundColor.colorCode : this.parent.fontColor.colorCode,
+            columns: (item === 'backgroundcolor') ? this.parent.backgroundColor.columns : this.parent.fontColor.columns,
             beforeTileRender: function (args) {
                 args.element.classList.add(CLS_COLOR_PALETTE);
                 args.element.classList.add(CLS_CUSTOM_TILE);
@@ -654,10 +656,6 @@ var ToolbarRenderer = /** @class */ (function () {
             }
         });
         colorPicker.isStringTemplate = true;
-        colorPicker.columns = (item === 'backgroundcolor') ? this.parent.backgroundColor.columns : this.parent.fontColor.columns;
-        colorPicker.presetColors = (item === 'backgroundcolor') ? this.parent.backgroundColor.colorCode :
-            this.parent.fontColor.colorCode;
-        colorPicker.cssClass = ((item === 'backgroundcolor') ? CLS_BACKGROUND_COLOR_PICKER : CLS_FONT_COLOR_PICKER) + ' ' + args.cssClass;
         colorPicker.createElement = this.parent.createElement;
         colorPicker.appendTo(document.getElementById(args.target));
         return colorPicker;