@syncfusion/ej2-navigations 20.3.48 → 20.3.50

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

@@ -2787,9 +2787,9 @@ let MenuBase = class MenuBase extends Component {
                 ul.querySelector('.' + FOCUSED).focus();
             }
             else {
+                const ele = this.getWrapper().children[this.getIdx(this.getWrapper(), ul) - 1];
                 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 (!(this.currentTarget.classList.contains("e-numerictextbox") || this.currentTarget.classList.contains("e-textbox") || this.currentTarget.tagName === 'INPUT')) {
                         if (ele) {
                             ele.querySelector('.' + SELECTED).focus();
                         }
@@ -2798,6 +2798,14 @@ let MenuBase = class MenuBase extends Component {
                         }
                     }
                 }
+                else {
+                    if (ele) {
+                        ele.querySelector('.' + SELECTED).focus();
+                    }
+                    else {
+                        this.element.focus();
+                    }
+                }
             }
         }
         else {
@@ -3036,7 +3044,7 @@ let MenuBase = class MenuBase extends Component {
             menuitem = new MenuItem(iitems[0], 'items', items[i], true);
             iitems.splice(isAfter ? idx + 1 : idx, 0, menuitem);
             const uls = this.isMenu ? [this.getWrapper()].concat(this.getPopups()) : [].slice.call(this.getWrapper().children);
-            if (navIdx.length < uls.length) {
+            if (!isNullOrUndefined(idx) && navIdx.length < uls.length) {
                 idx = isAfter ? idx + 1 : idx;
                 li = this.createItems(iitems).children[idx];
                 const ul = this.isMenu ? select('.e-menu-parent', uls[navIdx.length]) : uls[navIdx.length];
@@ -5568,9 +5576,7 @@ let Accordion = class Accordion extends Component {
         }
         ele.classList.remove(CLS_ACRDN_ROOT);
         ele.removeAttribute('style');
-        ['aria-disabled', 'aria-multiselectable', 'role', 'data-ripple'].forEach((attrb) => {
-            this.element.removeAttribute(attrb);
-        });
+        this.element.removeAttribute('data-ripple');
         if (!this.isNested && isRippleEnabled) {
             this.removeRippleEffect();
         }
@@ -5619,19 +5625,12 @@ let Accordion = class Accordion extends Component {
         const width = formatUnit(this.width);
         const height = formatUnit(this.height);
         setStyleAttribute(this.element, { 'width': width, 'height': height });
-        const ariaAttr = {
-            'aria-disabled': 'false', 'role': 'presentation', 'aria-multiselectable': 'true'
-        };
         if (isNullOrUndefined(this.initExpand)) {
             this.initExpand = [];
         }
         if (this.expandedIndices.length > 0) {
             this.initExpand = this.expandedIndices;
         }
-        attributes(this.element, ariaAttr);
-        if (this.expandMode === 'Single') {
-            this.element.setAttribute('aria-multiselectable', 'false');
-        }
     }
     renderControl() {
         this.trgtEle = (this.element.children.length > 0) ? select('div', this.element) : null;
@@ -5938,18 +5937,15 @@ let Accordion = class Accordion extends Component {
     }
     headerEleGenerate() {
         const header = this.createElement('div', { className: CLS_HEADER, id: getUniqueID('acrdn_header') });
-        const items = this.getItems();
         const ariaAttr = {
-            'tabindex': '0', 'role': 'heading', 'aria-label': 'collapsed',
-            'aria-disabled': 'false', 'aria-level': items.length.toString()
+            'tabindex': '0', 'role': 'button', 'aria-disabled': 'false', 'aria-expanded': 'false'
         };
         attributes(header, ariaAttr);
         return header;
     }
     renderInnerItem(item, index) {
         const innerEle = this.createElement('div', {
-            className: CLS_ITEM$1, id: item.id || getUniqueID('acrdn_item'),
-            attrs: { 'aria-expanded': 'false', 'role': 'row' }
+            className: CLS_ITEM$1, id: item.id || getUniqueID('acrdn_item')
         });
         if (this.headerTemplate) {
             const ctnEle = this.headerEleGenerate();
@@ -6097,7 +6093,7 @@ let Accordion = class Accordion extends Component {
         const content = select('.' + CLS_CONTENT, itemEle);
         header.setAttribute('aria-controls', content.id);
         content.setAttribute('aria-labelledby', header.id);
-        content.setAttribute('role', 'definition');
+        content.setAttribute('role', 'region');
     }
     contentRendering(index) {
         const itemcnt = this.createElement('div', { className: CLS_CONTENT + ' ' + CLS_CTNHIDE, id: getUniqueID('acrdn_panel') });
@@ -6194,8 +6190,7 @@ let Accordion = class Accordion extends Component {
         if (progress === 'end') {
             this.add(trgtItemEle, CLS_ACTIVE);
             trgt.setAttribute('aria-hidden', 'false');
-            attributes(trgtItemEle, { 'aria-expanded': 'true' });
-            attributes(trgt.previousElementSibling, { 'aria-label': 'expanded' });
+            attributes(trgt.previousElementSibling, { 'aria-expanded': 'true' });
             icon.classList.remove(CLS_TOGANIMATE);
             this.trigger('expanded', eventArgs);
         }
@@ -6309,8 +6304,7 @@ let Accordion = class Accordion extends Component {
             icon.classList.remove(CLS_TOGANIMATE);
             this.remove(trgtItemEle, CLS_ACTIVE);
             trgt.setAttribute('aria-hidden', 'true');
-            attributes(trgtItemEle, { 'aria-expanded': 'false' });
-            attributes(trgt.previousElementSibling, { 'aria-label': 'collapsed' });
+            attributes(trgt.previousElementSibling, { 'aria-expanded': 'false' });
             this.trigger('expanded', eventArgs);
         }
     }
@@ -6323,14 +6317,6 @@ let Accordion = class Accordion extends Component {
     getModuleName() {
         return 'accordion';
     }
-    itemAttribUpdate() {
-        const items = this.getItems();
-        const itemEle = this.getItemElements();
-        const itemLen = items.length;
-        itemEle.forEach((ele) => {
-            select('.' + CLS_HEADER, ele).setAttribute('aria-level', '' + itemLen);
-        });
-    }
     getItems() {
         let items;
         if (this.itemTemplate && this.headerTemplate) {
@@ -6370,7 +6356,6 @@ let Accordion = class Accordion extends Component {
                 }
                 EventHandler.add(innerItemEle.querySelector('.' + CLS_HEADER), 'focus', this.focusIn, this);
                 EventHandler.add(innerItemEle.querySelector('.' + CLS_HEADER), 'blur', this.focusOut, this);
-                this.itemAttribUpdate();
                 this.expandedIndices = [];
                 this.expandedItemRefresh(ele);
                 if (addItem && addItem.expanded) {
@@ -6410,7 +6395,6 @@ let Accordion = class Accordion extends Component {
         this.restoreContent(index);
         detach(ele);
         items.splice(index, 1);
-        this.itemAttribUpdate();
         this.expandedIndices = [];
         this.expandedItemRefresh(this.element);
     }
@@ -6695,14 +6679,8 @@ let Accordion = class Accordion extends Component {
                     setStyleAttribute(this.element, { 'width': formatUnit(newProp.width) });
                     break;
                 case 'expandMode':
-                    if (newProp.expandMode === 'Single') {
-                        this.element.setAttribute('aria-multiselectable', 'false');
-                        if (this.expandedIndices.length > 1) {
-                            this.expandItem(false);
-                        }
-                    }
-                    else {
-                        this.element.setAttribute('aria-multiselectable', 'true');
+                    if (newProp.expandMode === 'Single' && this.expandedIndices.length > 1) {
+                        this.expandItem(false);
                     }
                     break;
             }
@@ -14626,7 +14604,7 @@ let Sidebar = class Sidebar extends Component {
         if (!isNullOrUndefined(classELement || this.targetEle)) {
             addClass([classELement || this.targetEle], [MAINCONTENTANIMATION]);
         }
-        this.tabIndex = this.element.hasAttribute('tabindex') ? this.element.getAttribute('tabindex') : '0';
+        this.tabIndex = this.element.hasAttribute('tabindex') ? this.element.getAttribute('tabindex') : null;
         if (!this.enableDock && this.type !== 'Auto') {
             addClass([this.element], [VISIBILITY]);
         }
@@ -14636,7 +14614,9 @@ let Sidebar = class Sidebar extends Component {
         if (this.enableDock) {
             addClass([this.element], DOCKER);
         }
-        this.element.setAttribute('tabindex', this.tabIndex);
+        if (!isNullOrUndefined(this.tabIndex)) {
+            this.element.setAttribute('tabindex', this.tabIndex);
+        }
         if (this.type === 'Auto' && !Browser.isDevice) {
             this.show();
         }