@syncfusion/ej2-richtexteditor 19.3.55 → 19.4.47

package/dist/global/index.d.ts

@@ -1,6 +1,6 @@
 /*!
 *  filename: index.d.ts
-*  version : 19.3.55
+*  version : 19.4.47
 *  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@19.3.53",
+  "_id": "@syncfusion/ej2-richtexteditor@19.4.40",
   "_inBundle": false,
-  "_integrity": "sha512-/w+XuY76VuYlFVyWhywJW+qPNC4qAsf4ICsEMJiaYSD0uMlEDlQdAEw56vCbKF+gMnWRUp0uBwCcRZYKPkFifQ==",
+  "_integrity": "sha512-NXliovnItdi7jrn+x5uT0dk6n171w7mBNe3K8VkThnEoJ80R6o419mz36rq9IyB2jZJoDBlSO7WrU8Lel+5lWA==",
   "_location": "/@syncfusion/ej2-richtexteditor",
   "_phantomChildren": {},
   "_requested": {
@@ -26,8 +26,8 @@
     "/@syncfusion/ej2-react-richtexteditor",
     "/@syncfusion/ej2-vue-richtexteditor"
   ],
-  "_resolved": "http://nexus.syncfusion.com/repository/ej2-hotfix/@syncfusion/ej2-richtexteditor/-/ej2-richtexteditor-19.3.53.tgz",
-  "_shasum": "ebf91ca62866526e3e847bbcb454f3d193c0bab2",
+  "_resolved": "http://nexus.syncfusion.com/repository/ej2-hotfix-new/@syncfusion/ej2-richtexteditor/-/ej2-richtexteditor-19.4.40.tgz",
+  "_shasum": "6a824e374410a7eda59dc02e5886f29637159629",
   "_spec": "@syncfusion/ej2-richtexteditor@*",
   "_where": "/jenkins/workspace/automation_release_19.1.0.1-ZPMUBNQ6AUYH6YGEFBPVYMEQLRRW2SLD4XCZ6GATNZJFYJ3RIAOA/packages/included",
   "author": {
@@ -38,13 +38,13 @@
   },
   "bundleDependencies": false,
   "dependencies": {
-    "@syncfusion/ej2-base": "~19.3.54",
-    "@syncfusion/ej2-buttons": "~19.3.53",
-    "@syncfusion/ej2-filemanager": "~19.3.55",
-    "@syncfusion/ej2-inputs": "~19.3.53",
-    "@syncfusion/ej2-navigations": "~19.3.54",
-    "@syncfusion/ej2-popups": "~19.3.53",
-    "@syncfusion/ej2-splitbuttons": "~19.3.53"
+    "@syncfusion/ej2-base": "~19.4.42",
+    "@syncfusion/ej2-buttons": "~19.4.42",
+    "@syncfusion/ej2-filemanager": "~19.4.47",
+    "@syncfusion/ej2-inputs": "~19.4.47",
+    "@syncfusion/ej2-navigations": "~19.4.47",
+    "@syncfusion/ej2-popups": "~19.4.47",
+    "@syncfusion/ej2-splitbuttons": "~19.4.47"
   },
   "deprecated": false,
   "description": "Essential JS 2 RichTextEditor component",
@@ -70,6 +70,6 @@
     "url": "git+https://github.com/syncfusion/ej2-javascript-ui-controls.git"
   },
   "typings": "index.d.ts",
-  "version": "19.3.55",
+  "version": "19.4.47",
   "sideEffects": false
 }

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

@@ -370,7 +370,15 @@ var InsertHtml = /** @class */ (function () {
                 tempSpan.parentNode.replaceChild(node, tempSpan);
             }
             else {
-                var splitedElm = nodeCutter.GetSpliceNode(range, blockNode);
+                var currentNode = nodes[nodes.length - 1];
+                var splitedElm = void 0;
+                if ((currentNode.nodeName === 'BR' || currentNode.nodeName === 'HR') && !isNOU(currentNode.parentElement) &&
+                    currentNode.parentElement.textContent.trim().length === 0 && !node.classList.contains('pasteContent')) {
+                    splitedElm = currentNode;
+                }
+                else {
+                    splitedElm = nodeCutter.GetSpliceNode(range, blockNode);
+                }
                 splitedElm.parentNode.replaceChild(node, splitedElm);
             }
         }

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

