@syncfusion/ej2-richtexteditor 20.4.51 → 20.4.53

package/dist/global/index.d.ts

@@ -1,6 +1,6 @@
 /*!
 *  filename: index.d.ts
-*  version : 20.4.51
+*  version : 20.4.53
 *  Copyright Syncfusion Inc. 2001 - 2020. All rights reserved.
 *  Use of this code is subject to the terms of our license.
 *  A copy of the current license can be obtained at any time by e-mailing

package/package.json

@@ -1,8 +1,8 @@
 {
   "_from": "@syncfusion/ej2-richtexteditor@*",
-  "_id": "@syncfusion/ej2-richtexteditor@20.4.50",
+  "_id": "@syncfusion/ej2-richtexteditor@20.4.52",
   "_inBundle": false,
-  "_integrity": "sha512-LPuq6IPqkC12pQBS7yO8auxWYIQ/+nQ+25RasBCHu36kxTy9FIwfRVN0PuFazuHZvWyjyk3mc3+irXblRNPcVw==",
+  "_integrity": "sha512-Mg2VkXybrYH8X66JfToNaI+wM7pqjImBAkkKYRLG1Cix+N24h0/dlXUJR3/OusAtfmYwseTA/cF6y1Jp0CD3Aw==",
   "_location": "/@syncfusion/ej2-richtexteditor",
   "_phantomChildren": {},
   "_requested": {
@@ -26,8 +26,8 @@
     "/@syncfusion/ej2-react-richtexteditor",
     "/@syncfusion/ej2-vue-richtexteditor"
   ],
-  "_resolved": "https://nexus.syncfusion.com/repository/ej2-hotfix-new/@syncfusion/ej2-richtexteditor/-/ej2-richtexteditor-20.4.50.tgz",
-  "_shasum": "12aa17cdad15da7c83e327c95a1ec072b301c991",
+  "_resolved": "https://nexus.syncfusion.com/repository/ej2-hotfix-new/@syncfusion/ej2-richtexteditor/-/ej2-richtexteditor-20.4.52.tgz",
+  "_shasum": "ad7fd58a9318984a86fe76d55bf24343fddec291",
   "_spec": "@syncfusion/ej2-richtexteditor@*",
   "_where": "/jenkins/workspace/ease-automation_release_19.1.0.1/packages/included",
   "author": {
@@ -39,11 +39,11 @@
   "bundleDependencies": false,
   "dependencies": {
     "@syncfusion/ej2-base": "~20.4.51",
-    "@syncfusion/ej2-buttons": "~20.4.50",
-    "@syncfusion/ej2-filemanager": "~20.4.51",
-    "@syncfusion/ej2-inputs": "~20.4.51",
-    "@syncfusion/ej2-navigations": "~20.4.51",
-    "@syncfusion/ej2-popups": "~20.4.51",
+    "@syncfusion/ej2-buttons": "~20.4.53",
+    "@syncfusion/ej2-filemanager": "~20.4.53",
+    "@syncfusion/ej2-inputs": "~20.4.52",
+    "@syncfusion/ej2-navigations": "~20.4.53",
+    "@syncfusion/ej2-popups": "~20.4.53",
     "@syncfusion/ej2-splitbuttons": "~20.4.50"
   },
   "deprecated": false,
@@ -70,6 +70,6 @@
     "url": "git+https://github.com/syncfusion/ej2-javascript-ui-controls.git"
   },
   "typings": "index.d.ts",
-  "version": "20.4.51",
+  "version": "20.4.53",
   "sideEffects": false
 }

package/src/common/util.d.ts

@@ -16,7 +16,7 @@ export declare function setEditFrameFocus(editableElement: Element, selector: st
  * @returns {void}
  * @hidden
  */
-export declare function updateTextNode(value: string): string;
+export declare function updateTextNode(value: string, enterAction?: string): string;
 /**
  * @param {Node} startChildNodes - specifies the node
  * @returns {void}

package/src/common/util.js

@@ -37,7 +37,7 @@ export function setEditFrameFocus(editableElement, selector) {
  * @returns {void}
  * @hidden
  */
