Skip to content

Revert "indent item group title" #214

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
merged 1 commit into from
Oct 24, 2018
Merged

Revert "indent item group title" #214

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
17 changes: 2 additions & 15 deletions examples/menuItemGroup.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,14 +2,13 @@

import React from 'react';
import ReactDOM from 'react-dom';
import Menu, { SubMenu, Item as MenuItem, ItemGroup as MenuItemGroup } from 'rc-menu';
import Menu, { Item as MenuItem, ItemGroup as MenuItemGroup } from 'rc-menu';

import 'rc-menu/assets/index.less';

ReactDOM.render(<div>
<h2>menu item group</h2>
<Menu style={{ margin: 20, width: 300 }} mode="inline">
<MenuItem key="11">1</MenuItem>
<Menu style={{ margin: 20, width: 300 }}>
<MenuItemGroup title="group 1" key="2">
<MenuItem key="21">2</MenuItem>
<MenuItem key="22">3</MenuItem>
Expand All @@ -18,17 +17,5 @@ ReactDOM.render(<div>
<MenuItem key="31">4</MenuItem>
<MenuItem key="32">5</MenuItem>
</MenuItemGroup>
<SubMenu title="6">
<MenuItem key="61">6.1</MenuItem>
<MenuItemGroup title="6.2" key="6.2">
<MenuItem key="621">6.2.1</MenuItem>
<MenuItem key="622">6.2.2</MenuItem>
</MenuItemGroup>
<MenuItemGroup title="6.3" key="6.3">
<MenuItem key="631">6.3.1</MenuItem>
<MenuItem key="632">6.3.2</MenuItem>
</MenuItemGroup>
<MenuItem key="64">6.4</MenuItem>
</SubMenu>
</Menu>
</div>, document.getElementById('__react-content'));
7 changes: 0 additions & 7 deletions src/MenuItemGroup.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,6 @@ class MenuItemGroup extends React.Component {
render() {
const { ...props } = this.props;
const { className = '', rootPrefixCls } = props;
const { mode, inlineIndent, level } = props;
const titleClassName = `${rootPrefixCls}-item-group-title`;
const listClassName = `${rootPrefixCls}-item-group-list`;
const { title, children } = props;
Expand All @@ -32,16 +31,10 @@ class MenuItemGroup extends React.Component {
// Set onClick to null, to ignore propagated onClick event
delete props.onClick;

const titleStyle = {};
if (mode === 'inline') {
titleStyle.paddingLeft = inlineIndent * level;
}

return (
<li {...props} className={`${className} ${rootPrefixCls}-item-group`}>
<div
className={titleClassName}
style={titleStyle}
title={typeof title === 'string' ? title : undefined}
>
{title}
Expand Down
2 changes: 0 additions & 2 deletions tests/__snapshots__/Menu.spec.js.snap
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -218,7 +218,6 @@ exports[`Menu should render inline menu correctly 1`] = `
>
<div
class="rc-menu-item-group-title"
style="padding-left:24px"
title="g1"
>
g1
Expand Down Expand Up @@ -257,7 +256,6 @@ exports[`Menu should render inline menu correctly 1`] = `
>
<div
class="rc-menu-item-group-title"
style="padding-left:24px"
title="g2"
>
g2
Expand Down
1 change: 0 additions & 1 deletion tests/__snapshots__/MenuItem.spec.js.snap
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -78,7 +78,6 @@ exports[`MenuItem rest props onClick event should only trigger 1 time along the
>
<div
class="rc-menu-item-group-title"
style="padding-left: 24px;"
title="title"
>
title
Expand Down