test/ant-design
1
0
Fork 0
mirror of https://gitee.com/ant-design/ant-design.git synced 2024-12-02 20:19:44 +08:00
Code Issues Actions 84 Packages Projects Releases Wiki Activity

feat: use menu with 7.4.0-beta, supporting menu overflow collapsing. Currently React >= 16.0 only

Browse Source
This commit is contained in:
picodoth 2018-08-30 11:32:40 +08:00 committed by 偏右
parent 0c6b3d5ac1
commit 6237511c04
3 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
components/menu/demo/horizontal.md
View File

@ -44,7 +44,7 @@ class App extends React.Component {
<Menu.Item key="app" disabled> <Menu.Item key="app" disabled>
<Icon type="appstore" />Navigation Two <Icon type="appstore" />Navigation Two
</Menu.Item> </Menu.Item>
<SubMenu title={<span><Icon type="setting" />Navigation Three - Submenu</span>}> <SubMenu title={<span className="submenu-title-wrapper"><Icon type="setting" />Navigation Three - Submenu</span>}>
<MenuItemGroup title="Item 1"> <MenuItemGroup title="Item 1">
<Menu.Item key="setting:1">Option 1</Menu.Item> <Menu.Item key="setting:1">Option 1</Menu.Item>
<Menu.Item key="setting:2">Option 2</Menu.Item> <Menu.Item key="setting:2">Option 2</Menu.Item>

7
components/menu/style/index.less
View File

@ -180,6 +180,10 @@
border-radius: @border-radius-base; border-radius: @border-radius-base;
z-index: @zindex-dropdown; z-index: @zindex-dropdown;
.submenu-title-wrapper {
padding-right: 20px;
}
&:before { &:before {
position: absolute; position: absolute;
top: -7px; top: -7px;
@ -272,12 +276,13 @@
border-bottom: @border-width-base @border-style-base @border-color-split; border-bottom: @border-width-base @border-style-base @border-color-split;
box-shadow: none; box-shadow: none;
line-height: 46px; line-height: 46px;
white-space: nowrap;
> .@{menu-prefix-cls}-item, > .@{menu-prefix-cls}-item,
> .@{menu-prefix-cls}-submenu { > .@{menu-prefix-cls}-submenu {
position: relative; position: relative;
top: 1px; top: 1px;
float: left; display: inline-block;
border-bottom: 2px solid transparent; border-bottom: 2px solid transparent;
&:hover, &:hover,

2
package.json
View File

@ -66,7 +66,7 @@
"rc-editor-mention": "^1.0.2", "rc-editor-mention": "^1.0.2",
"rc-form": "^2.1.0", "rc-form": "^2.1.0",
"rc-input-number": "~4.0.0", "rc-input-number": "~4.0.0",
"rc-menu": "~7.3.0", "rc-menu": "7.4.0-beta",
"rc-notification": "~3.2.0", "rc-notification": "~3.2.0",
"rc-pagination": "~1.17.0", "rc-pagination": "~1.17.0",
"rc-progress": "~2.2.2", "rc-progress": "~2.2.2",