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

Refact/menu collapse animation #3140

Merged
merged 7 commits into from
Jul 26, 2023
Merged

Refact/menu collapse animation #3140

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
28dc291
feat: use common collapse animation
xiaosansiji Jul 24, 2023
17fe368
test: update snapshot
xiaosansiji Jul 24, 2023
7c4c727
fix: menu item click event params
xiaosansiji Jul 25, 2023
6d65783
feat: update common
xiaosansiji Jul 25, 2023
f1c6817
feat: update common
xiaosansiji Jul 25, 2023
adaa73e
Merge branch 'develop' into refact/menu-collapse-animation
xiaosansiji Jul 25, 2023
4fd6dd7
fix: menu item click event
xiaosansiji Jul 25, 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
2 changes: 1 addition & 1 deletion src/_common
Open in desktop
Submodule _common updated 9 files
+6 −0 docs/web/api/transfer.en-US.md
+6 −0 docs/web/api/transfer.md
+54 −0 js/slider/utils.ts
+1 −1 style/mobile/components/overlay/v2/_var.less
+2 −0 style/mobile/components/toast/v2/_index.less
+1 −1 style/mobile/components/toast/v2/_var.less
+5 −0 style/web/_global.less
+0 −5 style/web/components/collapse/_index.less
+6 −6 style/web/components/menu/_index.less
2 changes: 1 addition & 1 deletion src/collapse/collapse-panel.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ import FakeArrow from '../common-components/fake-arrow';
import { CollapseValue, TdCollapsePanelProps } from './type';
import { useTNodeJSX, useContent } from '../hooks/tnode';
import { usePrefixClass } from '../hooks/useConfig';
import useCollapseAnimation from './useCollapseAnimation';
import useCollapseAnimation from '../hooks/useCollapseAnimation';

export default defineComponent({
name: 'TCollapsePanel',
Expand Down
0 src/collapse/useCollapseAnimation.ts → src/hooks/useCollapseAnimation.ts
View file
Open in desktop
File renamed without changes.
2 changes: 1 addition & 1 deletion src/menu/menu-item.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@ export default defineComponent({
e.stopPropagation();
if (this.disabled) return;
this.menu.select(this.value);
emitEvent(this, 'click');
emitEvent(this, 'click', { e });
if (this.to || (this.routerLink && this.href)) {
const router = this.router || this.$router;
const methods: string = this.replace ? 'replace' : 'push';
Expand Down
23 changes: 20 additions & 3 deletions src/menu/submenu.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@ import {
toRefs,
reactive,
nextTick,
Transition,
} from 'vue';
import props from './submenu-props';
import { renderContent, renderTNodeJSX } from '../utils/render-tnode';
Expand All @@ -21,6 +22,7 @@ import { usePrefixClass } from '../hooks/useConfig';
import { Popup, PopupPlacement } from '../popup';
import isFunction from 'lodash/isFunction';
import { TdSubmenuProps } from './type';
import useCollapseAnimation from '../hooks/useCollapseAnimation';

export default defineComponent({
name: 'TSubmenu',
Expand Down Expand Up @@ -50,6 +52,7 @@ export default defineComponent({
const popupWrapperRef = ref<HTMLElement>();
const subPopupRef = ref<HTMLElement>();
const submenuRef = ref<HTMLElement>();
const transitionClass = usePrefixClass('slide-down');
useRipple(submenuRef, rippleColor);

const classes = computed(() => [
Expand Down Expand Up @@ -215,6 +218,8 @@ export default defineComponent({
isNested,
classes,
subClass,
isOpen,
transitionClass,
arrowClass,
overlayInnerClassName,
overlayClassName,
Expand Down Expand Up @@ -308,6 +313,8 @@ export default defineComponent({
parent = parent.parent;
}

const { beforeEnter, enter, afterEnter, beforeLeave, leave, afterLeave } = useCollapseAnimation();

const needRotate = this.mode === 'popup' && this.isNested;

const normalSubmenu = [
Expand All @@ -321,9 +328,19 @@ export default defineComponent({
/>
)}
</div>,
<ul class={this.subClass} style={{ '--padding-left': `${paddingLeft}px` }}>
{child}
</ul>,
<Transition
name={this.transitionClass}
onBeforeEnter={beforeEnter}
onEnter={enter}
onAfterEnter={afterEnter}
onBeforeLeave={beforeLeave}
onLeave={leave}
onAfterLeave={afterLeave}
>
<ul v-show={this.isOpen} class={this.subClass} style={{ '--padding-left': `${paddingLeft}px` }}>
{child}
</ul>
</Transition>,
];

const triggerElement = [
Expand Down
Loading