Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
1 change: 1 addition & 0 deletions src/MenuItem.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -140,6 +140,7 @@ const InternalMenuItem = React.forwardRef((props: MenuItemProps, ref: React.Ref<
label: children,
itemIcon,
extra: props.extra,
title: props.title,
};

return {
Expand Down
1 change: 1 addition & 0 deletions src/interface.ts
Original file line number Diff line number Diff line change
Expand Up @@ -69,6 +69,7 @@ export type ItemData = {
itemIcon?: RenderIconType;
extra?: React.ReactNode;
key: React.Key;
title?: string;
};

export interface MenuItemGroupType extends ItemSharedProps {
Expand Down
7 changes: 1 addition & 6 deletions src/utils/nodeUtil.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -51,12 +51,7 @@ function convertItemsToNodes(
const hasExtra = !!extra || extra === 0;

return (
<MergedMenuItem
key={mergedKey}
{...restProps}
extra={extra}
itemData={{ label, key: mergedKey, itemIcon: restProps?.itemIcon, extra }}
>
<MergedMenuItem key={mergedKey} {...restProps} extra={extra} itemData={{ ...opt, key: mergedKey }}>
{hasExtra ? (
<>
<span className={`${prefixCls}-item-label`}>{label}</span>
Expand Down
36 changes: 5 additions & 31 deletions tests/MenuItem.spec.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -181,51 +181,25 @@ describe('MenuItem', () => {
);
});

it('should only pass defined itemData properties in onSelect and onClick', () => {
it('should pass all itemData properties in onSelect and onClick when using items prop', () => {
const onSelect = jest.fn();
const onClick = jest.fn();
const items = [{ key: '1', label: 'Menu Item', foo: '123', title: 'test title' }];
const { container } = render(
<Menu
onSelect={onSelect}
onClick={onClick}
selectable
items={[{ key: '1', label: 'Menu Item', foo: '123' }] as any}
/>,
<Menu onSelect={onSelect} onClick={onClick} selectable items={items as any} />,
);

fireEvent.click(container.querySelector('.rc-menu-item')!);
expect(onSelect).toHaveBeenCalledWith(
expect.objectContaining({
key: '1',
itemData: expect.objectContaining({
key: '1',
label: 'Menu Item',
}),
}),
);
expect(onSelect).toHaveBeenCalledWith(
expect.objectContaining({
key: '1',
itemData: expect.not.objectContaining({
foo: '123',
}),
itemData: expect.objectContaining(items[0]),
}),
);
expect(onClick).toHaveBeenCalledWith(
expect.objectContaining({
key: '1',
itemData: expect.objectContaining({
key: '1',
label: 'Menu Item',
}),
}),
);
expect(onClick).toHaveBeenCalledWith(
expect.objectContaining({
key: '1',
itemData: expect.not.objectContaining({
foo: '123',
}),
itemData: expect.objectContaining(items[0]),
}),
);
});
Expand Down
Loading