Skip to content

Commit

Permalink
fix: Tooltip not hidden when menu is in control mode (#16812)
Browse files Browse the repository at this point in the history
  • Loading branch information
zombieJ committed May 27, 2019
1 parent c5aaeb8 commit 008136e
Showing 1 changed file with 7 additions and 1 deletion.
8 changes: 7 additions & 1 deletion components/menu/MenuItem.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ import * as React from 'react';
import { Item } from 'rc-menu';
import { ClickParam } from '.';
import { MenuContext, MenuContextProps } from './';
import Tooltip from '../tooltip';
import Tooltip, { TooltipProps } from '../tooltip';
import { SiderContext, SiderContextProps } from '../layout/Sider';

export interface MenuItemProps {
Expand Down Expand Up @@ -37,13 +37,19 @@ export default class MenuItem extends React.Component<MenuItemProps> {
return (
<MenuContext.Consumer>
{({ inlineCollapsed }: MenuContextProps) => {
const tooltipProps: TooltipProps = {};

let titleNode = title || (level === 1 ? children : '');
if (!siderCollapsed && !inlineCollapsed) {
titleNode = null;
// Reset `visible` to fix control mode tooltip display not correct
// ref: https://github.com/ant-design/ant-design/issues/16742
tooltipProps.visible = false;
}

return (
<Tooltip
{...tooltipProps}
title={titleNode}
placement="right"
overlayClassName={`${rootPrefixCls}-inline-collapsed-tooltip`}
Expand Down

0 comments on commit 008136e

Please sign in to comment.