From 8beb7fdf1ff1c94e9a9a6c7c90be4159d85d8a79 Mon Sep 17 00:00:00 2001
From: Chaojie <hi@chaojie.fun>
Date: Mon, 4 Dec 2023 21:07:26 +0800
Subject: [PATCH] Add toggle switches support (#46)

Co-authored-by: Samuel Colvin <s@muelcolvin.com>
---
 README.md                                    |  2 +-
 packages/fastui-bootstrap/src/index.tsx      | 16 ++++++++++++----
 packages/fastui-prebuilt/src/main.scss       |  7 ++++++-
 packages/fastui/src/components/FormField.tsx |  9 +++++----
 packages/fastui/src/components/index.tsx     |  6 +++---
 python/demo/forms.py                         |  4 +++-
 python/fastui/components/__init__.py         |  4 ++--
 python/fastui/components/forms.py            |  7 ++++---
 python/fastui/json_schema.py                 | 15 +++++++++------
 9 files changed, 45 insertions(+), 25 deletions(-)

diff --git a/README.md b/README.md
index 388f9356..92890dcd 100644
--- a/README.md
+++ b/README.md
@@ -141,7 +141,7 @@ FastUI already defines the following components, all are shown in the [demo app]
 - `Table` — renders a table from a list of Pydantic models
 - `Pagination` — renders a pagination component
 - `FormFieldInput` — renders a form field using `<input>`
-- `FormFieldCheckbox` — renders a form field for a boolean using `<input type="checkbox">`
+- `FormFieldBoolean` — renders a form field for a boolean using `<input type="checkbox">`
 - `FormFieldSelect` — renders a form field using `<select>` or [react-select](https://react-select.com)
 - `FormFieldSelectSearch` — renders a form field using [react-select](https://react-select.com) with options updated from the server on search
 - `Form` — renders a form using a list of `FormField` components
diff --git a/packages/fastui-bootstrap/src/index.tsx b/packages/fastui-bootstrap/src/index.tsx
index 9d454e7f..2614cddd 100644
--- a/packages/fastui-bootstrap/src/index.tsx
+++ b/packages/fastui-bootstrap/src/index.tsx
@@ -59,13 +59,17 @@ export const classNameGenerator: ClassNameGenerator = ({ props, fullPath, subEle
         }
       }
     case 'FormFieldInput':
-    case 'FormFieldCheckbox':
+    case 'FormFieldBoolean':
     case 'FormFieldSelect':
     case 'FormFieldSelectSearch':
     case 'FormFieldFile':
       switch (subElement) {
         case 'input':
-          return props.error ? 'is-invalid form-control' : 'form-control'
+          return {
+            'form-control': type !== 'FormFieldBoolean',
+            'is-invalid': props.error != null,
+            'form-check-input': type === 'FormFieldBoolean',
+          }
         case 'select':
           return 'form-select'
         case 'select-react':
@@ -74,14 +78,18 @@ export const classNameGenerator: ClassNameGenerator = ({ props, fullPath, subEle
           if (props.displayMode === 'inline') {
             return 'visually-hidden'
           } else {
-            return { 'form-label': true, 'fw-bold': props.required }
+            return { 'form-label': true, 'fw-bold': props.required, 'form-check-label': type === 'FormFieldBoolean' }
           }
         case 'error':
           return 'invalid-feedback'
         case 'description':
           return 'form-text'
         default:
-          return 'mb-3'
+          return {
+            'mb-3': true,
+            'form-check': type === 'FormFieldBoolean',
+            'form-switch': type === 'FormFieldBoolean' && props.mode === 'switch',
+          }
       }
     case 'Navbar':
       switch (subElement) {
diff --git a/packages/fastui-prebuilt/src/main.scss b/packages/fastui-prebuilt/src/main.scss
index 7c305459..d485a334 100644
--- a/packages/fastui-prebuilt/src/main.scss
+++ b/packages/fastui-prebuilt/src/main.scss
@@ -21,7 +21,12 @@ body {
 
 .top-offset {
   margin-top: 70px;
-  h1, h2, h3, h4, h5, h6 {
+  h1,
+  h2,
+  h3,
+  h4,
+  h5,
+  h6 {
     scroll-margin-top: 60px;
   }
 }
diff --git a/packages/fastui/src/components/FormField.tsx b/packages/fastui/src/components/FormField.tsx
index d7c733cc..aa8a4edd 100644
--- a/packages/fastui/src/components/FormField.tsx
+++ b/packages/fastui/src/components/FormField.tsx
@@ -19,7 +19,7 @@ interface BaseFormFieldProps {
 
 export type FormFieldProps =
   | FormFieldInputProps
-  | FormFieldCheckboxProps
+  | FormFieldBooleanProps
   | FormFieldFileProps
   | FormFieldSelectProps
   | FormFieldSelectSearchProps
@@ -53,12 +53,13 @@ export const FormFieldInputComp: FC<FormFieldInputProps> = (props) => {
   )
 }
 
-interface FormFieldCheckboxProps extends BaseFormFieldProps {
-  type: 'FormFieldCheckbox'
+interface FormFieldBooleanProps extends BaseFormFieldProps {
+  type: 'FormFieldBoolean'
+  mode: 'checkbox' | 'switch'
   initial?: boolean
 }
 
-export const FormFieldCheckboxComp: FC<FormFieldCheckboxProps> = (props) => {
+export const FormFieldBooleanComp: FC<FormFieldBooleanProps> = (props) => {
   const { name, required, locked } = props
 
   return (
diff --git a/packages/fastui/src/components/index.tsx b/packages/fastui/src/components/index.tsx
index ee58e6d0..c79465f6 100644
--- a/packages/fastui/src/components/index.tsx
+++ b/packages/fastui/src/components/index.tsx
@@ -15,7 +15,7 @@ import { FormComp, FormProps, ModelFormProps } from './form'
 import {
   FormFieldProps,
   FormFieldInputComp,
-  FormFieldCheckboxComp,
+  FormFieldBooleanComp,
   FormFieldSelectComp,
   FormFieldSelectSearchComp,
   FormFieldFileComp,
@@ -141,8 +141,8 @@ export const AnyComp: FC<FastProps> = (props) => {
         return <FormComp {...props} />
       case 'FormFieldInput':
         return <FormFieldInputComp {...props} />
-      case 'FormFieldCheckbox':
-        return <FormFieldCheckboxComp {...props} />
+      case 'FormFieldBoolean':
+        return <FormFieldBooleanComp {...props} />
       case 'FormFieldFile':
         return <FormFieldFileComp {...props} />
       case 'FormFieldSelect':
diff --git a/python/demo/forms.py b/python/demo/forms.py
index 7ca29961..33f8d7fb 100644
--- a/python/demo/forms.py
+++ b/python/demo/forms.py
@@ -158,8 +158,10 @@ class BigModel(BaseModel):
     profile_pics: Annotated[list[UploadFile], FormFile(accept='image/*')] | None = Field(
         None, description='Upload multiple images'
     )
-
     dob: date = Field(title='Date of Birth', description='Your date of birth, this is required hence bold')
+    human: bool | None = Field(
+        None, title='Is human', description='Are you human?', json_schema_extra={'mode': 'switch'}
+    )
     size: SizeModel
 
     @field_validator('name')
diff --git a/python/fastui/components/__init__.py b/python/fastui/components/__init__.py
index 2093783e..9287f4e1 100644
--- a/python/fastui/components/__init__.py
+++ b/python/fastui/components/__init__.py
@@ -17,7 +17,7 @@
 from .forms import (
     Form,
     FormField,
-    FormFieldCheckbox,
+    FormFieldBoolean,
     FormFieldFile,
     FormFieldInput,
     FormFieldSelect,
@@ -39,7 +39,7 @@
     'Modal',
     'ModelForm',
     'FormFieldInput',
-    'FormFieldCheckbox',
+    'FormFieldBoolean',
     'FormFieldFile',
     'FormFieldSelect',
     'FormFieldSelectSearch',
diff --git a/python/fastui/components/forms.py b/python/fastui/components/forms.py
index 68c44e24..ad882950 100644
--- a/python/fastui/components/forms.py
+++ b/python/fastui/components/forms.py
@@ -31,9 +31,10 @@ class FormFieldInput(BaseFormField):
     type: typing.Literal['FormFieldInput'] = 'FormFieldInput'
 
 
-class FormFieldCheckbox(BaseFormField):
+class FormFieldBoolean(BaseFormField):
     initial: bool | None = None
-    type: typing.Literal['FormFieldCheckbox'] = 'FormFieldCheckbox'
+    mode: typing.Literal['checkbox', 'switch'] = 'checkbox'
+    type: typing.Literal['FormFieldBoolean'] = 'FormFieldBoolean'
 
 
 class FormFieldFile(BaseFormField):
@@ -61,7 +62,7 @@ class FormFieldSelectSearch(BaseFormField):
     type: typing.Literal['FormFieldSelectSearch'] = 'FormFieldSelectSearch'
 
 
-FormField = FormFieldInput | FormFieldCheckbox | FormFieldFile | FormFieldSelect | FormFieldSelectSearch
+FormField = FormFieldInput | FormFieldBoolean | FormFieldFile | FormFieldSelect | FormFieldSelectSearch
 
 
 class BaseForm(pydantic.BaseModel, ABC, defer_build=True):
diff --git a/python/fastui/json_schema.py b/python/fastui/json_schema.py
index 2dd0798b..21458901 100644
--- a/python/fastui/json_schema.py
+++ b/python/fastui/json_schema.py
@@ -10,7 +10,7 @@
 
 from .components.forms import (
     FormField,
-    FormFieldCheckbox,
+    FormFieldBoolean,
     FormFieldFile,
     FormFieldInput,
     FormFieldSelect,
@@ -75,6 +75,7 @@ class JsonSchemaFile(JsonSchemaBase, total=False):
 class JsonSchemaBool(JsonSchemaBase, total=False):
     type: Required[Literal['boolean']]
     default: bool
+    mode: Literal['checkbox', 'switch']
 
 
 class JsonSchemaInt(JsonSchemaBase, total=False):
@@ -170,12 +171,13 @@ def json_schema_field_to_field(
 ) -> FormField:
     name = loc_to_name(loc)
     if schema['type'] == 'boolean':
-        return FormFieldCheckbox(
+        return FormFieldBoolean(
             name=name,
             title=title,
             required=required,
             initial=schema.get('default'),
             description=schema.get('description'),
+            mode=schema.get('mode', 'checkbox'),
         )
     elif field := special_string_field(schema, name, title, required, False):
         return field
@@ -279,10 +281,11 @@ def deference_json_schema(
             # If anyOf is a single type and null, then it is optional
             not_null_schema = next(s for s in any_of if s.get('type') != 'null')
 
-            # is there anything else apart from `default` we need to copy over?
-            for field in 'default', 'description':
-                if value := schema.get(field):
-                    not_null_schema[field] = value  # type: ignore
+            # copy everything except `anyOf` across to the new schema
+            # TODO is this right?
+            for key, value in schema.items():  # type: ignore
+                if key not in {'anyOf'}:
+                    not_null_schema[key] = value  # type: ignore
 
             return deference_json_schema(not_null_schema, defs, False)
         else: