@syncfusion/ej2-navigations 25.1.35 → 25.1.38

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

@@ -3941,16 +3941,21 @@ let Toolbar = class Toolbar extends Component {
                 popObj.enableRtl = false;
                 popObj.position = { X: 'right', Y: 'top' };
             }
-            popObj.dataBind();
-            popObj.refreshPosition();
-            popObj.element.style.top = this.getElementOffsetY() + 'px';
             if (this.overflowMode === 'Extended') {
                 popObj.element.style.minHeight = '0px';
+                popObj.width = this.getToolbarPopupWidth(this.element);
             }
+            popObj.dataBind();
+            popObj.refreshPosition();
+            popObj.element.style.top = this.getElementOffsetY() + 'px';
             popupNav.classList.add(CLS_TBARNAVACT);
             popObj.show({ name: 'FadeIn', duration: 100 });
         }
     }
+    getToolbarPopupWidth(ele) {
+        var eleStyles = window.getComputedStyle(ele);
+        return parseFloat(eleStyles.width) + ((parseFloat(eleStyles.borderRightWidth)) * 2);
+    }
     /**
      * To Initialize the control rendering
      *
@@ -4342,7 +4347,7 @@ let Toolbar = class Toolbar extends Component {
                 position: this.enableRtl ? { X: 'left', Y: 'top' } : { X: 'right', Y: 'top' }
             });
             if (this.overflowMode === 'Extended') {
-                popup.width = parseFloat(eleStyles.width) + ((parseFloat(eleStyles.borderRightWidth)) * 2);
+                popup.width = this.getToolbarPopupWidth(this.element);
                 popup.offsetX = 0;
             }
             popup.appendTo(ele);
@@ -5373,8 +5378,7 @@ let Toolbar = class Toolbar extends Component {
         }
         if (this.popObj) {
             if (this.overflowMode === 'Extended') {
-                const eleStyles = window.getComputedStyle(this.element);
-                this.popObj.width = parseFloat(eleStyles.width) + ((parseFloat(eleStyles.borderRightWidth)) * 2);
+                this.popObj.width = this.getToolbarPopupWidth(this.element);
             }
             if (this.tbarAlign) {
                 this.removePositioning();
@@ -12406,11 +12410,17 @@ let TreeView = TreeView_1 = class TreeView extends Component {
     focusIn() {
         if (!this.mouseDownStatus) {
             let focusedElement = this.getFocusedNode();
-            focusedElement.setAttribute("tabindex", "0");
-            addClass([focusedElement], FOCUS);
-            EventHandler.add(focusedElement, 'blur', this.focusOut, this);
+            if (focusedElement.classList.contains('e-disable')) {
+                focusedElement.setAttribute("tabindex", "-1");
+                this.navigateNode(true);
+            }
+            else {
+                focusedElement.setAttribute("tabindex", "0");
+                addClass([focusedElement], FOCUS);
+                EventHandler.add(focusedElement, 'blur', this.focusOut, this);
+            }
+            this.mouseDownStatus = false;
         }
-        this.mouseDownStatus = false;
     }
     focusOut(event) {
         let focusedElement = this.getFocusedNode();