@syncfusion/ej2-splitbuttons 33.2.6 → 34.1.31

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

@@ -704,6 +704,11 @@ let DropDownButton = class DropDownButton extends Component {
         if (e.target === this.element && (e.keyCode === 9 || (!e.altKey && e.keyCode === 40) || e.keyCode === 38)) {
             return;
         }
+        const 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();
         }
@@ -736,10 +741,13 @@ let DropDownButton = class DropDownButton extends Component {
         upDownKeyHandler(this.getULElement(), e.keyCode);
     }
     keyEventHandler(e) {
+        const 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;
@@ -787,6 +795,11 @@ let DropDownButton = class DropDownButton extends Component {
         }
     }
     clickHandler(e) {
+        const splitButton = getComponent(this.activeElem[0], 'split-btn');
+        if (splitButton) {
+            // eslint-disable-next-line @typescript-eslint/no-explicit-any
+            splitButton.issecondaryBtnClick = false;
+        }
         const trgt = e.target;
         if (closest(trgt, '[id="' + this.element.id + '"]')) {
             if (!this.createPopupOnClick || (this.target && this.target !== '' && !this.isColorPicker() && !this.createPopupOnClick)) {
@@ -863,6 +876,7 @@ let DropDownButton = class DropDownButton extends Component {
             }
         }
         const ul = this.getULElement();
+        const isSplitbutton = Boolean(this.element.parentElement && this.element.parentElement.classList.contains('e-split-btn-wrapper'));
         this.popupWireEvents();
         const beforeOpenArgs = { element: ul, items: this.items, event: e, cancel: false };
         this.trigger('beforeOpen', beforeOpenArgs, (observedArgs) => {
@@ -880,11 +894,24 @@ let DropDownButton = class DropDownButton extends Component {
                 this.element.setAttribute('aria-expanded', 'true');
                 this.element.setAttribute('aria-owns', this.getPopUpElement().id);
                 if (ul && !this.isSafari()) {
-                    ul.focus();
+                    if (this.target && isSplitbutton) {
+                        if (ul.tagName === 'UL') {
+                            ul.focus({ preventScroll: observedArgs.preventScroll });
+                        }
+                        else {
+                            const focusableChild = ul.querySelector('ul');
+                            if (focusableChild) {
+                                focusableChild.focus({ preventScroll: observedArgs.preventScroll });
+                            }
+                        }
+                    }
+                    else {
+                        ul.focus({ preventScroll: observedArgs.preventScroll });
+                    }
                 }
                 if (this.enableRtl && ul.parentElement.style.left !== '0px') {
                     let wrapperWidth;
-                    if (this.element.parentElement && this.element.parentElement.classList.contains('e-split-btn-wrapper')) {
+                    if (isSplitbutton) {
                         wrapperWidth = this.element.parentElement.offsetWidth;
                     }
                     else {
@@ -1168,6 +1195,7 @@ let SplitButton = class SplitButton extends DropDownButton {
      */
     constructor(options, element) {
         super(options, element);
+        this.issecondaryBtnClick = false;
     }
     /**
      * Initialize Angular support.
@@ -1419,16 +1447,20 @@ let SplitButton = class SplitButton extends DropDownButton {
     btnKeyBoardHandler(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;
         }