From af0352f91bebf5c9265713fc0e95baeba409f5ba Mon Sep 17 00:00:00 2001 From: Junbin Huang Date: Wed, 24 Oct 2018 13:50:34 +0800 Subject: [PATCH] Revert "indent item group title" --- examples/menuItemGroup.js | 17 ++--------------- src/MenuItemGroup.jsx | 7 ------- tests/__snapshots__/Menu.spec.js.snap | 2 -- tests/__snapshots__/MenuItem.spec.js.snap | 1 - 4 files changed, 2 insertions(+), 25 deletions(-) diff --git a/examples/menuItemGroup.js b/examples/menuItemGroup.js index 9cfebbff..6f95a8f0 100644 --- a/examples/menuItemGroup.js +++ b/examples/menuItemGroup.js @@ -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(

menu item group

- - 1 + 2 3 @@ -18,17 +17,5 @@ ReactDOM.render(
4 5 - - 6.1 - - 6.2.1 - 6.2.2 - - - 6.3.1 - 6.3.2 - - 6.4 -
, document.getElementById('__react-content')); diff --git a/src/MenuItemGroup.jsx b/src/MenuItemGroup.jsx index f91f6d26..49211ced 100644 --- a/src/MenuItemGroup.jsx +++ b/src/MenuItemGroup.jsx @@ -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; @@ -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 (
  • {title} diff --git a/tests/__snapshots__/Menu.spec.js.snap b/tests/__snapshots__/Menu.spec.js.snap index ad3c6f03..5a69acec 100644 --- a/tests/__snapshots__/Menu.spec.js.snap +++ b/tests/__snapshots__/Menu.spec.js.snap @@ -218,7 +218,6 @@ exports[`Menu should render inline menu correctly 1`] = ` >
    g1 @@ -257,7 +256,6 @@ exports[`Menu should render inline menu correctly 1`] = ` >
    g2 diff --git a/tests/__snapshots__/MenuItem.spec.js.snap b/tests/__snapshots__/MenuItem.spec.js.snap index ef22a54a..9793955e 100644 --- a/tests/__snapshots__/MenuItem.spec.js.snap +++ b/tests/__snapshots__/MenuItem.spec.js.snap @@ -78,7 +78,6 @@ exports[`MenuItem rest props onClick event should only trigger 1 time along the >
    title