@syncfusion/ej2-richtexteditor 25.1.39 → 25.1.41-85815

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

@@ -22,7 +22,7 @@ export declare class Count {
      *
      * @returns {void}
      * @hidden
-
+     * @deprecated
      */
     renderCount(): void;
     private appendCount;
@@ -30,7 +30,7 @@ export declare class Count {
     /**
      * @returns {void}
      * @hidden
-
+     * @deprecated
      */
     refresh(): void;
     /**
@@ -39,7 +39,7 @@ export declare class Count {
      * @function destroy
      * @returns {void}
      * @hidden
-
+     * @deprecated
      */
     destroy(): void;
     private toggle;

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

@@ -22,7 +22,7 @@ var Count = /** @class */ (function () {
      *
      * @returns {void}
      * @hidden
-
+     * @deprecated
      */
     Count.prototype.renderCount = function () {
         this.initializeInstance();
@@ -63,7 +63,7 @@ var Count = /** @class */ (function () {
     /**
      * @returns {void}
      * @hidden
-
+     * @deprecated
      */
     Count.prototype.refresh = function () {
         if (!isNullOrUndefined(this.editPanel)) {
@@ -79,7 +79,7 @@ var Count = /** @class */ (function () {
      * @function destroy
      * @returns {void}
      * @hidden
-
+     * @deprecated
      */
     Count.prototype.destroy = function () {
         if (this.element && !isNullOrUndefined(this.parent.element.querySelector('.' + CLS_COUNT))) {

package/src/rich-text-editor/actions/dropdown-buttons.d.ts

@@ -37,7 +37,7 @@ export declare class DropDownButtons {
      * @param {IDropDownRenderArgs} args - specifies the arguments
      * @returns {void}
      * @hidden
-
+     * @deprecated
      */
     renderDropDowns(args: IDropDownRenderArgs): void;
     private getUpdateItems;
@@ -56,7 +56,7 @@ export declare class DropDownButtons {
      *
      * @returns {void}
      * @hidden
-
+     * @deprecated
      */
     destroyDropDowns(): void;
     private setRtl;

package/src/rich-text-editor/actions/dropdown-buttons.js

@@ -39,7 +39,7 @@ var DropDownButtons = /** @class */ (function () {
      * @param {IDropDownRenderArgs} args - specifies the arguments
      * @returns {void}
      * @hidden
-
+     * @deprecated
      */
     DropDownButtons.prototype.renderDropDowns = function (args) {
         var _this = this;
@@ -406,7 +406,7 @@ var DropDownButtons = /** @class */ (function () {
      *
      * @returns {void}
      * @hidden
-
+     * @deprecated
      */
     DropDownButtons.prototype.destroyDropDowns = function () {
         if (this.formatDropDown) {

package/src/rich-text-editor/actions/emoji-picker.d.ts

@@ -21,7 +21,7 @@ export declare class EmojiPicker {
      * @function destroy
      * @returns {void}
      * @hidden
-
+     * @deprecated
      */
     destroy(): void;
     protected addEventListener(): void;

package/src/rich-text-editor/actions/emoji-picker.js

@@ -19,7 +19,7 @@ var EmojiPicker = /** @class */ (function () {
      * @function destroy
      * @returns {void}
      * @hidden
-
+     * @deprecated
      */
     EmojiPicker.prototype.destroy = function () {
         this.removeEventListener();
@@ -767,7 +767,7 @@ var EmojiPicker = /** @class */ (function () {
         var popupHeight = 330;
         var popupTop = cursorTop;
         var popupLeft = cursorLeft + rect.width;
-        if (rteEle.getBoundingClientRect().top < 0) {
+        if (rteEle.getBoundingClientRect().top < 0 && !this.parent.inlineMode.enable) {
             popupTop = popupTop + rteContent.getBoundingClientRect().top - toolbarHeight;
         }
         if (rect.top < popupHeight) {

package/src/rich-text-editor/actions/enter-key.d.ts

@@ -19,4 +19,10 @@ export declare class EnterKeyAction {
     private insertBRElement;
     private insertFocusContent;
     private createInsertElement;
+    private triggerActionComplete;
+    private handleCursorAtTableSide;
+    private handleEnterKeyAtImageSide;
+    private isTableOrImageStart;
+    private isTableOrImageEnd;
+    private processedTableImageCursor;
 }

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

@@ -39,6 +39,19 @@ var EnterKeyAction = /** @class */ (function () {
         this.getRangeNode();
         var isTableEnter = true;
         this.formatTags = ['h1', 'h2', 'h3', 'h4', 'h5', 'h6', 'blockquote'];
+        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;
             var curElement = this.startNode;
@@ -353,6 +366,7 @@ var EnterKeyAction = /** @class */ (function () {
                             else {
                                 currentParent = _this.startNode;
                             }
+                            var currentParentStyle = window.getComputedStyle(currentParent);
                             _this.removeBRElement(currentParent);
                             var isEmptyBrInserted = false;
                             var currentParentLastChild = currentParent.lastChild;
@@ -405,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();
@@ -417,6 +430,14 @@ var EnterKeyAction = /** @class */ (function () {
                                         // eslint-disable-next-line @typescript-eslint/no-unused-vars
                                         isEmptyBrInserted = true;
                                     }
+                                    else if (currentParent !== _this.parent.inputElement &&
+                                        (currentParentStyle.display === 'inline' || currentParentStyle.display === 'inline-block')) {
+                                        // eslint-disable-next-line @typescript-eslint/no-unused-vars
+                                        newElem = _this.parent.formatter.editorManager.nodeCutter.SplitNode(_this.range, currentParent, true).cloneNode(true);
+                                        currentParent.parentElement.insertBefore(outerBRElem, currentParent);
+                                        _this.parent.formatter.editorManager.nodeSelection.setCursorPoint(_this.parent.contentModule.getDocument(), currentParent, 0);
+                                        _this.insertFocusContent();
+                                    }
                                     else {
                                         _this.insertBRElement();
                                     }
@@ -427,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);
                     }
                 });
             }
@@ -497,6 +518,125 @@ 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') {
+            var shiftKey_2 = e.args.shiftKey;
+            var actionBeginArgs = {
+                cancel: false,
+                name: events.actionBegin,
+                requestType: shiftKey_2 ? 'ShiftEnterAction' : 'EnterAction',
+                originalEvent: e.args
+            };
+            this.parent.trigger(events.actionBegin, actionBeginArgs, function (actionBeginArgs) {
+                if (!actionBeginArgs.cancel) {
+                    var newElement = _this.parent.createElement(_this.parent.enterKey);
+                    newElement.innerHTML = '<br>';
+                    var tableElement = void 0;
+                    if (isStart) {
+                        tableElement = _this.range.startContainer.childNodes[_this.range.startOffset];
+                        tableElement.parentElement.insertBefore(newElement, tableElement);
+                    }
+                    if (isEnd) {
+                        tableElement = _this.range.startContainer.childNodes[_this.range.startOffset - 1];
+                        if (!isNOU(tableElement.nextSibling)) {
+                            tableElement.parentElement.insertBefore(newElement, tableElement.nextSibling);
+                        }
+                        else if (isNOU(tableElement.nextSibling)) {
+                            tableElement.parentElement.appendChild(newElement);
+                        }
+                    }
+                    _this.parent.formatter.editorManager.nodeSelection.setCursorPoint(_this.parent.contentModule.getDocument(), newElement, 0);
+                    e.args.preventDefault();
+                    _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.d.ts

@@ -13,7 +13,7 @@ export declare class FullScreen {
      * @param {MouseEvent} event - specifies the mouse event
      * @returns {void}
      * @hidden
-
+     * @deprecated
      */
     showFullScreen(event?: MouseEvent | KeyboardEventArgs): void;
     /**
@@ -22,7 +22,7 @@ export declare class FullScreen {
      * @param {MouseEvent} event - specifies the mouse event
      * @returns {void}
      * @hidden
-
+     * @deprecated
      */
     hideFullScreen(event?: MouseEvent | KeyboardEventArgs): void;
     private toggleParentOverflow;
@@ -34,7 +34,7 @@ export declare class FullScreen {
      *
      * @returns {void}
      * @hidden
-
+     * @deprecated
      */
     destroy(): void;
     private moduleDestroy;

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

@@ -17,7 +17,7 @@ var FullScreen = /** @class */ (function () {
      * @param {MouseEvent} event - specifies the mouse event
      * @returns {void}
      * @hidden
-
+     * @deprecated
      */
     FullScreen.prototype.showFullScreen = function (event) {
         var _this = this;
@@ -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 = {
@@ -72,7 +69,7 @@ var FullScreen = /** @class */ (function () {
      * @param {MouseEvent} event - specifies the mouse event
      * @returns {void}
      * @hidden
-
+     * @deprecated
      */
     FullScreen.prototype.hideFullScreen = function (event) {
         var _this = this;
@@ -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,
@@ -162,7 +156,7 @@ var FullScreen = /** @class */ (function () {
      *
      * @returns {void}
      * @hidden
-
+     * @deprecated
      */
     FullScreen.prototype.destroy = function () {
         if (isNOU(this.parent)) {

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

@@ -29,14 +29,14 @@ export declare class HtmlEditor {
      * @function destroy
      * @returns {void}
      * @hidden
-
+     * @deprecated
      */
     destroy(): void;
     /**
      * @param {string} value - specifies the string value
      * @returns {void}
      * @hidden
-
+     * @deprecated
      */
     sanitizeHelper(value: string): string;
     private addEventListener;
@@ -50,6 +50,7 @@ export declare class HtmlEditor {
     private onKeyDown;
     private isOrderedList;
     private isUnOrderedList;
+    private hasMultipleTextNode;
     private backSpaceCleanup;
     private deleteCleanup;
     private getCaretIndex;
@@ -69,7 +70,7 @@ export declare class HtmlEditor {
      * @param {RichTextEditorModel} e - specifies the editor model
      * @returns {void}
      * @hidden
-
+     * @deprecated
      */
     protected onPropertyChanged(e: {
         [key: string]: RichTextEditorModel;
@@ -106,4 +107,5 @@ export declare class HtmlEditor {
      * @hidden
      */
     private getSelectedHtml;
+    private marginTabAdd;
 }

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

@@ -11,7 +11,7 @@ import { ColorPickerInput } from './color-picker';
 import { NodeSelection } from '../../selection/selection';
 import { InsertHtml } from '../../editor-manager/plugin/inserthtml';
 import { getTextNodesUnder, sanitizeHelper, getDefaultValue } from '../base/util';
-import { isIDevice } from '../../common/util';
+import { isIDevice, scrollToCursor } from '../../common/util';
 import { XhtmlValidation } from './xhtml-validation';
 import { ON_BEGIN } from './../../common/constant';
 import * as CONSTANT from '../base/constant';
@@ -34,7 +34,7 @@ var HtmlEditor = /** @class */ (function () {
      * @function destroy
      * @returns {void}
      * @hidden
-
+     * @deprecated
      */
     HtmlEditor.prototype.destroy = function () {
         this.removeEventListener();
@@ -43,7 +43,7 @@ var HtmlEditor = /** @class */ (function () {
      * @param {string} value - specifies the string value
      * @returns {void}
      * @hidden
-
+     * @deprecated
      */
     HtmlEditor.prototype.sanitizeHelper = function (value) {
         value = sanitizeHelper(value, this.parent);
@@ -216,8 +216,14 @@ var HtmlEditor = /** @class */ (function () {
                     range.insertNode(tempSpan);
                 }
                 var currentChild = this.parent.inputElement.firstChild;
-                while (!isNOU(currentChild) && currentChild.textContent.replace(regEx, '').trim().length > 0) {
-                    currentChild.innerHTML = currentChild.innerHTML.replace(regEx, '');
+                while (!isNOU(currentChild)) {
+                    if (currentChild.nodeName === '#text') {
+                        currentChild = currentChild.nextElementSibling;
+                        continue;
+                    }
+                    if (currentChild.textContent.replace(regEx, '').trim().length > 0) {
+                        currentChild.innerHTML = currentChild.innerHTML.replace(regEx, '');
+                    }
                     currentChild = currentChild.nextElementSibling;
                 }
                 var tempSpanToRemove = this.parent.inputElement.querySelector('.tempSpan');
@@ -281,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' ||
@@ -316,15 +351,7 @@ var HtmlEditor = /** @class */ (function () {
                 }
                 else {
                     this.parent.notify(events.enterHandler, { args: e.args });
-                    var newRange = this.parent.getRange();
-                    if (!isNullOrUndefined(newRange.startContainer) && this.parent.height !== 'auto' && newRange.startContainer.nodeName !== '#text'
-                        && !this.parent.iframeSettings.enable && newRange.startContainer.getBoundingClientRect().bottom > this.parent.element.getBoundingClientRect().bottom) {
-                        this.parent.element.querySelector('.e-rte-content').scrollTop += newRange.startContainer.getBoundingClientRect().bottom - this.parent.element.getBoundingClientRect().bottom;
-                    }
-                    else if (!isNullOrUndefined(newRange.startContainer) && this.parent.height === 'auto' && newRange.startContainer.nodeName !== '#text'
-                        && !this.parent.iframeSettings.enable && window.innerHeight < newRange.startContainer.getBoundingClientRect().top) {
-                        newRange.startContainer.scrollIntoView({ block: 'end', inline: 'nearest' });
-                    }
+                    scrollToCursor(this.parent.contentModule.getDocument(), this.parent.inputElement);
                 }
             }
         }
@@ -333,7 +360,11 @@ var HtmlEditor = /** @class */ (function () {
             var editorValue = currentRange_1.startContainer.textContent.slice(0, currentRange_1.startOffset);
             var orderedList_1 = this.isOrderedList(editorValue);
             var unOrderedList = this.isUnOrderedList(editorValue);
-            if (orderedList_1 && !unOrderedList || unOrderedList && !orderedList_1) {
+            var hasSplitedText = false;
+            if (orderedList_1 || unOrderedList) {
+                hasSplitedText = this.hasMultipleTextNode(currentRange_1);
+            }
+            if (!hasSplitedText && (orderedList_1 && !unOrderedList || unOrderedList && !orderedList_1)) {
                 var eventArgs_1 = {
                     callBack: null,
                     event: e.args,
@@ -398,6 +429,31 @@ var HtmlEditor = /** @class */ (function () {
         }
         return false;
     };
+    HtmlEditor.prototype.hasMultipleTextNode = function (range) {
+        if (range && range.startContainer && range.startContainer.parentNode) {
+            var parentNode = range.startContainer.parentNode;
+            if (range.startContainer.previousElementSibling &&
+                range.startContainer.previousElementSibling.classList.contains('e-mention-chip')
+                && !range.startContainer.previousElementSibling.isContentEditable) {
+                return true;
+            }
+            if (this.parent.enterKey === 'BR' || closest(parentNode, 'table')) {
+                return false;
+            }
+            var childNodes = parentNode.childNodes;
+            var textNodes = [];
+            for (var i = 0; i < childNodes.length; i++) {
+                var node = childNodes[i];
+                if (node && node.nodeType === Node.TEXT_NODE) {
+                    textNodes.push(node);
+                    if (textNodes.length > 1) {
+                        return true;
+                    }
+                }
+            }
+        }
+        return false;
+    };
     HtmlEditor.prototype.backSpaceCleanup = function (e, currentRange) {
         var isLiElement = false;
         var isPreviousNotContentEditable = true;
@@ -913,7 +969,7 @@ var HtmlEditor = /** @class */ (function () {
      * @param {RichTextEditorModel} e - specifies the editor model
      * @returns {void}
      * @hidden
-
+     * @deprecated
      */
     HtmlEditor.prototype.onPropertyChanged = function (e) {
         // On property code change here
@@ -970,6 +1026,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 };