Skip to content

Commit cc25e98

Browse files
authored
fix: fix getPopupContainer null error (#636)
* fix: fix getPopupContainer null error * chore: code clena * chore: code clean * chore: update snapshot
1 parent 5ce582c commit cc25e98

File tree

3 files changed

+20
-24
lines changed

3 files changed

+20
-24
lines changed

src/Menu.tsx

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -479,8 +479,6 @@ const Menu = React.forwardRef<MenuRef, MenuProps>((props, ref) => {
479479
}
480480
});
481481

482-
const getInternalPopupContainer = useMemoCallback(getPopupContainer);
483-
484482
// ==================== Accessibility =====================
485483
const triggerAccessibilityOpen = (key: string, open?: boolean) => {
486484
const nextOpen = open ?? !mergedOpenKeys.includes(key);
@@ -622,7 +620,7 @@ const Menu = React.forwardRef<MenuRef, MenuProps>((props, ref) => {
622620
forceSubMenuRender={forceSubMenuRender}
623621
builtinPlacements={builtinPlacements}
624622
triggerSubMenuAction={triggerSubMenuAction}
625-
getPopupContainer={getInternalPopupContainer}
623+
getPopupContainer={getPopupContainer}
626624
// Icon
627625
itemIcon={itemIcon}
628626
expandIcon={expandIcon}

tests/SubMenu.spec.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ import { isActive, last } from './util';
77

88
jest.mock('@rc-component/trigger', () => {
99
const react = require('react');
10-
let Trigger = jest.requireActual('rc-trigger/lib/mock');
10+
let Trigger = jest.requireActual('@rc-component/trigger/lib/mock');
1111
Trigger = Trigger.default || Trigger;
1212

1313
return react.forwardRef((props, ref) => {

tests/__snapshots__/SubMenu.spec.tsx.snap

Lines changed: 18 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -81,28 +81,26 @@ HTMLCollection [
8181
class="rc-menu-submenu-arrow"
8282
/>
8383
</div>
84-
<div>
85-
<div
86-
class="rc-menu-submenu rc-menu-submenu-popup custom-className"
87-
style="opacity: 0;"
84+
<div
85+
class="rc-menu-submenu rc-menu-submenu-popup custom-className rc-menu-submenu-placement-rightTop"
86+
style="--arrow-x: 0px; --arrow-y: 0px; left: -1000vw; top: -1000vh; box-sizing: border-box;"
87+
>
88+
<ul
89+
class="rc-menu rc-menu-sub rc-menu-vertical"
90+
data-menu-list="true"
91+
id="rc-menu-uuid-test-1-popup"
92+
role="menu"
8893
>
89-
<ul
90-
class="rc-menu rc-menu-sub rc-menu-vertical"
91-
data-menu-list="true"
92-
id="rc-menu-uuid-test-1-popup"
93-
role="menu"
94+
<li
95+
aria-selected="false"
96+
class="rc-menu-item"
97+
data-menu-id="rc-menu-uuid-test-1-1"
98+
role="option"
99+
tabindex="-1"
94100
>
95-
<li
96-
aria-selected="false"
97-
class="rc-menu-item"
98-
data-menu-id="rc-menu-uuid-test-1-1"
99-
role="option"
100-
tabindex="-1"
101-
>
102-
submenu7
103-
</li>
104-
</ul>
105-
</div>
101+
submenu7
102+
</li>
103+
</ul>
106104
</div>
107105
</li>
108106
<li

0 commit comments

Comments
 (0)