fix(atoms): move gap modifier to the form default props

8base · Oct 9, 2018 · e76722e · e76722e
1 parent f342e12
commit e76722e
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 5 deletions.
diff --git a/src/atoms/dataEntry/Form/FormPlate.js b/src/atoms/dataEntry/Form/FormPlate.js
@@ -47,8 +47,6 @@ function FormPlate({
     >
       <FlexLayout
         { ...rest }
-        gap="md"
-        alignItems="stretch"
       >
         { children }
       </FlexLayout>
@@ -60,6 +58,9 @@ FormPlate.defaultProps = {
   ...theme[name].defaults,
   component: 'form',
   direction: 'column',
+  gap: 'md',
+  alignItems: 'stretch',
+
 };
 
 export { FormPlate, theme };
diff --git a/src/atoms/dataEntry/Form/FormSection.js b/src/atoms/dataEntry/Form/FormSection.js
@@ -12,12 +12,15 @@ const FormSection = ({ children, ...rest }: FormSectionProps) => (
   <FlexLayout
     { ...rest }
     stretch
-    gap="sm"
     direction="column"
   >
     { children }
   </FlexLayout>
 );
 
+FormSection.defaultProps = {
+  gap: 'sm',
+};
+
 export { FormSection };
 
diff --git a/src/atoms/dataEntry/Form/FormSectionBody.js b/src/atoms/dataEntry/Form/FormSectionBody.js
@@ -15,7 +15,6 @@ const FormSectionBody = ({ children, ...rest }: FormSectionBodyProps) => {
     <FlexLayout
       { ...rest }
       stretch
-      gap="md"
       direction="column"
     >
       { children }
@@ -25,6 +24,7 @@ const FormSectionBody = ({ children, ...rest }: FormSectionBodyProps) => {
 
 FormSectionBody.defaultProps = {
   alignItems: 'stretch',
+  gap: 'md',
 };
 
 export { FormSectionBody };

diff --git a/storybook/__tests__/__snapshots__/storyshots.test.js.snap b/storybook/__tests__/__snapshots__/storyshots.test.js.snap
@@ -3856,7 +3856,7 @@ exports[`Storyshots ATOMS/DATA ENTRY/Form with form error 1`] = `
 </div>
 `;
 
-exports[`Storyshots ATOMS/DATA ENTRY/Form with form error is undefined 1`] = `
+exports[`Storyshots ATOMS/DATA ENTRY/Form with form error is null 1`] = `
 .emotion-28 {
   margin: 2rem;
 }