@syncfusion/ej2-navigations 21.1.38 → 21.1.39

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

@@ -1283,9 +1283,9 @@ let MenuBase = class MenuBase extends Component {
             }
             this.targetElement = target;
             if (!this.isMenu) {
-                EventHandler.add(this.targetElement, 'scroll', this.scrollHandler, this);
+                EventHandler.add(this.targetElement, 'mousewheel DOMMouseScroll', this.scrollHandler, this);
                 for (const parent of getScrollableParent(this.targetElement)) {
-                    EventHandler.add(parent, 'scroll', this.scrollHandler, this);
+                    EventHandler.add(parent, 'mousewheel DOMMouseScroll', this.scrollHandler, this);
                 }
             }
         }
@@ -1325,6 +1325,13 @@ let MenuBase = class MenuBase extends Component {
             this.closeMenu(this.isMenu ? null : this.navIdx.length, e);
         }
     }
+    keyHandler(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();
+            }
+        }
+    }
     keyBoardHandler(e) {
         let actionName = '';
         const trgt = e.target;
@@ -1577,6 +1584,10 @@ let MenuBase = class MenuBase extends Component {
                         closeArgs = { element: ul, parentItem: item, items: items };
                         this.trigger('onClose', closeArgs);
                         this.navIdx.pop();
+                        if (!this.isMenu) {
+                            EventHandler.remove(ul, 'keydown', this.keyHandler);
+                            this.keyType = '';
+                        }
                     }
                     this.updateReactTemplate();
                     let trgtliId;
@@ -2128,10 +2139,10 @@ let MenuBase = class MenuBase extends Component {
                 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];
@@ -2733,9 +2744,9 @@ let MenuBase = class MenuBase extends Component {
                 }
             }
             if (!this.isMenu) {
-                EventHandler.remove(this.targetElement, 'scroll', this.scrollHandler);
+                EventHandler.remove(this.targetElement, 'mousewheel DOMMouseScroll', this.scrollHandler);
                 for (const parent of getScrollableParent(this.targetElement)) {
-                    EventHandler.remove(parent, 'scroll', this.scrollHandler);
+                    EventHandler.remove(parent, 'mousewheel DOMMouseScroll', this.scrollHandler);
                 }
             }
         }
@@ -2804,6 +2815,9 @@ let MenuBase = class MenuBase extends Component {
             element: ul, parentItem: item, items: item ? item.items : this.items
         };
         this.trigger('onOpen', eventArgs);
+        if (!this.isMenu) {
+            EventHandler.add(ul, 'keydown', this.keyHandler, this);
+        }
     }
     end(ul, isMenuOpen) {
         if (isMenuOpen) {
@@ -8381,7 +8395,7 @@ let Tab = class Tab extends Component {
         }
         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);
             }
         }