@syncfusion/ej2-richtexteditor 22.1.34 → 22.1.38

package/dist/global/index.d.ts

@@ -1,6 +1,6 @@
 /*!
 *  filename: index.d.ts
-*  version : 22.1.34
+*  version : 22.1.38
 *  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@21.8.0",
+  "_id": "@syncfusion/ej2-richtexteditor@22.1.36",
   "_inBundle": false,
-  "_integrity": "sha512-KKugUmllHAC97zgvz2Bo3y8SB95H4fuecSj40S5i6oXXbNLdkOsYoPr66a38Di+/igSY9RgzG7R9BedERFsMQg==",
+  "_integrity": "sha512-mS0ty0acT5STRbjz9ZSXS5y0hcs04Oe00244YG4ojqmGkymJ4OuAhd6+jZPTAzIqy4Pj9ziOOFIm+NLj1tqJLQ==",
   "_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-release/@syncfusion/ej2-richtexteditor/-/ej2-richtexteditor-21.8.0.tgz",
-  "_shasum": "11fb16ec178e4100183ec60405ad3ed21c7b38e9",
+  "_resolved": "https://nexus.syncfusion.com/repository/ej2-hotfix-new/@syncfusion/ej2-richtexteditor/-/ej2-richtexteditor-22.1.36.tgz",
+  "_shasum": "8af01f54f053e047038c2f48f38cb58b0db212b4",
   "_spec": "@syncfusion/ej2-richtexteditor@*",
   "_where": "/jenkins/workspace/elease-automation_release_21.1.1/packages/included",
   "author": {
@@ -38,13 +38,13 @@
   },
   "bundleDependencies": false,
   "dependencies": {
-    "@syncfusion/ej2-base": "~22.1.34",
-    "@syncfusion/ej2-buttons": "~22.1.34",
-    "@syncfusion/ej2-filemanager": "~22.1.34",
-    "@syncfusion/ej2-inputs": "~22.1.34",
-    "@syncfusion/ej2-navigations": "~22.1.34",
-    "@syncfusion/ej2-popups": "~22.1.34",
-    "@syncfusion/ej2-splitbuttons": "~22.1.34"
+    "@syncfusion/ej2-base": "~22.1.38",
+    "@syncfusion/ej2-buttons": "~22.1.38",
+    "@syncfusion/ej2-filemanager": "~22.1.38",
+    "@syncfusion/ej2-inputs": "~22.1.38",
+    "@syncfusion/ej2-navigations": "~22.1.38",
+    "@syncfusion/ej2-popups": "~22.1.38",
+    "@syncfusion/ej2-splitbuttons": "~22.1.37"
   },
   "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": "22.1.34",
+  "version": "22.1.38",
   "sideEffects": false
 }

package/src/editor-manager/plugin/format-painter-actions.js

@@ -142,7 +142,7 @@ var FormatPainterActions = /** @class */ (function () {
                             var classLength = classes.length;
                             for (var k = 0; k < classLength; k++) {
                                 if (elementsList[j].classList.contains(classes[k])) {
-                                    removeClass([elementsList[j]], classes[k]);
+                                    removeClass([elementsList[j]], classes[k].trim());
                                 }
                             }
                             if (elementsList[j].classList.length === 0) {
@@ -153,7 +153,7 @@ var FormatPainterActions = /** @class */ (function () {
                             var styles = deniedPropArray[i].styles;
                             var styleLength = styles.length;
                             for (var k = 0; k < styleLength; k++) {
-                                elementsList[j].style.removeProperty(styles[k]);
+                                elementsList[j].style.removeProperty(styles[k].trim());
                             }
                             if (elementsList[j].style.length === 0) {
                                 elementsList[j].removeAttribute('style');
@@ -163,7 +163,7 @@ var FormatPainterActions = /** @class */ (function () {
                             var attributes = deniedPropArray[i].attributes;
                             var attributeLength = attributes.length;
                             for (var k = 0; k < attributeLength; k++) {
-                                elementsList[j].removeAttribute(attributes[k]);
+                                elementsList[j].removeAttribute(attributes[k].trim());
                             }
                         }
                     }
@@ -606,7 +606,7 @@ var FormatPainterActions = /** @class */ (function () {
             min = Math.min(openIndexArray[0], openIndexArray[1], openIndexArray[2]);
         }
         tagName = value.substring(0, min);
-        tagName.trim();
+        tagName = tagName.trim();
         return ({
             tag: tagName, styles: stylesList, classes: classList,
             attributes: attributesList

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

@@ -463,7 +463,8 @@ var InsertHtml = /** @class */ (function () {
     InsertHtml.findDetachEmptyElem = function (element) {
         var removableElement;
         if (!isNOU(element.parentElement)) {
-            if (element.parentElement.textContent.trim() === '' && element.parentElement.contentEditable !== 'true') {
+            if (element.parentElement.textContent.trim() === '' && element.parentElement.contentEditable !== 'true' &&
+                isNOU(element.parentElement.querySelector('img'))) {
                 removableElement = this.findDetachEmptyElem(element.parentElement);
             }
             else {

package/src/rich-text-editor/actions/format-painter.js

@@ -14,10 +14,17 @@ var FormatPainter = /** @class */ (function () {
         this.parent.on(events.keyDown, this.onKeyDown, this);
         this.parent.on(events.destroy, this.destroy, this);
     };
-    FormatPainter.prototype.toolbarClick = function (args) {
-        this.isActive = true;
+    FormatPainter.prototype.toolbarClick = function (clickargs) {
         this.parent.focusIn();
-        this.actionHandler(args, 'click');
+        if (!this.isSticky) {
+            this.isActive = true;
+            this.actionHandler(clickargs, 'click');
+        }
+        else {
+            // Handling the format painter double click toolbar esape action
+            clickargs.args.action = 'escape';
+            this.actionHandler(clickargs, 'keyBoard');
+        }
     };
     FormatPainter.prototype.toolbarDoubleClick = function (args) {
         this.isActive = true;

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

@@ -40,7 +40,8 @@ var XhtmlValidation = /** @class */ (function () {
 
      */
     XhtmlValidation.prototype.selfEncloseValidation = function (currentValue, valueLength) {
-        if (valueLength === 0 && currentValue.indexOf('table') < 0 && currentValue.indexOf('img') < 0) {
+        if (valueLength === 0 && currentValue.indexOf('table') < 0 && currentValue.indexOf('img') < 0 &&
+            currentValue !== '<p><br></p>' && currentValue !== '<div><br></div>' && currentValue !== '<br>') {
             var arrayValue = currentValue.split('&nbsp;');
             arrayValue[arrayValue.length - 1] = '&#8203;' + arrayValue[arrayValue.length - 1];
             currentValue = arrayValue.join('');

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

@@ -852,6 +852,9 @@ var Table = /** @class */ (function () {
         var maxiumWidth;
         var currentTdElement = this.curTable.closest('td');
         var args = { event: e, requestType: 'table' };
+        var isRowCellsMerged = false;
+        var mergedCellIndex;
+        var mergedElement;
         this.parent.trigger(events.onResize, args, function (resizingArgs) {
             if (resizingArgs.cancel) {
                 _this.cancelResizeAction();
@@ -916,7 +919,8 @@ var Table = /** @class */ (function () {
                             var differenceWidth = currentTableWidth - _this.convertPixelToPercentage(tableWidth + mouseX, widthCompare);
                             for (var i = 0; i < lastColumnsCell.length; i++) {
                                 if (_this.curTable.rows[i].cells[_this.colIndex]) {
-                                    _this.curTable.rows[i].cells[_this.colIndex].style.width = (currentColumnCellWidth - differenceWidth) + '%';
+                                    _this.curTable.rows[i].cells[_this.curTable.rows[i].cells.length === _this.colIndex ?
+                                        _this.colIndex - 1 : _this.colIndex].style.width = (currentColumnCellWidth - differenceWidth) + '%';
                                 }
                             }
                         }
@@ -927,19 +931,72 @@ var Table = /** @class */ (function () {
                         var totalwid = parseFloat(_this.columnEle.offsetWidth.toString()) +
                             parseFloat(cellColl[_this.colIndex - 1].offsetWidth.toString());
                         for (var i = 0; i < _this.curTable.rows.length; i++) {
-                            if ((totalwid - actualwid) > 20 && actualwid > 20 && _this.curTable.rows[i].cells[i]) {
+                            var currentRow = _this.curTable.rows[i];
+                            if ((totalwid - actualwid) > 20 && actualwid > 20) {
                                 var leftColumnWidth = totalwid - actualwid;
                                 var rightColWidth = actualwid;
-                                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 =
+                                var index = void 0;
+                                var isMergedEleResize = false;
+                                var leftTableCell = void 0;
+                                var rightTableCell = void 0;
+                                for (var j = 0; j < currentRow.cells.length; j++) {
+                                    if (currentRow.cells[j].hasAttribute('rowspan') && j <= _this.colIndex) {
+                                        isRowCellsMerged = true;
+                                        mergedCellIndex = i;
+                                        mergedElement = currentRow.cells[j];
+                                    }
+                                }
+                                if (!isNOU(currentRow.cells[i]) && currentRow.cells[i].hasAttribute('colspan')) {
+                                    index = parseInt(currentRow.cells[i].getAttribute('colspan'), 10) - 1;
+                                }
+                                else {
+                                    index = _this.colIndex;
+                                }
+                                if (isRowCellsMerged) {
+                                    var currentResizeRow = void 0;
+                                    if (currentRow.cells.length < cellColl.length) {
+                                        index = currentRow.cells.length === _this.colIndex ?
+                                            _this.colIndex - 1 : _this.colIndex - (_this.colIndex - 1);
+                                        currentResizeRow = _this.curTable.rows[!isNullOrUndefined(mergedCellIndex) ?
+                                            mergedCellIndex : _this.colIndex - 1];
+                                        if (currentResizeRow && (currentResizeRow.cells[_this.colIndex - 1] === mergedElement ||
+                                            currentResizeRow.cells[currentResizeRow.cells.length - 1] === mergedElement)) {
+                                            isMergedEleResize = true;
+                                        }
+                                        else {
+                                            isMergedEleResize = false;
+                                        }
+                                    }
+                                    else {
+                                        index = _this.colIndex;
+                                    }
+                                    leftTableCell = !isMergedEleResize ? currentRow.cells[index - 1] : (currentResizeRow &&
+                                        currentResizeRow.cells[currentResizeRow.cells.length - 1] !== mergedElement) ?
+                                        currentResizeRow.cells[_this.colIndex - 1] : currentRow.cells[currentRow.cells.length - 1];
+                                    rightTableCell = !isMergedEleResize ? currentRow.cells[index] : rightTableCell && rightTableCell.hasAttribute('rowspan') ?
+                                        rightTableCell : currentResizeRow && currentResizeRow.cells[currentResizeRow.cells.length - 1] !== mergedElement ?
+                                        currentRow.cells[index - 1] : currentResizeRow.cells[currentResizeRow.cells.length - 1];
+                                }
+                                if (!isNOU(currentRow.cells[index - 1]) && !isRowCellsMerged) {
+                                    currentRow.cells[index - 1].style.width =
                                         _this.convertPixelToPercentage(leftColumnWidth, tableWidth) + '%';
                                 }
-                                if (!isNOU(_this.curTable.rows[i].cells[index])) {
-                                    _this.curTable.rows[i].cells[index].style.width =
+                                else {
+                                    if (leftTableCell) {
+                                        leftTableCell.style.width =
+                                            _this.convertPixelToPercentage(leftColumnWidth, tableWidth) + '%';
+                                    }
+                                }
+                                if (!isNOU(currentRow.cells[index]) && !isRowCellsMerged) {
+                                    currentRow.cells[index].style.width =
                                         _this.convertPixelToPercentage(rightColWidth, tableWidth) + '%';
                                 }
+                                else {
+                                    if (rightTableCell) {
+                                        rightTableCell.style.width =
+                                            _this.convertPixelToPercentage(rightColWidth, tableWidth) + '%';
+                                    }
+                                }
                             }
                         }
                     }
@@ -963,8 +1020,8 @@ var Table = /** @class */ (function () {
                         EventHandler.remove(_this.contentModule.getEditPanel(), 'mouseover', _this.resizeHelper);
                     }
                     if (currentTdElement) {
-                        // eslint-disable-next-line max-len
-                        var tableBoxPosition = _this.curTable.getBoundingClientRect().left - currentTdElement.getBoundingClientRect().left;
+                        var tableBoxPosition = _this.curTable.getBoundingClientRect().left
+                            - currentTdElement.getBoundingClientRect().left;
                         maxiumWidth = Math.abs(tableBoxPosition - currentTdElement.getBoundingClientRect().width) - 5;
                         _this.curTable.style.maxWidth = maxiumWidth + 'px';
                     }