From 94443c50bae96c8247b5760df6827775873ab7db Mon Sep 17 00:00:00 2001
From: kyletsang <6854874+kyletsang@users.noreply.github.com>
Date: Thu, 7 Jul 2022 12:04:58 -0700
Subject: [PATCH] fix(Anchor): don't check role when applying button props

---
 src/Anchor.tsx | 2 +-
 src/Button.tsx | 6 ++++--
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/src/Anchor.tsx b/src/Anchor.tsx
index fb434e0..aaf5f42 100644
--- a/src/Anchor.tsx
+++ b/src/Anchor.tsx
@@ -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} />
       );
diff --git a/src/Button.tsx b/src/Button.tsx
index a7c357e..324a3c8 100644
--- a/src/Button.tsx
+++ b/src/Button.tsx
@@ -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) {
@@ -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;
@@ -43,6 +44,7 @@ export function useButtonProps({
   href,
   target,
   rel,
+  role,
   onClick,
   tabIndex = 0,
   type,
@@ -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,