From 34125b7c7a57b749cf8cbaf6bab8d3b186a52559 Mon Sep 17 00:00:00 2001 From: crupest Date: Tue, 11 Jul 2023 21:45:37 +0800 Subject: ... --- FrontEnd/src/views/common/button/Button.tsx | 42 ++++++++++++++++------------- 1 file changed, 23 insertions(+), 19 deletions(-) (limited to 'FrontEnd/src/views/common/button/Button.tsx') diff --git a/FrontEnd/src/views/common/button/Button.tsx b/FrontEnd/src/views/common/button/Button.tsx index c5976909..be605328 100644 --- a/FrontEnd/src/views/common/button/Button.tsx +++ b/FrontEnd/src/views/common/button/Button.tsx @@ -1,43 +1,47 @@ -import * as React from "react"; +import { ComponentPropsWithoutRef, Ref } from "react"; import classNames from "classnames"; -import { useTranslation } from "react-i18next"; -import { convertI18nText, I18nText } from "@/common"; +import { I18nText, useC } from "@/common"; import { PaletteColorType } from "@/palette"; import "./Button.css"; -function _Button( - props: { - color?: PaletteColorType; - text?: I18nText; - outline?: boolean; - } & React.ComponentPropsWithoutRef<"button">, - ref: React.ForwardedRef -): JSX.Element { - const { t } = useTranslation(); +interface ButtonProps extends ComponentPropsWithoutRef<"button"> { + color?: PaletteColorType; + text?: I18nText; + outline?: boolean; + buttonRef?: Ref | null; +} - const { color, text, outline, className, children, ...otherProps } = props; +export default function Button(props: ButtonProps) { + const { + buttonRef, + color, + text, + outline, + className, + children, + ...otherProps + } = props; if (text != null && children != null) { console.warn("You can't set both text and children props."); } + const c = useC(); + return ( ); } - -const Button = React.forwardRef(_Button); -export default Button; -- cgit v1.2.3