Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix: fix popup flicker issue when inline menus have benn collased #664

Open
wants to merge 3 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion docs/examples/antd.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,8 @@

import React from 'react';
import type { CSSMotionProps } from 'rc-motion';
import Menu, { SubMenu, Item as MenuItem, Divider, MenuProps } from '../../src';
import Menu, { SubMenu, Item as MenuItem, Divider } from '../../src';
import type { MenuProps } from '../../src';
import '../../assets/index.less';

function handleClick(info) {
Expand Down
10 changes: 8 additions & 2 deletions docs/examples/inlineCollapsed.tsx
Original file line number Diff line number Diff line change
@@ -1,11 +1,12 @@
import React, { useState } from 'react';
import Menu, { SubMenu, Item } from 'rc-menu';
import './inlineCollapsed.less';
import { inlineMotion } from './antd'

const App = () => {
const [collapsed, setCollapsed] = useState(false);
return (
<>
<div style={{ height: 600 }}>
<label>
<input type="checkbox" value={collapsed} onChange={e => setCollapsed(e.target.checked)} />
inlineCollapsed: {collapsed.toString()}
Expand All @@ -15,14 +16,19 @@ const App = () => {
inlineCollapsed={collapsed}
style={{ width: 600 }}
className={collapsed ? 'collapsed' : ''}
motion={inlineMotion}
>
<Item key="1">item 1</Item>
<SubMenu key="2" title={`inlineCollapsed: ${collapsed.toString()}`}>
<Item key="3">item 2</Item>
<Item key="4">item 3</Item>
<SubMenu key="5" title={`inlineCollapsed: ${collapsed.toString()}`} style={{ minWidth: 220 }}>
<Item key="6">item 4</Item>
<Item key="7">item 5</Item>
</SubMenu>
</SubMenu>
</Menu>
</>
</div>
);
}

Expand Down
2 changes: 2 additions & 0 deletions src/Menu.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -598,7 +598,9 @@ const Menu = React.forwardRef<MenuRef, MenuProps>((props, ref) => {
<MenuContextProvider
prefixCls={prefixCls}
rootClassName={rootClassName}
originMode={mode}
mode={internalMode}
inlineCollapsed={internalInlineCollapsed}
openKeys={mergedOpenKeys}
rtl={isRtl}
// Disabled
Expand Down
8 changes: 4 additions & 4 deletions src/SubMenu/PopupTrigger.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -75,10 +75,10 @@ export default function PopupTrigger({
}

const mergedMotion: CSSMotionProps = {
...targetMotionRef.current,
leavedClassName: `${prefixCls}-hidden`,
removeOnLeave: false,
motionAppear: true,
...targetMotionRef.current,
leavedClassName: `${prefixCls}-hidden`,
removeOnLeave: false,
motionAppear: true,
};

// Delay to change visible
Expand Down
6 changes: 5 additions & 1 deletion src/SubMenu/index.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -80,6 +80,8 @@ const InternalSubMenu = (props: SubMenuProps) => {
const {
prefixCls,
mode,
originMode,
inlineCollapsed,
openKeys,

// Disabled
Expand Down Expand Up @@ -272,14 +274,16 @@ const InternalSubMenu = (props: SubMenuProps) => {

if (!overflowDisabled) {
const triggerMode = triggerModeRef.current;
const canTriggerPopupVisible = originMode !== 'inline' || inlineCollapsed;
const visible = !internalPopupClose && open && mode !== 'inline' && canTriggerPopupVisible;

// Still wrap with Trigger here since we need avoid react re-mount dom node
// Which makes motion failed
titleNode = (
<PopupTrigger
mode={triggerMode}
prefixCls={subMenuPrefixCls}
visible={!internalPopupClose && open && mode !== 'inline'}
visible={visible}
popupClassName={popupClassName}
popupOffset={popupOffset}
popupStyle={popupStyle}
Expand Down
2 changes: 2 additions & 0 deletions src/context/MenuContext.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,9 @@ export interface MenuContextProps {
rtl?: boolean;

// Mode
originMode: MenuMode;
mode: MenuMode;
inlineCollapsed?: boolean;

// Disabled
disabled?: boolean;
Expand Down