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.

Sign up for GitHub

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

Jump to bottom

fix menu popuptrigger flicker #497

Merged
merged 1 commit into from
Nov 10, 2022
Merged

fix menu popuptrigger flicker #497

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
6 changes: 4 additions & 2 deletions src/SubMenu/index.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -262,8 +262,10 @@ const InternalSubMenu = (props: SubMenuProps) => {

// Cache mode if it change to `inline` which do not have popup motion
const triggerModeRef = React.useRef(mode);
if (mode !== 'inline') {
triggerModeRef.current = connectedPath.length > 1 ? 'vertical' : mode;
if (mode !== 'inline' && connectedPath.length > 1) {
triggerModeRef.current = 'vertical';
} else {
triggerModeRef.current = mode;
JarvisArt marked this conversation as resolved.
Show resolved Hide resolved
}

if (!overflowDisabled) {
Expand Down
53 changes: 53 additions & 0 deletions tests/Collapsed.spec.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,6 +46,59 @@ describe('Menu.Collapsed', () => {
);
});

it('should always follow submenu popup hidden when mode is switched', () => {
const genMenu = props => (
<Menu mode="vertical" {...props}>
<SubMenu key="1" title="submenu1">
<SubMenu key="1-1" title="submenu1-1">
<MenuItem key="Option-1">Option 1</MenuItem>
</SubMenu>
</SubMenu>
</Menu>
);

const { container, rerender } = render(genMenu());

// Hover submenu1
fireEvent.mouseEnter(
container.querySelectorAll('.rc-menu-submenu-title')[0],
);

act(() => {
jest.runAllTimers();
});
act(() => {
jest.runAllTimers();
});

// Hover submenu1-1
fireEvent.mouseEnter(
container.querySelectorAll('.rc-menu-submenu-title')[1],
);

act(() => {
jest.runAllTimers();
});
act(() => {
jest.runAllTimers();
});

rerender(genMenu({ mode: 'inline' }));

// Click submenu1
fireEvent.click(container.querySelectorAll('.rc-menu-submenu-title')[0]);
// Click submenu1-1
fireEvent.click(container.querySelectorAll('.rc-menu-submenu-title')[2]);

act(() => {
jest.runAllTimers();
});

expect(container.querySelectorAll('.rc-menu-submenu')[3]).toHaveClass(
'rc-menu-submenu-hidden',
);
});

it('should always follow openKeys when inlineCollapsed is switched', () => {
const genMenu = props => (
<Menu defaultOpenKeys={['1']} mode="inline" {...props}>
Expand Down