@syncfusion/ej2-richtexteditor 23.1.40 → 23.1.43

package/dist/global/index.d.ts

@@ -1,6 +1,6 @@
 /*!
 *  filename: index.d.ts
-*  version : 23.1.40
+*  version : 23.1.43
 *  Copyright Syncfusion Inc. 2001 - 2023. 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@23.1.39",
+  "_id": "@syncfusion/ej2-richtexteditor@23.1.41",
   "_inBundle": false,
-  "_integrity": "sha512-V6HvyVC8YYc6eSNz2M5jIO8qngm8IPaoMoSlPX+k2yj4b32y7X1jed6kwH+alM9z7Ze1A/AKIZTKHzhMPpMlyQ==",
+  "_integrity": "sha512-CIPlpeV1ZJSthFtQHaNVAdANuI0M5aDYUT/Ar7obSF9TC4jwgwVIY0UdZ6KZC/dXzsAqRq1q7+QE8F5OzjvG7A==",
   "_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-hotfix-new/@syncfusion/ej2-richtexteditor/-/ej2-richtexteditor-23.1.39.tgz",
-  "_shasum": "cc5669f0dd4098e1c15fe63e0cd31cded1e50be3",
+  "_resolved": "https://nexus.syncfusion.com/repository/ej2-hotfix-new/@syncfusion/ej2-richtexteditor/-/ej2-richtexteditor-23.1.41.tgz",
+  "_shasum": "a9c6e53775552699f2528d6f4cf619a806d4660e",
   "_spec": "@syncfusion/ej2-richtexteditor@*",
   "_where": "/jenkins/workspace/elease-automation_release_23.1.1/packages/included",
   "author": {
@@ -38,13 +38,13 @@
   },
   "bundleDependencies": false,
   "dependencies": {
-    "@syncfusion/ej2-base": "~23.1.38",
-    "@syncfusion/ej2-buttons": "~23.1.39",
-    "@syncfusion/ej2-filemanager": "~23.1.40",
-    "@syncfusion/ej2-inputs": "~23.1.40",
-    "@syncfusion/ej2-navigations": "~23.1.40",
-    "@syncfusion/ej2-popups": "~23.1.38",
-    "@syncfusion/ej2-splitbuttons": "~23.1.36"
+    "@syncfusion/ej2-base": "~23.1.41",
+    "@syncfusion/ej2-buttons": "~23.1.43",
+    "@syncfusion/ej2-filemanager": "~23.1.43",
+    "@syncfusion/ej2-inputs": "~23.1.43",
+    "@syncfusion/ej2-navigations": "~23.1.43",
+    "@syncfusion/ej2-popups": "~23.1.43",
+    "@syncfusion/ej2-splitbuttons": "~23.1.43"
   },
   "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": "23.1.40",
+  "version": "23.1.43",
   "sideEffects": false
 }

package/src/editor-manager/plugin/emoji-picker-action.js

@@ -10,7 +10,7 @@ var EmojiPickerAction = /** @class */ (function () {
     };
     EmojiPickerAction.prototype.emojiInsert = function (args) {
         var node = document.createTextNode(args.value);
-        var selection = window.getSelection();
+        var selection = this.parent.currentDocument.getSelection();
         var range = selection.getRangeAt(0);
         var cursorPos = range.startOffset;
         for (var i = cursorPos - 1; i >= cursorPos - 15; i--) {

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

@@ -319,10 +319,15 @@ var FormatPainterActions = /** @class */ (function () {
         return this.INVALID_TAGS.indexOf(node.tagName) > -1;
     };
     FormatPainterActions.prototype.findCurrentContext = function (parentElem) {
-        if (closest(parentElem, 'p')) {
+        var closestParagraph = closest(parentElem, 'p');
+        var closestList = closest(parentElem, 'li');
+        if (closestParagraph && !closestList) {
             return 'Text';
         }
         else if (closest(parentElem, 'li')) {
+            if (!isNOU(closestParagraph) && !isNOU(closestList) && closestParagraph.textContent.trim() !== closestList.textContent.trim()) {
+                return 'Text';
+            }
             return 'List';
         }
         else if (closest(parentElem, 'td') || closest(parentElem, 'tr') || closest(parentElem, 'th')) {
@@ -380,7 +385,7 @@ var FormatPainterActions = /** @class */ (function () {
         var cloneElementNode = isNOU(cloneListParentNode) ? element : element.firstChild;
         for (var index = 0; index < nodes.length; index++) {
             if (this.INVALID_TAGS.indexOf(nodes[index].nodeName) > -1 ||
-                nodes[index].querySelectorAll('a,img,audio,video,iframe').length > 0) {
+                nodes[index].querySelectorAll('img,audio,video,iframe').length > 0) {
                 continue;
             }
             var cloneParentNode = cloneElementNode.cloneNode(false);

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

@@ -344,6 +344,11 @@ var InsertHtml = /** @class */ (function () {
             : lastSelectionNode.previousSibling) : lastSelectionNode;
         while (!isNOU(lastSelectionNode) && lastSelectionNode.nodeName !== '#text' && lastSelectionNode.nodeName !== 'IMG' &&
             lastSelectionNode.nodeName !== 'BR' && lastSelectionNode.nodeName !== 'HR') {
+            if (!isNOU(lastSelectionNode.lastChild) && (lastSelectionNode.lastChild.nodeName === 'P' &&
+                lastSelectionNode.lastChild.innerHTML === '')) {
+                var lineBreak = createElement('br');
+                lastSelectionNode.lastChild.appendChild(lineBreak);
+            }
             lastSelectionNode = lastSelectionNode.lastChild;
         }
         lastSelectionNode = isNOU(lastSelectionNode) ? node : lastSelectionNode;

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

@@ -275,7 +275,7 @@ var LinkCommand = /** @class */ (function () {
             for (var i = 0; i < blockNodes.length; i++) {
                 var linkNode = blockNodes[i].querySelectorAll('a');
                 for (var j = 0; j < linkNode.length; j++) {
-                    if (document.getSelection().containsNode(linkNode[j], true)) {
+                    if (this.parent.currentDocument.getSelection().containsNode(linkNode[j], true)) {
                         linkNode[j].outerHTML = linkNode[j].innerHTML;
                     }
                 }

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

@@ -307,8 +307,10 @@ var MsWordPaste = /** @class */ (function () {
                     else {
                         continue;
                     }
-                    isCroppedImage = this.extractCropValue('cropl', fullImg[i]) > 0 &&
-                        this.extractCropValue('cropt', fullImg[i]) > 0 ? true : false;
+                    isCroppedImage = ((this.extractCropValue('cropl', fullImg[i]) > 0 &&
+                        this.extractCropValue('cropt', fullImg[i]) > 0) ||
+                        this.extractCropValue('cropr', fullImg[i]) > 0 ||
+                        this.extractCropValue('cropb', fullImg[i])) ? true : false;
                     if (isCroppedImage) {
                         goalWidth = this.extractCropValue('wgoal', fullImg[i]);
                         goalHeight = this.extractCropValue('hgoal', fullImg[i]);
@@ -335,7 +337,7 @@ var MsWordPaste = /** @class */ (function () {
     };
     MsWordPaste.prototype.extractCropValue = function (crop, rtfData) {
         // eslint-disable-next-line security/detect-non-literal-regexp
-        var result = new RegExp('\\\\pic' + crop + '(\\-?\\d+)\\\\').exec(rtfData.replace('\r\n\\', '\\'))[1];
+        var result = new RegExp('\\\\pic' + crop + '(\\-?\\d+)\\\\').exec(rtfData.replace(/\r\n\\/g, '\\').replace(/\n/g, '\\'))[1];
         return parseInt(result, 10);
     };
     MsWordPaste.prototype.removeClassName = function (elm) {
@@ -374,6 +376,10 @@ var MsWordPaste = /** @class */ (function () {
         return removableElement;
     };
     MsWordPaste.prototype.removeUnwantedElements = function (elm) {
+        var styleElm = elm.querySelector('style');
+        if (!isNOU(styleElm)) {
+            detach(styleElm);
+        }
         var innerElement = elm.innerHTML;
         for (var i = 0; i < this.removableElements.length; i++) {
             // eslint-disable-next-line security/detect-non-literal-regexp
@@ -671,10 +677,8 @@ var MsWordPaste = /** @class */ (function () {
                 }
                 if (!isNOU(listNodes[i].getAttribute('style'))) {
                     listNodes[i].setAttribute('style', listNodes[i].getAttribute('style').replace('text-align:start;', ''));
-                    if (listNodes[i].style.textAlign !== '') {
-                        listNodes[i].setAttribute('style', 'text-align:' + listNodes[i].style.textAlign);
-                        currentListStyle = listNodes[i].getAttribute('style');
-                    }
+                    listNodes[i].style.textIndent = '';
+                    currentListStyle = listNodes[i].getAttribute('style');
                 }
                 collection.push({
                     listType: type, content: tempNode, nestedLevel: level, class: currentClassName,
@@ -882,8 +886,7 @@ var MsWordPaste = /** @class */ (function () {
                 }
             }
             prevList.setAttribute('class', collection[index].class);
-            var currentStyle = prevList.getAttribute('style');
-            prevList.setAttribute('style', (!isNOU(currentStyle) ? currentStyle : ''));
+            prevList.setAttribute('style', (!isNOU(collection[index].listStyle) ? collection[index].listStyle : ''));
             pLevel = collection[index].nestedLevel;
             listCount++;
             if (!isNOU(collection[index].start)) {

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

@@ -49,7 +49,7 @@ var NodeCutter = /** @class */ (function () {
                 node = parent_1.childNodes[index];
                 fragment = this.spliceEmptyNode(fragment, false);
                 if (fragment && fragment.childNodes.length > 0) {
-                    var isEmpty = (fragment.childNodes.length === 1 && fragment.childNodes[0].nodeName !== 'IMG'
+                    var isEmpty = (fragment.childNodes.length === 1 && fragment.childNodes[0].nodeName !== 'IMG' && !(fragment.querySelectorAll('img').length > 0)
                         && this.isRteElm(fragment) && fragment.textContent === '') ? true : false;
                     if (!isEmpty) {
                         if (node) {

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

@@ -86,7 +86,7 @@ var EmojiPicker = /** @class */ (function () {
         }
         else if (isNOU(args.x) && isNOU(args.y) && !this.parent.inlineMode.enable && isNOU(this.parent.quickToolbarSettings.text)) {
             target = this.parent.inputElement;
-            if (window.getSelection().rangeCount > 0) {
+            if (this.parent.contentModule.getDocument().getSelection().rangeCount > 0) {
                 var coordinates = this.getCoordinates();
                 xValue = coordinates.left;
                 yValue = coordinates.top;
@@ -94,7 +94,7 @@ var EmojiPicker = /** @class */ (function () {
         }
         else if (isNOU(args.x) && isNOU(args.y) && (this.parent.inlineMode.enable || !isNOU(this.parent.quickToolbarSettings.text))) {
             this.parent.notify(events.hidePopup, {});
-            if (window.getSelection().rangeCount > 0) {
+            if (this.parent.contentModule.getDocument().getSelection().rangeCount > 0) {
                 var coordinates = this.getCoordinates();
                 xValue = coordinates.left;
                 yValue = coordinates.top;
@@ -683,7 +683,7 @@ var EmojiPicker = /** @class */ (function () {
     };
     EmojiPicker.prototype.onkeyPress = function (e) {
         var originalEvent = e.args;
-        var selection = window.getSelection();
+        var selection = this.parent.contentModule.getDocument().getSelection();
         if (selection.rangeCount <= 0) {
             return;
         }
@@ -713,7 +713,10 @@ var EmojiPicker = /** @class */ (function () {
     };
     EmojiPicker.prototype.onkeyUp = function (e) {
         var originalEvent = e.args;
-        var selection = window.getSelection();
+        var selection = this.parent.contentModule.getDocument().getSelection();
+        if (selection.rangeCount <= 0) {
+            return;
+        }
         var range = selection.getRangeAt(0);
         var cursorPos = range.startOffset;
         // eslint-disable-next-line
@@ -736,7 +739,7 @@ var EmojiPicker = /** @class */ (function () {
     };
     EmojiPicker.prototype.getCoordinates = function () {
         var coordinates;
-        var selection = window.getSelection();
+        var selection = this.parent.contentModule.getDocument().getSelection();
         var range = selection.getRangeAt(0);
         var firstChild;
         if (range.startContainer.nodeName === 'P' || range.startContainer.nodeName === 'DIV') {

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

@@ -236,7 +236,7 @@ var EnterKeyAction = /** @class */ (function () {
                                     }
                                     _this.parent.formatter.editorManager.nodeSelection.setCursorPoint(_this.parent.contentModule.getDocument(), insertElem.nextElementSibling, 0);
                                 }
-                                else if (nearBlockNode.textContent.length === 0 && !(!isNOU(nearBlockNode.childNodes[0]) && nearBlockNode.childNodes[0].nodeName === 'IMG')) {
+                                else if (nearBlockNode.textContent.length === 0 && !(!isNOU(nearBlockNode.childNodes[0]) && nearBlockNode.childNodes[0].nodeName === 'IMG') && !(nearBlockNode.querySelectorAll('img').length > 0)) {
                                     if (!isNOU(nearBlockNode.children[0]) && nearBlockNode.children[0].tagName !== 'BR') {
                                         var newElem = _this.parent.formatter.editorManager.nodeCutter.SplitNode(_this.range, nearBlockNode, false).cloneNode(true);
                                         _this.parent.formatter.editorManager.domNode.insertAfter(newElem, nearBlockNode);

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

@@ -151,7 +151,7 @@ var HtmlEditor = /** @class */ (function () {
                             detach(currentChildNode[i]);
                             i--;
                         }
-                        if (focusNode.textContent.replace(regEx, '') === currentChildNode[i].textContent) {
+                        if (!isNOU(currentChildNode[i]) && focusNode.textContent.replace(regEx, '') === currentChildNode[i].textContent) {
                             pointer = focusNode.textContent.length > 1 ?
                                 (focusNode.textContent === currentChildNode[i].textContent ? pointer :
                                     pointer - (focusNode.textContent.length - focusNode.textContent.replace(regEx, '').length)) :

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

@@ -16,6 +16,7 @@ import { ToolbarAction } from './toolbar-action';
  */
 var Toolbar = /** @class */ (function () {
     function Toolbar(parent, serviceLocator) {
+        this.tools = {};
         this.parent = parent;
         this.isToolbar = false;
         this.locator = serviceLocator;

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

@@ -1534,6 +1534,7 @@ export declare class RichTextEditor extends Component<HTMLElement> implements IN
     private getUpdatedValue;
     private updateValueOnIdle;
     private updateIntervalValue;
+    private removeResizeElement;
     private updateStatus;
     private onDocumentClick;
     private blurHandler;

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

@@ -743,13 +743,14 @@ var RichTextEditor = /** @class */ (function (_super) {
                 this.formatter.editorManager.nodeSelection.setCursorPoint(this.contentModule.getDocument(), range.startContainer, range.startOffset);
             }
         }
-        var notFormatPainterCopy = !isNOU(e.action) && e.action !== 'format-copy';
-        if (this.formatter.getUndoRedoStack().length === 0 && notFormatPainterCopy) {
+        var notFormatPainterCopy = isNOU(e.action) ? true : (e.action !== 'format-copy' ? true : false);
+        if (this.formatter.getUndoRedoStack().length === 0 && notFormatPainterCopy &&
+            !(e.altKey || e.shiftKey || (e.altKey && e.shiftKey && e.which === 67))) {
             this.formatter.saveData();
         }
         if (e.action !== 'insert-link' &&
             e.action !== 'format-copy' && e.action !== 'format-paste' &&
-            (!e.target || (e.target.classList.contains('e-mention') && e.code !== 'Tab')) &&
+            (!e.target || !(e.target.classList.contains('e-mention') && e.code === 'Tab')) &&
             (e.action && e.action !== 'paste' && e.action !== 'space'
                 || e.which === 9 || (e.code === 'Backspace' && e.which === 8))) {
             var FormatPainterEscapeAction = false;
@@ -1864,8 +1865,8 @@ var RichTextEditor = /** @class */ (function (_super) {
             }
             else {
                 if (target === 'windowResize' && heightPercent) {
-                    // cntEle hide the borderBottom of RichTextEditor. so removed the 2px of cntEle height. 
-                    heightValue = parseInt(heightValue) - 2 + 'px';
+                    //cntEle hide the borderBottom of RichTextEditor. so removed the 2px of cntEle height.
+                    heightValue = parseInt(heightValue, 10) - 2 + 'px';
                 }
                 setStyleAttribute(cntEle, { height: heightValue, marginTop: topValue + 'px' });
             }
@@ -1889,7 +1890,7 @@ var RichTextEditor = /** @class */ (function (_super) {
      * @public
      */
     RichTextEditor.prototype.getHtml = function () {
-        var htmlValue = this.contentModule.getEditPanel().innerHTML;
+        var htmlValue = this.removeResizeElement(this.contentModule.getEditPanel().innerHTML);
         return (this.enableXhtml && (htmlValue === '<p><br></p>' || htmlValue === '<div><br></div>' ||
             htmlValue === '<br>') ? null : this.serializeValue(htmlValue));
     };
@@ -1900,7 +1901,7 @@ var RichTextEditor = /** @class */ (function (_super) {
      * @public
      */
     RichTextEditor.prototype.getXhtml = function () {
-        var currentValue = this.value;
+        var currentValue = this.removeResizeElement(this.value);
         if (!isNOU(currentValue) && this.enableXhtml) {
             currentValue = this.htmlEditorModule.xhtmlValidation.selfEncloseValidation(currentValue);
         }
@@ -2141,14 +2142,11 @@ var RichTextEditor = /** @class */ (function (_super) {
     };
     RichTextEditor.prototype.getUpdatedValue = function () {
         var value;
-        if (!isNOU(this.tableModule)) {
-            this.tableModule.removeResizeElement();
-        }
         var getTextArea = this.element.querySelector('.e-rte-srctextarea');
         if (this.editorMode === 'HTML') {
             value = (this.inputElement.innerHTML === '<p><br></p>' || this.inputElement.innerHTML === '<div><br></div>' ||
                 this.inputElement.innerHTML === '<br>') ? null : this.enableHtmlEncode ?
-                this.encode(decode(this.inputElement.innerHTML)) : this.inputElement.innerHTML;
+                this.encode(decode(this.removeResizeElement(this.inputElement.innerHTML))) : this.inputElement.innerHTML;
             if (getTextArea && getTextArea.style.display === 'block') {
                 value = getTextArea.value;
             }
@@ -2157,6 +2155,9 @@ var RichTextEditor = /** @class */ (function (_super) {
             value = this.inputElement.value === '' ? null :
                 this.inputElement.value;
         }
+        if (value != null && !this.enableHtmlEncode) {
+            value = this.removeResizeElement(value);
+        }
         return value;
     };
     RichTextEditor.prototype.updateValueOnIdle = function () {
@@ -2172,6 +2173,17 @@ var RichTextEditor = /** @class */ (function (_super) {
         clearTimeout(this.idleInterval);
         this.idleInterval = setTimeout(this.updateValueOnIdle.bind(this), 0);
     };
+    RichTextEditor.prototype.removeResizeElement = function (value) {
+        var valueElementWrapper = document.createElement("div");
+        valueElementWrapper.innerHTML = value;
+        var item = valueElementWrapper.querySelectorAll('.e-column-resize, .e-row-resize, .e-table-box, .e-table-rhelper, .e-img-resize');
+        if (item.length > 0) {
+            for (var i = 0; i < item.length; i++) {
+                detach(item[i]);
+            }
+        }
+        return valueElementWrapper.innerHTML;
+    };
     RichTextEditor.prototype.updateStatus = function (e) {
         if (!isNOU(e.html) || !isNOU(e.markdown)) {
             var status_1 = this.formatter.editorManager.undoRedoManager.getUndoStatus();
@@ -2220,6 +2232,7 @@ var RichTextEditor = /** @class */ (function (_super) {
             this.notify(events.focusChange, {});
             var value = this.getUpdatedValue();
             this.setProperties({ value: value });
+            this.valueContainer.value = this.value;
             this.notify(events.toolbarRefresh, { args: e, documentNode: document });
             this.isValueChangeBlurhandler = true;
             this.invokeChangeEvent();

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

@@ -69,20 +69,20 @@ var Formatter = /** @class */ (function () {
         }
         if (isNOU(args)) {
             var action_1 = event.action;
+            args = {};
+            var items = {
+                originalEvent: event, cancel: false,
+                requestType: action_1 || (event.key + 'Key'),
+                itemCollection: value
+            };
+            extend(args, args, items, true);
             if (action_1 !== 'tab' && action_1 !== 'enter' && action_1 !== 'space' && action_1 !== 'escape') {
-                args = {};
                 if (self.editorMode === 'Markdown' && action_1 === 'insert-table') {
                     value = {
                         'headingText': self.localeObj.getConstant('TableHeadingText'),
                         'colText': self.localeObj.getConstant('TableColText')
                     };
                 }
-                var items = {
-                    originalEvent: event, cancel: false,
-                    requestType: action_1 || (event.key + 'Key'),
-                    itemCollection: value
-                };
-                extend(args, args, items, true);
                 self.trigger(CONSTANT.actionBegin, args, function (actionBeginArgs) {
                     if (actionBeginArgs.cancel) {
                         if (action_1 === 'paste' || action_1 === 'cut' || action_1 === 'copy') {
@@ -91,20 +91,22 @@ var Formatter = /** @class */ (function () {
                     }
                 });
             }
-            var isTableModule = isNOU(self.tableModule) ? true : self.tableModule ?
-                self.tableModule.ensureInsideTableList : false;
-            if ((event.which === 9 && isTableModule) || event.which !== 9) {
-                if (event.which === 13 && self.editorMode === 'HTML') {
-                    value = {
-                        'enterAction': self.enterKey
-                    };
+            if (!args.cancel) {
+                var isTableModule = isNOU(self.tableModule) ? true : self.tableModule ?
+                    self.tableModule.ensureInsideTableList : false;
+                if ((event.which === 9 && isTableModule) || event.which !== 9) {
+                    if (event.which === 13 && self.editorMode === 'HTML') {
+                        value = {
+                            'enterAction': self.enterKey
+                        };
+                    }
+                    this.editorManager.observer.notify((event.type === 'keydown' ? KEY_DOWN : KEY_UP), {
+                        event: event,
+                        callBack: this.onSuccess.bind(this, self),
+                        value: value,
+                        enterAction: self.enterKey
+                    });
                 }
-                this.editorManager.observer.notify((event.type === 'keydown' ? KEY_DOWN : KEY_UP), {
-                    event: event,
-                    callBack: this.onSuccess.bind(this, self),
-                    value: value,
-                    enterAction: self.enterKey
-                });
             }
         }
         else if (!isNOU(args) && args.item.command && args.item.subCommand && ((args.item.command !== args.item.subCommand

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

@@ -58,10 +58,10 @@ var ToolbarRenderer = /** @class */ (function () {
         if (!this.parent.enabled) {
             return;
         }
+        this.parent.trigger('toolbarClick', args);
         if (!this.parent.readonly || isNullOrUndefined(args.item)) {
             this.parent.notify(events.toolbarClick, args);
         }
-        this.parent.trigger('toolbarClick', args);
     };
     ToolbarRenderer.prototype.dropDownSelected = function (args) {
         this.parent.notify(events.dropDownSelect, args);
@@ -250,6 +250,7 @@ var ToolbarRenderer = /** @class */ (function () {
                     args.cancel = true;
                     return;
                 }
+                proxy.parent.notify(events.selectionRestore, {});
                 var element = (args.event) ? args.event.target : null;
                 proxy.currentElement = dropDown.element;
                 proxy.currentDropdown = dropDown;
@@ -276,6 +277,12 @@ var ToolbarRenderer = /** @class */ (function () {
         }
         args.element.tabIndex = -1;
         dropDown.element.removeAttribute('type');
+        dropDown.element.onmousedown = function () {
+            proxy.parent.notify(events.selectionSave, {});
+        };
+        dropDown.element.onkeydown = function () {
+            proxy.parent.notify(events.selectionSave, {});
+        };
         return dropDown;
     };
     // eslint-disable-next-line