@syncfusion/ej2-splitbuttons 33.2.6 → 34.1.31

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

@@ -748,6 +748,11 @@ var DropDownButton = /** @__PURE__ @class */ (function (_super) {
         if (e.target === this.element && (e.keyCode === 9 || (!e.altKey && e.keyCode === 40) || e.keyCode === 38)) {
             return;
         }
+        var splitButton = getComponent(this.activeElem[0], 'split-btn');
+        if (splitButton && (e.keyCode === 13 || e.keyCode === 40 || e.keyCode === 38)) {
+            // eslint-disable-next-line @typescript-eslint/no-explicit-any
+            splitButton.issecondaryBtnClick = true;
+        }
         if (e.target && (e.target.classList.contains('e-item') || (e.target.parentElement && e.target.parentElement.classList.contains('e-split-btn-wrapper'))) && e.keyCode === 13) {
             e.preventDefault();
         }
@@ -780,10 +785,13 @@ var DropDownButton = /** @__PURE__ @class */ (function (_super) {
         upDownKeyHandler(this.getULElement(), e.keyCode);
     };
     DropDownButton.prototype.keyEventHandler = function (e) {
+        var isSplitbutton = this.activeElem[0].classList.contains('e-split-btn');
         if (this.target && (e.keyCode === 13 || e.keyCode === 9)) {
-            return;
+            if (!isSplitbutton) {
+                return;
+            }
         }
-        if (e.keyCode === 13 && this.activeElem[0].classList.contains('e-split-btn')) {
+        if (e.keyCode === 13 && isSplitbutton) {
             this.triggerSelect(e);
             this.activeElem[0].focus();
             return;
@@ -831,6 +839,11 @@ var DropDownButton = /** @__PURE__ @class */ (function (_super) {
         }
     };
     DropDownButton.prototype.clickHandler = function (e) {
+        var splitButton = getComponent(this.activeElem[0], 'split-btn');
+        if (splitButton) {
+            // eslint-disable-next-line @typescript-eslint/no-explicit-any
+            splitButton.issecondaryBtnClick = false;
+        }
         var trgt = e.target;
         if (closest(trgt, '[id="' + this.element.id + '"]')) {
             if (!this.createPopupOnClick || (this.target && this.target !== '' && !this.isColorPicker() && !this.createPopupOnClick)) {
@@ -909,6 +922,7 @@ var DropDownButton = /** @__PURE__ @class */ (function (_super) {
             }
         }
         var ul = this.getULElement();
+        var isSplitbutton = Boolean(this.element.parentElement && this.element.parentElement.classList.contains('e-split-btn-wrapper'));
         this.popupWireEvents();
         var beforeOpenArgs = { element: ul, items: this.items, event: e, cancel: false };
         this.trigger('beforeOpen', beforeOpenArgs, function (observedArgs) {
@@ -926,11 +940,24 @@ var DropDownButton = /** @__PURE__ @class */ (function (_super) {
                 _this.element.setAttribute('aria-expanded', 'true');
                 _this.element.setAttribute('aria-owns', _this.getPopUpElement().id);
                 if (ul_1 && !_this.isSafari()) {
-                    ul_1.focus();
+                    if (_this.target && isSplitbutton) {
+                        if (ul_1.tagName === 'UL') {
+                            ul_1.focus({ preventScroll: observedArgs.preventScroll });
+                        }
+                        else {
+                            var focusableChild = ul_1.querySelector('ul');
+                            if (focusableChild) {
+                                focusableChild.focus({ preventScroll: observedArgs.preventScroll });
+                            }
+                        }
+                    }
+                    else {
+                        ul_1.focus({ preventScroll: observedArgs.preventScroll });
+                    }
                 }
                 if (_this.enableRtl && ul_1.parentElement.style.left !== '0px') {
                     var wrapperWidth = void 0;
-                    if (_this.element.parentElement && _this.element.parentElement.classList.contains('e-split-btn-wrapper')) {
+                    if (isSplitbutton) {
                         wrapperWidth = _this.element.parentElement.offsetWidth;
                     }
                     else {
@@ -1231,7 +1258,9 @@ var SplitButton = /** @__PURE__ @class */ (function (_super) {
      * @hidden
      */
     function SplitButton(options, element) {
-        return _super.call(this, options, element) || this;
+        var _this = _super.call(this, options, element) || this;
+        _this.issecondaryBtnClick = false;
+        return _this;
     }
     /**
      * Initialize Angular support.
@@ -1485,16 +1514,20 @@ var SplitButton = /** @__PURE__ @class */ (function (_super) {
     SplitButton.prototype.btnKeyBoardHandler = function (e) {
         switch (e.action) {
             case 'altdownarrow':
-                this.clickHandler(e);
+                if (this.issecondaryBtnClick) {
+                    this.clickHandler(e);
+                }
                 break;
             case 'enter':
-                this.clickHandler(e);
-                if (this.getPopUpElement() && !this.getPopUpElement().classList.contains('e-popup-close')) {
-                    this.element.classList.remove('e-active');
-                    this.secondaryBtnObj.element.classList.add('e-active');
-                }
-                else {
-                    this.secondaryBtnObj.element.classList.remove('e-active');
+                if (this.issecondaryBtnClick) {
+                    this.clickHandler(e);
+                    if (this.getPopUpElement() && !this.getPopUpElement().classList.contains('e-popup-close')) {
+                        this.element.classList.remove('e-active');
+                        this.secondaryBtnObj.element.classList.add('e-active');
+                    }
+                    else {
+                        this.secondaryBtnObj.element.classList.remove('e-active');
+                    }
                 }
                 break;
         }