-
Notifications
You must be signed in to change notification settings - Fork 7
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
feat(form): radio input with radio group component #45
base: main
Are you sure you want to change the base?
Changes from 2 commits
944db6b
587bca9
2a1974d
6518310
File filter
Filter by extension
Conversations
Jump to
Diff view
Diff view
There are no files selected for viewing
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,20 @@ | ||
import { FC } from 'react'; | ||
|
||
import { FormControlLabel, Radio as MuiRadio } from '@mui/material'; | ||
|
||
import { RadioProps } from './radio.types'; | ||
|
||
import useRadio from './useRadio'; | ||
|
||
const Radio: FC<RadioProps> = (props) => { | ||
const { getFormControlLabelProps, getRadioInputProps } = useRadio(props); | ||
|
||
return ( | ||
<FormControlLabel | ||
{...getFormControlLabelProps()} | ||
control={<MuiRadio {...getRadioInputProps()} />} | ||
/> | ||
); | ||
}; | ||
|
||
export default Radio; |
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,27 @@ | ||
import { | ||
FormControlLabelProps, | ||
RadioGroupProps as MuiRadioGroupProps, | ||
RadioProps as MuiRadioProps, | ||
} from '@mui/material'; | ||
|
||
import { Api } from '@mui-builder/types/api.types'; | ||
import { Script } from '@mui-builder/types/script.types'; | ||
|
||
import { Dependesies, FormId, Id } from '../../../types/public.types'; | ||
import { Rule } from '../../../types/validation.types'; | ||
|
||
export type RadioProps = Omit<FormControlLabelProps, 'control'> & { | ||
radioInputProps?: MuiRadioProps; | ||
}; | ||
|
||
export type RadioGroupProps = MuiRadioGroupProps & { | ||
id: Id; | ||
formId: FormId; | ||
script?: Script; | ||
dependesies?: Dependesies; | ||
propsController?: Record<string, any>; | ||
api?: Api; | ||
rule?: Rule; | ||
show?: boolean; | ||
radioInputsList: RadioProps[]; | ||
}; |
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,22 @@ | ||
import { FC } from 'react'; | ||
|
||
import { RadioGroup as MuiRadioGroup } from '@mui/material'; | ||
|
||
import { RadioGroupProps } from './radio.types'; | ||
|
||
import Radio from './radio'; | ||
import useRadioGroup from './useRadioGroup'; | ||
|
||
const RadioGroup: FC<RadioGroupProps> = (props) => { | ||
const { getRadioGroupProps, radioInputsList } = useRadioGroup(props); | ||
|
||
return ( | ||
<MuiRadioGroup {...getRadioGroupProps()}> | ||
{radioInputsList.map((radio) => ( | ||
<Radio key={radio.id} {...radio} /> | ||
))} | ||
</MuiRadioGroup> | ||
); | ||
}; | ||
|
||
export default RadioGroup; |
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,13 @@ | ||
import { RadioProps } from './radio.types'; | ||
|
||
const useRadio = (props: RadioProps) => { | ||
const { radioInputProps, ...restRadioProps } = props; | ||
|
||
const getRadioInputProps = () => ({ ...radioInputProps }); | ||
|
||
const getFormControlLabelProps = () => ({ ...restRadioProps }); | ||
|
||
return { getRadioInputProps, getFormControlLabelProps }; | ||
}; | ||
|
||
export default useRadio; |
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,84 @@ | ||
import { useController, useWatch } from 'react-hook-form'; | ||
|
||
import useQueryBuilder from '@mui-builder/utils/useQueryBuilder/useQueryBuilder'; | ||
import UseScript from '@mui-builder/utils/useScript/useScript'; | ||
|
||
import axios from 'axios'; | ||
|
||
import { RadioGroupProps } from './radio.types'; | ||
|
||
import useForms from '../../../hooks/useForms/useForms'; | ||
import usePropsController from '../../../hooks/usePropsController/usePropsController'; | ||
import useRule from '../../../hooks/useRule/useRule'; | ||
|
||
const useRadioGroup = (props: RadioGroupProps) => { | ||
const { | ||
id, | ||
api, | ||
script, | ||
formId, | ||
show = true, | ||
dependesies, | ||
defaultValue, | ||
radioInputsList, | ||
...restRadioGroupProps | ||
} = props; | ||
|
||
const { configs, queries } = api || {}; | ||
|
||
const { forms } = useForms(); | ||
const formMethod = forms?.[formId]; | ||
|
||
const { setProps, propsController } = usePropsController(); | ||
const newProps = propsController?.[id] || {}; | ||
|
||
useQueryBuilder({ | ||
apiInstance: axios, | ||
apiConfigs: configs ?? {}, | ||
apiQuery: queries ?? {}, | ||
formMethod, | ||
formId, | ||
forms, | ||
}); | ||
|
||
// Handle Wtach Fields | ||
useWatch({ | ||
control: formMethod.control, | ||
name: dependesies ?? [], | ||
}); | ||
|
||
// Controller | ||
const { | ||
field, | ||
formState: { errors }, | ||
} = useController({ | ||
name: id, | ||
control: formMethod.control, | ||
// disabled: restRadioGroupProps.disabled, | ||
rules: useRule(restRadioGroupProps?.rule), | ||
defaultValue, | ||
}); | ||
|
||
const error = errors?.[id]; | ||
|
||
// Handle Script | ||
const { scriptResult } = UseScript({ | ||
script, | ||
formMethod, | ||
forms, | ||
formId, | ||
setProps, | ||
}); | ||
|
||
const getRadioGroupProps = () => ({ | ||
...field, | ||
...restRadioGroupProps, | ||
error, | ||
...scriptResult, | ||
...newProps, | ||
}); | ||
|
||
return { getRadioGroupProps, radioInputsList }; | ||
}; | ||
|
||
export default useRadioGroup; |
Original file line number | Diff line number | Diff line change | ||||||||||||||||||||||||||||||||||||||||
---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|
|
@@ -6,6 +6,7 @@ import { | |||||||||||||||||||||||||||||||||||||||||
AutoCompleteProps, | ||||||||||||||||||||||||||||||||||||||||||
} from '../../components/fields/autoComplete/autoComplete.types'; | ||||||||||||||||||||||||||||||||||||||||||
import { CheckboxProps } from '../../components/fields/checkbox/checkbox.types'; | ||||||||||||||||||||||||||||||||||||||||||
import { RadioGroupProps } from '../../components/fields/radio/radio.types'; | ||||||||||||||||||||||||||||||||||||||||||
import { TextProps } from '../../components/fields/text/text.types'; | ||||||||||||||||||||||||||||||||||||||||||
import { FormSelectorProps } from './formSelector.types'; | ||||||||||||||||||||||||||||||||||||||||||
|
||||||||||||||||||||||||||||||||||||||||||
|
@@ -67,6 +68,17 @@ const FormSelector: FC<FormSelectorProps> = ({ | |||||||||||||||||||||||||||||||||||||||||
</Suspense> | ||||||||||||||||||||||||||||||||||||||||||
); | ||||||||||||||||||||||||||||||||||||||||||
|
||||||||||||||||||||||||||||||||||||||||||
case 'radio': | ||||||||||||||||||||||||||||||||||||||||||
SelectedComponent = lazy( | ||||||||||||||||||||||||||||||||||||||||||
() => import('../../components/fields/radio/radioGroup') | ||||||||||||||||||||||||||||||||||||||||||
); | ||||||||||||||||||||||||||||||||||||||||||
|
||||||||||||||||||||||||||||||||||||||||||
return ( | ||||||||||||||||||||||||||||||||||||||||||
<Suspense key={fieldProps.id} fallback={<SubmitLoading {...loading} />}> | ||||||||||||||||||||||||||||||||||||||||||
<SelectedComponent {...(fieldProps as RadioGroupProps)} /> | ||||||||||||||||||||||||||||||||||||||||||
</Suspense> | ||||||||||||||||||||||||||||||||||||||||||
); | ||||||||||||||||||||||||||||||||||||||||||
Comment on lines
+72
to
+81
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. The implementation for the 'radio' case in the switch statement follows the established pattern and correctly uses lazy loading and suspense. Consider using a more specific loading component for radio fields, similar to other field types, to enhance user experience. - <Suspense key={fieldProps.id} fallback={<SubmitLoading {...loading} />}>
+ <Suspense key={fieldProps.id} fallback={<RadioLoading {...loading} />}> Committable suggestion
Suggested change
|
||||||||||||||||||||||||||||||||||||||||||
|
||||||||||||||||||||||||||||||||||||||||||
default: | ||||||||||||||||||||||||||||||||||||||||||
SelectedComponent = Fragment; | ||||||||||||||||||||||||||||||||||||||||||
|
||||||||||||||||||||||||||||||||||||||||||
|
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Convert to options