@syncfusion/ej2-navigations 21.1.38 → 21.1.39

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

@@ -1358,10 +1358,10 @@ var MenuBase = /** @__PURE__ @class */ (function (_super) {
             }
             this.targetElement = target;
             if (!this.isMenu) {
-                EventHandler.add(this.targetElement, 'scroll', this.scrollHandler, this);
+                EventHandler.add(this.targetElement, 'mousewheel DOMMouseScroll', this.scrollHandler, this);
                 for (var _i = 0, _a = getScrollableParent(this.targetElement); _i < _a.length; _i++) {
                     var parent_1 = _a[_i];
-                    EventHandler.add(parent_1, 'scroll', this.scrollHandler, this);
+                    EventHandler.add(parent_1, 'mousewheel DOMMouseScroll', this.scrollHandler, this);
                 }
             }
         }
@@ -1401,6 +1401,13 @@ var MenuBase = /** @__PURE__ @class */ (function (_super) {
             this.closeMenu(this.isMenu ? null : this.navIdx.length, e);
         }
     };
+    MenuBase.prototype.keyHandler = function (e) {
+        if (e.keyCode === 38 || e.keyCode === 40) {
+            if (e.target && (e.target.classList.contains('e-contextmenu') || e.target.classList.contains('e-menu-item'))) {
+                e.preventDefault();
+            }
+        }
+    };
     MenuBase.prototype.keyBoardHandler = function (e) {
         var actionName = '';
         var trgt = e.target;
@@ -1657,6 +1664,10 @@ var MenuBase = /** @__PURE__ @class */ (function (_super) {
                         closeArgs = { element: ul_1, parentItem: item_1, items: items_1 };
                         _this.trigger('onClose', closeArgs);
                         _this.navIdx.pop();
+                        if (!_this.isMenu) {
+                            EventHandler.remove(ul_1, 'keydown', _this.keyHandler);
+                            _this.keyType = '';
+                        }
                     }
                     _this.updateReactTemplate();
                     var trgtliId;
@@ -2219,10 +2230,10 @@ var MenuBase = /** @__PURE__ @class */ (function (_super) {
                 if (!args.curData[args.fields[fields.id]]) {
                     args.curData[args.fields[fields.id]] = getUniqueID('menuitem');
                 }
-                args.curData.htmlAttributes = {
-                    role: 'menuitem',
-                    tabindex: '-1'
-                };
+                if (isNullOrUndefined(args.curData.htmlAttributes)) {
+                    args.curData.htmlAttributes = {};
+                }
+                Object.assign(args.curData.htmlAttributes, { role: 'menuitem', tabindex: '-1' });
                 if (_this.isMenu && !args.curData[_this.getField('separator', level)]) {
                     args.curData.htmlAttributes['aria-label'] = args.curData[args.fields.text] ?
                         args.curData[args.fields.text] : args.curData[args.fields.id];
@@ -2837,10 +2848,10 @@ var MenuBase = /** @__PURE__ @class */ (function (_super) {
                 }
             }
             if (!this.isMenu) {
-                EventHandler.remove(this.targetElement, 'scroll', this.scrollHandler);
+                EventHandler.remove(this.targetElement, 'mousewheel DOMMouseScroll', this.scrollHandler);
                 for (var _i = 0, _a = getScrollableParent(this.targetElement); _i < _a.length; _i++) {
                     var parent_2 = _a[_i];
-                    EventHandler.remove(parent_2, 'scroll', this.scrollHandler);
+                    EventHandler.remove(parent_2, 'mousewheel DOMMouseScroll', this.scrollHandler);
                 }
             }
         }
@@ -2911,6 +2922,9 @@ var MenuBase = /** @__PURE__ @class */ (function (_super) {
             element: ul, parentItem: item, items: item ? item.items : this.items
         };
         this.trigger('onOpen', eventArgs);
+        if (!this.isMenu) {
+            EventHandler.add(ul, 'keydown', this.keyHandler, this);
+        }
     };
     MenuBase.prototype.end = function (ul, isMenuOpen) {
         if (isMenuOpen) {
@@ -8655,7 +8669,7 @@ var Tab = /** @__PURE__ @class */ (function (_super) {
         }
         else {
             this.isPopup = false;
-            if (!isNullOrUndefined(trgParent) && (trgIndex !== this.selectedItem || trgIndex !== this.prevIndex)) {
+            if (!isNullOrUndefined(trgParent) && (trgIndex !== this.selectedItem)) {
                 this.selectTab(trgIndex, args.originalEvent, true);
             }
         }