fix: theme overrides

Author: vip-git

src/FieldSet/ReorderableFormField.tsx

@@ -50,7 +50,7 @@ export const RawReorderableFormField = ({
           canReorder={canReorder}
         />
       </div>
-    );
-}
+  );
+};
 
 export default RawReorderableFormField;

src/FieldSet/field-set-styles.ts

@@ -70,7 +70,7 @@ export default {
     },
   }),
 
-  reorderable:  makeStyles(() => createStyles({
+  reorderable: makeStyles(() => createStyles({
     root: {
       'display': 'flex',
       'alignItems': 'baseline',

src/Form.tsx

@@ -189,7 +189,7 @@ const Form = ({
 
   return (
     <StyledEngineProvider injectFirst>
-      <ThemeProvider theme={createTheme(theme || defaultTheme)}>
+      <ThemeProvider theme={createTheme(theme ? { ...defaultTheme, ...theme } : defaultTheme)}>
         <Paper className={classes.root} style={uiSchema && uiSchema['ui:page'] ? uiSchema['ui:page'].style : {}}>
           {
             !isFormLoading && (actionButtonPos === 'top' && !hasPageLayoutSteps) && (