Merge pull request #6926 from marmelab/fix-bulkactions-type

Fix List bulkActionButtons prop does not handle the value true
marmelab · Dec 2, 2021 · e063037 · e063037
2 parents d5bfda4 + 3b64748
commit e063037
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 5 deletions.
diff --git a/packages/ra-ui-materialui/src/list/ListView.tsx b/packages/ra-ui-materialui/src/list/ListView.tsx
@@ -1,5 +1,5 @@
 import * as React from 'react';
-import { Children, cloneElement, ReactElement } from 'react';
+import { Children, cloneElement, isValidElement, ReactElement } from 'react';
 import PropTypes from 'prop-types';
 import Card from '@material-ui/core/Card';
 import classnames from 'classnames';
@@ -68,11 +68,15 @@ export const ListView = (props: ListViewProps) => {
                     })}
                     key={version}
                 >
-                    {bulkActionButtons !== false && bulkActionButtons && (
+                    {bulkActionButtons !== false ? (
                         <BulkActionsToolbar {...controllerProps}>
-                            {bulkActionButtons}
+                            {isValidElement(bulkActionButtons) ? (
+                                bulkActionButtons
+                            ) : (
+                                <DefaultBulkActionButtons />
+                            )}
                         </BulkActionsToolbar>
-                    )}
+                    ) : null}
                     {children &&
                         // @ts-ignore-line
                         cloneElement(Children.only(children), {

diff --git a/packages/ra-ui-materialui/src/types.ts b/packages/ra-ui-materialui/src/types.ts
@@ -15,7 +15,7 @@ import {
 export interface ListProps extends ResourceComponentProps {
     actions?: ReactElement | false;
     aside?: ReactElement;
-    bulkActionButtons?: ReactElement | false;
+    bulkActionButtons?: ReactElement | boolean;
     classes?: any;
     className?: string;
     component?: ElementType;