chore: sync fork properly

src/npm-fastui/src/components/FormField.tsx

@@ -24,7 +24,7 @@ interface FormFieldInputProps extends FormFieldInput {
 }
 
 export const FormFieldInputComp: FC<FormFieldInputProps> = (props) => {
-  const { name, placeholder, required, htmlType, locked, autocomplete, onChange } = props
+  const { name, placeholder, required, htmlType, locked, autocomplete, onChange, step } = props
 
   return (
     <div className={useClassName(props)}>
@@ -39,6 +39,7 @@ export const FormFieldInputComp: FC<FormFieldInputProps> = (props) => {
         disabled={locked}
         placeholder={placeholder}
         autoComplete={autocomplete}
+        step={step}
         aria-describedby={descId(props)}
         onChange={onChange}
       />

src/npm-fastui/src/models.d.ts

@@ -433,6 +433,7 @@ export interface FormFieldInput {
   initial?: string | number
   placeholder?: string
   autocomplete?: string
+  step?: number | 'any'
   type: 'FormFieldInput'
 }
 /**

src/python-fastui/fastui/components/forms.py

@@ -58,6 +58,9 @@ class FormFieldInput(BaseFormField):
     autocomplete: _t.Union[str, None] = None
     """Autocomplete value for the field."""
 
+    step: _t.Union[float, _t.Literal['any'], None] = None
+    """Step value for the field."""
+
     type: _t.Literal['FormFieldInput'] = 'FormFieldInput'
     """The type of the component. Always 'FormFieldInput'."""
 

src/python-fastui/fastui/json_schema.py

@@ -185,6 +185,7 @@ def json_schema_field_to_field(
             initial=schema.get('default'),
             description=schema.get('description'),
             mode=schema.get('mode', 'checkbox'),
+            class_name=schema.get('className'),
         )
     elif field := special_string_field(schema, name, title, required, False):
         return field
@@ -197,7 +198,9 @@ def json_schema_field_to_field(
             initial=schema.get('default'),
             autocomplete=schema.get('autocomplete'),
             description=schema.get('description'),
+            step=schema.get('step', get_default_step(schema)),
             placeholder=schema.get('placeholder'),
+            class_name=schema.get('className'),
         )
 
 
@@ -247,6 +250,7 @@ def special_string_field(
                 multiple=multiple,
                 accept=schema.get('accept'),
                 description=schema.get('description'),
+                class_name=schema.get('className'),
             )
         elif schema.get('format') == 'textarea':
             return FormFieldTextarea(
@@ -259,6 +263,7 @@ def special_string_field(
                 initial=schema.get('initial'),
                 description=schema.get('description'),
                 autocomplete=schema.get('autocomplete'),
+                class_name=schema.get('className'),
             )
         elif enum := schema.get('enum'):
             enum_labels = schema.get('enum_labels', {})
@@ -272,6 +277,7 @@ def special_string_field(
                 initial=schema.get('default'),
                 description=schema.get('description'),
                 autocomplete=schema.get('autocomplete'),
+                class_name=schema.get('className'),
             )
         elif search_url := schema.get('search_url'):
             return FormFieldSelectSearch(
@@ -283,6 +289,7 @@ def special_string_field(
                 multiple=multiple,
                 initial=schema.get('initial'),
                 description=schema.get('description'),
+                class_name=schema.get('className'),
             )
 
 
@@ -313,7 +320,9 @@ def deference_json_schema(
         if def_schema is None:
             raise ValueError(f'Invalid $ref "{ref}", not found in {defs}')
         else:
-            return def_schema.copy(), required  # clone dict to avoid attribute leakage via shared schema.
+            def_schema_new = def_schema.copy()  # clone dict to avoid attribute leakage via shared schema.
+            def_schema_new.update({k: v for k, v in schema.items() if k != '$ref'})  # type: ignore
+            return def_schema_new, required
     elif any_of := schema.get('anyOf'):
         if len(any_of) == 2 and sum(s.get('type') == 'null' for s in any_of) == 1:
             # If anyOf is a single type and null, then it is optional
@@ -373,6 +382,14 @@ def input_html_type(schema: JsonSchemaField) -> InputHtmlType:
         raise ValueError(f'Unknown schema: {schema}') from e
 
 
+def get_default_step(schema: JsonSchemaField) -> _t.Union[_t.Literal['any'], None]:
+    key = schema['type']
+    if key == 'integer':
+        return None
+    if key == 'number':
+        return 'any'
+
+
 def schema_is_field(schema: JsonSchemaConcrete) -> _ta.TypeGuard[JsonSchemaField]:
     """
     Determine if a schema is a field `JsonSchemaField`

src/python-fastui/tests/test_forms.py

@@ -1,5 +1,6 @@
 import enum
 from contextlib import asynccontextmanager
+from enum import Enum
 from io import BytesIO
 from typing import List, Tuple, Union
 
@@ -547,3 +548,93 @@ def test_form_fields():
         'submitUrl': '/foobar/',
         'type': 'ModelForm',
     }
+
+
+class FormNumbersDefaultStep(BaseModel):
+    size: int
+    cost: float
+
+
+def test_form_numbers_default_step():
+    m = components.ModelForm(model=FormNumbersDefaultStep, submit_url='/foobar')
+
+    assert m.model_dump(by_alias=True, exclude_none=True) == {
+        'submitUrl': '/foobar',
+        'method': 'POST',
+        'type': 'ModelForm',
+        'formFields': [
+            {
+                'name': 'size',
+                'title': ['Size'],
+                'required': True,
+                'locked': False,
+                'htmlType': 'number',
+                'type': 'FormFieldInput',
+            },
+            {
+                'name': 'cost',
+                'title': ['Cost'],
+                'required': True,
+                'locked': False,
+                'htmlType': 'number',
+                'step': 'any',
+                'type': 'FormFieldInput',
+            },
+        ],
+    }
+
+
+class ToolEnum(str, Enum):
+    """Tools that can be leveraged to complete a job."""
+
+    hammer = 'hammer'
+    screwdriver = 'screwdriver'
+    saw = 'saw'
+    claw_hammer = 'claw_hammer'
+
+
+class FormEnumWithOptionalEnum(BaseModel):
+    job_name: str
+    tool_required: Union[ToolEnum, None] = Field(
+        json_schema_extra={
+            # Override certain schema fields.
+            'placeholder': 'tool',
+            'description': '',
+        }
+    )
+
+
+def test_form_with_enum():
+    m = components.ModelForm(model=FormEnumWithOptionalEnum, submit_url='/foobar')
+
+    assert m.model_dump(by_alias=True, exclude_none=True) == {
+        'submitUrl': '/foobar',
+        'method': 'POST',
+        'type': 'ModelForm',
+        'formFields': [
+            {
+                'name': 'job_name',
+                'title': ['Job Name'],
+                'required': True,
+                'locked': False,
+                'htmlType': 'text',
+                'type': 'FormFieldInput',
+            },
+            {
+                'name': 'tool_required',
+                'title': ['ToolEnum'],
+                'required': False,
+                'locked': False,
+                'description': '',
+                'options': [
+                    {'value': 'hammer', 'label': 'Hammer'},
+                    {'value': 'screwdriver', 'label': 'Screwdriver'},
+                    {'value': 'saw', 'label': 'Saw'},
+                    {'value': 'claw_hammer', 'label': 'Claw Hammer'},
+                ],
+                'multiple': False,
+                'placeholder': 'tool',
+                'type': 'FormFieldSelect',
+            },
+        ],
+    }