@syncfusion/ej2-richtexteditor 19.4.53 → 19.4.56

package/dist/global/index.d.ts

@@ -1,6 +1,6 @@
 /*!
 *  filename: index.d.ts
-*  version : 19.4.53
+*  version : 19.4.56
 *  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.4.52",
+  "_id": "@syncfusion/ej2-richtexteditor@19.4.55",
   "_inBundle": false,
-  "_integrity": "sha512-xjpEWIVKc57xj8kkwLnXXg6eNcUO79Fr5P15M6qjMemiEQnHthEX6Rcu0kvO9qjQTPaKyqsJXAXJOOhmAQu0zg==",
+  "_integrity": "sha512-yCzpe6Glr/5vD9wGZWamZZlXj6Pij6DBLAW2/7gKcFRevy5MG22PPORfDb0WrRRYYYj+kIV2Ea/7nU5HSpmtXw==",
   "_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-new/@syncfusion/ej2-richtexteditor/-/ej2-richtexteditor-19.4.52.tgz",
-  "_shasum": "b744ad1962f30a8e005044b4f638a796151b8ccb",
+  "_resolved": "http://nexus.syncfusion.com/repository/ej2-hotfix-new/@syncfusion/ej2-richtexteditor/-/ej2-richtexteditor-19.4.55.tgz",
+  "_shasum": "c71b371a808166cf0c76c804df45bc6723eb4027",
   "_spec": "@syncfusion/ej2-richtexteditor@*",
   "_where": "/jenkins/workspace/automation_release_19.1.0.1-ZPMUBNQ6AUYH6YGEFBPVYMEQLRRW2SLD4XCZ6GATNZJFYJ3RIAOA/packages/included",
   "author": {
@@ -39,10 +39,10 @@
   "bundleDependencies": false,
   "dependencies": {
     "@syncfusion/ej2-base": "~19.4.52",
-    "@syncfusion/ej2-buttons": "~19.4.53",
-    "@syncfusion/ej2-filemanager": "~19.4.52",
+    "@syncfusion/ej2-buttons": "~19.4.55",
+    "@syncfusion/ej2-filemanager": "~19.4.56",
     "@syncfusion/ej2-inputs": "~19.4.52",
-    "@syncfusion/ej2-navigations": "~19.4.53",
+    "@syncfusion/ej2-navigations": "~19.4.56",
     "@syncfusion/ej2-popups": "~19.4.53",
     "@syncfusion/ej2-splitbuttons": "~19.4.52"
   },
@@ -70,6 +70,6 @@
     "url": "git+https://github.com/syncfusion/ej2-javascript-ui-controls.git"
   },
   "typings": "index.d.ts",
-  "version": "19.4.53",
+  "version": "19.4.56",
   "sideEffects": false
 }

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

@@ -218,7 +218,12 @@ var ImageCommand = /** @class */ (function () {
     ImageCommand.prototype.removeImage = function (e) {
         if (closest(e.item.selectNode[0], 'a')) {
             if (e.item.selectNode[0].parentElement.nodeName === 'A' && !isNOU(e.item.selectNode[0].parentElement.innerText)) {
-                detach(e.item.selectNode[0]);
+                if (!isNOU(closest(e.item.selectNode[0], '.' + classes.CLASS_CAPTION))) {
+                    detach(closest(e.item.selectNode[0], '.' + classes.CLASS_CAPTION));
+                }
+                else {
+                    detach(e.item.selectNode[0]);
+                }
             }
             else {
                 detach(closest(e.item.selectNode[0], 'a'));

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

@@ -374,7 +374,7 @@ var InsertHtml = /** @class */ (function () {
                 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')) {
+                    currentNode.parentElement.textContent.trim().length === 0) {
                     splitedElm = currentNode;
                 }
                 else {

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

@@ -74,6 +74,11 @@ var LinkCommand = /** @class */ (function () {
         else {
             var domSelection = new NodeSelection();
             var range = domSelection.getRange(this.parent.currentDocument);
+            if (range.endContainer.nodeName === '#text' && range.startContainer.textContent.length === (range.endOffset + 1) &&
+                range.endContainer.textContent.charAt(range.endOffset) === ' ' && range.endContainer.nextSibling.nodeName === 'A') {
+                domSelection.setSelectionText(this.parent.currentDocument, range.startContainer, range.endContainer, range.startOffset, range.endOffset + 1);
+                range = domSelection.getRange(this.parent.currentDocument);
+            }
             var text = isNOU(e.item.text) ? true : e.item.text.replace(/ /g, '').localeCompare(range.toString()
                 .replace(/\n/g, ' ').replace(/ /g, '')) < 0;
             if (e.event && e.event.type === 'keydown' && (e.event.keyCode === 32

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

@@ -407,6 +407,14 @@ var Lists = /** @class */ (function () {
     };
     Lists.prototype.applyListsHandler = function (e) {
         var range = this.parent.nodeSelection.getRange(this.parent.currentDocument);
+        if (range.startContainer === range.endContainer && range.startContainer === this.parent.editableElement &&
+            range.startOffset === range.endOffset && range.startOffset === 0 &&
+            this.parent.editableElement.textContent.length === 0 && (this.parent.editableElement.childNodes[0].nodeName != 'TABLE' &&
+            this.parent.editableElement.childNodes[0].nodeName != 'IMG')) {
+            var focusNode = range.startContainer.childNodes[0];
+            this.parent.nodeSelection.setSelectionText(this.parent.currentDocument, focusNode, focusNode, 0, 0);
+            range = this.parent.nodeSelection.getRange(this.parent.currentDocument);
+        }
         this.saveSelection = this.parent.nodeSelection.save(range, this.parent.currentDocument);
         this.currentAction = e.subCommand;
         this.currentAction = e.subCommand = this.currentAction === 'NumberFormatList' ? 'OL' : this.currentAction === 'BulletFormatList' ? 'UL' : this.currentAction;

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

@@ -110,6 +110,7 @@ var SelectionCommands = /** @class */ (function () {
     };
     SelectionCommands.insertCursorNode = function (docElement, domSelection, range, isFormatted, nodeCutter, format, value, endNode) {
         var cursorNodes = domSelection.getNodeCollection(range);
+        var domNode = new DOMNode(endNode, docElement);
         var cursorFormat = (cursorNodes.length > 0) ?
             (cursorNodes.length > 1 && range.startContainer === range.endContainer) ?
                 this.getCursorFormat(isFormatted, cursorNodes, format, endNode) :
@@ -117,12 +118,17 @@ var SelectionCommands = /** @class */ (function () {
         var cursorNode = null;
         if (cursorFormat) {
             cursorNode = cursorNodes[0];
-            if (cursorFormat.firstChild.textContent.charCodeAt(0) === 8203) {
+            if (cursorFormat.firstChild.textContent.charCodeAt(0) === 8203 && cursorFormat.firstChild.nodeType === 3) {
                 var isCursorEqual = false;
                 var regEx = new RegExp(String.fromCharCode(8203), 'g');
                 var emptySpaceNode = void 0;
                 if (cursorFormat.firstChild === cursorNode) {
-                    cursorNode.textContent = cursorNode.textContent.replace(regEx, '');
+                    cursorNode.textContent = (cursorFormat.parentElement && (domNode.isBlockNode(cursorFormat.parentElement) &&
+                        cursorFormat.parentElement.textContent.length <= 1 ? cursorFormat.parentElement.childElementCount > 1 :
+                        cursorFormat.childElementCount === 0) &&
+                        (cursorFormat.parentElement.textContent.length > 1 ||
+                            cursorFormat.parentElement.firstChild && cursorFormat.parentElement.firstChild.nodeType === 1) ?
+                        cursorNode.textContent : cursorNode.textContent.replace(regEx, ''));
                     emptySpaceNode = cursorNode;
                     isCursorEqual = true;
                 }

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 removeBRElement;
     private insertBRElement;
     private insertFocusContent;
     private createInsertElement;

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

@@ -1,4 +1,4 @@
-import { isNullOrUndefined as isNOU, detach } from '@syncfusion/ej2-base';
+import { isNullOrUndefined as isNOU, detach, Browser } from '@syncfusion/ej2-base';
 import * as events from '../base/constant';
 /**
  * `EnterKey` module is used to handle enter key press actions.
@@ -123,6 +123,7 @@ var EnterKeyAction = /** @class */ (function () {
                             else if (_this.range.startOffset === 0 && _this.range.endOffset === 0) {
                                 isFocusedFirst = true;
                             }
+                            _this.removeBRElement(nearBlockNode);
                             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'))) {
@@ -226,6 +227,7 @@ var EnterKeyAction = /** @class */ (function () {
                             else {
                                 currentParent = _this.startNode;
                             }
+                            _this.removeBRElement(currentParent);
                             var isEmptyBrInserted = false;
                             var currentParentLastChild = currentParent.lastChild;
                             while (!isNOU(currentParentLastChild) && !(currentParentLastChild.nodeName === '#text' || currentParentLastChild.nodeName === 'BR')) {
@@ -288,6 +290,13 @@ var EnterKeyAction = /** @class */ (function () {
             }
         }
     };
+    EnterKeyAction.prototype.removeBRElement = function (currentElement) {
+        if (Browser.userAgent.indexOf('Firefox') != -1 &&
+            this.range.endOffset === currentElement.textContent.length &&
+            currentElement.lastChild.nodeName === 'BR') {
+            detach(currentElement.lastChild);
+        }
+    };
     EnterKeyAction.prototype.insertBRElement = function () {
         var isEmptyBrInserted = false;
         var brElm = this.parent.createElement('br');

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

@@ -18,6 +18,7 @@ export declare class HtmlEditor {
     private oldRangeElement;
     private deleteRangeElement;
     private deleteOldRangeElement;
+    private isImageDelete;
     private saveSelection;
     xhtmlValidation: XhtmlValidation;
     constructor(parent?: IRichTextEditor, serviceLocator?: ServiceLocator);

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

@@ -20,6 +20,7 @@ import { ON_BEGIN } from './../../common/constant';
 var HtmlEditor = /** @class */ (function () {
     function HtmlEditor(parent, serviceLocator) {
         this.rangeCollection = [];
+        this.isImageDelete = false;
         this.parent = parent;
         this.locator = serviceLocator;
         this.renderFactory = this.locator.getService('rendererFactory');
@@ -105,7 +106,9 @@ var HtmlEditor = /** @class */ (function () {
                 this.parent.formatter.editorManager.nodeSelection.setCursorPoint(this.parent.contentModule.getDocument(), range.startContainer, pointer);
             }
             if (!isNOU(range.startContainer.previousSibling) && !isNOU(range.startContainer.previousSibling.parentElement) &&
-                range.startContainer.parentElement === range.startContainer.previousSibling.parentElement && range.startContainer.previousSibling.textContent.charCodeAt(0) === 8203) {
+                range.startContainer.parentElement === range.startContainer.previousSibling.parentElement &&
+                range.startContainer.previousSibling.textContent.charCodeAt(0) === 8203 &&
+                range.startContainer.previousSibling.textContent.length <= 1) {
                 range.startContainer.previousSibling.textContent = range.startContainer.previousSibling.textContent.replace(regEx, '');
             }
             if (range.endContainer.textContent.charCodeAt(range.endOffset) === 8203) {
@@ -193,7 +196,9 @@ var HtmlEditor = /** @class */ (function () {
             this.oldRangeElement = null;
             this.deleteRangeElement = null;
             this.deleteOldRangeElement = null;
-            args.preventDefault();
+            if (!this.isImageDelete) {
+                args.preventDefault();
+            }
         }
     };
     HtmlEditor.prototype.isOrderedList = function (editorValue) {
@@ -317,7 +322,15 @@ var HtmlEditor = /** @class */ (function () {
                     return;
                 }
                 else {
-                    this.parent.formatter.editorManager.nodeSelection.setCursorPoint(this.parent.contentModule.getDocument(), this.deleteRangeElement, this.deleteRangeElement.childNodes.length);
+                    if (currentRange.startOffset === 0 && currentRange.endOffset === 1 &&
+                        this.deleteRangeElement.childNodes[0].nodeName === 'IMG') {
+                        this.parent.formatter.editorManager.nodeSelection.setSelectionText(this.parent.contentModule.getDocument(), this.deleteRangeElement, this.deleteRangeElement, 0, 1);
+                        this.isImageDelete = true;
+                    }
+                    else {
+                        this.parent.formatter.editorManager.nodeSelection.setCursorPoint(this.parent.contentModule.getDocument(), this.deleteRangeElement, this.deleteRangeElement.childNodes.length);
+                        this.isImageDelete = false;
+                    }
                     if (this.deleteRangeElement.querySelector('BR')) {
                         detach(this.deleteRangeElement.querySelector('BR'));
                     }

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

@@ -27,6 +27,7 @@ export declare class PasteCleanup {
     private makeSpace;
     private imgUploading;
     private getBlob;
+    private toolbarEnableDisable;
     private uploadMethod;
     private uploadFailure;
     private popupClose;

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

@@ -212,6 +212,11 @@ var PasteCleanup = /** @class */ (function () {
             }
         }
     };
+    PasteCleanup.prototype.toolbarEnableDisable = function (state) {
+        if (!this.parent.inlineMode.enable) {
+            this.parent.toolbarModule.baseToolbar.toolbarObj.disable(state);
+        }
+    };
     PasteCleanup.prototype.uploadMethod = function (fileList, imgElem) {
         var _this = this;
         var uploadEle = document.createElement('div');
@@ -288,6 +293,7 @@ var PasteCleanup = /** @class */ (function () {
                         if (beforeUploadArgs.cancel) {
                             return;
                         }
+                        _this.toolbarEnableDisable(true);
                         /* eslint-disable */
                         uploadObj.currentRequestHeader = beforeUploadArgs.currentRequest ?
                             beforeUploadArgs.currentRequest : uploadObj.currentRequestHeader;
@@ -299,6 +305,7 @@ var PasteCleanup = /** @class */ (function () {
                 }
                 else {
                     _this.parent.trigger(events.beforeImageUpload, args);
+                    _this.toolbarEnableDisable(true);
                 }
             },
             // eslint-disable-next-line
@@ -371,6 +378,7 @@ var PasteCleanup = /** @class */ (function () {
         popupObj.close();
         imgElem.style.opacity = '1';
         uploadObj.destroy();
+        this.toolbarEnableDisable(false);
     };
     PasteCleanup.prototype.refreshPopup = function (imageElement, popupObj) {
         var imgPosition = this.parent.iframeSettings.enable ? this.parent.element.offsetTop +

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

@@ -1059,6 +1059,7 @@ export declare class RichTextEditor extends Component<HTMLElement> implements IN
      * @hidden
      */
     protected eventInitializer(): void;
+    cleanList(e: KeyboardEvent): void;
     /**
      * For internal use only - keydown the event handler;
      *

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

@@ -463,6 +463,27 @@ var RichTextEditor = /** @class */ (function (_super) {
     RichTextEditor.prototype.eventInitializer = function () {
         this.wireEvents();
     };
+    RichTextEditor.prototype.cleanList = function (e) {
+        var range = this.getRange();
+        var currentStartContainer = range.startContainer;
+        var currentEndContainer = range.endContainer;
+        var currentStartOffset = range.startOffset;
+        var isSameContainer = currentStartContainer === currentEndContainer ? true : false;
+        var currentEndOffset;
+        var endNode = range.endContainer.nodeName === '#text' ? range.endContainer.parentElement :
+            range.endContainer;
+        var closestLI = closest(endNode, 'LI');
+        if (!isNOU(closestLI) && endNode.textContent.length === range.endOffset &&
+            !range.collapsed) {
+            closestLI.textContent = closestLI.textContent.trim();
+            currentEndOffset = closestLI.textContent.length - 1;
+            var currentLastElem = closestLI;
+            while (currentLastElem.nodeName !== '#text') {
+                currentLastElem = currentLastElem.lastChild;
+            }
+            this.formatter.editorManager.nodeSelection.setSelectionText(this.contentModule.getDocument(), isSameContainer ? currentLastElem : currentStartContainer, currentLastElem, currentStartOffset, currentLastElem.textContent.length);
+        }
+    };
     /**
      * For internal use only - keydown the event handler;
      *
@@ -475,6 +496,9 @@ var RichTextEditor = /** @class */ (function (_super) {
     RichTextEditor.prototype.keyDown = function (e) {
         this.notify(events.keyDown, { member: 'keydown', args: e });
         this.restrict(e);
+        if (this.editorMode === 'HTML') {
+            this.cleanList(e);
+        }
         if (this.editorMode === 'HTML' && ((e.which === 8 && e.code === 'Backspace') || (e.which === 46 && e.code === 'Delete'))) {
             var range = this.getRange();
             var startNode = range.startContainer.nodeName === '#text' ? range.startContainer.parentElement :

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

@@ -1846,7 +1846,8 @@ var Image = /** @class */ (function () {
         if (activePopupElement) {
             activePopupElement.classList.add(classes.CLS_HIDE);
         }
-        if (e.dataTransfer.files.length > 0) { //For external image drag and drop
+        var imgElement = this.parent.inputElement.ownerDocument.querySelector('.' + classes.CLS_RTE_DRAG_IMAGE);
+        if (e.dataTransfer.files.length > 0 && imgElement === null) { //For external image drag and drop
             if (e.dataTransfer.files.length > 1) {
                 return;
             }
@@ -1869,7 +1870,6 @@ var Image = /** @class */ (function () {
         }
         else { //For internal image drag and drop
             var range = this.parent.formatter.editorManager.nodeSelection.getRange(this.parent.contentModule.getDocument());
-            var imgElement = this.parent.inputElement.ownerDocument.querySelector('.' + classes.CLS_RTE_DRAG_IMAGE);
             if (imgElement && imgElement.tagName === 'IMG') {
                 if (imgElement.nextElementSibling) {
                     if (imgElement.nextElementSibling.classList.contains(classes.CLS_IMG_INNER)) {

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

@@ -511,7 +511,7 @@ var Table = /** @class */ (function () {
             return;
         }
         var target = e.target || e.targetTouches[0].target;
-        var closestTable = closest(target, 'table');
+        var closestTable = closest(target, 'table.e-rte-table');
         if (!isNOU(this.curTable) && !isNOU(closestTable) && closestTable !== this.curTable) {
             this.removeResizeElement();
             this.removeHelper(e);