Skip to content

fix: add keys for fragment #2812

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
Ricbet merged 1 commit into from
Jun 19, 2023
Merged

fix: add keys for fragment #2812

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
45 changes: 24 additions & 21 deletions packages/core-browser/src/components/actions/index.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -98,39 +98,42 @@ export const MenuActionList: React.FC<{
(dataSource: MenuNode[], key?: string) =>
dataSource.map((menuNode, index) => {
if (menuNode.id === SeparatorMenuItemNode.ID) {
if (dataSource[index - 1]?.id === SeparatorMenuItemNode.ID) {
return null;
}
return <Menu.Divider key={`divider-${index}`} className={styles.menuItemDivider} />;
return null;
}

const hasSeparator = dataSource[index + 1] && dataSource[index + 1].id === SeparatorMenuItemNode.ID;
if (menuNode.id === SubmenuItemNode.ID) {
// 子菜单项为空时不渲染
if (!Array.isArray(menuNode.children) || !menuNode.children.length) {
return null;
}

return (
<Menu.SubMenu
className={styles.submenuItem}
key={`${(menuNode as SubmenuItemNode).submenuId}-${index}`}
popupClassName='kt-menu'
title={<MenuAction hasSubmenu data={menuNode} iconService={iconService} />}
>
{recursiveRender(menuNode.children, menuNode.label)}
</Menu.SubMenu>
<React.Fragment key={`${menuNode.id}-${(menuNode as SubmenuItemNode).submenuId}-${index}`}>
<Menu.SubMenu
key={`${menuNode.id}-${(menuNode as SubmenuItemNode).submenuId}-${index}`}
className={styles.submenuItem}
popupClassName='kt-menu'
title={<MenuAction hasSubmenu data={menuNode} iconService={iconService} />}
>
{recursiveRender(menuNode.children, menuNode.label)}
</Menu.SubMenu>
{hasSeparator ? <Menu.Divider key={`divider-${index}`} className={styles.menuItemDivider} /> : null}
</React.Fragment>
);
}

return (
<Menu.Item
id={`${menuNode.id}-${index}`}
key={`${menuNode.id}-${key}-${index}`}
className={styles.menuItem}
disabled={menuNode.disabled}
>
<MenuAction data={menuNode} disabled={menuNode.disabled} iconService={iconService} />
</Menu.Item>
<React.Fragment key={`${menuNode.id}-${index}`}>
<Menu.Item
id={`${menuNode.id}-${index}`}
key={`${menuNode.id}-${index}`}
className={styles.menuItem}
disabled={menuNode.disabled}
>
<MenuAction data={menuNode} disabled={menuNode.disabled} iconService={iconService} />
</Menu.Item>
{hasSeparator ? <Menu.Divider key={`divider-${index}`} className={styles.menuItemDivider} /> : null}
</React.Fragment>
);
}),
[],
Expand Down