@syncfusion/ej2-splitbuttons 20.3.56 → 20.4.40

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

@@ -338,7 +338,7 @@ var DropDownButton = /** @__PURE__ @class */ (function (_super) {
             this.dropDown.refreshPosition(this.element);
         }
         this.dropDown.hide();
-        attributes(this.element, (_a = {}, _a['aria-haspopup'] = this.items.length || this.target ? 'true' : 'false', _a['aria-expanded'] = 'false', _a['aria-owns'] = this.getPopUpElement().id, _a['type'] = 'button', _a['aria-label'] = this.element.textContent ? this.element.textContent : 'dropdownbutton', _a));
+        attributes(this.element, (_a = {}, _a['aria-haspopup'] = this.items.length || this.target ? 'true' : 'false', _a['aria-expanded'] = 'false', _a['type'] = 'button', _a['aria-label'] = this.element.textContent ? this.element.textContent : 'dropdownbutton', _a));
         if (this.cssClass) {
             addClass([div], this.cssClass.split(' '));
         }
@@ -369,7 +369,7 @@ var DropDownButton = /** @__PURE__ @class */ (function (_super) {
             li = this.createElement('li', {
                 innerHTML: item.url ? '' : tempItem,
                 className: item.separator ? classNames.ITEM + ' ' + classNames.SEPARATOR : classNames.ITEM,
-                attrs: { 'role': 'menuItem', 'tabindex': '-1', 'aria-label': tempItem },
+                attrs: item.separator ? { 'role': 'separator', 'tabindex': '-1' } : { 'role': 'menuitem', 'tabindex': '-1', 'aria-label': tempItem },
                 id: item.id ? item.id : getUniqueID('e-' + this.getModuleName() + '-item')
             });
             if (this.enableHtmlSanitizer) {
@@ -412,7 +412,7 @@ var DropDownButton = /** @__PURE__ @class */ (function (_super) {
     };
     DropDownButton.prototype.hasIcon = function (items, field) {
         for (var i = 0, len = items.length; i < len; i++) {
-            if (items[i][field]) {
+            if (items[i]["" + field]) {
                 return true;
             }
         }
@@ -729,6 +729,7 @@ var DropDownButton = /** @__PURE__ @class */ (function (_super) {
                 _this.dropDown.show(null, _this.element);
                 addClass([_this.element], 'e-active');
                 _this.element.setAttribute('aria-expanded', 'true');
+                _this.element.setAttribute('aria-owns', _this.getPopUpElement().id);
                 if (ul_1) {
                     ul_1.focus();
                 }
@@ -742,12 +743,12 @@ var DropDownButton = /** @__PURE__ @class */ (function (_super) {
         if (e === void 0) { e = null; }
         var ul = this.getULElement();
         var beforeCloseArgs = { element: ul, items: this.items, event: e, cancel: false };
-        var popupElement = this.getPopUpElement();
-        if (popupElement) {
-            EventHandler.remove(popupElement, 'keydown', this.keyBoardHandler);
-        }
         this.trigger('beforeClose', beforeCloseArgs, function (observedArgs) {
             if (!observedArgs.cancel) {
+                var popupElement = _this.getPopUpElement();
+                if (popupElement) {
+                    EventHandler.remove(popupElement, 'keydown', _this.keyBoardHandler);
+                }
                 _this.popupUnWireEvents();
                 var ul_2 = _this.getULElement();
                 var selectedLi = void 0;
@@ -760,6 +761,7 @@ var DropDownButton = /** @__PURE__ @class */ (function (_super) {
                 _this.dropDown.hide();
                 removeClass(_this.activeElem, 'e-active');
                 _this.element.setAttribute('aria-expanded', 'false');
+                _this.element.removeAttribute('aria-owns');
                 if (focusEle) {
                     focusEle.focus();
                 }
@@ -777,6 +779,11 @@ var DropDownButton = /** @__PURE__ @class */ (function (_super) {
                     _this.isPopupCreated = _this.createPopupOnClick ? false : true;
                 }
             }
+            else {
+                if (ul) {
+                    ul.focus();
+                }
+            }
         });
     };
     DropDownButton.prototype.unWireEvents = function () {