Skip to content

Commit 84052da

Browse files
authoredJul 6, 2022
Merge pull request #7931 from marmelab/fix-menu-list-warning
Fix warnings in Menu
2 parents 3f7ec50 + fd58d9a commit 84052da

File tree

1 file changed

+23
-25
lines changed
  • packages/ra-ui-materialui/src/layout

1 file changed

+23
-25
lines changed
 

‎packages/ra-ui-materialui/src/layout/Menu.tsx

+23-25
Original file line numberDiff line numberDiff line change
@@ -45,31 +45,29 @@ export const Menu = (props: MenuProps) => {
4545
const createPath = useCreatePath();
4646
const {
4747
hasDashboard,
48-
children = (
49-
<>
50-
{hasDashboard && <DashboardMenuItem />}
51-
{Object.keys(resources)
52-
.filter(name => resources[name].hasList)
53-
.map(name => (
54-
<MenuItemLink
55-
key={name}
56-
to={createPath({
57-
resource: name,
58-
type: 'list',
59-
})}
60-
state={{ _scrollToTop: true }}
61-
primaryText={getResourceLabel(name, 2)}
62-
leftIcon={
63-
resources[name].icon ? (
64-
createElement(resources[name].icon)
65-
) : (
66-
<DefaultIcon />
67-
)
68-
}
69-
/>
70-
))}
71-
</>
72-
),
48+
children = [
49+
hasDashboard ? <DashboardMenuItem /> : null,
50+
...Object.keys(resources)
51+
.filter(name => resources[name].hasList)
52+
.map(name => (
53+
<MenuItemLink
54+
key={name}
55+
to={createPath({
56+
resource: name,
57+
type: 'list',
58+
})}
59+
state={{ _scrollToTop: true }}
60+
primaryText={getResourceLabel(name, 2)}
61+
leftIcon={
62+
resources[name].icon ? (
63+
createElement(resources[name].icon)
64+
) : (
65+
<DefaultIcon />
66+
)
67+
}
68+
/>
69+
)),
70+
],
7371
className,
7472
...rest
7573
} = props;

0 commit comments

Comments
 (0)
Please sign in to comment.