refactor button typing

hazelcast · Oct 26, 2023 · 39fe388 · 39fe388
1 parent dc0543e
commit 39fe388
Showing 1 changed file with 3 additions and 3 deletions.
diff --git a/packages/ui/src/Button.tsx b/packages/ui/src/Button.tsx
@@ -79,7 +79,8 @@ export type ButtonCommonProps = {
   outlineClassName?: string
   outline?: ButtonOutlineType
   tooltip?: string
-} & Pick<HTMLAttributes<HTMLAnchorElement | HTMLButtonElement>, 'className' | 'onClick' | 'tabIndex' | 'style'>
+} & (ButtonDisabledProps | ButtonNotDisabledProps) &
+  Pick<HTMLAttributes<HTMLAnchorElement | HTMLButtonElement>, 'className' | 'onClick' | 'tabIndex' | 'style'>
 
 export type ButtonTypeAnchorProps = {
   component: 'a'
@@ -96,8 +97,7 @@ export type ButtonTypeButtonProps = {
   target?: never
   rel?: never
   loading?: boolean
-} & (ButtonDisabledProps | ButtonNotDisabledProps) &
-  Pick<ButtonHTMLAttributes<HTMLButtonElement>, 'autoFocus' | 'type'>
+} & Pick<ButtonHTMLAttributes<HTMLButtonElement>, 'autoFocus' | 'type'>
 
 export type ButtonTypeProps = ButtonTypeAnchorProps | ButtonTypeButtonProps