Skip to content

fix(ui5-split-button): fire click event when focused with shift + tab #11197

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft
wants to merge 3 commits into
base: main
Choose a base branch
from
Draft

fix(ui5-split-button): fire click event when focused with shift + tab #11197

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
8dcbf7a
fix(ui5-split-button): fire click event when focused with shift + tab
hinzzx Mar 26, 2025
d3cc459
chore: remove duplicate code
hinzzx Mar 28, 2025
b05753c
chore: add missing doc
hinzzx Apr 16, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
121 changes: 53 additions & 68 deletions packages/main/src/SplitButton.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -173,12 +173,12 @@ class SplitButton extends UI5Element {
_spacePressed = false;

/**
* Indicates if there is SHIFT or ESCAPE key pressed
* Indicates if there is Shift or Escape key pressed while Space key is down.
* @default false
* @private
*/
@property({ type: Boolean, noAttribute: true })
_shiftOrEscapePressed = false;
_shiftOrEscapePressedDuringSpace = false;

/**
* Defines the active state of the text button
Expand Down Expand Up @@ -227,9 +227,6 @@ class SplitButton extends UI5Element {
@slot({ type: Node, "default": true })
text!: Array<Node>;

_isDefaultActionPressed = false;
_isKeyDownOperation = false;

@i18n("@ui5/webcomponents")
static i18nBundle: I18nBundle;

Expand All @@ -248,17 +245,10 @@ class SplitButton extends UI5Element {
return;
}

this._shiftOrEscapePressed = false;
this._resetActionButtonStates();
this._setTabIndexValue();
}

_onFocusIn() {
if (this.disabled || this.getFocusDomRef()!.matches(":has(:focus-within)")) {
return;
}
this._shiftOrEscapePressed = false;
}

handleTouchStart(e: TouchEvent | MouseEvent) {
e.stopPropagation();
this._textButtonActive = true;
Expand All @@ -273,59 +263,67 @@ class SplitButton extends UI5Element {
}

_onKeyDown(e: KeyboardEvent) {
this._isKeyDownOperation = true;
if (this._isArrowKeyAction(e)) {
this._handleArrowButtonAction(e);
this._activeArrowButton = true;
} else if (this._isDefaultAction(e)) {
return;
}

if (this._isDefaultAction(e)) {
this._handleDefaultAction(e);
this._isDefaultActionPressed = true;
return;
}

if (this._spacePressed && this._isShiftOrEscape(e)) {
this._handleShiftOrEscapePressed();
if ((isShift(e) || isEscape(e)) && this._spacePressed) {
e.preventDefault();
this._shiftOrEscapePressedDuringSpace = true;
}

// Handles button freeze issue when pressing Enter/Space and navigating with Tab/Shift+Tab simultaneously.
if (this._isDefaultActionPressed && (isTabNext(e) || isTabPrevious(e))) {
this._activeArrowButton = false;
this._textButtonActive = false;
if (isEscape(e)) {
this._resetActionButtonStates();
}

this._tabIndex = -1;
}

_onKeyUp(e: KeyboardEvent) {
this._isKeyDownOperation = false;
const target = e.target as Button;
if (this._isArrowKeyAction(e)) {
e.preventDefault();
this._activeArrowButton = false;
return;
}

if (isSpace(e)) {
e.preventDefault();
e.stopPropagation();
this._textButtonActive = false;
} else if (this._isDefaultAction(e)) {
this._isDefaultActionPressed = false;
this._textButtonActive = false;
if (isSpace(e)) {
e.preventDefault();
e.stopPropagation();
if (!this._shiftOrEscapePressedDuringSpace && target !== this.arrowButton) { // Do not fire click if Arrow button is focused by mouse and Space is pressed afterwards
this._fireClick();
this._spacePressed = false;
this._textButtonActive = false;
}

this._spacePressed = false;
return;
}

if (this._isShiftOrEscape(e)) {
this._handleShiftOrEscapePressed();
if (isEnter(e)) {
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I suggest combining this statement and the one below into a variable like "shouldToggleOffActiveButton" and then if (should ...): this._buttonActive = false to avoid the duplicate code

this._textButtonActive = false;
return;
}

this._tabIndex = -1;
if (isShift(e) && this._textButtonActive) {
this._textButtonActive = false;
}
}

_resetActionButtonStates() {
this._activeArrowButton = false;
this._textButtonActive = false;
}

_fireClick(e?: Event) {
e?.stopPropagation();
if (!this._shiftOrEscapePressed) {
this.fireDecoratorEvent("click");
}
this._shiftOrEscapePressed = false;
this.fireDecoratorEvent("click");
}

_fireArrowClick(e?: Event) {
Expand Down Expand Up @@ -383,15 +381,6 @@ class SplitButton extends UI5Element {
return isSpace(e) || isEnter(e);
}

/**
* Checks if the pressed key is an escape key or shift key.
* @param e - keyboard event
* @private
*/
_isShiftOrEscape(e: KeyboardEvent): boolean {
return isEscape(e) || isShift(e);
}

/**
* Handles the click event and the focus on the arrow button.
* @param e - keyboard event
Expand All @@ -401,10 +390,6 @@ class SplitButton extends UI5Element {
e.preventDefault();

this._fireArrowClick(e);

if (isSpace((e as KeyboardEvent))) {
this._spacePressed = true;
}
}

/**
Expand All @@ -414,30 +399,30 @@ class SplitButton extends UI5Element {
*/
_handleDefaultAction(e: KeyboardEvent) {
e.preventDefault();
const wasSpacePressed = isSpace(e);
const target = e.target as Button;

if (this.arrowButton && target === this.arrowButton) {
this._activeArrowButton = true;
this._fireArrowClick();
if (wasSpacePressed) {
this._spacePressed = true;
this._textButtonActive = false;
}
} else {
this._textButtonActive = true;
if (wasSpacePressed) {
this._spacePressed = true;
return;
}
this._fireClick();
return;
}
}

_handleShiftOrEscapePressed() {
this._shiftOrEscapePressed = true;
this._textButtonActive = false;
this._isKeyDownOperation = false;
this._textButtonActive = true;

if (isSpace(e)) {
this._spacePressed = true;
this._shiftOrEscapePressedDuringSpace = false; // Reset whenever new Space action starts
return;
}

if (isEnter(e)) {
this._fireClick(e);
return;
}

if (isTabPrevious(e) || isTabNext(e)) {
this._resetActionButtonStates();
}
}

get effectiveActiveArrowButton() {
Expand Down
1 change: 0 additions & 1 deletion packages/main/src/SplitButtonTemplate.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,6 @@ export default function SplitButtonTemplate(this: SplitButton) {
tabindex={this._tabIndex}
aria-labelledby={`${this._id}-invisibleTextDefault ${this._id}}-invisibleText`}
onFocusOut={this._onFocusOut}
onFocusIn={this._onFocusIn}
onKeyDown={this._onKeyDown}
onKeyUp={this._onKeyUp}
>
Expand Down
Loading