@syncfusion/ej2-richtexteditor 20.4.52 → 21.1.35

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

@@ -76,7 +76,7 @@ var MsWordPaste = /** @class */ (function () {
             if (pattern4.test(tempHTMLContent)) {
                 this.addTableBorderClass(elm);
             }
-            // Removing the margin for list items 
+            // Removing the margin for list items
             var liChildren = elm.querySelectorAll('li');
             if (liChildren.length > 0) {
                 for (var i = 0; i < liChildren.length; i++) {
@@ -374,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) {
@@ -495,22 +518,29 @@ 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
-                            if (!isNaN(parseInt(startString))) {
-                                startAttr = parseInt(startString);
+                            if (!isNaN(parseInt(startString, 10))) {
+                                startAttr = parseInt(startString, 10);
                             }
                         }
-                        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 = [];
@@ -529,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();
@@ -555,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;
@@ -603,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/selection-commands.d.ts

@@ -1,3 +1,4 @@
+import { FormatPainterValue } from '../plugin';
 export declare class SelectionCommands {
     static enterAction: string;
     /**
@@ -9,11 +10,12 @@ export declare class SelectionCommands {
      * @param {string} enterAction - specifies the enter key action
      * @param {string} value - specifies the string value
      * @param {string} selector - specifies the string
+     * @param {FormatPainterValue} painterValues specifies the element created and last child
      * @returns {void}
      * @hidden
 
      */
-    static applyFormat(docElement: Document, format: string, endNode: Node, enterAction: string, value?: string, selector?: string): void;
+    static applyFormat(docElement: Document, format: string, endNode: Node, enterAction: string, value?: string, selector?: string, painterValues?: FormatPainterValue): void;
     private static insertCursorNode;
     private static getCursorFormat;
     private static removeFormat;
@@ -24,4 +26,5 @@ export declare class SelectionCommands {
     private static applySelection;
     private static GetFormatNode;
     private static updateStyles;
+    private static insertFormatPainterElem;
 }

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

@@ -20,15 +20,16 @@ var SelectionCommands = /** @class */ (function () {
      * @param {string} enterAction - specifies the enter key action
      * @param {string} value - specifies the string value
      * @param {string} selector - specifies the string
+     * @param {FormatPainterValue} painterValues specifies the element created and last child
      * @returns {void}
      * @hidden
 
      */
-    SelectionCommands.applyFormat = function (docElement, format, endNode, enterAction, value, selector) {
+    SelectionCommands.applyFormat = function (docElement, format, endNode, enterAction, value, selector, painterValues) {
         this.enterAction = enterAction;
         var validFormats = ['bold', 'italic', 'underline', 'strikethrough', 'superscript',
             'subscript', 'uppercase', 'lowercase', 'fontcolor', 'fontname', 'fontsize', 'backgroundcolor'];
-        if (validFormats.indexOf(format) > -1) {
+        if (validFormats.indexOf(format) > -1 || value === 'formatPainter') {
             if (format === 'backgroundcolor' && value === '') {
                 value = 'transparent';
             }
@@ -104,8 +105,10 @@ var SelectionCommands = /** @class */ (function () {
                 if (formatNode !== null && (!isFormat || isFontStyle)) {
                     nodes[index] = this.removeFormat(nodes, index, formatNode, isCursor, isFormat, isFontStyle, range, nodeCutter, format, value, domSelection, endNode, domNode);
                 }
-                else if (range.startContainer.parentElement !== endNode || (range.commonAncestorContainer === endNode || nodes.length === 1)) {
-                    nodes[index] = this.insertFormat(docElement, nodes, index, formatNode, isCursor, isFormat, isFontStyle, range, nodeCutter, format, value, domNode, endNode);
+                else if (range.startContainer.parentElement !== endNode ||
+                    (range.commonAncestorContainer !== endNode && range.startContainer.parentElement === endNode)
+                    || (range.commonAncestorContainer === endNode || nodes.length === 1)) {
+                    nodes[index] = this.insertFormat(docElement, nodes, index, formatNode, isCursor, isFormat, isFontStyle, range, nodeCutter, format, value, painterValues, domNode, endNode);
                 }
                 domSelection = this.applySelection(nodes, domSelection, nodeCutter, index, isCollapsed);
             }
@@ -401,7 +404,7 @@ var SelectionCommands = /** @class */ (function () {
         }
         return nodes[index];
     };
-    SelectionCommands.insertFormat = function (docElement, nodes, index, formatNode, isCursor, isFormat, isFontStyle, range, nodeCutter, format, value, domNode, endNode) {
+    SelectionCommands.insertFormat = function (docElement, nodes, index, formatNode, isCursor, isFormat, isFontStyle, range, nodeCutter, format, value, painterValues, domNode, endNode) {
         var rootElementNode;
         if (!isCursor) {
             if ((formatNode === null && isFormat) || isFontStyle) {
@@ -428,11 +431,11 @@ var SelectionCommands = /** @class */ (function () {
                 }
                 else if (!(isFontStyle === true && value === '')) {
                     var element = this.GetFormatNode(format, value);
-                    if (format === 'fontsize' || format === 'fontcolor' || format === 'fontname' || format === 'backgroundcolor') {
+                    if (value === 'formatPainter' || format === 'fontsize' || format === 'fontcolor' || format === 'fontname' || format === 'backgroundcolor') {
                         if (format !== 'fontname' && format !== 'backgroundcolor') {
                             var liElement = nodes[index].parentElement;
                             var parentElement = nodes[index].parentElement;
-                            while (!isNOU(parentElement) && parentElement.tagName.toLowerCase() !== 'li' && parentElement !== endNode) {
+                            while (!isNOU(parentElement) && parentElement.tagName.toLowerCase() !== 'li') {
                                 parentElement = parentElement.parentElement;
                                 liElement = parentElement;
                             }
@@ -447,7 +450,7 @@ var SelectionCommands = /** @class */ (function () {
                                 }
                             }
                         }
-                        if (rootElementNode && rootElementNode.nodeType !== 3) {
+                        if (rootElementNode && rootElementNode.nodeType !== 3 && rootElementNode.nodeName !== 'A') {
                             var save = new NodeSelection();
                             save.save(range, docElement);
                             domNode.setMarker(save);
@@ -467,7 +470,12 @@ var SelectionCommands = /** @class */ (function () {
                             domNode.saveMarker(save, null);
                         }
                         else {
-                            nodes[index] = this.applyStyles(nodes, index, element);
+                            if (value === 'formatPainter') {
+                                return this.insertFormatPainterElem(nodes, index, range, nodeCutter, painterValues, domNode);
+                            }
+                            else {
+                                nodes[index] = this.applyStyles(nodes, index, element);
+                            }
                         }
                         if (format === 'fontsize') {
                             var bg = closest(nodes[index].parentElement, 'span[style*=' + 'background-color' + ']');
@@ -598,6 +606,59 @@ var SelectionCommands = /** @class */ (function () {
             ele.setAttribute('style', styles);
         }
     };
+    // Below function is used to insert the element created by the format painter plugin.
+    SelectionCommands.insertFormatPainterElem = function (nodes, index, range, nodeCutter, painterValues, domNode) {
+        var parent = nodes[index].parentElement;
+        if (!domNode.isBlockNode(parent)) {
+            // The below code is used to remove the already present inline style from the text node.
+            while (parent.textContent.trim() === parent.parentElement.textContent.trim() && !domNode.isBlockNode(parent.parentElement)) {
+                parent = parent.parentElement;
+            }
+            if (parent.textContent.trim() !== nodes[index].textContent.trim()) {
+                nodeCutter.SplitNode(range, parent, true);
+                var childELemList = nodes[index].parentElement.childNodes;
+                for (var i = 0; i < childELemList.length; i++) {
+                    if (childELemList[i].textContent.trim() === nodes[i].textContent.trim()) {
+                        parent.parentNode.insertBefore(childELemList[i], parent);
+                        break;
+                    }
+                }
+                var blockChildNodes = parent.parentElement.childNodes;
+                for (var k = 0; k < blockChildNodes.length; k++) {
+                    if (blockChildNodes[k].textContent.trim() === '' || blockChildNodes[k].textContent.length === 0) {
+                        detach(blockChildNodes[k]);
+                    }
+                }
+            }
+            else {
+                InsertMethods.unwrap(parent);
+            }
+        }
+        var elem = painterValues.element;
+        if (!isNOU(elem)) {
+            // Step 1: Cloning the element that is created by format painter.
+            // Step 2: Finding the last child of the nested elememt using the paintervalues.lastchild nodename
+            // Step 3: Assigning the nodes[index] text content to the last child element.
+            // Step 4: Wrapping the cloned element with the nodes[index]
+            var clonedElement = elem.cloneNode(true);
+            var elemList = clonedElement.querySelectorAll(painterValues.lastChild.nodeName);
+            var lastElement = void 0;
+            if (elemList.length > 0) {
+                lastElement = elemList[elemList.length - 1];
+            }
+            else {
+                if (!isNOU(clonedElement) && clonedElement.nodeName === painterValues.lastChild.nodeName) {
+                    lastElement = clonedElement;
+                }
+            }
+            lastElement.textContent = nodes[index].textContent;
+            var lastChild = lastElement.childNodes[0];
+            nodes[index] = InsertMethods.Wrap(nodes[index], clonedElement);
+            nodes[index].textContent = '';
+            nodes[index] = lastChild;
+        }
+        return nodes[index];
+    };
     SelectionCommands.enterAction = 'P';
     return SelectionCommands;
 }());

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

@@ -161,6 +161,8 @@ var VideoCommand = /** @class */ (function () {
                 : (Browser.isIE ? selectedNode : !e.item.isEmbedUrl ? selectedNode.lastElementChild : selectedNode.querySelector('iframe'));
             videoElm_1.addEventListener(videoElm_1.tagName !== 'IFRAME' ? 'loadeddata' : 'load', function () {
                 if (e.value !== 'VideoReplace' || !isReplaced) {
+                    if (e.item.isEmbedUrl && videoElm_1)
+                        videoElm_1.classList.add('e-rte-embed-url');
                     e.callBack({
                         requestType: 'Videos',
                         editorMode: 'HTML',

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

@@ -23,3 +23,4 @@ export * from './plugin/clearformat-exec';
 export * from './plugin/undo';
 export * from './plugin/table';
 export * from './plugin/toolbar-status';
+export * from './plugin/format-painter-actions';

package/src/editor-manager/plugin.js

@@ -23,3 +23,4 @@ export * from './plugin/clearformat-exec';
 export * from './plugin/undo';
 export * from './plugin/table';
 export * from './plugin/toolbar-status';
+export * from './plugin/format-painter-actions';

package/src/global.js

@@ -1,3 +1,3 @@
 import * as index from './index';
-index.RichTextEditor.Inject(index.Toolbar, index.Link, index.Image, index.Audio, index.Video, index.Count, index.QuickToolbar, index.HtmlEditor, index.MarkdownEditor, index.Table, index.PasteCleanup, index.Resize, index.FileManager);
+index.RichTextEditor.Inject(index.Toolbar, index.Link, index.Image, index.Audio, index.Video, index.Count, index.QuickToolbar, index.HtmlEditor, index.MarkdownEditor, index.Table, index.PasteCleanup, index.Resize, index.FileManager, index.FormatPainter);
 export * from './index';

package/src/rich-text-editor/actions/base-quick-toolbar.d.ts

@@ -21,6 +21,7 @@ export declare class BaseQuickToolbar {
     private popupRenderer;
     toolbarElement: HTMLElement;
     private renderFactory;
+    private tooltip;
     constructor(parent?: IRichTextEditor, locator?: ServiceLocator);
     private appendPopupContent;
     /**

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

@@ -1,6 +1,6 @@
 import { detach, getUniqueID, append, closest, selectAll, select, isNullOrUndefined as isNOU } from '@syncfusion/ej2-base';
 import { addClass, removeClass, Browser, isNullOrUndefined, setStyleAttribute } from '@syncfusion/ej2-base';
-import { isCollide } from '@syncfusion/ej2-popups';
+import { isCollide, Tooltip } from '@syncfusion/ej2-popups';
 import * as events from '../base/constant';
 import * as classes from '../base/classes';
 import { RenderType } from '../base/enum';
@@ -69,6 +69,8 @@ var BaseQuickToolbar = /** @class */ (function () {
         var x;
         var y;
         var imgWrapper = closest(e.target, '.e-img-caption');
+        var isAligned = (e.target.classList.contains('e-imginline') ||
+            e.target.classList.contains('e-imgbreak')) ? false : true;
         var target = !isNOU(imgWrapper) ? imgWrapper : e.target;
         addClass([this.toolbarElement], [classes.CLS_RM_WHITE_SPACE]);
         var targetOffsetTop = target.offsetTop;
@@ -82,6 +84,7 @@ var BaseQuickToolbar = /** @class */ (function () {
         else {
             y = e.y;
         }
+        target = isAligned ? e.target : target;
         if (target.offsetWidth > e.popWidth) {
             x = (target.offsetWidth / 2) - (e.popWidth / 2) + e.parentData.left + target.offsetLeft;
         }
@@ -213,6 +216,13 @@ var BaseQuickToolbar = /** @class */ (function () {
                     _this.parent.enableToolbarItem(['Undo', 'Redo']);
                 }
                 append([_this.element], document.body);
+                if (_this.parent.showTooltip) {
+                    _this.tooltip = new Tooltip({
+                        target: '#' + _this.element.id + ' [title]',
+                        showTipPointer: true
+                    });
+                    _this.tooltip.appendTo(_this.element);
+                }
                 _this.popupObj.position.X = x + 20;
                 _this.popupObj.position.Y = y + 20;
                 _this.popupObj.dataBind();
@@ -279,6 +289,16 @@ var BaseQuickToolbar = /** @class */ (function () {
         if (Browser.isDevice && !isIDevice()) {
             removeClass([this.parent.getToolbar()], [classes.CLS_HIDE]);
         }
+        if (!isNullOrUndefined(document.querySelector('.e-tooltip-wrap'))) {
+            if (!isNullOrUndefined(document.querySelector('#' + this.element.id + ' [data-tooltip-id]'))) {
+                var tooltipTargetEle = document.querySelector('#' + this.element.id + ' [data-tooltip-id]');
+                var dataContent = tooltipTargetEle.getAttribute('data-content');
+                tooltipTargetEle.removeAttribute('data-content');
+                tooltipTargetEle.setAttribute('title', dataContent);
+                tooltipTargetEle.removeAttribute('data-tooltip-id');
+            }
+            this.tooltip.destroy();
+        }
         if (!isNullOrUndefined(this.parent.getToolbar()) && !this.parent.inlineMode.enable) {
             if (isNullOrUndefined(viewSourcePanel) || viewSourcePanel.style.display === 'none') {
                 this.parent.enableToolbarItem(this.parent.toolbarSettings.items);

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

@@ -1,9 +1,9 @@
 import { RenderType } from '../base/enum';
 import { CLS_HR_SEPARATOR } from '../base/classes';
 import * as events from '../base/constant';
-import { getTooltipText, toObjectLowerCase } from '../base/util';
-import { tools, templateItems } from '../models/items';
-import { isNullOrUndefined, extend } from '@syncfusion/ej2-base';
+import { getTooltipText, isIDevice, toObjectLowerCase } from '../base/util';
+import { tools, templateItems, windowKeys } from '../models/items';
+import { isNullOrUndefined, extend, Browser } from '@syncfusion/ej2-base';
 /**
  * `Toolbar` module is used to handle Toolbar actions.
  */
@@ -107,13 +107,23 @@ var BaseToolbar = /** @class */ (function () {
                 case '-':
                     return { type: 'Separator', cssClass: CLS_HR_SEPARATOR };
                 default:
-                    return {
-                        id: this.parent.getID() + '_' + container + '_' + this.tools[itemStr.toLocaleLowerCase()].id,
-                        prefixIcon: this.tools[itemStr.toLocaleLowerCase()].icon,
-                        tooltipText: getTooltipText(itemStr, this.locator),
-                        command: this.tools[itemStr.toLocaleLowerCase()].command,
-                        subCommand: this.tools[itemStr.toLocaleLowerCase()].subCommand
-                    };
+                    if (this.parent.showTooltip) {
+                        return {
+                            id: this.parent.getID() + '_' + container + '_' + this.tools[itemStr.toLocaleLowerCase()].id,
+                            prefixIcon: this.tools[itemStr.toLocaleLowerCase()].icon,
+                            tooltipText: getTooltipText(itemStr, this.locator),
+                            command: this.tools[itemStr.toLocaleLowerCase()].command,
+                            subCommand: this.tools[itemStr.toLocaleLowerCase()].subCommand
+                        };
+                    }
+                    else {
+                        return {
+                            id: this.parent.getID() + '_' + container + '_' + this.tools[itemStr.toLocaleLowerCase()].id,
+                            prefixIcon: this.tools[itemStr.toLocaleLowerCase()].icon,
+                            command: this.tools[itemStr.toLocaleLowerCase()].command,
+                            subCommand: this.tools[itemStr.toLocaleLowerCase()].subCommand
+                        };
+                    }
             }
         }
     };
@@ -161,6 +171,19 @@ var BaseToolbar = /** @class */ (function () {
             var item = tbItems_1[_i];
             _loop_1(item);
         }
+        for (var num = 0; num < items.length; num++) {
+            var tooltipText = items[num].tooltipText;
+            var shortCutKey = void 0;
+            if (windowKeys["" + tooltipText]) {
+                shortCutKey = Browser.isDevice && isIDevice() ? windowKeys["" + tooltipText].replace('Ctrl', 'Cmd') : windowKeys["" + tooltipText];
+            }
+            else {
+                shortCutKey = tooltipText;
+            }
+            if (shortCutKey) {
+                items[num].tooltipText = (tooltipText !== shortCutKey) ? tooltipText + ' (' + shortCutKey + ')' : tooltipText;
+            }
+        }
         return items;
     };
     BaseToolbar.prototype.getToolbarOptions = function (args) {

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

@@ -47,7 +47,7 @@ var EnterKeyAction = /** @class */ (function () {
             isTableEnter = blockElement.tagName === 'TD' || blockElement.tagName === 'TBODY' ? false : true;
         }
         if (e.args.which === 13 && e.args.code === 'Enter') {
-            if (isNOU(this.startNode.closest('LI,UL,OL')) && isNOU(this.endNode.closest('LI,UL,OL')) && isTableEnter &&
+            if (isNOU(this.startNode.closest('LI, UL, OL')) && isNOU(this.endNode.closest('LI, UL, OL')) && isTableEnter &&
                 isNOU(this.startNode.closest('PRE')) && isNOU(this.endNode.closest('PRE'))) {
                 var shiftKey_1 = e.args.shiftKey;
                 var actionBeginArgs = {
@@ -117,13 +117,17 @@ var EnterKeyAction = /** @class */ (function () {
                         }
                         if (_this.range.startContainer === _this.range.endContainer &&
                             _this.range.startOffset === _this.range.endOffset && _this.range.startContainer === _this.parent.inputElement) {
-                            if (!isNOU(_this.range.startContainer.childNodes[_this.range.startOffset]) &&
-                                !isNOU(_this.range.startContainer.childNodes[_this.range.startOffset].previousElementSibling) &&
-                                _this.range.startContainer.childNodes[_this.range.startOffset].previousElementSibling.nodeName === 'TABLE') {
-                                _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();
                         }
@@ -148,7 +152,7 @@ var EnterKeyAction = /** @class */ (function () {
                                 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' && nearBlockNode.querySelectorAll('img,audio,video').length > 0)) {
+                                    && nearBlockNode.childNodes[0].nodeName === 'IMG' && nearBlockNode.querySelectorAll('img, audio, video').length > 0)) {
                                     var startNodeText = _this.range.startContainer.textContent;
                                     var splitFirstText = startNodeText.substring(0, _this.range.startOffset);
                                     // eslint-disable-next-line max-len
@@ -169,8 +173,8 @@ var EnterKeyAction = /** @class */ (function () {
                                         (_this.range.startContainer.previousSibling.nodeName === 'IMG' || _this.range.startContainer.previousSibling.nodeName === 'BR'))) {
                                     var isNearBlockLengthZero = void 0;
                                     var newElem = void 0;
-                                    if (!isNOU(_this.range.startContainer.childNodes) && _this.range.startContainer.textContent.length === 0 &&
-                                        (_this.range.startContainer.querySelectorAll('img,audio,video').length > 0 ||
+                                    if (!isNOU(_this.range.startContainer.childNodes) && _this.range.startContainer.textContent.length === 0
+                                        && (_this.range.startContainer.querySelectorAll('img, audio, video').length > 0 ||
                                             _this.range.startContainer.nodeName === 'IMG' || _this.range.startContainer.nodeName === 'TABLE')) {
                                         newElem = _this.createInsertElement(shiftKey_1);
                                         isMediaNode = true;
@@ -179,7 +183,7 @@ var EnterKeyAction = /** @class */ (function () {
                                     else {
                                         if ((nearBlockNode.textContent.trim().length !== 0 ||
                                             nearBlockNode.childNodes[0].nodeName === 'IMG' ||
-                                            (nearBlockNode.textContent.trim() === '' && nearBlockNode.querySelectorAll('img,audio,video').length > 0))) {
+                                            (nearBlockNode.textContent.trim() === '' && nearBlockNode.querySelectorAll('img, audio, video').length > 0))) {
                                             if ((_this.range.startOffset === _this.range.endOffset && _this.range.startOffset !== 0)) {
                                                 newElem = _this.parent.formatter.editorManager.nodeCutter.SplitNode(_this.range, nearBlockNode, false).cloneNode(true);
                                             }
@@ -346,11 +350,13 @@ var EnterKeyAction = /** @class */ (function () {
                             }
                             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 ||
-                                    (currentParent.textContent.trim().length === 0 && currentParent.lastChild.nodeName === 'IMG'))) {
+                                    (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);
@@ -359,10 +365,11 @@ 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 &&
-                                        currentParent.lastChild && currentParent.lastChild.nodeName === 'IMG') {
-                                        currentParentLastChild.parentElement.insertBefore(focusBRElem, currentParentLastChild);
-                                        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');

package/src/rich-text-editor/actions/format-painter.d.ts

@@ -0,0 +1,24 @@
+import { IRichTextEditor } from '../base/interface';
+export declare class FormatPainter {
+    private parent;
+    private isSticky;
+    private isActive;
+    previousAction: string;
+    constructor(parent?: IRichTextEditor);
+    private addEventListener;
+    private toolbarClick;
+    private toolbarDoubleClick;
+    private onKeyDown;
+    private actionHandler;
+    private updateCursor;
+    private updateToolbarBtn;
+    private editAreaClick;
+    destroy(): void;
+    /**
+     * For internal use only - Get the module name.
+     *
+     * @returns {void}
+     * @hidden
+     */
+    private getModuleName;
+}