zelo72
/
mastodon
mirror of https://github.com/mastodon/mastodon
2
2
Fork 1
Code Issues 9 Releases Wiki Activity

Fix props for `<Button>` (#29780)

This commit is contained in:
Renaud Chaput 2024-03-28 11:06:25 +01:00 committed by GitHub
parent f2fd1da23f
commit d088964761
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 9 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
app/javascript/mastodon/components/button.tsx
View File

@ -1,26 +1,26 @@
import type { PropsWithChildren } from 'react';
import { useCallback } from 'react';
import classNames from 'classnames';
interface BaseProps extends React.ButtonHTMLAttributes<HTMLButtonElement> {
interface BaseProps
extends Omit<React.ButtonHTMLAttributes<HTMLButtonElement>, 'children'> {
block?: boolean;
secondary?: boolean;
text?: JSX.Element;
}
interface PropsWithChildren extends BaseProps {
text?: never;
interface PropsChildren extends PropsWithChildren<BaseProps> {
text?: undefined;
}
interface PropsWithText extends BaseProps {
text: JSX.Element;
children: never;
text: JSX.Element | string;
children?: undefined;
}
type Props = PropsWithText | PropsWithChildren;
type Props = PropsWithText | PropsChildren;
export const Button: React.FC<Props> = ({
text,
type = 'button',
onClick,
disabled,
@ -28,6 +28,7 @@ export const Button: React.FC<Props> = ({
secondary,
className,
title,
text,
children,
...props
}) => {