Skip to content

Commit

Permalink
fix: Menu defaultOpenKeys not work in React18 (#502)
Browse files Browse the repository at this point in the history
* fix: Menu defaultOpenKeys not work in React18

* fix: mount check logic
  • Loading branch information
zombieJ authored Aug 15, 2022
1 parent 5100a57 commit 438bdec
Show file tree
Hide file tree
Showing 2 changed files with 67 additions and 1 deletion.
9 changes: 8 additions & 1 deletion src/Menu.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -293,7 +293,6 @@ const Menu = React.forwardRef<MenuRef, MenuProps>((props, ref) => {
// Restore
React.useEffect(() => {
if (!mountRef.current) {
mountRef.current = true;
return;
}

Expand All @@ -305,6 +304,14 @@ const Menu = React.forwardRef<MenuRef, MenuProps>((props, ref) => {
}
}, [isInlineMode]);

React.useEffect(() => {
mountRef.current = true;

return () => {
mountRef.current = false;
};
}, []);

// ========================= Path =========================
const {
registerPath,
Expand Down
59 changes: 59 additions & 0 deletions tests/React18.spec.tsx
Original file line number Diff line number Diff line change
@@ -0,0 +1,59 @@
/* eslint-disable no-undef */
import React from 'react';
import { act, render } from '@testing-library/react';
import Menu, { MenuItem, SubMenu } from '../src';
import type { MenuProps } from '../src';

describe('React18', () => {
function runAllTimer() {
for (let i = 0; i < 10; i += 1) {
act(() => {
jest.runAllTimers();
});
}
}

beforeEach(() => {
jest.useFakeTimers();
});

afterEach(() => {
jest.useRealTimers();
});

function createMenu(props?: MenuProps) {
return (
<React.StrictMode>
<Menu {...props}>
<SubMenu key="s1" title="submenu1">
<MenuItem key="s1-1">1</MenuItem>
<SubMenu key="s1-2" title="submenu1-1">
<MenuItem key="s1-2-1">2</MenuItem>
</SubMenu>
</SubMenu>
<SubMenu key="s2" title="submenu2">
<MenuItem key="s2-2">2</MenuItem>
</SubMenu>
</Menu>
</React.StrictMode>
);
}

it("don't show submenu when disabled", () => {
const { container } = render(
createMenu({
defaultOpenKeys: ['s1'],
mode: 'horizontal',
}),
);

runAllTimer();

expect(
container
.querySelector('.rc-menu-submenu-open')
.querySelector('.rc-menu-submenu-title').textContent,
).toEqual('submenu1');
});
});
/* eslint-enable */

0 comments on commit 438bdec

Please sign in to comment.