Skip to content

fix: vertical animation not being affected by inline #578

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 4 commits into from
Jan 17, 2023
Merged

fix: vertical animation not being affected by inline #578

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
ea70d66
fix: vertical animation not being affected by inline
JarvisArt Dec 30, 2022
da328fe
test: inline does not affect vertical motion
JarvisArt Dec 30, 2022
5c5ec4f
chore: optimize logic
JarvisArt Jan 17, 2023
2e8843c
Merge branch 'master' into fix-vertical
JarvisArt Jan 17, 2023
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
11 changes: 10 additions & 1 deletion src/SubMenu/PopupTrigger.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -62,9 +62,18 @@ export default function PopupTrigger({
const popupPlacement = popupPlacementMap[mode];

const targetMotion = getMotion(mode, motion, defaultMotions);
const targetMotionRef = React.useRef(targetMotion);

if (mode !== 'inline') {
/**
* PopupTrigger is only used for vertical and horizontal types.
* When collapsed is unfolded, the inline animation will destroy the vertical animation.
*/
targetMotionRef.current = targetMotion;
}

const mergedMotion: CSSMotionProps = {
...targetMotion,
...targetMotionRef.current,
leavedClassName: `${prefixCls}-hidden`,
removeOnLeave: false,
motionAppear: true,
Expand Down
16 changes: 16 additions & 0 deletions tests/Menu.spec.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -574,6 +574,22 @@ describe('Menu', () => {
rerender(genMenu({ mode: 'vertical' }));
expect(global.triggerProps.popupMotion.motionName).toEqual('bambooLight');
});

it('inline does not affect vertical motion', () => {
const genMenu = props => (
<Menu defaultMotions={defaultMotions} {...props}>
<SubMenu key="bamboo">
<MenuItem key="light" />
</SubMenu>
</Menu>
);

const { rerender } = render(genMenu({ mode: 'vertical' }));
rerender(genMenu({ mode: 'inline' }));
expect(global.triggerProps.popupMotion.motionName).toEqual(
'defaultMotion',
);
});
});

it('onMouseEnter should work', () => {
Expand Down