@syncfusion/ej2-navigations 20.2.39 → 20.2.43

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

@@ -1496,6 +1496,7 @@ let MenuBase = class MenuBase extends Component {
     }
     cmenuHandler(e) {
         e.preventDefault();
+        this.currentTarget = e.target;
         this.isCMenu = true;
         this.pageX = e.changedTouches ? e.changedTouches[0].pageX + 1 : e.pageX + 1;
         this.pageY = e.changedTouches ? e.changedTouches[0].pageY + 1 : e.pageY + 1;
@@ -2617,6 +2618,14 @@ let MenuBase = class MenuBase extends Component {
                             navIdx.length = 0;
                         }
                     }
+                    if (this.enableScrolling) {
+                        if (this.element.classList.contains('e-vertical')) {
+                            addScrolling(this.createElement, wrapper, this.element, 'vscroll', this.enableRtl);
+                        }
+                        else {
+                            addScrolling(this.createElement, wrapper, this.element, 'hscroll', this.enableRtl);
+                        }
+                    }
                     break;
                 }
             }
@@ -2770,12 +2779,16 @@ let MenuBase = class MenuBase extends Component {
                 ul.querySelector('.' + FOCUSED).focus();
             }
             else {
-                const ele = this.getWrapper().children[this.getIdx(this.getWrapper(), ul) - 1];
-                if (ele) {
-                    ele.querySelector('.' + SELECTED).focus();
-                }
-                else {
-                    this.element.focus();
+                if (this.currentTarget) {
+                    if (!(this.currentTarget.classList.contains("e-numerictextbox") || this.currentTarget.classList.contains("e-textbox"))) {
+                        const ele = this.getWrapper().children[this.getIdx(this.getWrapper(), ul) - 1];
+                        if (ele) {
+                            ele.querySelector('.' + SELECTED).focus();
+                        }
+                        else {
+                            this.element.focus();
+                        }
+                    }
                 }
             }
         }