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

[improvement] Transition: remove classNames from data

Browse Source 
fix #1761
This commit is contained in:
rex 2019-07-15 10:46:15 +08:00 committed by GitHub
parent 7f2c9c1b58
commit 56c3f5529b
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 13 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
packages/mixins/transition.ts
View File

@ -25,16 +25,14 @@ export const transition = function(showDefaultValue: boolean) {
}, },
name: { name: {
type: String, type: String,
value: 'fade', value: 'fade'
observer: 'updateClasses'
} }
}, },
data: { data: {
type: '', type: '',
inited: false, inited: false,
display: false, display: false
classNames: getClassNames('fade')
}, },
attached() { attached() {
@ -52,14 +50,9 @@ export const transition = function(showDefaultValue: boolean) {
} }
}, },
updateClasses(name: string) {
this.set({
classNames: getClassNames(name)
});
},
enter() { enter() {
const { classNames, duration } = this.data; const { duration, name } = this.data;
const classNames = getClassNames(name);
const currentDuration = isObj(duration) ? duration.leave : duration; const currentDuration = isObj(duration) ? duration.leave : duration;
this.status = 'enter'; this.status = 'enter';
@ -88,7 +81,8 @@ export const transition = function(showDefaultValue: boolean) {
}, },
leave() { leave() {
const { classNames, duration } = this.data; const { duration, name } = this.data;
const classNames = getClassNames(name);
const currentDuration = isObj(duration) ? duration.leave : duration; const currentDuration = isObj(duration) ? duration.leave : duration;
this.status = 'leave'; this.status = 'leave';

9
packages/popup/index.ts
View File

@ -55,11 +55,16 @@ VantComponent({
observeClass() { observeClass() {
const { transition, position } = this.data; const { transition, position } = this.data;
this.updateClasses(transition || position);
const updateData: { [key: string]: any } = {
name: transition || position
};
if (transition === 'none') { if (transition === 'none') {
this.set({ duration: 0 }); updateData.duration = 0;
} }
this.set(updateData);
} }
} }
}); });