@syncfusion/ej2-navigations 21.2.6 → 21.2.9

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

@@ -1533,9 +1533,17 @@ var MenuBase = /** @__PURE__ @class */ (function (_super) {
         return index;
     };
     MenuBase.prototype.getUlByNavIdx = function (navIdxLen) {
+        var _this = this;
         if (navIdxLen === void 0) { navIdxLen = this.navIdx.length; }
         if (this.isMenu) {
-            var popup = [this.getWrapper()].concat([].slice.call(selectAll('.' + POPUP)))[navIdxLen];
+            var popups_1 = [];
+            var allPopup = selectAll('.' + POPUP);
+            allPopup.forEach(function (elem) {
+                if (_this.element.id === elem.id.split('-')[2]) {
+                    popups_1.push(elem);
+                }
+            });
+            var popup = [this.getWrapper()].concat([].slice.call(popups_1))[navIdxLen];
             return isNullOrUndefined(popup) ? null : select('.e-menu-parent', popup);
         }
         else {
@@ -3146,7 +3154,8 @@ var MenuBase = /** @__PURE__ @class */ (function (_super) {
             index = navIdx.pop();
             ul = this.getUlByNavIdx(navIdx.length);
             if (ul) {
-                if (ishide) {
+                var validUl = isUniqueId ? ul.children[index].id : ul.children[index].textContent;
+                if (ishide && validUl === items[i]) {
                     ul.children[index].classList.add(HIDE);
                 }
                 else {
@@ -3770,20 +3779,20 @@ var Toolbar = /** @__PURE__ @class */ (function (_super) {
                         if (isVisible(this.popObj.element)) {
                             nodes = [].slice.call(popupCheck.children);
                             if (e.action === 'home') {
-                                ele = nodes[0];
+                                ele = this.focusFirstVisibleEle(nodes);
                             }
                             else {
-                                ele = nodes[nodes.length - 1];
+                                ele = this.focusLastVisibleEle(nodes);
                             }
                         }
                     }
                     else {
                         nodes = this.element.querySelectorAll('.' + CLS_ITEMS + ' .' + CLS_ITEM + ':not(.' + CLS_SEPARATOR + ')');
                         if (e.action === 'home') {
-                            ele = nodes[0];
+                            ele = this.focusFirstVisibleEle(nodes);
                         }
                         else {
-                            ele = nodes[nodes.length - 1];
+                            ele = this.focusLastVisibleEle(nodes);
                         }
                     }
                     if (ele) {
@@ -3897,6 +3906,30 @@ var Toolbar = /** @__PURE__ @class */ (function (_super) {
     Toolbar.prototype.eleContains = function (el) {
         return el.classList.contains(CLS_SEPARATOR) || el.classList.contains(CLS_DISABLE$2) || el.getAttribute('disabled') || el.classList.contains(CLS_HIDDEN) || !isVisible(el) || !el.classList.contains(CLS_ITEM);
     };
+    Toolbar.prototype.focusFirstVisibleEle = function (nodes) {
+        var element;
+        var index = 0;
+        while (index < nodes.length) {
+            var ele = nodes[parseInt(index.toString(), 10)];
+            if (!ele.classList.contains(CLS_HIDDEN) && !ele.classList.contains(CLS_DISABLE$2)) {
+                return ele;
+            }
+            index++;
+        }
+        return element;
+    };
+    Toolbar.prototype.focusLastVisibleEle = function (nodes) {
+        var element;
+        var index = nodes.length - 1;
+        while (index >= 0) {
+            var ele = nodes[parseInt(index.toString(), 10)];
+            if (!ele.classList.contains(CLS_HIDDEN) && !ele.classList.contains(CLS_DISABLE$2)) {
+                return ele;
+            }
+            index--;
+        }
+        return element;
+    };
     Toolbar.prototype.eleFocus = function (closest$$1, pos) {
         var sib = Object(closest$$1)[pos + 'ElementSibling'];
         if (sib) {
@@ -4540,12 +4573,10 @@ var Toolbar = /** @__PURE__ @class */ (function (_super) {
             if (checkoffset) {
                 if (inEle[parseInt(i.toString(), 10)].classList.contains(CLS_SEPARATOR)) {
                     if (this.overflowMode === 'Extended') {
-                        if (itemCount === itemPopCount) {
-                            var sepEle = inEle[parseInt(i.toString(), 10)];
-                            if (checkClass(sepEle, [CLS_SEPARATOR, CLS_TBARIGNORE])) {
-                                inEle[parseInt(i.toString(), 10)].classList.add(CLS_POPUP);
-                                itemPopCount++;
-                            }
+                        var sepEle = inEle[parseInt(i.toString(), 10)];
+                        if (checkClass(sepEle, [CLS_SEPARATOR, CLS_TBARIGNORE])) {
+                            inEle[parseInt(i.toString(), 10)].classList.add(CLS_POPUP);
+                            itemPopCount++;
                         }
                         itemCount++;
                     }
@@ -5509,10 +5540,7 @@ var Toolbar = /** @__PURE__ @class */ (function (_super) {
                     break;
                 case 'width':
                     setStyleAttribute(tEle, { 'width': formatUnit(newProp.width) });
-                    this.renderOverflowMode();
-                    if (this.popObj && wid < tEle.offsetWidth) {
-                        this.popupRefresh(this.popObj.element, false);
-                    }
+                    this.refreshOverflow();
                     break;
                 case 'height':
                     setStyleAttribute(this.element, { 'height': formatUnit(newProp.height) });