Skip to content

fix(Anchor): don't check role when applying button props #62

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

Merged
kyletsang merged 1 commit into from
Jul 9, 2022
Merged

fix(Anchor): don't check role when applying button props #62

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
2 changes: 1 addition & 1 deletion src/Anchor.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ const Anchor = React.forwardRef<HTMLAnchorElement, AnchorProps>(
},
);

if ((isTrivialHref(props.href) && !props.role) || props.role === 'button') {
if (isTrivialHref(props.href) || props.role === 'button') {
return (
<a ref={ref} {...props} {...buttonProps} onKeyDown={handleKeyDown} />
);
Expand Down
6 changes: 4 additions & 2 deletions src/Button.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@ export interface UseButtonPropsOptions extends AnchorOptions {
onClick?: React.EventHandler<React.MouseEvent | React.KeyboardEvent>;
tabIndex?: number;
tagName?: keyof JSX.IntrinsicElements;
role?: React.AriaRole | undefined;
}

export function isTrivialHref(href?: string) {
Expand All @@ -23,7 +24,7 @@ export function isTrivialHref(href?: string) {
export interface AriaButtonProps {
type?: ButtonType | undefined;
disabled: boolean | undefined;
role?: 'button';
role?: React.AriaRole;
tabIndex?: number | undefined;
href?: string | undefined;
target?: string | undefined;
Expand All @@ -43,6 +44,7 @@ export function useButtonProps({
href,
target,
rel,
role,
onClick,
tabIndex = 0,
type,
Expand Down Expand Up @@ -90,7 +92,7 @@ export function useButtonProps({

return [
{
role: 'button',
role: role ?? 'button',
// explicitly undefined so that it overrides the props disabled in a spread
// e.g. <Tag {...props} {...hookProps} />
disabled: undefined,
Expand Down