From b0c93c45922ba9a38ef077d8b468e287df1b025b Mon Sep 17 00:00:00 2001 From: Samuel Colvin Date: Mon, 20 Nov 2023 16:06:19 +0000 Subject: [PATCH] simplify className usage --- packages/fastui/src/components/FormField.tsx | 99 ++++++++++++++------ packages/fastui/src/components/Json.tsx | 3 + packages/fastui/src/components/button.tsx | 6 +- packages/fastui/src/components/div.tsx | 4 +- packages/fastui/src/components/form.tsx | 6 +- packages/fastui/src/components/heading.tsx | 8 +- packages/fastui/src/components/index.tsx | 2 + packages/fastui/src/components/link.tsx | 4 +- packages/fastui/src/components/modal.tsx | 6 +- packages/fastui/src/components/table.tsx | 6 +- packages/fastui/src/hooks/className.ts | 42 ++++++--- python/fastui/components/forms.py | 2 + python/fastui/json_schema.py | 4 + 13 files changed, 131 insertions(+), 61 deletions(-) diff --git a/packages/fastui/src/components/FormField.tsx b/packages/fastui/src/components/FormField.tsx index f21e33f2..93b75c8d 100644 --- a/packages/fastui/src/components/FormField.tsx +++ b/packages/fastui/src/components/FormField.tsx @@ -1,6 +1,6 @@ import { FC, useState } from 'react' -import { ClassName, useClassNameGenerator } from '../hooks/className' +import { ClassName, useClassName } from '../hooks/className' interface BaseFormFieldProps { name: string @@ -8,6 +8,7 @@ interface BaseFormFieldProps { required: boolean locked: boolean error?: string + description?: string className?: ClassName } @@ -17,27 +18,29 @@ interface FormFieldInputProps extends BaseFormFieldProps { type: 'FormFieldInput' htmlType?: 'text' | 'date' | 'datetime-local' | 'time' | 'email' | 'url' | 'file' | 'number' initial?: string | number + placeholder?: string } export const FormFieldInputComp: FC = (props) => { - const { className, name, title, required, htmlType, locked } = props + const { name, placeholder, required, htmlType, locked } = props const [value, setValue] = useState(props.initial ?? '') - // TODO placeholder return ( -
-