mirror/ant-design
1
0
Fork 0
mirror of https://github.com/ant-design/ant-design.git synced 2025-06-13 21:32:56 +08:00
Code Issues Actions 18 Packages Projects Releases Wiki Activity

Fix menu submenu animation, close #12864

Browse Source
This commit is contained in:
afc163 2018-10-30 11:58:59 +08:00
parent 72a6febcc4
commit f7fa8e0eb6
1 changed files with 1 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
components/menu/index.tsx
View File

@ -1,5 +1,4 @@
import * as React from 'react'; import * as React from 'react';
import { findDOMNode } from 'react-dom';
import RcMenu, { Divider, ItemGroup } from 'rc-menu'; import RcMenu, { Divider, ItemGroup } from 'rc-menu';
import * as PropTypes from 'prop-types'; import * as PropTypes from 'prop-types';
import classNames from 'classnames'; import classNames from 'classnames';
@ -79,7 +78,6 @@ export default class Menu extends React.Component<MenuProps, MenuState> {
collapsedWidth: PropTypes.oneOfType([PropTypes.number, PropTypes.string]), collapsedWidth: PropTypes.oneOfType([PropTypes.number, PropTypes.string]),
}; };
switchModeFromInline: boolean; switchModeFromInline: boolean;
leaveAnimationExecutedWhenInlineCollapsed: boolean;
inlineOpenKeys: string[] = []; inlineOpenKeys: string[] = [];
constructor(props: MenuProps) { constructor(props: MenuProps) {
super(props); super(props);
@ -113,7 +111,6 @@ export default class Menu extends React.Component<MenuProps, MenuState> {
}; };
} }
componentWillReceiveProps(nextProps: MenuProps, nextContext: SiderContext) { componentWillReceiveProps(nextProps: MenuProps, nextContext: SiderContext) {
const { prefixCls } = this.props;
if (this.props.mode === 'inline' && if (this.props.mode === 'inline' &&
nextProps.mode !== 'inline') { nextProps.mode !== 'inline') {
this.switchModeFromInline = true; this.switchModeFromInline = true;
@ -124,9 +121,7 @@ export default class Menu extends React.Component<MenuProps, MenuState> {
} }
if ((nextProps.inlineCollapsed && !this.props.inlineCollapsed) || if ((nextProps.inlineCollapsed && !this.props.inlineCollapsed) ||
(nextContext.siderCollapsed && !this.context.siderCollapsed)) { (nextContext.siderCollapsed && !this.context.siderCollapsed)) {
const menuNode = findDOMNode(this) as Element; this.switchModeFromInline = true;
this.switchModeFromInline =
!!this.state.openKeys.length && !!menuNode.querySelectorAll(`.${prefixCls}-submenu-open`).length;
this.inlineOpenKeys = this.state.openKeys; this.inlineOpenKeys = this.state.openKeys;
this.setState({ openKeys: [] }); this.setState({ openKeys: [] });
} }