Skip to content

chore: Keep node #388

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

Merged
merged 2 commits into from
May 6, 2021
Merged

chore: Keep node #388

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
b6475d6
fix: mode switch motion
zombieJ May 6, 2021
f00e5ce
chore: Add comment
zombieJ May 6, 2021
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
24 changes: 18 additions & 6 deletions src/SubMenu/index.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -267,18 +267,30 @@ const InternalSubMenu = (props: SubMenuProps) => {
</div>
);

if (mode !== 'inline' && !overflowDisabled) {
// Cache mode if it change to `inline` which do not have popup motion
const triggerModeRef = React.useRef(mode);
if (mode !== 'inline') {
triggerModeRef.current = mode;
}

if (!overflowDisabled) {
const triggerMode = triggerModeRef.current;

// Still wrap with Trigger here since we need avoid react re-mount dom node
// Which makes motion failed
titleNode = (
<PopupTrigger
mode={mode}
mode={triggerMode}
prefixCls={subMenuPrefixCls}
visible={!internalPopupClose && open}
visible={!internalPopupClose && open && mode !== 'inline'}
popupClassName={popupClassName}
popupOffset={popupOffset}
popup={
<SubMenuList id={popupId} ref={popupRef}>
{children}
</SubMenuList>
<MenuContextProvider mode={triggerMode}>
<SubMenuList id={popupId} ref={popupRef}>
{children}
</SubMenuList>
</MenuContextProvider>
}
disabled={mergedDisabled}
onVisibleChange={onPopupVisibleChange}
Expand Down