fix(FormField): fixed alignment issues

LexSwed · Oct 12, 2020 · a99db40 · a99db40 · vercel · Oct 12, 2020
1 parent f98a054
commit a99db40
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 6 deletions.
diff --git a/src/lib/Checkbox/Checkbox.tsx b/src/lib/Checkbox/Checkbox.tsx
@@ -110,12 +110,12 @@ const Checkbox: React.FC<Props> = ({
   css,
   style,
   className,
-  flow = 'row-reverse',
+  flow = 'row',
   label,
   secondaryLabel,
   space = 'sm',
-  display = 'inline',
-  cross = 'center',
+  display,
+  cross,
   disabled,
   id,
   ...props
@@ -137,7 +137,6 @@ const Checkbox: React.FC<Props> = ({
       flow={flow}
       cross={cross}
     >
-      {label && <Label label={label} secondary={secondaryLabel} disabled={disabled} as="span" />}
       <CheckboxWrapper>
         <Input
           aria-checked={checked}
@@ -151,6 +150,7 @@ const Checkbox: React.FC<Props> = ({
           <Icon as={HiCheck} />
         </CheckMark>
       </CheckboxWrapper>
+      {label && <Label label={label} secondary={secondaryLabel} disabled={disabled} as="span" />}
     </FormField>
   );
 };

diff --git a/src/lib/FormField/FormField.tsx b/src/lib/FormField/FormField.tsx
@@ -45,7 +45,7 @@ export const FormField: React.FC<Props> = ({
   main = 'stretch',
   cross = 'stretch',
   flow,
-  display,
+  display = 'inline',
   space = 'xs',
   css,
   style,

diff --git a/src/lib/Switch/Switch.tsx b/src/lib/Switch/Switch.tsx
@@ -114,7 +114,7 @@ const Switch: React.FC<Props> = ({
   secondaryLabel,
   space = 'sm',
   display = 'inline',
-  cross = 'center',
+  cross,
   disabled,
   ...props
 }) => {