@syncfusion/ej2-richtexteditor 23.2.7-52849 → 24.1.41-569421

package/src/rich-text-editor/renderer/toolbar-renderer.d.ts

@@ -17,12 +17,11 @@ export declare class ToolbarRenderer implements IRenderer {
      * @private
      */
     parent: IRichTextEditor;
-    private popupContainer;
     private currentElement;
     private currentDropdown;
-    private popupOverlay;
     private tooltip;
     private l10n;
+    private tooltipTargetEle;
     /**
      * Constructor for toolbar renderer module
      *
@@ -41,7 +40,6 @@ export declare class ToolbarRenderer implements IRenderer {
     private tooltipBeforeRender;
     private dropDownOpen;
     private dropDownClose;
-    private removePopupContainer;
     /**
      * renderToolbar method
      *
@@ -60,6 +58,8 @@ export declare class ToolbarRenderer implements IRenderer {
      * @deprecated
      */
     renderDropDownButton(args: IDropDownModel): DropDownButton;
+    private mouseOutHandler;
+    private closeTooltip;
     /**
      * renderListDropDown method
      *
@@ -69,8 +69,6 @@ export declare class ToolbarRenderer implements IRenderer {
      * @deprecated
      */
     renderListDropDown(args: IDropDownModel): DropDownButton;
-    private onPopupOverlay;
-    private setIsModel;
     private paletteSelection;
     /**
      * renderColorPickerDropDown method
@@ -85,7 +83,6 @@ export declare class ToolbarRenderer implements IRenderer {
      */
     renderColorPickerDropDown(args: IColorPickerModel, item: string, colorPicker: ColorPicker, defaultColor: string): DropDownButton;
     private pickerRefresh;
-    private popupModal;
     private setColorPickerContentWidth;
     /**
      * renderColorPicker method

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

@@ -1,5 +1,5 @@
-import { addClass, Browser, removeClass, EventHandler, formatUnit, isNullOrUndefined, isNullOrUndefined as isNOU } from '@syncfusion/ej2-base';
-import { getInstance, closest, selectAll, detach } from '@syncfusion/ej2-base';
+import { addClass, Browser, removeClass, formatUnit, isNullOrUndefined, isNullOrUndefined as isNOU, EventHandler } from '@syncfusion/ej2-base';
+import { getInstance, closest, selectAll } from '@syncfusion/ej2-base';
 import { Toolbar } from '@syncfusion/ej2-navigations';
 import { DropDownButton } from '@syncfusion/ej2-splitbuttons';
 import { Popup, Tooltip } from '@syncfusion/ej2-popups';
@@ -8,6 +8,7 @@ import * as events from '../base/constant';
 import { CLS_TOOLBAR, CLS_DROPDOWN_BTN, CLS_RTE_ELEMENTS, CLS_TB_BTN, CLS_INLINE_DROPDOWN, CLS_COLOR_CONTENT, CLS_FONT_COLOR_DROPDOWN, CLS_BACKGROUND_COLOR_DROPDOWN, CLS_COLOR_PALETTE, CLS_FONT_COLOR_PICKER, CLS_BACKGROUND_COLOR_PICKER, CLS_CUSTOM_TILE, CLS_NOCOLOR_ITEM, CLS_BULLETFORMATLIST_TB_BTN, CLS_NUMBERFORMATLIST_TB_BTN, CLS_LIST_PRIMARY_CONTENT } from '../base/classes';
 import { ColorPicker } from '@syncfusion/ej2-inputs';
 import { hasClass } from '../base/util';
+import { ToolbarStatus } from '../../editor-manager/plugin/toolbar-status';
 /**
  * `Toolbar renderer` module is used to render toolbar in RichTextEditor.
  *
@@ -30,21 +31,22 @@ var ToolbarRenderer = /** @class */ (function () {
     }
     ToolbarRenderer.prototype.wireEvent = function () {
         this.parent.on(events.destroy, this.unWireEvent, this);
-        this.parent.on(events.maximizeMinimizeClick, this.destroyTooltip, this);
+        this.parent.on(events.destroyTooltip, this.destroyTooltip, this);
+        this.parent.on(events.closeTooltip, this.closeTooltip, this);
     };
     ToolbarRenderer.prototype.destroyTooltip = function () {
-        if (!isNullOrUndefined(document.querySelector('.e-tooltip-wrap')) && !isNullOrUndefined(document.querySelector(' [data-tooltip-id]'))) {
-            var tooltipTargetEle = this.parent.element.querySelector('[data-tooltip-id]');
+        var currentDocument = this.parent.iframeSettings.enable ? this.parent.contentModule.getPanel().ownerDocument :
+            this.parent.contentModule.getDocument();
+        if (!isNullOrUndefined(currentDocument.querySelector('.e-tooltip-wrap')) && !isNullOrUndefined(currentDocument.querySelector('[data-tooltip-id]'))) {
+            var tooltipTargetEle = currentDocument.querySelector('[data-tooltip-id]');
             var event_1 = new MouseEvent('mouseleave', { bubbles: true, cancelable: true });
             tooltipTargetEle.dispatchEvent(event_1);
         }
     };
     ToolbarRenderer.prototype.unWireEvent = function () {
         this.parent.off(events.destroy, this.unWireEvent);
-        if (this.popupOverlay) {
-            EventHandler.remove(this.popupOverlay, 'click touchmove', this.onPopupOverlay);
-        }
-        this.removePopupContainer();
+        this.parent.off(events.destroyTooltip, this.destroyTooltip);
+        this.parent.off(events.closeTooltip, this.closeTooltip);
     };
     ToolbarRenderer.prototype.toolbarBeforeCreate = function (e) {
         if (this.mode === 'Extended') {
@@ -64,8 +66,8 @@ var ToolbarRenderer = /** @class */ (function () {
         }
     };
     ToolbarRenderer.prototype.dropDownSelected = function (args) {
-        this.parent.notify(events.dropDownSelect, args);
-        this.onPopupOverlay();
+        this.parent.notify(events.dropDownSelect, { element: args.element, item: args.item, originalEvent: args.event });
+        this.destroyTooltip();
     };
     ToolbarRenderer.prototype.beforeDropDownItemRender = function (args) {
         if (this.parent.readonly || !this.parent.enabled) {
@@ -88,41 +90,36 @@ var ToolbarRenderer = /** @class */ (function () {
                     break;
             }
         }
+        if (args.target.querySelector('.e-active')) {
+            args.cancel = true;
+        }
     };
     ToolbarRenderer.prototype.dropDownOpen = function (args) {
         if (args.element.parentElement.getAttribute('id').indexOf('TableCell') > -1 && !isNOU(args.element.parentElement.querySelector('.e-cell-merge')) &&
             (!isNOU(args.element.parentElement.querySelector('.e-cell-horizontal-split')) || !isNOU(args.element.parentElement.querySelector('.e-cell-vertical-split')))) {
             var listEle = args.element.querySelectorAll('li');
-            if (this.parent.inputElement.querySelectorAll('.e-cell-select').length === 1) {
+            var selectedEles_1 = this.parent.inputElement.querySelectorAll('.e-cell-select');
+            if (selectedEles_1.length === 1) {
                 addClass([listEle[0]], 'e-disabled');
                 removeClass([listEle[1], listEle[2]], 'e-disabled');
             }
-            else if (this.parent.inputElement.querySelectorAll('.e-cell-select').length > 1) {
-                removeClass([listEle[0]], 'e-disabled');
+            else if (selectedEles_1.length > 1) {
+                if (!Array.from(selectedEles_1).every(function (element) {
+                    return element.tagName.toLowerCase() === selectedEles_1[0].tagName.toLowerCase();
+                })) {
+                    addClass([listEle[0]], 'e-disabled');
+                }
+                else {
+                    removeClass([listEle[0]], 'e-disabled');
+                }
                 addClass([listEle[1], listEle[2]], 'e-disabled');
             }
         }
-        if (Browser.isDevice && !args.element.parentElement.classList.contains(classes.CLS_QUICK_DROPDOWN)) {
-            this.popupModal(args.element.parentElement);
-        }
         this.parent.notify(events.selectionSave, args);
     };
     ToolbarRenderer.prototype.dropDownClose = function (args) {
-        this.removePopupContainer();
         this.parent.notify(events.selectionRestore, args);
     };
-    ToolbarRenderer.prototype.removePopupContainer = function () {
-        if (Browser.isDevice && !isNullOrUndefined(this.popupContainer)) {
-            var popupEle = this.popupContainer.querySelector('.e-dropdown-popup.e-tbar-btn.e-control');
-            if (popupEle) {
-                this.popupContainer.parentNode.insertBefore(popupEle, this.popupContainer.nextSibling);
-                popupEle.style.removeProperty('position');
-                removeClass([popupEle], 'e-popup-modal');
-            }
-            detach(this.popupContainer);
-            this.popupContainer = undefined;
-        }
-    };
     /**
      * renderToolbar method
      *
@@ -156,11 +153,11 @@ var ToolbarRenderer = /** @class */ (function () {
                 openDelay: 400,
                 opensOn: 'Hover',
                 beforeRender: this.tooltipBeforeRender.bind(this),
-                cssClass: this.parent.cssClass,
+                cssClass: this.parent.getCssClass(),
                 windowCollision: true,
                 position: 'BottomCenter'
             });
-            this.tooltip.appendTo(args.target);
+            this.tooltip.appendTo(args.target.parentElement);
         }
     };
     /**
@@ -216,7 +213,7 @@ var ToolbarRenderer = /** @class */ (function () {
                     }
                     //Alignments preselect
                     var alignEle = proxy.parent.getRange().startContainer;
-                    while (alignEle !== proxy.parent.element.querySelector('.e-content') && !isNOU(alignEle.parentElement)) {
+                    while (alignEle !== proxy.parent.inputElement && !isNOU(alignEle.parentElement)) {
                         if (alignEle.nodeName === '#text') {
                             alignEle = alignEle.parentElement;
                         }
@@ -242,7 +239,8 @@ var ToolbarRenderer = /** @class */ (function () {
                         alignEle = alignEle.parentElement;
                     }
                     //image preselect
-                    var imageEle = startNode.closest('img') ? startNode.closest('img') : startNode.querySelector('img');
+                    var closestNode = startNode.closest('img');
+                    var imageEle = closestNode ? closestNode : startNode.querySelector('img');
                     if (args.items[0].command === 'Images') {
                         if (!isNOU(imageEle)) {
                             var index = void 0;
@@ -261,12 +259,23 @@ var ToolbarRenderer = /** @class */ (function () {
                         }
                     }
                     //Formats preselect
-                    if (args.items[0].command === 'Formats') {
+                    if (args.items[0].command === 'Formats' || args.items[0].command === 'Font') {
+                        var fontName_1 = [];
+                        var formats_1 = [];
+                        _this.parent.format.types.forEach(function (item) {
+                            formats_1.push(item.value.toLocaleLowerCase());
+                        });
+                        _this.parent.fontFamily.items.forEach(function (item) {
+                            fontName_1.push(item.value);
+                        });
+                        var toolbarStatus = ToolbarStatus.get(_this.parent.contentModule.getDocument(), _this.parent.contentModule.getEditPanel(), formats_1, null, fontName_1);
                         for (var index = 0; index < args.element.childNodes.length; index++) {
                             var divNode = _this.parent.createElement('div');
                             divNode.innerHTML = dropDown.content.trim();
-                            if (divNode.textContent.trim() !== ''
-                                && args.element.childNodes[index].textContent.trim() === divNode.textContent.trim()) {
+                            if ((divNode.textContent.trim() !== ''
+                                && args.element.childNodes[index].textContent.trim() === divNode.textContent.trim()) ||
+                                ((args.items[0].command === 'Formats' && !isNOU(toolbarStatus.formats) && _this.parent.format.types[index].value.toLowerCase() === toolbarStatus.formats.toLowerCase() && args.element.childNodes[index].classList.contains(_this.parent.format.types[index].cssClass))
+                                    || (args.items[0].command === 'Font' && !isNOU(toolbarStatus.fontname) && _this.parent.fontFamily.items[index].value.toLowerCase() === toolbarStatus.fontname.toLowerCase() && args.element.childNodes[index].classList.contains(_this.parent.fontFamily.items[index].cssClass)))) {
                                 if (!args.element.childNodes[index].classList.contains('e-active')) {
                                     addClass([args.element.childNodes[index]], 'e-active');
                                 }
@@ -291,6 +300,32 @@ var ToolbarRenderer = /** @class */ (function () {
         popupElement.setAttribute('aria-owns', this.parent.getID());
         return dropDown;
     };
+    ToolbarRenderer.prototype.mouseOutHandler = function () {
+        if (!isNOU(this.tooltipTargetEle)) {
+            this.tooltipTargetEle.setAttribute('title', this.tooltipTargetEle.getAttribute('data-title'));
+        }
+        else {
+            var currentDocument = this.parent.iframeSettings.enable ? this.parent.contentModule.getPanel().ownerDocument :
+                this.parent.contentModule.getDocument();
+            this.tooltipTargetEle = currentDocument.querySelector('[data-title]');
+            this.tooltipTargetEle.setAttribute('title', this.tooltipTargetEle.getAttribute('data-title'));
+        }
+        this.tooltipTargetEle.removeAttribute('data-title');
+        EventHandler.remove(this.tooltipTargetEle, 'mouseout', this.mouseOutHandler);
+    };
+    ToolbarRenderer.prototype.closeTooltip = function (args) {
+        var currentDocument = this.parent.iframeSettings.enable ? this.parent.contentModule.getPanel().ownerDocument :
+            this.parent.contentModule.getDocument();
+        this.tooltipTargetEle = closest(args.target, '[data-tooltip-id]');
+        if (!isNOU(this.tooltipTargetEle) && this.parent.showTooltip && !isNOU(currentDocument.querySelector('.e-tooltip-wrap'))) {
+            this.destroyTooltip();
+            if (!this.tooltipTargetEle.closest('.e-rte-quick-popup')) {
+                this.tooltipTargetEle.setAttribute('data-title', this.tooltipTargetEle.getAttribute('title'));
+                this.tooltipTargetEle.removeAttribute('title');
+                EventHandler.add(this.tooltipTargetEle, 'mouseout', this.mouseOutHandler, this);
+            }
+        }
+    };
     /**
      * renderListDropDown method
      *
@@ -300,6 +335,7 @@ var ToolbarRenderer = /** @class */ (function () {
      * @deprecated
      */
     ToolbarRenderer.prototype.renderListDropDown = function (args) {
+        var _this = this;
         // eslint-disable-next-line
         var proxy = this;
         var css = CLS_RTE_ELEMENTS + ' ' + CLS_TB_BTN + ((this.parent.inlineMode) ? (' ' + CLS_INLINE_DROPDOWN) : '');
@@ -315,6 +351,37 @@ var ToolbarRenderer = /** @class */ (function () {
             enableRtl: this.parent.enableRtl,
             select: this.dropDownSelected.bind(this),
             beforeOpen: function (args) {
+                if (proxy.parent.editorMode !== 'Markdown') {
+                    var startNode = proxy.parent.getRange().startContainer.parentElement;
+                    var listElem = startNode.closest('LI');
+                    var currentLiElem = !isNOU(listElem) ? listElem.parentElement : null;
+                    if (!isNOU(currentLiElem) && (currentLiElem.nodeName === 'OL' || currentLiElem.nodeName === 'UL')) {
+                        if (currentLiElem.nodeName === 'UL' && args.items[0].subCommand === 'NumberFormatList') {
+                            addClass([args.element.childNodes[0]], 'e-active');
+                        }
+                        else if (currentLiElem.nodeName === 'OL' && args.items[0].subCommand === 'BulletFormatList') {
+                            addClass([args.element.childNodes[0]], 'e-active');
+                        }
+                        else {
+                            var currentListStyle = currentLiElem.style.listStyleType.split('-').join('').toLocaleLowerCase();
+                            currentListStyle = currentListStyle === 'decimal' ? 'number' : currentListStyle;
+                            for (var index = 0; index < args.element.childNodes.length; index++) {
+                                if (currentListStyle === args.element.childNodes[index].innerHTML.split(' ').join('').toLocaleLowerCase()) {
+                                    addClass([args.element.childNodes[index]], 'e-active');
+                                    break;
+                                }
+                                else if (currentListStyle === '' && args.element.childNodes[index].innerHTML !== 'None') {
+                                    addClass([args.element.childNodes[index]], 'e-active');
+                                    break;
+                                }
+                            }
+                        }
+                    }
+                    else {
+                        addClass([args.element.childNodes[0]], 'e-active');
+                    }
+                }
+                _this.closeTooltip({ target: args.event.target });
                 if (proxy.parent.readonly || !proxy.parent.enabled) {
                     args.cancel = true;
                     return;
@@ -354,39 +421,6 @@ var ToolbarRenderer = /** @class */ (function () {
         };
         return dropDown;
     };
-    // eslint-disable-next-line
-    ToolbarRenderer.prototype.onPopupOverlay = function (args) {
-        if (!isNullOrUndefined(this.popupOverlay)) {
-            closest(this.popupOverlay, '.e-popup-container').style.display = 'none';
-            this.popupOverlay.style.display = 'none';
-            removeClass([this.popupOverlay], 'e-popup-overlay');
-        }
-    };
-    ToolbarRenderer.prototype.setIsModel = function (element) {
-        if (!closest(element, '.e-popup-container')) {
-            this.popupContainer = this.parent.createElement('div', {
-                className: 'e-rte-modal-popup e-popup-container e-center'
-            });
-            element.parentNode.insertBefore(this.popupContainer, element);
-            this.popupContainer.appendChild(element);
-            this.popupContainer.style.zIndex = element.style.zIndex;
-            this.popupContainer.style.display = 'flex';
-            element.style.position = 'relative';
-            addClass([element], 'e-popup-modal');
-            this.popupOverlay = this.parent.createElement('div', { className: 'e-popup-overlay' });
-            // eslint-disable-next-line
-            this.popupOverlay.style.zIndex = (parseInt(element.style.zIndex, null) - 1).toString();
-            this.popupOverlay.style.display = 'block';
-            this.popupContainer.appendChild(this.popupOverlay);
-            EventHandler.add(this.popupOverlay, 'click touchmove', this.onPopupOverlay, this);
-        }
-        else {
-            element.parentElement.style.display = 'flex';
-            this.popupOverlay = element.nextElementSibling;
-            this.popupOverlay.style.display = 'block';
-            addClass([this.popupOverlay], 'e-popup-overlay');
-        }
-    };
     ToolbarRenderer.prototype.paletteSelection = function (dropDownArgs, currentElement) {
         var ele = dropDownArgs.element.querySelector('.e-control.e-colorpicker');
         var colorbox = [].slice.call(selectAll('.e-tile', ele.parentElement));
@@ -415,7 +449,7 @@ var ToolbarRenderer = /** @class */ (function () {
         var proxy = this;
         var css = CLS_RTE_ELEMENTS + ' ' + CLS_TB_BTN + ((this.parent.inlineMode) ? (' ' + CLS_INLINE_DROPDOWN) : '');
         css += (' ' + ((item === 'backgroundcolor') ? CLS_BACKGROUND_COLOR_DROPDOWN : CLS_FONT_COLOR_DROPDOWN));
-        css += ' ' + this.parent.cssClass;
+        css += this.parent.getCssClass(true);
         var content = proxy.parent.createElement('span', { className: CLS_COLOR_CONTENT });
         var inlineEle = proxy.parent.createElement('span', { className: args.cssClass });
         var range;
@@ -487,9 +521,6 @@ var ToolbarRenderer = /** @class */ (function () {
                 if (focusEle) {
                     focusEle.focus();
                 }
-                if (Browser.isDevice) {
-                    _this.popupModal(dropDownArgs.element.parentElement);
-                }
                 _this.pickerRefresh(dropDownArgs);
             },
             beforeClose: function (dropDownArgs) {
@@ -517,22 +548,6 @@ var ToolbarRenderer = /** @class */ (function () {
             },
             close: function (dropDownArgs) {
                 proxy.parent.notify(events.selectionRestore, {});
-                var dropElement = closest(dropDownArgs.element.parentElement, '.e-popup-container');
-                if (dropElement) {
-                    dropElement.style.display = 'none';
-                    dropElement.lastElementChild.style.display = 'none';
-                    removeClass([dropElement.lastElementChild], 'e-popup-overlay');
-                }
-                if (Browser.isDevice && !isNullOrUndefined(dropElement)) {
-                    var popupEle = dropElement.querySelector('.e-dropdown-popup.e-tbar-btn.e-control');
-                    if (popupEle) {
-                        dropElement.parentNode.insertBefore(popupEle, dropElement.nextSibling);
-                        popupEle.style.removeProperty('position');
-                        removeClass([popupEle], 'e-popup-modal');
-                    }
-                    detach(dropElement);
-                    proxy.popupContainer = undefined;
-                }
             }
         });
         dropDown.isStringTemplate = true;
@@ -560,16 +575,6 @@ var ToolbarRenderer = /** @class */ (function () {
             popupElem.style.width = (popupElem.offsetWidth - 5).toString() + 'px';
         }
     };
-    ToolbarRenderer.prototype.popupModal = function (element) {
-        var popupInst = getInstance(element, Popup);
-        popupInst.relateTo = document.body;
-        popupInst.position = { X: 0, Y: 0 };
-        popupInst.targetType = 'container';
-        popupInst.collision = { X: 'fit', Y: 'fit' };
-        popupInst.offsetY = 4;
-        popupInst.dataBind();
-        this.setIsModel(element);
-    };
     ToolbarRenderer.prototype.setColorPickerContentWidth = function (colorPicker) {
         var colorPickerContent = colorPicker.element.nextSibling;
         if (colorPickerContent.style.width === '0px') {
@@ -608,7 +613,7 @@ var ToolbarRenderer = /** @class */ (function () {
                 args.element.classList.add(CLS_COLOR_PALETTE);
                 args.element.classList.add(CLS_CUSTOM_TILE);
                 if (!isNullOrUndefined(_this.parent.cssClass)) {
-                    var allClassName = _this.parent.cssClass.split(' ');
+                    var allClassName = _this.parent.getCssClass().split(' ');
                     for (var i = 0; i < allClassName.length; i++) {
                         if (allClassName[i].trim() !== '') {
                             args.element.classList.add(allClassName[i]);

package/src/rich-text-editor/renderer/video-module.d.ts

@@ -23,6 +23,7 @@ export declare class Video {
     private isAllowedTypes;
     private pageX;
     private pageY;
+    private mouseX;
     private dialogRenderObj;
     private deletedVid;
     private changedWidthValue;
@@ -51,6 +52,7 @@ export declare class Video {
     private vidResizePos;
     private calcPos;
     private setAspectRatio;
+    private updateVidEleWidth;
     private pixToPerc;
     private vidDupMouseMove;
     private resizing;
@@ -59,6 +61,7 @@ export declare class Video {
     private resizeBtnInit;
     private onToolbarAction;
     private onKeyDown;
+    private handleSelectAll;
     private openDialog;
     private showDialog;
     private closeDialog;