Skip to content

feat: support subItem and subItemTitle semantic for SubMenu #890

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

Open
EmilyyyLiu wants to merge 1 commit into
base: master
Choose a base branch
from
+49 −10
Open

feat: support subItem and subItemTitle semantic for SubMenu #890

Show file tree
Hide file tree
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
26 changes: 16 additions & 10 deletions src/SubMenu/index.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ import {
import { useMenuId } from '../context/IdContext';
import PrivateContext from '../context/PrivateContext';

export type SemanticName = 'list' | 'listTitle';
export type SemanticName = 'list' | 'listTitle' | 'subItem' | 'subItemTitle';
export interface SubMenuProps extends Omit<SubMenuType, 'key' | 'children' | 'label' | 'title'> {
classNames?: Partial<Record<SemanticName, string>>;
styles?: Partial<Record<SemanticName, React.CSSProperties>>;
Expand Down Expand Up @@ -250,8 +250,8 @@ const InternalSubMenu = React.forwardRef<HTMLLIElement, SubMenuProps>((props, re
let titleNode: React.ReactElement = (
<div
role="menuitem"
style={directionStyle}
className={`${subMenuPrefixCls}-title`}
style={{ ...directionStyle, ...styles?.subItemTitle }}
className={clsx(`${subMenuPrefixCls}-title`, menuClassNames?.subItemTitle)}
tabIndex={mergedDisabled ? null : -1}
ref={elementRef}
title={itemTitle ?? (typeof title === 'string' ? title : null)}
Expand Down Expand Up @@ -339,13 +339,19 @@ const InternalSubMenu = React.forwardRef<HTMLLIElement, SubMenuProps>((props, re
role="none"
{...restProps}
component="li"
style={style}
className={clsx(subMenuPrefixCls, `${subMenuPrefixCls}-${mode}`, className, {
[`${subMenuPrefixCls}-open`]: open,
[`${subMenuPrefixCls}-active`]: mergedActive,
[`${subMenuPrefixCls}-selected`]: childrenSelected,
[`${subMenuPrefixCls}-disabled`]: mergedDisabled,
})}
style={{ ...styles?.subItem, ...style }}
className={clsx(
subMenuPrefixCls,
`${subMenuPrefixCls}-${mode}`,
menuClassNames?.subItem,
className,
{
[`${subMenuPrefixCls}-open`]: open,
[`${subMenuPrefixCls}-active`]: mergedActive,
[`${subMenuPrefixCls}-selected`]: childrenSelected,
[`${subMenuPrefixCls}-disabled`]: mergedDisabled,
},
)}
onMouseEnter={onInternalMouseEnter}
onMouseLeave={onInternalMouseLeave}
>
Expand Down
33 changes: 33 additions & 0 deletions tests/semantic.spec.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,6 +47,39 @@ describe('semantic', () => {
expect(listTitle).toHaveClass(testClassNames.listTitle);
expect(listTitle).toHaveStyle(testStyles.listTitle);
});
it('support classNames and styles for SubMenu self node (subItem / subItemTitle)', () => {
const testClassNames = {
subItem: 'test-sub-item',
subItemTitle: 'test-sub-item-title',
};
const testStyles = {
subItem: { width: '200px' },
subItemTitle: { whiteSpace: 'normal' },
};
const { container } = render(
<Menu mode="inline" openKeys={['s1', 's1-2']}>
<SubMenu key="s1" title="submenu1" classNames={testClassNames} styles={testStyles}>
<SubMenu key="s1-2" title="submenu1-1" classNames={testClassNames} styles={testStyles}>
<MenuItem key="s1-2-1">2-1</MenuItem>
</SubMenu>
</SubMenu>
</Menu>,
);

const subItem = container.querySelector('.rc-menu-submenu');
const subItemTitle = container.querySelector('.rc-menu-submenu-title');
expect(subItem).toHaveClass(testClassNames.subItem);
expect(subItem).toHaveStyle(testStyles.subItem);
expect(subItemTitle).toHaveClass(testClassNames.subItemTitle);
expect(subItemTitle).toHaveStyle(testStyles.subItemTitle);

const nestedSubItem = container.querySelector('.rc-menu-submenu .rc-menu-submenu');
const nestedSubItemTitle = nestedSubItem.querySelector('.rc-menu-submenu-title');
expect(nestedSubItem).toHaveClass(testClassNames.subItem);
expect(nestedSubItem).toHaveStyle(testStyles.subItem);
expect(nestedSubItemTitle).toHaveClass(testClassNames.subItemTitle);
expect(nestedSubItemTitle).toHaveStyle(testStyles.subItemTitle);
});
it('support classNames and styles for Menu', () => {
const testClassNames = {
list: 'test-list',
Expand Down
Loading