Skip to content

fix(ui): forward button refs #892

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
zoldyzdk wants to merge 1 commit into
base: main
Choose a base branch
from
+23 −12
Open

fix(ui): forward button refs #892

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
35 changes: 23 additions & 12 deletions src/ui/Button.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ type ButtonRounded = 'none' | 'md' | 'lg' | 'full'

type ButtonOwnProps<TElement extends React.ElementType = 'button'> = {
as?: TElement
children: React.ReactNode
children?: React.ReactNode
variant?: ButtonVariant
color?: ButtonColor
size?: ButtonSize
Expand All @@ -35,8 +35,11 @@ type ButtonProps<TElement extends React.ElementType = 'button'> =
keyof ButtonOwnProps<TElement>
>

type ButtonRef<TElement extends React.ElementType> =
React.ComponentPropsWithRef<TElement>['ref']

type ButtonComponent = <TElement extends React.ElementType = 'button'>(
props: ButtonProps<TElement>,
props: ButtonProps<TElement> & { ref?: ButtonRef<TElement> },
) => React.ReactNode

const primaryColorStyles: Record<ButtonColor, string> = {
Expand Down Expand Up @@ -102,16 +105,19 @@ function getDefaultRounded(size: ButtonSize): ButtonRounded {
return 'lg'
}

export const Button: ButtonComponent = ({
as,
children,
variant = 'primary',
color = 'blue',
size,
rounded,
className,
...props
}) => {
function ButtonInner<TElement extends React.ElementType = 'button'>(
{
as,
children,
variant = 'primary',
color = 'blue',
size,
rounded,
className,
...props
}: ButtonProps<TElement>,
ref: ButtonRef<TElement>,
) {
const Component = as || 'button'
const resolvedSize = size ?? getDefaultSize(variant)
const resolvedRounded = rounded ?? getDefaultRounded(resolvedSize)
Expand All @@ -126,6 +132,7 @@ export const Button: ButtonComponent = ({
return React.createElement(
Component,
{
ref,
className: twMerge(
baseStyles,
variantStyles[variant],
Expand All @@ -139,3 +146,7 @@ export const Button: ButtonComponent = ({
children,
)
}

export const Button = React.forwardRef(
ButtonInner as React.ForwardRefRenderFunction<unknown, ButtonProps>,
) as unknown as ButtonComponent