blackteay/vant-weapp
1
0
Fork 0
mirror of https://gitee.com/vant-contrib/vant-weapp.git synced 2025-04-06 03:58:05 +08:00
Code Issues Projects Releases Wiki Activity

fix(Transition): fix transition event sequence (#5699)

Browse Source
This commit is contained in:
johnsonwong666 2024-01-15 19:47:25 +08:00 committed by GitHub
parent f2ff0e7b48
commit 19083a327c
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 49 additions and 43 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
packages/mixins/transition.ts
View File

@ -53,6 +53,7 @@ export function transition(showDefaultValue: boolean) {
}, },
enter() { enter() {
this.waitEnterEndPromise = new Promise((resolve) => {
const { duration, name } = this.data; const { duration, name } = this.data;
const classNames = getClassNames(name); const classNames = getClassNames(name);
const currentDuration = isObj(duration) ? duration.enter : duration; const currentDuration = isObj(duration) ? duration.enter : duration;
@ -85,11 +86,15 @@ export function transition(showDefaultValue: boolean) {
this.transitionEnded = false; this.transitionEnded = false;
this.setData({ classes: classNames['enter-to'] }); this.setData({ classes: classNames['enter-to'] });
resolve();
});
}); });
}); });
}, },
leave() { leave() {
if (!this.waitEnterEndPromise) return;
this.waitEnterEndPromise.then(() => {
if (!this.data.display) { if (!this.data.display) {
return; return;
} }
@ -124,6 +129,7 @@ export function transition(showDefaultValue: boolean) {
this.setData({ classes: classNames['leave-to'] }); this.setData({ classes: classNames['leave-to'] });
}); });
}); });
});
}, },
onTransitionEnd() { onTransitionEnd() {