@@ -46,8 +46,9 @@ var Lists = /** @class */ (function () {
     Lists.prototype.testCurrentList = function (range) {
         var olListStartRegex = [/^[1]+[.]+$/, /^[i]+[.]+$/, /^[a]+[.]+$/];
         if (!isNullOrUndefined(range.startContainer.textContent.slice(0, range.startOffset))) {
+            var currentContent = range.startContainer.textContent.replace(/\u200B/g, '').slice(0, range.startOffset).trim();
             for (var i = 0; i < olListStartRegex.length; i++) {
-                if (olListStartRegex[i].test(range.startContainer.textContent.replace(/\u200B/g, '').slice(0, range.startOffset).trim())) {
+                if (olListStartRegex[i].test(currentContent) && currentContent.length === 2) {
                     return true;
                 }
             }
@@ -89,7 +90,8 @@ var Lists = /** @class */ (function () {
             range.startContainer.parentElement.closest('LI');
         var endNode = range.endContainer.nodeName === 'LI' ? range.endContainer :
             range.endContainer.parentElement.closest('LI');
-        if (!isNOU(startNode) && !isNOU(endNode) && startNode === endNode && startNode.tagName === 'LI' && startNode.textContent.trim() === '') {
+        if (!isNOU(startNode) && !isNOU(endNode) && startNode === endNode && startNode.tagName === 'LI' &&
+            startNode.textContent.trim() === '' && startNode.querySelectorAll('IMG').length === 0) {
             if (startNode.textContent.charCodeAt(0) === 65279) {
                 startNode.textContent = '';
             }

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

@@ -38,7 +38,7 @@ export declare class MsWordPaste {
     private removingComments;
     private cleanUp;
     private listConverter;
+    private getlistStyleType;
     private makeConversion;
-    private getListStyle;
     private getListContent;
 }

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

@@ -46,7 +46,7 @@ var MsWordPaste = /** @class */ (function () {
         this.parent.observer.on(EVENTS.MS_WORD_CLEANUP_PLUGIN, this.wordCleanup, this);
     };
     MsWordPaste.prototype.wordCleanup = function (e) {
-        var wordPasteStyleConfig = e.allowedStylePropertiesArray;
+        var wordPasteStyleConfig = !isNOU(e.allowedStylePropertiesArray) ? e.allowedStylePropertiesArray : [];
         var listNodes = [];
         var tempHTMLContent = e.args.clipboardData.getData('text/HTML');
         var rtfData = e.args.clipboardData.getData('text/rtf');
@@ -471,8 +471,10 @@ var MsWordPaste = /** @class */ (function () {
             this.listContents = [];
             this.getListContent(listNodes[i]);
             var type = void 0;
+            var listStyleType = void 0;
             if (!isNOU(this.listContents[0])) {
                 type = this.listContents[0].trim().length > 1 ? 'ol' : 'ul';
+                listStyleType = this.getlistStyleType(this.listContents[0], type);
                 var tempNode = [];
                 for (var j = 1; j < this.listContents.length; j++) {
                     tempNode.push(this.listContents[j]);
@@ -489,7 +491,7 @@ var MsWordPaste = /** @class */ (function () {
                     }
                 }
                 collection.push({ listType: type, content: tempNode, nestedLevel: level, class: currentClassName,
-                    listStyle: currentListStyle });
+                    listStyle: currentListStyle, listStyleTypeName: listStyleType });
             }
         }
         stNode = listNodes.shift();
@@ -513,6 +515,45 @@ var MsWordPaste = /** @class */ (function () {
             }
         }
     };
+    MsWordPaste.prototype.getlistStyleType = function (listContent, type) {
+        var currentListClass;
+        if (type === 'ol') {
+            switch (listContent.split('.')[0]) {
+                case "A":
+                    currentListClass = "upper-alpha";
+                    break;
+                case "a":
+                    currentListClass = "lower-alpha";
+                    break;
+                case "I":
+                    currentListClass = "upper-roman";
+                    break;
+                case "i":
+                    currentListClass = "lower-roman";
+                    break;
+                case "α":
+                    currentListClass = "lower-greek";
+                    break;
+                default:
+                    currentListClass = "decimal";
+                    break;
+            }
+        }
+        else {
+            switch (listContent.split('.')[0]) {
+                case "o":
+                    currentListClass = "circle";
+                    break;
+                case "§":
+                    currentListClass = "square";
+                    break;
+                default:
+                    currentListClass = "disc";
+                    break;
+            }
+        }
+        return currentListClass;
+    };
     MsWordPaste.prototype.makeConversion = function (collection) {
         var root = createElement('div');
         var temp;
@@ -529,7 +570,7 @@ var MsWordPaste = /** @class */ (function () {
                 prevList.appendChild(pElement);
                 temp.appendChild(prevList);
                 temp.setAttribute('level', collection[index].nestedLevel.toString());
-                temp.style.listStyle = this.getListStyle(collection[index].listType, collection[index].nestedLevel);
+                temp.style.listStyleType = collection[index].listStyleTypeName;
             }
             else if (collection[index].nestedLevel === pLevel) {
                 if (prevList.parentElement.tagName.toLowerCase() === collection[index].listType) {
@@ -538,6 +579,7 @@ var MsWordPaste = /** @class */ (function () {
                 }
                 else {
                     temp = createElement(collection[index].listType);
+                    temp.style.listStyleType = collection[index].listStyleTypeName;
                     prevList.parentElement.parentElement.appendChild(temp);
                     prevList = createElement('li');
                     prevList.appendChild(pElement);
@@ -549,14 +591,15 @@ var MsWordPaste = /** @class */ (function () {
                 if (!isNOU(prevList)) {
                     for (var j = 0; j < collection[index].nestedLevel - pLevel; j++) {
                         prevList.appendChild(temp = createElement(collection[index].listType));
-                        prevList = createElement('li', { styles: 'list-style-type: none;' });
+                        prevList = createElement('li');
+                        if (j != collection[index].nestedLevel - pLevel - 1 && collection[index].nestedLevel - pLevel > 1) {
+                            prevList.style.listStyleType = "none";
+                        }
                         temp.appendChild(prevList);
                     }
                     prevList.appendChild(pElement);
                     temp.setAttribute('level', collection[index].nestedLevel.toString());
-                    temp.style.listStyle = this.getListStyle(collection[index].listType, collection[index].nestedLevel);
-                    temp.childNodes[0].style.listStyle =
-                        this.getListStyle(collection[index].listType, collection[index].nestedLevel);
+                    temp.style.listStyleType = collection[index].listStyleTypeName;
                 }
                 else {
                     root.appendChild(temp = createElement(collection[index].listType));
@@ -564,7 +607,7 @@ var MsWordPaste = /** @class */ (function () {
                     prevList.appendChild(pElement);
                     temp.appendChild(prevList);
                     temp.setAttribute('level', collection[index].nestedLevel.toString());
-                    temp.style.listStyle = this.getListStyle(collection[index].listType, collection[index].nestedLevel);
+                    temp.style.listStyleType = collection[index].listStyleTypeName;
                 }
             }
             else if (collection[index].nestedLevel === 1) {
@@ -573,12 +616,12 @@ var MsWordPaste = /** @class */ (function () {
                 }
                 else {
                     root.appendChild(temp = createElement(collection[index].listType));
+                    temp.style.listStyleType = collection[index].listStyleTypeName;
                 }
                 prevList = createElement('li');
                 prevList.appendChild(pElement);
                 temp.appendChild(prevList);
                 temp.setAttribute('level', collection[index].nestedLevel.toString());
-                temp.style.listStyle = this.getListStyle(collection[index].listType, collection[index].nestedLevel);
             }
             else {
                 elem = prevList;
@@ -599,7 +642,7 @@ var MsWordPaste = /** @class */ (function () {
                             prevList.appendChild(pElement);
                             temp.appendChild(prevList);
                             temp.setAttribute('level', collection[index].nestedLevel.toString());
-                            temp.style.listStyle = this.getListStyle(collection[index].listType, collection[index].nestedLevel);
+                            temp.style.listStyleType = collection[index].listStyleTypeName;
                             break;
                         }
                     }
@@ -608,21 +651,12 @@ var MsWordPaste = /** @class */ (function () {
             }
             prevList.setAttribute('class', collection[index].class);
             var currentStyle = prevList.getAttribute('style');
-            prevList.setAttribute('style', (!isNOU(currentStyle) ? currentStyle : '') + collection[index].listStyle);
+            prevList.setAttribute('style', (!isNOU(currentStyle) ? currentStyle : ''));
             pLevel = collection[index].nestedLevel;
             listCount++;
         }
         return root;
     };
-    MsWordPaste.prototype.getListStyle = function (listType, nestedLevel) {
-        nestedLevel = (nestedLevel > 0) ? nestedLevel - 1 : nestedLevel;
-        if (listType === 'ol') {
-            return (nestedLevel < this.olData.length ? this.olData[nestedLevel] : this.olData[0]);
-        }
-        else {
-            return (nestedLevel < this.ulData.length ? this.ulData[nestedLevel] : this.ulData[0]);
-        }
-    };
     MsWordPaste.prototype.getListContent = function (elem) {
         var pushContent = '';
         var firstChild = elem.firstElementChild;

package/src/editor-manager/plugin/selection-commands.js

@@ -188,6 +188,9 @@ var SelectionCommands = /** @class */ (function () {
     };
     SelectionCommands.removeFormat = function (nodes, index, formatNode, isCursor, isFormat, isFontStyle, range, nodeCutter, format, value, domSelection, endNode, domNode) {
         var splitNode = null;
+        var startText = range.startContainer.nodeName === '#text' ?
+            range.startContainer.textContent.substring(range.startOffset, range.startContainer.textContent.length) :
+            range.startContainer.textContent;
         if (!(range.startContainer === range.endContainer && range.startOffset === 0
             && range.endOffset === range.startContainer.length)) {
             var nodeIndex = [];
@@ -287,11 +290,13 @@ var SelectionCommands = /** @class */ (function () {
             for (var num = 0; num < child.length; num++) {
                 if (child[num].nodeType !== 3 || (child[num].textContent && child[num].textContent.trim().length > 0)) {
                     child[num] = InsertMethods.Wrap(child[num], this.GetFormatNode(format, value, formatNodeTagName, formatNodeStyles));
-                    if (num === 0) {
-                        range.setStartBefore(child[num]);
-                    }
-                    else if (num === child.length - 1) {
-                        range.setEndAfter(child[num]);
+                    if (child[num].textContent === startText) {
+                        if (num === 0) {
+                            range.setStartBefore(child[num]);
+                        }
+                        else if (num === child.length - 1) {
+                            range.setEndAfter(child[num]);
+                        }
                     }
                 }
             }

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

@@ -1,4 +1,4 @@
-import { debounce, isNullOrUndefined } from '@syncfusion/ej2-base';
+import { debounce, isNullOrUndefined, detach } from '@syncfusion/ej2-base';
 import { NodeSelection } from './../../selection/selection';
 import * as EVENTS from './../../common/constant';
 import { isIDevice, setEditFrameFocus } from '../../common/util';
@@ -96,6 +96,15 @@ var UndoRedoManager = /** @class */ (function () {
      */
     UndoRedoManager.prototype.saveData = function (e) {
         var range = new NodeSelection().getRange(this.parent.currentDocument);
+        var currentContainer = range.startContainer;
+        for (var 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);
         var save = new NodeSelection().save(range, this.parent.currentDocument);
         var htmlText = this.parent.editableElement.innerHTML;
         var changEle = { text: htmlText, range: save };

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

@@ -5,6 +5,7 @@ import { RendererFactory } from '../services/renderer-factory';
  * `Color Picker` module is used to handle ColorPicker actions.
  */
 export declare class ColorPickerInput {
+    private defaultColorPicker;
     private fontColorPicker;
     private backgroundColorPicker;
     private fontColorDropDown;

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

@@ -77,7 +77,7 @@ var ColorPickerInput = /** @class */ (function () {
                             target: (targetID)
                         };
                         _this.backgroundColorPicker = _this.toolbarRenderer.renderColorPicker(options, 'backgroundcolor');
-                        _this.backgroundColorDropDown = _this.toolbarRenderer.renderColorPickerDropDown(options, 'backgroundcolor', _this.backgroundColorPicker);
+                        _this.backgroundColorDropDown = _this.toolbarRenderer.renderColorPickerDropDown(options, 'backgroundcolor', _this.backgroundColorPicker, _this.defaultColorPicker);
                         break;
                     }
                 }
@@ -112,6 +112,7 @@ var ColorPickerInput = /** @class */ (function () {
         if (this.backgroundColorDropDown && !this.backgroundColorDropDown.isDestroyed) {
             var innerEle = this.backgroundColorDropDown.element.querySelector('.e-rte-color-content');
             if (innerEle) {
+                this.defaultColorPicker = innerEle.children[0].style.borderBottomColor;
                 detach(innerEle);
             }
             this.backgroundColorDropDown.destroy();

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

@@ -206,11 +206,6 @@ var DropDownButtons = /** @class */ (function () {
             var prop = _a[_i];
             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 (var _b = 0, _c = Object.keys(newProp.fontFamily); _b < _c.length; _b++) {
                             var fontFamily = _c[_b];
@@ -242,11 +237,6 @@ var DropDownButtons = /** @class */ (function () {
                     }
                     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 (var _d = 0, _e = Object.keys(newProp.fontSize); _d < _e.length; _d++) {
                             var fontSize = _e[_d];

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

@@ -13,6 +13,7 @@ export declare class EnterKeyAction {
     private removeEventListener;
     private getRangeNode;
     private enterHandler;
+    private insertBRElement;
     private insertFocusContent;
     private createInsertElement;
 }

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

@@ -29,9 +29,20 @@ var EnterKeyAction = /** @class */ (function () {
     EnterKeyAction.prototype.enterHandler = function (e) {
         var _this = this;
         this.getRangeNode();
+        var isTableEnter = true;
+        if (!isNOU(this.startNode.closest('TABLE')) && !isNOU(this.endNode.closest('TABLE'))) {
+            isTableEnter = false;
+            var curElement = this.startNode;
+            var 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 (isNOU(this.startNode.closest('LI')) && isNOU(this.endNode.closest('LI')) && isNOU(this.startNode.closest('TABLE')) &&
-                isNOU(this.endNode.closest('TABLE')) && isNOU(this.startNode.closest('PRE')) && isNOU(this.endNode.closest('PRE'))) {
+            if (isNOU(this.startNode.closest('LI')) && isNOU(this.endNode.closest('LI')) && isTableEnter &&
+                isNOU(this.startNode.closest('PRE')) && isNOU(this.endNode.closest('PRE'))) {
                 var shiftKey_1 = e.args.shiftKey;
                 var actionBeginArgs = {
                     cancel: false,
@@ -89,12 +100,32 @@ var EnterKeyAction = /** @class */ (function () {
                             _this.parent.formatter.editorManager.nodeSelection.setCursorPoint(_this.parent.contentModule.getDocument(), _this.range.startContainer.childNodes[_this.range.startOffset], 0);
                             _this.getRangeNode();
                         }
-                        if (_this.parent.enterKey === 'P' || _this.parent.enterKey === 'DIV' ||
+                        if ((_this.parent.enterKey === 'P' && !shiftKey_1) || (_this.parent.enterKey === 'DIV' && !shiftKey_1) ||
                             (_this.parent.shiftEnterKey === 'P' && shiftKey_1) ||
                             (_this.parent.shiftEnterKey === 'DIV' && shiftKey_1)) {
-                            var nearBlockNode = _this.parent.formatter.editorManager.domNode.blockParentNode(_this.startNode);
+                            var nearBlockNode = void 0;
+                            if (isTableEnter && _this.parent.formatter.editorManager.domNode.isBlockNode(_this.startNode)) {
+                                nearBlockNode = _this.startNode;
+                            }
+                            else {
+                                nearBlockNode = _this.parent.formatter.editorManager.domNode.blockParentNode(_this.startNode);
+                            }
                             var isImageNode = false;
-                            if (_this.range.startOffset === 0 && _this.range.endOffset === 0 && !(!isNOU(_this.range.startContainer.previousSibling) && _this.range.startContainer.previousSibling.nodeName === 'IMG')) {
+                            var isFocusedFirst = false;
+                            if (_this.range.startOffset != 0 && _this.range.endOffset != 0 && _this.range.startContainer === _this.range.endContainer &&
+                                !(!isNOU(nearBlockNode.childNodes[0]) && nearBlockNode.childNodes[0].nodeName === 'IMG')) {
+                                var startNodeText = _this.range.startContainer.textContent;
+                                var 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) &&
+                                !(!isNOU(_this.range.startContainer.previousSibling) &&
+                                    (_this.range.startContainer.previousSibling.nodeName === 'IMG' || _this.range.startContainer.previousSibling.nodeName === 'BR'))) {
                                 var isNearBlockLengthZero = void 0;
                                 var newElem = void 0;
                                 if (_this.range.startContainer.nodeName === 'IMG') {
@@ -103,7 +134,7 @@ var EnterKeyAction = /** @class */ (function () {
                                     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;
                                     }
@@ -152,7 +183,18 @@ var EnterKeyAction = /** @class */ (function () {
                                 }
                                 if (newElem.textContent.trim().length === 0) {
                                     var brElm = _this.parent.createElement('br');
-                                    _this.startNode.appendChild(brElm);
+                                    if (_this.startNode.nodeName === 'A') {
+                                        var 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_1) || ((_this.parent.shiftEnterKey === 'DIV' ||
@@ -163,12 +205,13 @@ var EnterKeyAction = /** @class */ (function () {
                                     }
                                     _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();
                         }
-                        if (_this.parent.enterKey === 'BR' && !shiftKey_1) {
+                        if ((_this.parent.enterKey === 'BR' && !shiftKey_1) || (_this.parent.shiftEnterKey === 'BR' && shiftKey_1)) {
                             var currentParent = void 0;
                             if (!_this.parent.formatter.editorManager.domNode.isBlockNode(_this.startNode)) {
                                 var currentNode = _this.startNode;
@@ -184,13 +227,21 @@ var EnterKeyAction = /** @class */ (function () {
                                 currentParent = _this.startNode;
                             }
                             var isEmptyBrInserted = false;
+                            var currentParentLastChild = currentParent.lastChild;
+                            while (!isNOU(currentParentLastChild) && !(currentParentLastChild.nodeName === '#text')) {
+                                currentParentLastChild = currentParentLastChild.lastChild;
+                            }
+                            var isLastNodeLength = _this.range.startContainer === currentParentLastChild ?
+                                _this.range.startContainer.textContent.length : currentParent.textContent.length;
                             if (currentParent !== _this.parent.inputElement &&
                                 _this.parent.formatter.editorManager.domNode.isBlockNode(currentParent) &&
                                 _this.range.startOffset === _this.range.endOffset &&
-                                _this.range.startOffset === currentParent.textContent.length) {
-                                var outerBRElem = _this.parent.createElement('br');
-                                _this.parent.formatter.editorManager.domNode.insertAfter(outerBRElem, currentParent);
-                                _this.parent.formatter.editorManager.nodeSelection.setCursorPoint(_this.parent.contentModule.getDocument(), outerBRElem, 0);
+                                _this.range.startOffset === isLastNodeLength) {
+                                var focusBRElem = _this.parent.createElement('br');
+                                var lineBreakBRElem = _this.parent.createElement('br');
+                                _this.parent.formatter.editorManager.domNode.insertAfter(focusBRElem, _this.range.startContainer);
+                                _this.parent.formatter.editorManager.domNode.insertAfter(lineBreakBRElem, _this.range.startContainer);
+                                _this.parent.formatter.editorManager.nodeSelection.setCursorPoint(_this.parent.contentModule.getDocument(), focusBRElem, 0);
                             }
                             else if (!isNOU(currentParent) && currentParent !== _this.parent.inputElement && currentParent.nodeName !== 'BR') {
                                 if (currentParent.textContent.trim().length === 0 || (currentParent.textContent.trim().length === 1 &&
@@ -217,34 +268,12 @@ var EnterKeyAction = /** @class */ (function () {
                                         isEmptyBrInserted = true;
                                     }
                                     else {
-                                        newElem = _this.parent.formatter.editorManager.nodeCutter.SplitNode(_this.range, currentParent, true);
-                                        newElem.parentElement.insertBefore(outerBRElem, newElem);
-                                        _this.insertFocusContent();
+                                        _this.insertBRElement();
                                     }
                                 }
                             }
                             else {
-                                var brElm = _this.parent.createElement('br');
-                                if (_this.startNode.nodeName === 'BR' && _this.endNode.nodeName === 'BR' && _this.range.startOffset === 0 && _this.range.startOffset === _this.range.endOffset) {
-                                    _this.parent.formatter.editorManager.domNode.insertAfter(brElm, _this.startNode);
-                                    isEmptyBrInserted = true;
-                                }
-                                else {
-                                    if (_this.startNode === _this.parent.inputElement && !isNOU(_this.range.startContainer.previousSibling) &&
-                                        _this.range.startContainer.previousSibling.nodeName === 'BR' && _this.range.startContainer.textContent.length === 0) {
-                                        isEmptyBrInserted = true;
-                                    }
-                                    _this.range.insertNode(brElm);
-                                }
-                                if (isEmptyBrInserted || (!isNOU(brElm.nextElementSibling) && brElm.nextElementSibling.tagName === 'BR') || (!isNOU(brElm.nextSibling) && brElm.nextSibling.textContent.length > 0)) {
-                                    _this.parent.formatter.editorManager.nodeSelection.setCursorPoint(_this.parent.contentModule.getDocument(), !isNOU(brElm.nextSibling) ? brElm.nextSibling : brElm, 0);
-                                    isEmptyBrInserted = false;
-                                }
-                                else {
-                                    var brElm2 = _this.parent.createElement('br');
-                                    _this.range.insertNode(brElm2);
-                                    _this.parent.formatter.editorManager.nodeSelection.setCursorPoint(_this.parent.contentModule.getDocument(), brElm, 0);
-                                }
+                                _this.insertBRElement();
                             }
                             e.args.preventDefault();
                         }
@@ -254,6 +283,30 @@ var EnterKeyAction = /** @class */ (function () {
             }
         }
     };
+    EnterKeyAction.prototype.insertBRElement = function () {
+        var isEmptyBrInserted = false;
+        var brElm = this.parent.createElement('br');
+        if (this.startNode.nodeName === 'BR' && this.endNode.nodeName === 'BR' && this.range.startOffset === 0 && this.range.startOffset === this.range.endOffset) {
+            this.parent.formatter.editorManager.domNode.insertAfter(brElm, this.startNode);
+            isEmptyBrInserted = true;
+        }
+        else {
+            if (this.startNode === this.parent.inputElement && !isNOU(this.range.startContainer.previousSibling) &&
+                this.range.startContainer.previousSibling.nodeName === 'BR' && this.range.startContainer.textContent.length === 0) {
+                isEmptyBrInserted = true;
+            }
+            this.range.insertNode(brElm);
+        }
+        if (isEmptyBrInserted || (!isNOU(brElm.nextElementSibling) && brElm.nextElementSibling.tagName === 'BR') || (!isNOU(brElm.nextSibling) && brElm.nextSibling.textContent.length > 0)) {
+            this.parent.formatter.editorManager.nodeSelection.setCursorPoint(this.parent.contentModule.getDocument(), !isNOU(brElm.nextSibling) ? brElm.nextSibling : brElm, 0);
+            isEmptyBrInserted = false;
+        }
+        else {
+            var brElm2 = this.parent.createElement('br');
+            this.range.insertNode(brElm2);
+            this.parent.formatter.editorManager.nodeSelection.setCursorPoint(this.parent.contentModule.getDocument(), brElm, 0);
+        }
+    };
     EnterKeyAction.prototype.insertFocusContent = function () {
         if (this.range.startContainer.textContent.length === 0) {
             if (this.range.startContainer.nodeName === '#text') {

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

@@ -149,7 +149,7 @@ var HtmlEditor = /** @class */ (function () {
             e.args.action === 'enter' ||
             e.args.keyCode === 13) {
             this.spaceLink(e.args);
-            if (this.parent.editorMode === 'HTML' && !((this.parent.shiftEnterKey === 'BR' && e.args.shiftKey))) {
+            if (this.parent.editorMode === 'HTML' && !this.parent.readonly) {
                 this.parent.notify(events.enterHandler, { args: e.args });
             }
         }
@@ -229,7 +229,8 @@ var HtmlEditor = /** @class */ (function () {
             if (this.rangeElement.tagName === 'OL' || this.rangeElement.tagName === 'UL') {
                 var liElement = this.getRangeLiNode(currentRange.startContainer);
                 if (liElement.previousElementSibling && liElement.previousElementSibling.childElementCount > 0) {
-                    this.oldRangeElement = liElement.previousElementSibling.lastElementChild;
+                    this.oldRangeElement = liElement.previousElementSibling.lastElementChild.nodeName === 'BR' ?
+                        liElement.previousElementSibling : liElement.previousElementSibling.lastElementChild;
                     if (!isNullOrUndefined(liElement.lastElementChild)) {
                         this.rangeElement = liElement.lastElementChild;
                         isLiElement = true;
@@ -426,7 +427,7 @@ var HtmlEditor = /** @class */ (function () {
             var divElement = this.parent.createElement('div');
             divElement.setAttribute('class', 'pasteContent');
             divElement.style.display = 'inline';
-            divElement.innerHTML = contentInnerElem;
+            divElement.innerHTML = contentInnerElem.replace('&para', '&para');
             var paraElem = divElement.querySelectorAll('span, p');
             for (var i = 0; i < paraElem.length; i++) {
                 var splitTextContent = paraElem[i].innerHTML.split(' ');

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

@@ -134,7 +134,7 @@ var QuickToolbar = /** @class */ (function () {
 
      */
     QuickToolbar.prototype.showInlineQTBar = function (x, y, target) {
-        if (this.parent.readonly) {
+        if (this.parent.readonly || target.tagName.toLowerCase() === "img") {
             return;
         }
         this.inlineQTBar.showPopup(x, y, target);

package/src/rich-text-editor/actions/xhtml-validation.js

@@ -29,7 +29,7 @@ var XhtmlValidation = /** @class */ (function () {
             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);
         }