@syncfusion/ej2-navigations 20.4.42 → 20.4.44

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

@@ -1415,14 +1415,6 @@ let MenuBase = class MenuBase extends Component {
                 if (fliIdx === (e.action === DOWNARROW ? cul.childElementCount : -1)) {
                     fliIdx = defaultIdx;
                 }
-                if (cul.children[fliIdx].classList.contains(HIDE)) {
-                    if (e.action === DOWNARROW && fliIdx === cul.childElementCount - 1) {
-                        fliIdx = defaultIdx;
-                    }
-                    else if (e.action === UPARROW && fliIdx === 0) {
-                        fliIdx = defaultIdx;
-                    }
-                }
             }
         }
         const cli = cul.children[fliIdx];
@@ -1432,8 +1424,15 @@ let MenuBase = class MenuBase extends Component {
     }
     isValidLI(cli, index, action) {
         const cul = this.getUlByNavIdx();
+        const defaultIdx = (action === DOWNARROW || action === HOME || action === TAB) ? 0 : cul.childElementCount - 1;
         if (cli.classList.contains(SEPARATOR) || cli.classList.contains(DISABLED) || cli.classList.contains(HIDE)) {
-            if ((action === DOWNARROW) || (action === RIGHTARROW)) {
+            if (action === DOWNARROW && index === cul.childElementCount - 1) {
+                index = defaultIdx;
+            }
+            else if (action === UPARROW && index === 0) {
+                index = defaultIdx;
+            }
+            else if ((action === DOWNARROW) || (action === RIGHTARROW)) {
                 index++;
             }
             else {
@@ -1593,11 +1592,15 @@ let MenuBase = class MenuBase extends Component {
                         closedLi = trgtpopUp.querySelector('[id="' + trgtliId + '"]');
                         trgtLi = (liElem && trgtpopUp.querySelector('[id="' + liElem.id + '"]'));
                     }
+                    else if (trgtpopUp) {
+                        closedLi = trgtpopUp.querySelector('.e-menu-item.e-selected');
+                        trgtLi = (liElem && trgtpopUp.querySelector('[id="' + liElem.id + '"]'));
+                    }
                     const submenus = liElem && liElem.querySelectorAll('.e-menu-item');
                     if (isOpen && this.hamburgerMode && ulIndex && !(submenus.length)) {
                         this.afterCloseMenu(e);
                     }
-                    else if (isOpen && !this.hamburgerMode && this.navIdx.length && closedLi && !trgtLi && this.keyType !== 'left') {
+                    else if (isOpen && !this.hamburgerMode && closedLi && !trgtLi && this.keyType !== 'left' && (this.navIdx.length || !this.isMenu && this.navIdx.length === 0)) {
                         let ele = (e && e.target.classList.contains('e-vscroll'))
                             ? closest(e.target, '.e-menu-wrapper') : null;
                         if (ele) {
@@ -1611,7 +1614,7 @@ let MenuBase = class MenuBase extends Component {
                         }
                     }
                     else if (isOpen && !isIterated && !ulIndex && ((this.hamburgerMode && this.navIdx.length) ||
-                        this.navIdx.length === 1)) {
+                        this.navIdx.length === 1 && liElem && trgtpopUp !== liElem.parentElement)) {
                         this.closeMenu(null, e);
                     }
                     else if (isOpen && isNullOrUndefined(ulIndex) && this.navIdx.length) {
@@ -7332,9 +7335,7 @@ let Tab = class Tab extends Component {
             this.tbObj = null;
         }
         this.unWireEvents();
-        ['role', 'aria-disabled', 'aria-activedescendant', 'tabindex', 'aria-orientation', 'aria-owns'].forEach((val) => {
-            this.element.removeAttribute(val);
-        });
+        this.element.removeAttribute('aria-disabled');
         this.expTemplateContent();
         if (!this.isTemplate) {
             while (this.element.firstElementChild) {
@@ -7413,7 +7414,7 @@ let Tab = class Tab extends Component {
         const css = (name === 'msie') ? 'e-ie' : (name === 'edge') ? 'e-edge' : (name === 'safari') ? 'e-safari' : '';
         setStyleAttribute(this.element, { 'width': formatUnit(this.width), 'height': formatUnit(this.height) });
         this.setCssClass(this.element, this.cssClass, true);
-        attributes(this.element, { role: 'tablist', 'aria-disabled': 'false', 'aria-activedescendant': '', 'aria-owns': this.element.id + '_' + 'tab_header_items' });
+        attributes(this.element, { 'aria-disabled': 'false' });
         this.setCssClass(this.element, css, true);
         this.updatePopAnimationConfig();
     }
@@ -7508,8 +7509,7 @@ let Tab = class Tab extends Component {
                 hdrItems.forEach((item, index) => {
                     this.lastIndex = index;
                     const attr = {
-                        className: CLS_ITEM$2, id: CLS_ITEM$2 + this.tabId + '_' + index,
-                        attrs: { role: 'tab', 'aria-controls': CLS_CONTENT$1 + this.tabId + '_' + index, 'aria-selected': 'false' }
+                        className: CLS_ITEM$2, id: CLS_ITEM$2 + this.tabId + '_' + index
                     };
                     const txt = this.createElement('span', {
                         className: CLS_TEXT, innerHTML: item, attrs: { 'role': 'presentation' }
@@ -7517,7 +7517,10 @@ let Tab = class Tab extends Component {
                     const cont = this.createElement('div', {
                         className: CLS_TEXT_WRAP, innerHTML: txt + this.btnCls.outerHTML
                     }).outerHTML;
-                    const wrap = this.createElement('div', { className: CLS_WRAP, innerHTML: cont, attrs: { tabIndex: '-1' } });
+                    const wrap = this.createElement('div', {
+                        className: CLS_WRAP, innerHTML: cont,
+                        attrs: { role: 'tab', tabIndex: '-1', 'aria-selected': 'false', 'aria-controls': CLS_CONTENT$1 + this.tabId + '_' + index }
+                    });
                     tabItems.appendChild(this.createElement('div', attr));
                     selectAll('.' + CLS_ITEM$2, tabItems)[index].appendChild(wrap);
                 });
@@ -7536,15 +7539,13 @@ let Tab = class Tab extends Component {
         this.tbObj.isStringTemplate = true;
         this.tbObj.createElement = this.createElement;
         this.tbObj.appendTo(this.hdrEle);
-        attributes(this.hdrEle, { 'aria-label': 'tab-header' });
-        this.updateOrientationAttribute();
+        attributes(this.hdrEle, { role: 'tablist' });
         this.setCloseButton(this.showCloseButton);
         const toolbarHeader = this.tbObj.element.querySelector('.' + CLS_TB_ITEMS);
         if (!isNullOrUndefined(toolbarHeader)) {
             if (isNullOrUndefined(toolbarHeader.id) || toolbarHeader.id === '') {
                 toolbarHeader.id = this.element.id + '_' + 'tab_header_items';
             }
-            this.element.setAttribute('aria-owns', toolbarHeader.id);
         }
     }
     renderContent() {
@@ -7638,7 +7639,7 @@ let Tab = class Tab extends Component {
                 }
             }
             const tabIndex = isNullOrUndefined(item.tabIndex) ? '-1' : item.tabIndex.toString();
-            const wrapAttrs = (item.disabled) ? {} : { tabIndex: tabIndex, 'data-tabindex': tabIndex };
+            const wrapAttrs = (item.disabled) ? {} : { tabIndex: tabIndex, 'data-tabindex': tabIndex, role: 'tab', 'aria-selected': 'false' };
             tCont.appendChild(this.btnCls.cloneNode(true));
             const wrap = this.createElement('div', { className: CLS_WRAP, attrs: wrapAttrs });
             wrap.appendChild(tCont);
@@ -7649,7 +7650,7 @@ let Tab = class Tab extends Component {
                 this.itemIndexArray.splice((index + i), 0, CLS_ITEM$2 + this.tabId + '_' + this.lastIndex);
             }
             const attrObj = {
-                id: CLS_ITEM$2 + this.tabId + '_' + this.lastIndex, role: 'tab', 'aria-selected': 'false'
+                id: CLS_ITEM$2 + this.tabId + '_' + this.lastIndex
             };
             const tItem = { htmlAttributes: attrObj, template: wrap };
             tItem.cssClass = ((item.cssClass !== undefined) ? item.cssClass : ' ') + ' ' + disabled + ' ' + hidden + ' '
@@ -7678,6 +7679,7 @@ let Tab = class Tab extends Component {
         if (tabHeader) {
             const tabItems = selectAll('.' + CLS_TB_ITEM + '.' + CLS_ACTIVE$1, tabHeader);
             [].slice.call(tabItems).forEach((node) => node.classList.remove(CLS_ACTIVE$1));
+            [].slice.call(tabItems).forEach((node) => node.firstElementChild.setAttribute('aria-selected', 'false'));
         }
     }
     checkPopupOverflow(ele) {
@@ -7720,9 +7722,6 @@ let Tab = class Tab extends Component {
         }
         return selectAll('.' + CLS_TB_ITEM, this.tbItems).length - 1;
     }
-    updateOrientationAttribute() {
-        attributes(this.element, { 'aria-orientation': (this.isVertical() ? 'vertical' : 'horizontal') });
-    }
     setCloseButton(val) {
         const trg = select('.' + CLS_HEADER$1, this.element);
         if (val === true) {
@@ -8026,7 +8025,6 @@ let Tab = class Tab extends Component {
             }
         }
         this.addVerticalClass();
-        this.updateOrientationAttribute();
         this.setActiveBorder();
         this.focusItem();
     }
@@ -8210,20 +8208,18 @@ let Tab = class Tab extends Component {
         if (!this.isTemplate) {
             const prev = this.tbItem[this.prevIndex];
             if (!isNullOrUndefined(prev)) {
-                prev.removeAttribute('aria-controls');
+                prev.firstElementChild.removeAttribute('aria-controls');
             }
-            attributes(trg, { 'aria-controls': CLS_CONTENT$1 + this.tabId + '_' + value });
+            attributes(trg.firstElementChild, { 'aria-controls': CLS_CONTENT$1 + this.tabId + '_' + value });
         }
         const id = trg.id;
         this.removeActiveClass();
         trg.classList.add(CLS_ACTIVE$1);
-        this.tbItem[this.prevIndex].setAttribute('aria-selected', 'false');
-        trg.setAttribute('aria-selected', 'true');
+        trg.firstElementChild.setAttribute('aria-selected', 'true');
         const no = Number(this.extIndex(id));
         if (isNullOrUndefined(this.prevActiveEle)) {
             this.prevActiveEle = CLS_CONTENT$1 + this.tabId + '_' + no;
         }
-        attributes(this.element, { 'aria-activedescendant': id });
         if (this.isTemplate) {
             if (select('.' + CLS_CONTENT$1, this.element).children.length > 0) {
                 const trg = this.findEle(select('.' + CLS_CONTENT$1, this.element).children, CLS_CONTENT$1 + this.tabId + '_' + no);
@@ -8892,7 +8888,7 @@ let Tab = class Tab extends Component {
                     (textValue.length === 0) && !isNullOrUndefined(item.header) && isNullOrUndefined(item.header.iconCss))) {
                     if (tabItems[place]) {
                         if (isNullOrUndefined(item.id)) {
-                            item.id = TABITEMPREFIX + (lastEleIndex + place).toString();
+                            item.id = CLS_ITEM$2 + this.tabId + '_' + TABITEMPREFIX + (lastEleIndex + place).toString();
                         }
                         tabItems[place].htmlAttributes['data-id'] = item.id;
                     }
@@ -9319,7 +9315,7 @@ let Tab = class Tab extends Component {
                     }
                 }
                 const tabIndex = isNullOrUndefined(item.tabIndex) ? '-1' : item.tabIndex.toString();
-                const wrapAtt = (item.disabled) ? {} : { tabIndex: tabIndex, 'data-tabindex': tabIndex };
+                const wrapAtt = (item.disabled) ? {} : { tabIndex: tabIndex, 'data-tabindex': tabIndex, role: 'tab', 'aria-selected': 'true' };
                 tConts.appendChild(this.btnCls.cloneNode(true));
                 const wraper = this.createElement('div', { className: CLS_WRAP, attrs: wrapAtt });
                 wraper.appendChild(tConts);
@@ -9370,11 +9366,7 @@ let Tab = class Tab extends Component {
             detach(element);
             detach(detachContent);
             const attr = {
-                className: CLS_TB_ITEM + ' ' + CLS_TEMPLATE$1 + ' ' + CLS_ACTIVE$1, id: CLS_ITEM$2 + this.tabId + '_' + index,
-                attrs: {
-                    role: 'tab', 'aria-controls': CLS_CONTENT$1 + this.tabId + '_' + index,
-                    'aria-disabled': 'false', 'aria-selected': 'true'
-                }
+                className: CLS_TB_ITEM + ' ' + CLS_TEMPLATE$1 + ' ' + CLS_ACTIVE$1, id: CLS_ITEM$2 + this.tabId + '_' + index
             };
             const txtString = this.createElement('span', {
                 className: CLS_TEXT, innerHTML: header, attrs: { 'role': 'presentation' }
@@ -9384,7 +9376,8 @@ let Tab = class Tab extends Component {
             }).outerHTML;
             const tabIndex = element.firstElementChild.getAttribute('data-tabindex');
             const wrap = this.createElement('div', {
-                className: CLS_WRAP, innerHTML: conte, attrs: { tabIndex: tabIndex, 'data-tabindex': tabIndex }
+                className: CLS_WRAP, innerHTML: conte,
+                attrs: { tabIndex: tabIndex, 'data-tabindex': tabIndex, role: 'tab', 'aria-controls': CLS_CONTENT$1 + this.tabId + '_' + index, 'aria-selected': 'true' }
             });
             tabItems.insertBefore(this.createElement('div', attr), tabItems.children[index + 1]);
             this.element.querySelector('.' + CLS_TB_ITEM + '.' + CLS_ACTIVE$1).appendChild(wrap);
@@ -10928,7 +10921,7 @@ let TreeView = TreeView_1 = class TreeView extends Component {
         }
     }
     clickHandler(event) {
-        let target = event.originalEvent.target;
+        let target = Browser.isDevice ? document.elementFromPoint(event.originalEvent.changedTouches[0].clientX, event.originalEvent.changedTouches[0].clientY) : event.originalEvent.target;
         EventHandler.remove(this.element, 'contextmenu', this.preventContextMenu);
         if (!target || this.dragStartAction) {
             return;