diff --git a/src/Fields/CheckboxField.tsx b/src/Fields/CheckboxField.tsx index b6042543..9d0653ff 100644 --- a/src/Fields/CheckboxField.tsx +++ b/src/Fields/CheckboxField.tsx @@ -1,5 +1,5 @@ import { omit } from 'lodash'; -import React from 'react'; +import React, { PropsWithChildren } from 'react'; import { useController, FieldValues, @@ -16,9 +16,10 @@ type CheckboxFieldProps< TFieldValues extends FieldValues, TName extends FieldPath, > = UseControllerProps & - Pick, 'formItem'> & { + Pick, 'formItem'> & + PropsWithChildren<{ component?: CheckboxProps; - }; + }>; export function CheckboxField< TFieldValues extends FieldValues = FieldValues, @@ -26,6 +27,7 @@ export function CheckboxField< >({ formItem, component, + children, ...controller }: CheckboxFieldProps) { const { field } = useController(controller); @@ -42,7 +44,9 @@ export function CheckboxField< checked={field.value} disabled={disabled} {...component} - /> + > + {children} + ); } diff --git a/src/Fields/index.stories.tsx b/src/Fields/index.stories.tsx index 00bd4ff5..6902b07b 100644 --- a/src/Fields/index.stories.tsx +++ b/src/Fields/index.stories.tsx @@ -128,23 +128,21 @@ export const NestedProviders: Story< function AllFields() { const formMethods = useFormContext(); return ( -
+ + > + Checkbox children + diff --git a/src/Provider/index.stories.tsx b/src/Provider/index.stories.tsx index 84574de2..32683c13 100644 --- a/src/Provider/index.stories.tsx +++ b/src/Provider/index.stories.tsx @@ -38,6 +38,7 @@ import { CustomDropdown as SelectCustomDropdownStory, } from '../Select/index.stories'; import { Space } from '../Space'; +import { Simple as SimpleStepsStory } from '../Steps/index.stories'; import { Table } from '../Table'; import { Tag } from '../Tag'; import { Typography } from '../Typography'; @@ -199,6 +200,7 @@ function SupportedComponents() { + ); } diff --git a/src/Steps/index.tsx b/src/Steps/index.tsx index 462d4ce6..d4419511 100644 --- a/src/Steps/index.tsx +++ b/src/Steps/index.tsx @@ -3,7 +3,17 @@ import { StepsProps as AntdStepsProps, StepProps as AntdStepProps, } from 'antd'; +import styled from 'styled-components'; + +import { fontSizeFromTheme } from '../styled-utils'; -export const Steps: typeof AntdSteps = AntdSteps; export type StepsProps = AntdStepsProps; export type StepProps = AntdStepProps; + +export const Steps: typeof AntdSteps = styled(AntdSteps)` + font-size: ${fontSizeFromTheme}; + + .mll-ant-steps-icon { + top: -5%; + } +`;