Skip to content

Commit

Permalink
feat: use menu with 7.4.0-beta, supporting menu overflow collapsing. …
Browse files Browse the repository at this point in the history
…Currently React >= 16.0 only
  • Loading branch information
picodoth authored and afc163 committed Sep 2, 2018
1 parent 0c6b3d5 commit 6237511
Show file tree
Hide file tree
Showing 3 changed files with 8 additions and 3 deletions.
2 changes: 1 addition & 1 deletion components/menu/demo/horizontal.md
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@ class App extends React.Component {
<Menu.Item key="app" disabled>
<Icon type="appstore" />Navigation Two
</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">
<Menu.Item key="setting:1">Option 1</Menu.Item>
<Menu.Item key="setting:2">Option 2</Menu.Item>
Expand Down
7 changes: 6 additions & 1 deletion components/menu/style/index.less
Original file line number Diff line number Diff line change
Expand Up @@ -180,6 +180,10 @@
border-radius: @border-radius-base;
z-index: @zindex-dropdown;

.submenu-title-wrapper {
padding-right: 20px;
}

&:before {
position: absolute;
top: -7px;
Expand Down Expand Up @@ -272,12 +276,13 @@
border-bottom: @border-width-base @border-style-base @border-color-split;
box-shadow: none;
line-height: 46px;
white-space: nowrap;

> .@{menu-prefix-cls}-item,
> .@{menu-prefix-cls}-submenu {
position: relative;
top: 1px;
float: left;
display: inline-block;
border-bottom: 2px solid transparent;

&:hover,
Expand Down
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -66,7 +66,7 @@
"rc-editor-mention": "^1.0.2",
"rc-form": "^2.1.0",
"rc-input-number": "~4.0.0",
"rc-menu": "~7.3.0",
"rc-menu": "7.4.0-beta",
"rc-notification": "~3.2.0",
"rc-pagination": "~1.17.0",
"rc-progress": "~2.2.2",
Expand Down

0 comments on commit 6237511

Please sign in to comment.