forked from themesberg/flowbite-react
-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
fix(button): Fixed Typescript error when using Next.js Link in the bu…
…tton `as` prop (themesberg#1244) * fix(button): correctly infer type from `as` prop `as` prop was throwing TS errors when using Next Link component. Now this correctly infers the type from any component passed to the `as` prop fix themesberg#1002 fix themesberg#1107 * fix(dropdown-item): applied the generic types to DropdownItem and also wraps it with a forwardRef * docs(button): removed now-unnecessary @ts-expect-error comments * fix(button): replaced use of old genericForwardRef
- Loading branch information
1 parent
130f7da
commit b1058e0
Showing
9 changed files
with
184 additions
and
171 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,18 +1,19 @@ | ||
import { createElement, type ComponentPropsWithoutRef, type ElementType, type ForwardedRef } from 'react'; | ||
import genericForwardRef from '../../helpers/generic-forward-ref'; | ||
import { createElement, type ComponentPropsWithoutRef, type ElementType, type ForwardedRef, forwardRef } from 'react'; | ||
|
||
export type ButtonBaseProps<T extends ElementType = 'button'> = { | ||
as?: T; | ||
href?: string; | ||
} & ComponentPropsWithoutRef<T>; | ||
|
||
const ButtonBaseComponent = <T extends ElementType = 'button'>( | ||
{ children, as: Component, href, type = 'button', ...props }: ButtonBaseProps<T>, | ||
ref: ForwardedRef<T>, | ||
) => { | ||
const BaseComponent = Component || (href ? 'a' : 'button'); | ||
export const ButtonBase = forwardRef( | ||
<T extends ElementType = 'button'>( | ||
{ children, as: Component, href, type = 'button', ...props }: ButtonBaseProps<T>, | ||
ref: ForwardedRef<T>, | ||
) => { | ||
const BaseComponent = Component || (href ? 'a' : 'button'); | ||
|
||
return createElement(BaseComponent, { ref, href, type, ...props }, children); | ||
}; | ||
return createElement(BaseComponent, { ref, href, type, ...props }, children); | ||
}, | ||
); | ||
|
||
export const ButtonBase = genericForwardRef(ButtonBaseComponent); | ||
ButtonBase.displayName = 'ButtonBaseComponent'; |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.