Skip to content

fix: make TabButton aria compliant as a button #417

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

Open
paralin wants to merge 2 commits into
base: master
Choose a base branch
from
Open

fix: make TabButton aria compliant as a button #417

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
86a0626
fix: make TabButton aria compliant as a button
paralin Oct 23, 2023
7cf890f
fix: make TabButton close button aria compliant as a button
paralin Nov 3, 2023
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
27 changes: 22 additions & 5 deletions src/view/TabButton.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -81,15 +81,20 @@ export const TabButton = (props: ITabButtonProps) => {
return false;
};

const onClose = (event: React.MouseEvent<HTMLDivElement>) => {
const onClose = (event: React.MouseEvent<HTMLButtonElement>) => {
event.preventDefault();
if (isClosable()) {
layout.doAction(Actions.deleteTab(node.getId()));
} else {
onClick();
}
};

const onCloseMouseDown = (event: React.MouseEvent<HTMLDivElement> | React.TouchEvent<HTMLDivElement>) => {
const onCloseMouseDown = (event: React.MouseEvent<HTMLButtonElement> | React.TouchEvent<HTMLButtonElement>) => {
event.stopPropagation();
};

const onCloseKeyDown = (event: React.KeyboardEvent<HTMLButtonElement>) => {
event.stopPropagation();
};

Expand Down Expand Up @@ -183,25 +188,37 @@ export const TabButton = (props: ITabButtonProps) => {
if (node.isEnableClose() && !isStretch) {
const closeTitle = layout.i18nName(I18nLabel.Close_Tab);
renderState.buttons.push(
<div
<button
key="close"
data-layout-path={path + "/button/close"}
title={closeTitle}
className={cm(CLASSES.FLEXLAYOUT__TAB_BUTTON_TRAILING)}
onMouseDown={onCloseMouseDown}
onClick={onClose}
onTouchStart={onCloseMouseDown}>
onTouchStart={onCloseMouseDown}
onKeyDown={onCloseKeyDown}>
{(typeof icons.close === "function") ? icons.close(node) : icons.close}
</div>
</button>
);
}

const onKeyDown = (event: React.KeyboardEvent<HTMLDivElement>) => {
if (event.key === "Enter" || event.key === " ") {
event.preventDefault();
onClick();
}
};

return (
<div
ref={selfRef}
role="button"
tabIndex={0}
aria-pressed={selected}
data-layout-path={path}
className={classNames}
onMouseDown={onMouseDown}
onKeyDown={onKeyDown}
onClick={onAuxMouseClick}
onAuxClick={onAuxMouseClick}
onContextMenu={onContextMenu}
Expand Down