fedi/mastodon
1
0
Fork 1
mirror of https://github.com/mastodon/mastodon.git synced 2024-12-18 15:48:22 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix props for <Button> (#29780)

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