Skip to content

fix(list-item): Improve accessibility #240

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
Anlerkan wants to merge 2 commits into
base: main
Choose a base branch
from
Open

fix(list-item): Improve accessibility #240

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
f7a4a64
fix(list-item): fix event bubbling issue and improve accessibility
Anlerkan May 13, 2024
959b183
fix: pass event directly to callback
Anlerkan May 14, 2024
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
35 changes: 19 additions & 16 deletions src/list/item/ListItem.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,27 +30,30 @@ function ListItem({
listItemRef
}: ListItemProps) {
const containerClassName = classNames("list-item", customClassName);
let listItem = (
<li
ref={listItemRef}
id={id}
data-testid={testid}
className={containerClassName}
role={role}
aria-selected={ariaSelected}>
{children}
</li>
);
const listItemProps: React.DetailedHTMLProps<
React.LiHTMLAttributes<HTMLLIElement>,
HTMLLIElement
> & {
"data-testid": string | undefined;
} = {
ref: listItemRef,
id,
"data-testid": testid,
className: containerClassName,
role,
"aria-selected": ariaSelected
};
let listItem = <li {...listItemProps}>{children}</li>;

if (clickableListItemProps) {
listItem = (
<li ref={listItemRef} id={id} data-testid={testid} className={containerClassName}>
<li {...listItemProps}>
<div
role={"button"}
tabIndex={clickableListItemProps.tabIndex || 0}
className={"list-item__click-wrapper"}
onClick={handleClick}
onKeyPress={handleKeyPress}>
onKeyDown={handleKeyDown}>
{children}
</div>
</li>
Expand All @@ -60,11 +63,11 @@ function ListItem({
return listItem;

function handleClick(event: React.SyntheticEvent) {
clickableListItemProps!.onClick(event);
clickableListItemProps?.onClick(event);
}

function handleKeyPress(event: React.KeyboardEvent) {
if (event.key === KEYBOARD_EVENT_KEY.ENTER) {
function handleKeyDown(event: React.KeyboardEvent) {
if ([KEYBOARD_EVENT_KEY.ENTER, KEYBOARD_EVENT_KEY.SPACE].includes(event.key)) {
handleClick(event);
}
}
Expand Down