diff --git a/app/components/Input.tsx b/app/components/Input.tsx index 18554df835..eff8cbab3a 100644 --- a/app/components/Input.tsx +++ b/app/components/Input.tsx @@ -1,4 +1,5 @@ import React from "react"; +import { Label } from "./Typography"; interface InputProps extends React.InputHTMLAttributes { label?: string; @@ -8,12 +9,10 @@ interface InputProps extends React.InputHTMLAttributes { export function Input({ label, className, ...rest }: InputProps) { return (
- {label && ( - - )} + {label && }
diff --git a/app/components/ItemPicker.tsx b/app/components/ItemPicker.tsx index 6831e1ef0e..2f70dc1593 100644 --- a/app/components/ItemPicker.tsx +++ b/app/components/ItemPicker.tsx @@ -26,7 +26,7 @@ export const ItemPicker = ({ )} onClick={handleSelected} > - +

{label}

diff --git a/app/components/Textarea.tsx b/app/components/Textarea.tsx index 3b069b39ee..4d85c98782 100644 --- a/app/components/Textarea.tsx +++ b/app/components/Textarea.tsx @@ -1,24 +1,42 @@ -import { TextareaHTMLAttributes } from "react" +import { TextareaHTMLAttributes } from "react"; import { twMerge } from "tailwind-merge"; +import { Label } from "./Typography"; + +type ResizeType = + | "none" + | "both" + | "horizontal" + | "vertical" + | "block" + | "inline" + | undefined; export const Textarea = ({ className, + label, + resize = "vertical", ...rest -}:TextareaHTMLAttributes) => { - return( -