Diagram - updateToolbox destroys tooltips fix (#20476)

DevExpress · Dec 9, 2021 · b8e7cab · b8e7cab
1 parent c34c9d1
commit b8e7cab
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 7 deletions.
diff --git a/js/ui/diagram/ui.diagram.js b/js/ui/diagram/ui.diagram.js
@@ -1577,7 +1577,10 @@ class Diagram extends Widget {
     }
     updateToolbox() {
         this._diagramInstance && this._diagramInstance.refreshToolbox();
-        this._toolbox && this._toolbox.updateMaxHeight();
+        if(this._toolbox) {
+            this._toolbox.updateTooltips();
+            this._toolbox.updateMaxHeight();
+        }
     }
 
     _getDefaultOptions() {

diff --git a/js/ui/diagram/ui.diagram.toolbox.js b/js/ui/diagram/ui.diagram.toolbox.js
@@ -227,16 +227,17 @@ class DiagramToolbox extends DiagramFloatingPanel {
                             filteringToolboxes: this._toolboxes.length - 1
                         });
                     }
-                    this._createTooltips($toolboxElement.find('[data-toggle="' + DIAGRAM_TOOLTIP_DATATOGGLE + '"]'));
+                    this._createTooltips($toolboxElement);
                 }
             };
             result.push(groupObj);
         }
         return result;
     }
-    _createTooltips(targets) {
+    _createTooltips($toolboxElement) {
         if(this._isTouchMode()) return;
 
+        const targets = $toolboxElement.find('[data-toggle="' + DIAGRAM_TOOLTIP_DATATOGGLE + '"]');
         const $container = this.$element();
         targets.each((index, element) => {
             const $target = $(element);
@@ -319,14 +320,17 @@ class DiagramToolbox extends DiagramFloatingPanel {
             text: this._filterText,
             filteringToolboxes: this._toolboxes.map(($element, index) => index)
         });
-        this._toolboxes.forEach($element => {
-            const $tooltipContainer = $($element);
-            this._createTooltips($tooltipContainer.find('[data-toggle="' + DIAGRAM_TOOLTIP_DATATOGGLE + '"]'));
-        });
+        this.updateTooltips();
 
         this.updateMaxHeight();
         this._scrollView.update();
     }
+    updateTooltips() {
+        this._toolboxes.forEach($element => {
+            const $tooltipContainer = $($element);
+            this._createTooltips($tooltipContainer);
+        });
+    }
 
     _createOnShapeCategoryRenderedAction() {
         this._onShapeCategoryRenderedAction = this._createActionByOption('onShapeCategoryRendered');