-export function updateTextNode(value) {
+export function updateTextNode(value, enterAction) {
     var tempNode = document.createElement('div');
     tempNode.innerHTML = value;
     tempNode.setAttribute('class', 'tempDiv');
@@ -52,15 +52,23 @@ export function updateTextNode(value) {
                 (tempNode.firstChild.textContent.indexOf('\n') < 0 || tempNode.firstChild.textContent.trim() !== '')) ||
                 inlineNode.indexOf(tempNode.firstChild.nodeName.toLocaleLowerCase()) >= 0) {
                 if (!isPreviousInlineElem) {
-                    paraElm = createElement('p');
-                    resultElm.appendChild(paraElm);
-                    paraElm.appendChild(tempNode.firstChild);
+                    if (enterAction === 'BR') {
+                        resultElm.appendChild(tempNode.firstChild);
+                        previousParent = resultElm;
+                    }
+                    else {
+                        paraElm = createElement('p');
+                        resultElm.appendChild(paraElm);
+                        paraElm.appendChild(tempNode.firstChild);
+                        previousParent = paraElm;
+                        isPreviousInlineElem = true;
+                    }
                 }
                 else {
                     previousParent.appendChild(tempNode.firstChild);
+                    previousParent = paraElm;
+                    isPreviousInlineElem = true;
                 }
-                previousParent = paraElm;
-                isPreviousInlineElem = true;
             }
             else if (tempNode.firstChild.nodeName === '#text' && (tempNode.firstChild.textContent === '\n' ||
                 (tempNode.firstChild.textContent.indexOf('\n') >= 0 && tempNode.firstChild.textContent.trim() === ''))) {

package/src/editor-manager/base/editor-manager.js

@@ -188,7 +188,7 @@ var EditorManager = /** @class */ (function () {
                 this.observer.notify(CONSTANT.SELECTION_TYPE, { subCommand: value, event: event, callBack: callBack, value: text, selector: selector, enterAction: enterAction });
                 break;
             case 'inserthtml':
-                this.observer.notify(CONSTANT.INSERTHTML_TYPE, { subCommand: value, callBack: callBack, value: text });
+                this.observer.notify(CONSTANT.INSERTHTML_TYPE, { subCommand: value, callBack: callBack, value: text, enterAction: enterAction });
                 break;
             case 'inserttext':
                 this.observer.notify(CONSTANT.INSERT_TEXT_TYPE, { subCommand: value, callBack: callBack, value: text });

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

@@ -22,7 +22,7 @@ var InsertHtmlExec = /** @class */ (function () {
         this.parent.observer.on(CONSTANT.INSERTHTML_TYPE, this.applyHtml, this);
     };
     InsertHtmlExec.prototype.applyHtml = function (e) {
-        InsertHtml.Insert(this.parent.currentDocument, e.value, this.parent.editableElement, true);
+        InsertHtml.Insert(this.parent.currentDocument, e.value, this.parent.editableElement, true, e.enterAction);
         if (e.subCommand === 'pasteCleanup') {
             var pastedElements = this.parent.editableElement.querySelectorAll('.pasteContent_RTE');
             var allPastedElements = [].slice.call(pastedElements);

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

@@ -13,7 +13,7 @@ export declare class InsertHtml {
      */
     static inlineNode: string[];
     static contentsDeleted: boolean;
-    static Insert(docElement: Document, insertNode: Node | string, editNode?: Element, isExternal?: boolean): void;
+    static Insert(docElement: Document, insertNode: Node | string, editNode?: Element, isExternal?: boolean, enterAction?: string): void;
     private static pasteInsertHTML;
     private static placeCursorEnd;
     private static getNodeCollection;

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

@@ -13,7 +13,7 @@ import { updateTextNode } from './../../common/util';
 var InsertHtml = /** @class */ (function () {
     function InsertHtml() {
     }
-    InsertHtml.Insert = function (docElement, insertNode, editNode, isExternal) {
+    InsertHtml.Insert = function (docElement, insertNode, editNode, isExternal, enterAction) {
         var node;
         if (typeof insertNode === 'string') {
             var divNode = document.createElement('div');
@@ -35,7 +35,8 @@ var InsertHtml = /** @class */ (function () {
         var nodeCutter = new NodeCutter();
         var range = nodeSelection.getRange(docElement);
         if (range.startContainer === editNode && range.startContainer === range.endContainer && range.startOffset === 0 &&
-            range.startOffset === range.endOffset && editNode.textContent.length === 0 && editNode.children[0].tagName === 'P') {
+            range.startOffset === range.endOffset && editNode.textContent.length === 0 &&
+            (editNode.children[0].tagName === 'P' || (editNode.children[0].tagName === 'BR'))) {
             nodeSelection.setSelectionText(docElement, range.startContainer.children[0], range.startContainer.children[0], 0, 0);
             range = nodeSelection.getRange(docElement);
         }
@@ -52,7 +53,7 @@ var InsertHtml = /** @class */ (function () {
         var closestParentNode = (node.nodeName.toLowerCase() === 'table') ? this.closestEle(nodes[0].parentNode, editNode) : nodes[0];
         if (isExternal || (!isNOU(node) && !isNOU(node.classList) &&
             node.classList.contains('pasteContent'))) {
-            this.pasteInsertHTML(nodes, node, range, nodeSelection, nodeCutter, docElement, isCollapsed, closestParentNode, editNode);
+            this.pasteInsertHTML(nodes, node, range, nodeSelection, nodeCutter, docElement, isCollapsed, closestParentNode, editNode, enterAction);
             return;
         }
         if (editNode !== range.startContainer && ((!isCollapsed && !(closestParentNode.nodeType === Node.ELEMENT_NODE &&
@@ -166,7 +167,7 @@ var InsertHtml = /** @class */ (function () {
             }
         }
     };
-    InsertHtml.pasteInsertHTML = function (nodes, node, range, nodeSelection, nodeCutter, docElement, isCollapsed, closestParentNode, editNode) {
+    InsertHtml.pasteInsertHTML = function (nodes, node, range, nodeSelection, nodeCutter, docElement, isCollapsed, closestParentNode, editNode, enterAction) {
         var isCursor = range.startOffset === range.endOffset &&
             range.startContainer === range.endContainer;
         if (isCursor && range.startContainer === editNode && editNode.textContent === '') {
@@ -276,7 +277,12 @@ var InsertHtml = /** @class */ (function () {
                             var firstParaElm = createElement('p');
                             node.parentElement.insertBefore(firstParaElm, node);
                         }
-                        node.previousElementSibling.appendChild(node.firstChild);
+                        if (node.previousElementSibling.nodeName === 'BR') {
+                            node.parentElement.insertBefore(node.firstChild, node);
+                        }
+                        else {
+                            node.previousElementSibling.appendChild(node.firstChild);
+                        }
                     }
                     else {
                         lastSelectionNode = node.firstChild;
@@ -308,7 +314,7 @@ var InsertHtml = /** @class */ (function () {
             this.placeCursorEnd(lastSelectionNode, node, nodeSelection, docElement, editNode);
         }
         else {
-            this.cursorPos(lastSelectionNode, node, nodeSelection, docElement, editNode);
+            this.cursorPos(lastSelectionNode, node, nodeSelection, docElement, editNode, enterAction);
         }
     };
     InsertHtml.placeCursorEnd = function (lastSelectionNode, node, nodeSelection, docElement, editNode) {
@@ -423,9 +429,9 @@ var InsertHtml = /** @class */ (function () {
             }
         }
     };
-    InsertHtml.cursorPos = function (lastSelectionNode, node, nodeSelection, docElement, editNode) {
+    InsertHtml.cursorPos = function (lastSelectionNode, node, nodeSelection, docElement, editNode, enterAction) {
         lastSelectionNode.classList.add('lastNode');
-        editNode.innerHTML = updateTextNode(editNode.innerHTML);
+        editNode.innerHTML = updateTextNode(editNode.innerHTML, enterAction);
         lastSelectionNode = editNode.querySelector('.lastNode');
         if (!isNOU(lastSelectionNode)) {
             this.placeCursorEnd(lastSelectionNode, node, nodeSelection, docElement, editNode);

package/src/editor-manager/plugin/ms-word-clean-up.js

@@ -120,7 +120,10 @@ var MsWordPaste = /** @class */ (function () {
         this.checkVShape(elm);
         var imgElem = elm.querySelectorAll('img');
         for (var i = 0; i < imgElem.length; i++) {
-            if (!isNOU(imgElem[i].getAttribute('v:shapes')) && imgElem[i].getAttribute('v:shapes').indexOf('Picture') < 0 && imgElem[i].getAttribute('v:shapes').indexOf('Image') < 0) {
+            if (!isNOU(imgElem[i].getAttribute('v:shapes')) &&
+                imgElem[i].getAttribute('v:shapes').indexOf('Picture') < 0 &&
+                imgElem[i].getAttribute('v:shapes').indexOf('圖片') < 0 &&
+                imgElem[i].getAttribute('v:shapes').indexOf('Image') < 0) {
                 detach(imgElem[i]);
             }
         }
@@ -371,6 +374,29 @@ var MsWordPaste = /** @class */ (function () {
                 }
                 fromClass = false;
             }
+            var listClass = ['MsoListParagraphCxSpFirst', 'MsoListParagraphCxSpMiddle', 'MsoListParagraphCxSpLast'];
+            for (var i = 0; i < listClass.length; i++) {
+                if (keys.indexOf('li.' + listClass[i]) > -1) {
+                    var olULElems = elm.querySelectorAll('ol.' + listClass[i] + ', ul.' + listClass[i]);
+                    for (var j = 0; j < olULElems.length; j++) {
+                        var styleProperty = olULElems[j].getAttribute('style');
+                        if (!isNOU(styleProperty) && styleProperty.trim() !== '' && olULElems[j].style.marginLeft !== '') {
+                            var valueSplit = values[keys.indexOf('li.' + listClass[i])].split(';');
+                            for (var k = 0; k < valueSplit.length; k++) {
+                                if ('margin-left'.indexOf(valueSplit[k].split(':')[0]) >= 0) {
+                                    if (!isNOU(valueSplit[k].split(':')[1]) &&
+                                        valueSplit[k].split(':')[1].indexOf('in') >= 0 &&
+                                        olULElems[j].style.marginLeft.indexOf('in') >= 0) {
+                                        var classStyle = parseFloat(valueSplit[k].split(':')[1].split('in')[0]);
+                                        var inlineStyle = parseFloat(olULElems[j].style.marginLeft.split('in')[0]);
+                                        olULElems[j].style.marginLeft = (inlineStyle - classStyle) + 'in';
+                                    }
+                                }
+                            }
+                        }
+                    }
+                }
+            }
         }
     };
     MsWordPaste.prototype.filterStyles = function (elm, wordPasteStyleConfig) {
@@ -492,12 +518,13 @@ var MsWordPaste = /** @class */ (function () {
             var type = void 0;
             var listStyleType = void 0;
             var startAttr = void 0;
+            var styleMarginLeft = void 0;
             if (!isNOU(this.listContents[0])) {
                 type = this.listContents[0].trim().length > 1 ? 'ol' : 'ul';
                 listStyleType = this.getlistStyleType(this.listContents[0], type);
-                if (type === 'ol' && listNodes[i - 1] === null) {
+                if (type === 'ol' && (i === 0 || listNodes[i - 1] === null)) {
                     var startString = this.listContents[0].split('.')[0];
-                    var listTypes = ['A', 'a', 'I', 'i', 'α', '1'];
+                    var listTypes = ['A', 'a', 'I', 'i', 'α', '1', '1-']; // Add '1-' for rare list type. 
                     if (listTypes.indexOf(startString) === -1) {
                         if (listStyleType === 'decimal') {
                             // Bug in getlistStyleType() list style stype is returned as decimal for nested list with start attribute
@@ -505,9 +532,15 @@ var MsWordPaste = /** @class */ (function () {
                                 startAttr = parseInt(startString);
                             }
                         }
-                        else if (listStyleType === 'upper-alpha' || listStyleType === 'lower-alpha') {
-                            startAttr = parseInt(startString.toLowerCase()) - 96;
+                        else if (listStyleType === 'upper-alpha') {
+                            startAttr = (startString.split('.')[0].charCodeAt(0) - 64);
                         }
+                        else if (listStyleType === 'lower-alpha') {
+                            startAttr = (startString.split('.')[0].charCodeAt(0) - 96);
+                        }
+                    }
+                    if (listNodes[i].style.marginLeft !== '') {
+                        styleMarginLeft = listNodes[i].style.marginLeft;
                     }
                 }
                 var tempNode = [];
@@ -526,7 +559,7 @@ var MsWordPaste = /** @class */ (function () {
                     }
                 }
                 collection.push({ listType: type, content: tempNode, nestedLevel: level, class: currentClassName,
-                    listStyle: currentListStyle, listStyleTypeName: listStyleType, start: startAttr });
+                    listStyle: currentListStyle, listStyleTypeName: listStyleType, start: startAttr, styleMarginLeft: styleMarginLeft });
             }
         }
         stNode = listNodes.shift();
@@ -552,23 +585,30 @@ var MsWordPaste = /** @class */ (function () {
     };
     MsWordPaste.prototype.getlistStyleType = function (listContent, type) {
         var currentListClass;
+        var upperRomanNumber = ['I', 'II', 'III', 'IV', 'V', 'VI', 'VII', 'VIII', 'IX',
+            'X', 'XI', 'XII', 'XIII', 'XIV', 'XV', 'XVI', 'XVII', 'XVIII', 'XIX', 'XX'];
+        var lowerRomanNumber = ['i', 'ii', 'iii', 'iv', 'v', 'vi', 'vii', 'viii', 'ix',
+            'x', 'xi', 'xii', 'xiii', 'xiv', 'xv', 'xvi', 'xvii', 'xviii', 'xix', 'xx'];
+        var lowerGreekNumber = ['α', 'β', 'γ', 'δ', 'ε', 'ζ', 'η', 'θ', 'ι', 'κ', 'λ',
+            'μ', 'ν', 'ξ', 'ο', 'π', 'ρ', 'σ', 'τ', 'υ', 'φ', 'χ', 'ψ', 'ω'];
         if (type === 'ol') {
-            switch (listContent.split('.')[0]) {
-                case 'A':
-                    currentListClass = 'upper-alpha';
-                    break;
-                case 'a':
-                    currentListClass = 'lower-alpha';
-                    break;
-                case 'I':
+            var charCode = listContent.split('.')[0].charCodeAt(0);
+            switch (true) {
+                case upperRomanNumber.indexOf(listContent.split('.')[0]) > -1:
                     currentListClass = 'upper-roman';
                     break;
-                case 'i':
+                case lowerRomanNumber.indexOf(listContent.split('.')[0]) > -1:
                     currentListClass = 'lower-roman';
                     break;
-                case 'α':
+                case lowerGreekNumber.indexOf(listContent.split('.')[0]) > -1:
                     currentListClass = 'lower-greek';
                     break;
+                case (charCode > 64 && charCode < 91):
+                    currentListClass = 'upper-alpha';
+                    break;
+                case (charCode > 96 && charCode < 123):
+                    currentListClass = 'lower-alpha';
+                    break;
                 default:
                     currentListClass = 'decimal';
                     break;
@@ -600,11 +640,12 @@ var MsWordPaste = /** @class */ (function () {
             var pElement = createElement('p');
             pElement.innerHTML = collection[index].content.join(' ');
             if ((collection[index].nestedLevel === 1) && listCount === 0 && collection[index].content) {
-                root.appendChild(temp = createElement(collection[index].listType));
+                root.appendChild(temp = createElement(collection[index].listType, { className: collection[index].class }));
                 prevList = createElement('li');
                 prevList.appendChild(pElement);
                 temp.appendChild(prevList);
                 temp.setAttribute('level', collection[index].nestedLevel.toString());
+                temp.style.marginLeft = collection[index].styleMarginLeft;
                 temp.style.listStyleType = collection[index].listStyleTypeName;
             }
             else if (collection[index].nestedLevel === pLevel) {

package/src/editor-manager/plugin/toolbar-status.js

@@ -156,7 +156,7 @@ var ToolbarStatus = /** @class */ (function () {
             formatCollection.fontname = this.isFontName(docElement, node, fontName);
         }
         if (!formatCollection.fontsize) {
-            formatCollection.fontsize = this.isFontSize(node, fontSize);
+            formatCollection.fontsize = this.isFontSize(docElement, node, fontSize);
         }
         if (!formatCollection.backgroundcolor) {
             formatCollection.backgroundcolor = this.isBackgroundColor(node);
@@ -216,8 +216,12 @@ var ToolbarStatus = /** @class */ (function () {
             return null;
         }
     };
-    ToolbarStatus.isFontSize = function (node, fontSize) {
+    ToolbarStatus.isFontSize = function (docElement, node, fontSize) {
         var size = node.style && node.style.fontSize;
+        if ((size === null || size === undefined || size === '') && node.nodeType !== 3 &&
+            node.parentElement.classList.contains('e-content')) {
+            size = this.getComputedStyle(docElement, node, 'font-size');
+        }
         if ((size !== null && size !== '' && size !== undefined)
             && (fontSize === null || fontSize === undefined || (fontSize.indexOf(size) > -1))) {
             return size;

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

@@ -123,7 +123,16 @@ var EnterKeyAction = /** @class */ (function () {
                                 _this.parent.tableModule.removeResizeElement();
                             }
                             if (!(_this.parent.inputElement.childNodes.length === 1 && _this.parent.inputElement.childNodes[0].nodeName === 'TABLE')) {
-                                _this.parent.formatter.editorManager.nodeSelection.setCursorPoint(_this.parent.contentModule.getDocument(), _this.range.startContainer.childNodes[_this.range.startOffset], 0);
+                                if (isNOU(_this.range.startContainer.childNodes[_this.range.startOffset])) {
+                                    var currentLastElem = _this.range.startContainer.childNodes[_this.range.startOffset - 1];
+                                    while (currentLastElem.lastChild !== null && currentLastElem.nodeName !== '#text') {
+                                        currentLastElem = currentLastElem.lastChild;
+                                    }
+                                    _this.parent.formatter.editorManager.nodeSelection.setCursorPoint(_this.parent.contentModule.getDocument(), currentLastElem, (currentLastElem.nodeName === 'BR' ? 0 : currentLastElem.textContent.length));
+                                }
+                                else {
+                                    _this.parent.formatter.editorManager.nodeSelection.setCursorPoint(_this.parent.contentModule.getDocument(), _this.range.startContainer.childNodes[_this.range.startOffset], 0);
+                                }
                             }
                             _this.getRangeNode();
                         }
@@ -340,15 +349,19 @@ var EnterKeyAction = /** @class */ (function () {
                             _this.removeBRElement(currentParent);
                             var isEmptyBrInserted = false;
                             var currentParentLastChild = currentParent.lastChild;
-                            while (!isNOU(currentParentLastChild) && !(currentParentLastChild.nodeName === '#text' || currentParentLastChild.nodeName === 'BR')) {
+                            while (!isNOU(currentParentLastChild) && !(currentParentLastChild.nodeName === '#text' || currentParentLastChild.nodeName === 'BR'
+                                || currentParentLastChild.nodeName === 'IMG')) {
                                 currentParentLastChild = currentParentLastChild.lastChild;
                             }
                             var isLastNodeLength = _this.range.startContainer === currentParentLastChild ?
                                 _this.range.startContainer.textContent.length : currentParent.textContent.length;
+                            var isImageElement = (_this.range.startContainer.nodeName === 'IMG' || (_this.range.startContainer.childNodes.length > 0
+                                && _this.range.startContainer.childNodes[_this.range.startOffset].nodeName === 'IMG'));
                             if (currentParent !== _this.parent.inputElement &&
                                 _this.parent.formatter.editorManager.domNode.isBlockNode(currentParent) &&
                                 _this.range.startOffset === _this.range.endOffset &&
-                                _this.range.startOffset === isLastNodeLength) {
+                                (_this.range.startOffset === isLastNodeLength ||
+                                    (currentParent.textContent.trim().length === 0 && isImageElement))) {
                                 var focusBRElem = _this.parent.createElement('br');
                                 if (_this.range.startOffset === 0 && _this.range.startContainer.nodeName === 'TABLE') {
                                     _this.range.startContainer.parentElement.insertBefore(focusBRElem, _this.range.startContainer);
@@ -357,6 +370,12 @@ var EnterKeyAction = /** @class */ (function () {
                                     if (currentParentLastChild.nodeName === 'BR' && currentParent.textContent.length === 0) {
                                         _this.parent.formatter.editorManager.domNode.insertAfter(focusBRElem, currentParentLastChild);
                                     }
+                                    else if (_this.range.startOffset === 0 && _this.range.endOffset === 0 && isImageElement) {
+                                        var imageElement = _this.range.startContainer.nodeName === 'IMG' ? _this.range.startContainer :
+                                            _this.range.startContainer.childNodes[_this.range.startOffset];
+                                        currentParent.insertBefore(focusBRElem, imageElement);
+                                        focusBRElem = imageElement;
+                                    }
                                     else {
                                         var lineBreakBRElem = _this.parent.createElement('br');
                                         _this.parent.formatter.editorManager.domNode.insertAfter(focusBRElem, _this.range.startContainer);

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

@@ -651,7 +651,7 @@ var PasteCleanup = /** @class */ (function () {
             this.parent.formatter.editorManager.execCommand('inserthtml', 'pasteCleanup', args, function (returnArgs) {
                 extend(args, { elements: returnArgs.elements, imageElements: returnArgs.imgElem }, true);
                 _this.parent.formatter.onSuccess(_this.parent, args);
-            }, clipBoardElem);
+            }, clipBoardElem, null, null, this.parent.enterKey);
             this.removeTempClass();
             this.parent.notify(events.toolbarRefresh, {});
             this.imgUploading(this.parent.inputElement);
@@ -721,7 +721,7 @@ var PasteCleanup = /** @class */ (function () {
             this.parent.formatter.editorManager.execCommand('inserthtml', 'pasteCleanup', args, function (returnArgs) {
                 extend(args, { elements: returnArgs.elements, imageElements: returnArgs.imgElem }, true);
                 _this.parent.formatter.onSuccess(_this.parent, args);
-            }, clipBoardElem);
+            }, clipBoardElem, null, null, this.parent.enterKey);
             this.removeTempClass();
         }
         else {

package/src/rich-text-editor/actions/quick-toolbar.js

@@ -250,10 +250,17 @@ var QuickToolbar = /** @class */ (function () {
     };
     QuickToolbar.prototype.keyUpHandler = function (e) {
         if (this.parent.inlineMode.enable && !Browser.isDevice) {
+            var args = e.args;
             if (this.parent.inlineMode.onSelection) {
+                if (this.parent.getSelection().length > 0) {
+                    if ((args.ctrlKey && args.keyCode === 65) || (args.shiftKey && (args.keyCode === 33 || args.keyCode === 34 ||
+                        args.keyCode === 35 || args.keyCode === 36 || args.keyCode === 37 || args.keyCode === 38 ||
+                        args.keyCode === 39 || args.keyCode === 40))) {
+                        this.showInlineQTBar(this.offsetX, this.offsetY, args.target);
+                    }
+                }
                 return;
             }
-            var args = e.args;
             this.deBounce(this.offsetX, this.offsetY, args.target);
         }
     };

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

@@ -557,6 +557,11 @@ var Toolbar = /** @class */ (function () {
     Toolbar.prototype.toolbarClickHandler = function (e) {
         var trg = closest(e.originalEvent.target, '.e-hor-nav');
         if (trg && this.parent.toolbarSettings.type === ToolbarType.Expand && !isNOU(trg)) {
+            var extendedTbar = this.tbElement.querySelector('.e-toolbar-extended');
+            if (!isNOU(extendedTbar)) {
+                setStyleAttribute(extendedTbar, { maxHeight: '', display: 'block' });
+                setStyleAttribute(extendedTbar, { maxHeight: extendedTbar.offsetHeight + 'px', display: '' });
+            }
             if (!trg.classList.contains('e-nav-active')) {
                 removeClass([this.tbElement], [classes.CLS_EXPAND_OPEN]);
                 this.parent.setContentHeight('toolbar', false);

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

@@ -628,15 +628,16 @@ var RichTextEditor = /** @class */ (function (_super) {
         var currentEndContainer = range.endContainer;
         var currentStartOffset = range.startOffset;
         var isSameContainer = currentStartContainer === currentEndContainer ? true : false;
-        var currentEndOffset = currentEndContainer.textContent.length;
         var endNode = range.endContainer.nodeName === '#text' ? range.endContainer.parentElement :
             range.endContainer;
         var closestLI = closest(endNode, 'LI');
+        var isDetached = false;
         if (!isNOU(closestLI) && endNode.textContent.length === range.endOffset &&
             !range.collapsed && isNOU(endNode.nextElementSibling)) {
             for (var i = 0; i < closestLI.childNodes.length; i++) {
                 if (closestLI.childNodes[i].nodeName === '#text' && closestLI.childNodes[i].textContent.trim().length === 0) {
                     detach(closestLI.childNodes[i]);
+                    isDetached = true;
                     i--;
                 }
             }
@@ -644,7 +645,11 @@ var RichTextEditor = /** @class */ (function (_super) {
             while (currentLastElem.lastChild !== null && currentLastElem.nodeName !== '#text') {
                 currentLastElem = currentLastElem.lastChild;
             }
-            this.formatter.editorManager.nodeSelection.setSelectionText(this.contentModule.getDocument(), isSameContainer ? currentStartContainer : (currentLastElem.nodeName === 'BR' && !isNOU(currentLastElem.previousSibling) ? currentLastElem.previousSibling : currentStartContainer), currentEndContainer, currentStartOffset, (currentLastElem.nodeName === 'BR' ? 0 : currentEndOffset));
+            if (isDetached) {
+                var currentLast = currentLastElem.nodeName === 'BR' && !isNOU(currentLastElem.previousSibling) ?
+                    currentLastElem.previousSibling : currentLastElem;
+                this.formatter.editorManager.nodeSelection.setSelectionText(this.contentModule.getDocument(), isSameContainer ? currentLast : currentStartContainer, currentLast, currentStartOffset, (currentLast.nodeName === 'BR' ? 0 : currentLast.textContent.length));
+            }
         }
     };
     /**
@@ -2004,7 +2009,9 @@ var RichTextEditor = /** @class */ (function (_super) {
         this.notify(events.windowResize, null);
     };
     RichTextEditor.prototype.scrollHandler = function (e) {
-        this.notify(events.scroll, { args: e });
+        if (this.element) {
+            this.notify(events.scroll, { args: e });
+        }
     };
     RichTextEditor.prototype.contentScrollHandler = function (e) {
         this.notify(events.contentscroll, { args: e });

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

@@ -916,12 +916,14 @@ var Table = /** @class */ (function () {
                             if ((totalwid - actualwid) > 20 && actualwid > 20) {
                                 var leftColumnWidth = totalwid - actualwid;
                                 var rightColWidth = actualwid;
-                                if (!isNOU(_this.curTable.rows[i].cells[_this.colIndex - 1])) {
-                                    _this.curTable.rows[i].cells[_this.colIndex - 1].style.width =
+                                var index = _this.curTable.rows[i].cells[i].hasAttribute('colspan') ?
+                                    parseInt(_this.curTable.rows[i].cells[i].getAttribute('colspan'), 10) - 1 : _this.colIndex;
+                                if (!isNOU(_this.curTable.rows[i].cells[index - 1])) {
+                                    _this.curTable.rows[i].cells[index - 1].style.width =
                                         _this.convertPixelToPercentage(leftColumnWidth, tableWidth) + '%';
                                 }
-                                if (!isNOU(_this.curTable.rows[i].cells[_this.colIndex])) {
-                                    _this.curTable.rows[i].cells[_this.colIndex].style.width =
+                                if (!isNOU(_this.curTable.rows[i].cells[index])) {
+                                    _this.curTable.rows[i].cells[index].style.width =
                                         _this.convertPixelToPercentage(rightColWidth, tableWidth) + '%';
                                 }
                             }

package/GitLeaksReport.json

@@ -1 +0,0 @@
-[]