@syncfusion/ej2-navigations 25.1.35 → 25.1.37

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

@@ -4081,16 +4081,21 @@ var Toolbar = /** @__PURE__ @class */ (function (_super) {
                 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 });
         }
     };
+    Toolbar.prototype.getToolbarPopupWidth = function (ele) {
+        var eleStyles = window.getComputedStyle(ele);
+        return parseFloat(eleStyles.width) + ((parseFloat(eleStyles.borderRightWidth)) * 2);
+    };
     /**
      * To Initialize the control rendering
      *
@@ -4484,7 +4489,7 @@ var Toolbar = /** @__PURE__ @class */ (function (_super) {
                 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);
@@ -5527,8 +5532,7 @@ var Toolbar = /** @__PURE__ @class */ (function (_super) {
         }
         if (this.popObj) {
             if (this.overflowMode === 'Extended') {
-                var 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();
@@ -12746,11 +12750,17 @@ var TreeView = /** @__PURE__ @class */ (function (_super) {
     TreeView.prototype.focusIn = function () {
         if (!this.mouseDownStatus) {
             var 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;
     };
     TreeView.prototype.focusOut = function (event) {
         var focusedElement = this.getFocusedNode();