@syncfusion/ej2-richtexteditor 20.4.38 → 20.4.42

package/dist/es6/ej2-richtexteditor.es2015.js

@@ -4738,7 +4738,10 @@ class Toolbar$2 {
      * @deprecated
      */
     updateItem(args) {
-        const item = this.tools[args.updateItem.toLocaleLowerCase()];
+        let item = this.tools[args.updateItem.toLocaleLowerCase()];
+        if (this.parent.locale !== 'en-US') {
+            item.tooltip = getTooltipText(args.updateItem.toLocaleLowerCase(), this.locator);
+        }
         const trgItem = this.tools[args.targetItem.toLocaleLowerCase()];
         const index = getTBarItemsIndex(getCollection(trgItem.subCommand), args.baseToolbar.toolbarObj.items)[0];
         if (!isNullOrUndefined(index)) {
@@ -17606,10 +17609,11 @@ class ToolbarStatus {
         let formatCollection = JSON.parse(JSON.stringify(statusCollection));
         const nodeCollection = JSON.parse(JSON.stringify(statusCollection));
         const nodeSelection = new NodeSelection();
-        const nodes = documentNode ? [documentNode] : nodeSelection.getNodeCollection(nodeSelection.getRange(docElement));
+        const range = nodeSelection.getRange(docElement);
+        const nodes = documentNode ? [documentNode] : range.collapsed ? nodeSelection.getNodeCollection(range) :
+            nodeSelection.getSelectionNodeCollectionBr(range);
         const nodesLength = nodes.length;
         let isNodeChanged = false;
-        const range = nodeSelection.getRange(docElement);
         for (let index = 0; index < nodes.length; index++) {
             while (nodes[index].nodeType === 3 && range.startContainer.nodeType === 3 && nodes[index].parentNode &&
                 nodes[index].parentNode.lastElementChild && nodes[index].parentNode.lastElementChild.nodeName !== 'BR' &&
@@ -18507,22 +18511,32 @@ class HtmlEditor {
             }
             const previousLength = this.parent.inputElement.innerHTML.length;
             const currentLength = this.parent.inputElement.innerHTML.replace(regEx, '').length;
+            let focusNode = range.startContainer;
             if (previousLength > currentLength) {
                 let currentChild = this.parent.inputElement.firstChild;
                 while (!isNullOrUndefined(currentChild) && currentChild.textContent.replace(regEx, '').trim().length > 0) {
                     currentChild.innerHTML = currentChild.innerHTML.replace(regEx, '');
                     currentChild = currentChild.nextElementSibling;
                 }
-                if (this.parent.inputElement.querySelector('.currentStartMark').childNodes.length > 1) {
-                    const currentChild = this.parent.inputElement.querySelector('.currentStartMark').childNodes;
-                    for (let i = 0; i < currentChild.length; i++) {
-                        if (currentChild[i].nodeName === '#text' && currentChild[i].textContent.length === 0) {
-                            detach(currentChild[i]);
+                const currentChildNode = this.parent.inputElement.querySelector('.currentStartMark').childNodes;
+                if (currentChildNode.length > 1) {
+                    for (let i = 0; i < currentChildNode.length; i++) {
+                        if (currentChildNode[i].nodeName === '#text' && currentChildNode[i].textContent.length === 0) {
+                            detach(currentChildNode[i]);
                             i--;
                         }
+                        if (focusNode.textContent.replace(regEx, '') === currentChildNode[i].textContent) {
+                            pointer = focusNode.textContent.length > 1 ? focusNode.textContent.length - 1 : focusNode.textContent.length;
+                            focusNode = currentChildNode[i];
+                        }
                     }
                 }
-                this.parent.formatter.editorManager.nodeSelection.setCursorPoint(this.parent.contentModule.getDocument(), this.parent.inputElement.querySelector('.currentStartMark').childNodes[0], pointer);
+                else if (currentChildNode.length === 1) {
+                    if (focusNode.textContent.replace(regEx, '') === currentChildNode[0].textContent) {
+                        focusNode = currentChildNode[0];
+                    }
+                }
+                this.parent.formatter.editorManager.nodeSelection.setCursorPoint(this.parent.contentModule.getDocument(), focusNode, pointer);
             }
             const currentElem = this.parent.inputElement.querySelector('.currentStartMark');
             if (!isNullOrUndefined(currentElem)) {
@@ -20569,6 +20583,7 @@ class FullScreen {
                             this.parent.toolbarModule.addFixedTBarClass();
                         }
                     }
+                    this.parent.refreshUI();
                     this.parent.trigger(actionComplete, { requestType: 'Minimize', targetItem: 'Minimize', args: event });
                 }
             });