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

fix(Popup): duration prop not work when position is center

Browse Source
This commit is contained in:
陈嘉涵 2020-01-28 21:57:29 +08:00
parent 4fba295ea1
commit 44072e8c3f
4 changed files with 21 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/action-sheet/index.tsx
View File

@ -30,7 +30,7 @@ export type ActionSheetProps = PopupMixinProps & {
round: boolean; round: boolean;
title?: string; title?: string;
actions?: ActionSheetItem[]; actions?: ActionSheetItem[];
duration: number; duration: number | string;
closeIcon: string; closeIcon: string;
cancelText?: string; cancelText?: string;
description?: string; description?: string;

6
src/popup/index.js
View File

@ -49,14 +49,16 @@ export default createComponent({
} }
const { round, position, duration } = this; const { round, position, duration } = this;
const isCenter = position === 'center';
const transitionName = const transitionName =
this.transition || this.transition ||
(position === 'center' ? 'van-fade' : `van-popup-slide-${position}`); (isCenter ? 'van-fade' : `van-popup-slide-${position}`);
const style = {}; const style = {};
if (isDef(duration)) { if (isDef(duration)) {
style.transitionDuration = `${duration}s`; const key = isCenter ? 'animationDuration' : 'transitionDuration';
style[key] = `${duration}s`;
} }
return ( return (

4
src/popup/test/__snapshots__/index.spec.js.snap
View File

@ -5,7 +5,9 @@ exports[`close-icon prop 1`] = `
<!----></i></div> <!----></i></div>
`; `;
exports[`duration prop 1`] = `<div class="van-popup van-popup--center" style="transition-duration: 0.5s;" name="van-fade"></div>`; exports[`duration prop when position is center 1`] = `<div class="van-popup van-popup--center" style="animation-duration: 0.5s;" name="van-fade"></div>`;
exports[`duration prop when position is top 1`] = `<div class="van-popup van-popup--top" style="transition-duration: 0.5s;" name="van-popup-slide-top"></div>`;
exports[`reset z-index 1`] = `<div class="van-popup van-popup--center" name="van-fade"></div>`; exports[`reset z-index 1`] = `<div class="van-popup van-popup--center" name="van-fade"></div>`;

14
src/popup/test/index.spec.js
View File

@ -206,7 +206,7 @@ test('click event', () => {
expect(wrapper.emitted('click')).toBeTruthy(); expect(wrapper.emitted('click')).toBeTruthy();
}); });
test('duration prop', () => { test('duration prop when position is center', () => {
const wrapper = mount(Popup, { const wrapper = mount(Popup, {
propsData: { propsData: {
value: true, value: true,
@ -217,6 +217,18 @@ test('duration prop', () => {
expect(wrapper).toMatchSnapshot(); expect(wrapper).toMatchSnapshot();
}); });
test('duration prop when position is top', () => {
const wrapper = mount(Popup, {
propsData: {
value: true,
duration: 0.5,
position: 'top',
},
});
expect(wrapper).toMatchSnapshot();
});
test('round prop', () => { test('round prop', () => {
const wrapper = mount(Popup, { const wrapper = mount(Popup, {
propsData: { propsData: {