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
6 changes: 4 additions & 2 deletions src/SubMenu/index.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -23,10 +23,11 @@ import { useMenuId } from '../context/IdContext';
import PrivateContext from '../context/PrivateContext';

export type SemanticName = 'list' | 'listTitle';
export interface SubMenuProps extends Omit<SubMenuType, 'key' | 'children' | 'label'> {
export interface SubMenuProps extends Omit<SubMenuType, 'key' | 'children' | 'label' | 'title'> {
classNames?: Partial<Record<SemanticName, string>>;
styles?: Partial<Record<SemanticName, React.CSSProperties>>;
title?: React.ReactNode;
itemTitle?: string;

children?: React.ReactNode;

Expand All @@ -51,6 +52,7 @@ const InternalSubMenu = React.forwardRef<HTMLLIElement, SubMenuProps>((props, re
classNames: menuClassNames,

title,
itemTitle,
eventKey,
warnKey,

Expand Down Expand Up @@ -252,7 +254,7 @@ const InternalSubMenu = React.forwardRef<HTMLLIElement, SubMenuProps>((props, re
className={`${subMenuPrefixCls}-title`}
tabIndex={mergedDisabled ? null : -1}
ref={elementRef}
title={typeof title === 'string' ? title : null}
title={itemTitle ?? (typeof title === 'string' ? title : null)}
data-menu-id={overflowDisabled && domDataId ? null : domDataId}
aria-expanded={open}
aria-haspopup
Expand Down
1 change: 1 addition & 0 deletions src/interface.ts
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@ export interface SubMenuType extends ItemSharedProps {
type?: 'submenu';

label?: React.ReactNode;
title?: string;

children: ItemType[];

Expand Down
16 changes: 14 additions & 2 deletions src/utils/nodeUtil.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -36,8 +36,15 @@ function convertItemsToNodes(
}

// Sub Menu
const { title: itemTitle, ...subMenuRestProps } = restProps;

return (
<MergedSubMenu key={mergedKey} {...restProps} title={label}>
<MergedSubMenu
key={mergedKey}
{...subMenuRestProps}
title={label}
itemTitle={typeof itemTitle === 'string' ? itemTitle : undefined}
>
{convertItemsToNodes(children, components, prefixCls)}
</MergedSubMenu>
);
Expand All @@ -51,7 +58,12 @@ function convertItemsToNodes(
const hasExtra = !!extra || extra === 0;

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

expect(container.children).toMatchSnapshot();
});

it('uses submenu item title as native title without replacing label', () => {
const { container } = render(
<Menu
items={[
{
label: 'Users',
key: 'sub1',
title: 'People',
children: [
{
label: 'User 1',
key: 'user1',
},
],
},
]}
/>,
);

const titleNode = container.querySelector('.rc-menu-submenu-title');

expect(titleNode).toHaveTextContent('Users');
expect(titleNode).toHaveAttribute('title', 'People');
});
});
/* eslint-enable */
Loading