Merge pull request #7738 from marmelab/fix-forms-toolbar-boolean-support

Fix Forms Components To Support false for toolbar prop
marmelab · May 23, 2022 · 54c860b · 54c860b
2 parents 74680dc + 77e0030
commit 54c860b
Show file tree

Hide file tree

Showing 5 changed files with 26 additions and 4 deletions.
diff --git a/packages/ra-ui-materialui/src/form/SimpleForm.stories.tsx b/packages/ra-ui-materialui/src/form/SimpleForm.stories.tsx
@@ -66,3 +66,13 @@ export const StackProps = () => (
         </SimpleForm>
     </Wrapper>
 );
+
+export const NoToolbar = () => (
+    <Wrapper>
+        <SimpleForm toolbar={false}>
+            <TextInput source="title" fullWidth />
+            <TextInput source="author" />
+            <NumberInput source="year" />
+        </SimpleForm>
+    </Wrapper>
+);
diff --git a/packages/ra-ui-materialui/src/form/SimpleForm.tsx b/packages/ra-ui-materialui/src/form/SimpleForm.tsx
@@ -52,7 +52,7 @@ export const SimpleForm = (props: SimpleFormProps) => {
                     {children}
                 </Stack>
             </Component>
-            {toolbar}
+            {toolbar !== false ? toolbar : null}
         </Form>
     );
 };

diff --git a/packages/ra-ui-materialui/src/form/TabbedForm.stories.tsx b/packages/ra-ui-materialui/src/form/TabbedForm.stories.tsx
@@ -78,3 +78,15 @@ export const CustomLayout = () => (
         </TabbedForm>
     </Wrapper>
 );
+
+export const NoToolbar = () => (
+    <Wrapper>
+        <TabbedForm toolbar={false}>
+            <FormTab label="main">
+                <TextInput source="title" fullWidth />
+                <TextInput source="author" sx={{ width: '50%' }} />
+                <NumberInput source="year" sx={{ width: '50%' }} />
+            </FormTab>
+        </TabbedForm>
+    </Wrapper>
+);
diff --git a/packages/ra-ui-materialui/src/form/TabbedForm.tsx b/packages/ra-ui-materialui/src/form/TabbedForm.tsx
@@ -125,7 +125,7 @@ export interface TabbedFormProps
     resource?: string;
     syncWithLocation?: boolean;
     tabs?: ReactElement;
-    toolbar?: ReactElement;
+    toolbar?: ReactElement | false;
     warnWhenUnsavedChanges?: boolean;
 }
 

diff --git a/packages/ra-ui-materialui/src/form/TabbedFormView.tsx b/packages/ra-ui-materialui/src/form/TabbedFormView.tsx
@@ -98,7 +98,7 @@ export const TabbedFormView = (props: TabbedFormViewProps): ReactElement => {
                         : null;
                 })}
             </Component>
-            {toolbar}
+            {toolbar !== false ? toolbar : null}
         </Root>
     );
 };
@@ -130,7 +130,7 @@ export interface TabbedFormViewProps {
     formRootPathname?: string;
     syncWithLocation?: boolean;
     tabs?: ReactElement;
-    toolbar?: ReactElement;
+    toolbar?: ReactElement | false;
     sx?: SxProps;
 }