mirror/ant-design
1
0
Fork 0
mirror of https://github.com/ant-design/ant-design.git synced 2025-01-18 22:36:31 +08:00
Code Issues Actions 26 Packages Projects Releases Wiki Activity

Fix inlineCollapsed in controlled mode

Browse Source 
ref #7063
This commit is contained in:
afc163 2017-08-04 16:23:52 +08:00
parent 1856fbe0df
commit 5da1403bc0
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
components/menu/index.tsx
View File

@ -102,11 +102,11 @@ export default class Menu extends React.Component<MenuProps, any> {
(nextContext.siderCollapsed && !this.context.siderCollapsed)) {
this.switchModeFromInline = !!this.state.openKeys.length;
this.inlineOpenKeys = this.state.openKeys;
this.setOpenKeys([]);
this.handleOpenChange([]);
}
if ((!nextProps.inlineCollapsed && this.props.inlineCollapsed) ||
(!nextContext.siderCollapsed && this.context.siderCollapsed)) {
this.setOpenKeys(this.inlineOpenKeys);
this.handleOpenChange(this.inlineOpenKeys);
this.inlineOpenKeys = [];
}
if ('openKeys' in nextProps) {
@ -114,7 +114,7 @@ export default class Menu extends React.Component<MenuProps, any> {
}
}
handleClick = (e) => {
this.setOpenKeys([]);
this.handleOpenChange([]);
const { onClick } = this.props;
if (onClick) {
@ -136,7 +136,7 @@ export default class Menu extends React.Component<MenuProps, any> {
}
getRealMenuMode() {
const inlineCollapsed = this.getInlineCollapsed();
if (this.switchModeFromInline && inlineCollapsed) {
if (this.switchModeFromInline && inlineCollapsed && !('openKeys' in this.props)) {
return 'inline';
}
const { mode } = this.props;