Skip to content
Open
Changes from all commits
Commits
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
30 changes: 14 additions & 16 deletions src/Button.tsx
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
import * as React from 'react';
import type { DynamicRefForwardingComponent } from './types.js';

export type ButtonType = 'button' | 'reset' | 'submit';

Expand Down Expand Up @@ -108,7 +109,7 @@ export function useButtonProps({
];
}

export interface BaseButtonProps {
export interface ButtonProps extends React.ButtonHTMLAttributes<HTMLElement> {
/**
* Control the underlying rendered element directly by passing in a valid
* component type
Expand All @@ -127,21 +128,18 @@ export interface BaseButtonProps {
rel?: string | undefined;
}

export interface ButtonProps
extends BaseButtonProps,
React.ComponentPropsWithoutRef<'button'> {}

const Button = React.forwardRef<HTMLElement, ButtonProps>(
({ as: asProp, disabled, ...props }, ref) => {
const [buttonProps, { tagName: Component }] = useButtonProps({
tagName: asProp,
disabled,
...props,
});

return <Component {...props} {...buttonProps} ref={ref} />;
},
);
const Button: DynamicRefForwardingComponent<'button', ButtonProps> =
React.forwardRef<HTMLElement, ButtonProps>(
({ as: asProp, disabled, ...props }, ref) => {
const [buttonProps, { tagName: Component }] = useButtonProps({
tagName: asProp,
disabled,
...props,
});

return <Component {...props} {...buttonProps} ref={ref} />;
},
);

Button.displayName = 'Button';

Expand Down
Loading