diff --git a/docs/markdown/v2-progress-tracking.md b/docs/markdown/v2-progress-tracking.md index 804ba91e8..3565171bf 100644 --- a/docs/markdown/v2-progress-tracking.md +++ b/docs/markdown/v2-progress-tracking.md @@ -53,6 +53,10 @@ - 新增`Skeleton`骨架屏组件 +### Popup + +- 新增`click`事件 + ### Loading - 新增`default`插槽 diff --git a/packages/popup/en-US.md b/packages/popup/en-US.md index 1e58e2e5f..721229d76 100644 --- a/packages/popup/en-US.md +++ b/packages/popup/en-US.md @@ -54,6 +54,7 @@ Use `position` prop to set popup display position | Event | Description | Arguments | |------|------|------| +| click | Triggered when click Popup | - | | open | Triggered when open Popup | - | | opened | Triggered when opened Popup | - | | close | Triggered when close Popup | - | diff --git a/packages/popup/index.js b/packages/popup/index.js index d16ddabfa..571c3ba55 100644 --- a/packages/popup/index.js +++ b/packages/popup/index.js @@ -25,7 +25,7 @@ export default sfc({ } const { position } = this; - const emit = event => () => this.$emit(event); + const emit = eventName => event => this.$emit(eventName, event); const transitionName = this.transition || (position ? `van-popup-slide-${position}` : 'van-fade'); return ( @@ -34,7 +34,7 @@ export default sfc({ onAfterEnter={emit('opened')} onAfterLeave={emit('closed')} > -
+
{this.slots()}
diff --git a/packages/popup/test/index.spec.js b/packages/popup/test/index.spec.js index 7c1b9558d..8d7bd662d 100644 --- a/packages/popup/test/index.spec.js +++ b/packages/popup/test/index.spec.js @@ -171,10 +171,21 @@ test('close on click modal', () => { expect(wrapper.vm.value).toBeFalsy(); }); -test('oepn & close event', () => { - wrapper = mount(Popup); +test('open & close event', () => { + const wrapper = mount(Popup); wrapper.vm.value = true; expect(wrapper.emitted('open')).toBeTruthy(); wrapper.vm.value = false; expect(wrapper.emitted('close')).toBeTruthy(); }); + +test('click event', () => { + const wrapper = mount(Popup, { + propsData: { + value: true + } + }); + + wrapper.trigger('click'); + expect(wrapper.emitted('click')).toBeTruthy(); +}); diff --git a/packages/popup/zh-CN.md b/packages/popup/zh-CN.md index da630dc0b..acf0dd09e 100644 --- a/packages/popup/zh-CN.md +++ b/packages/popup/zh-CN.md @@ -54,6 +54,7 @@ export default { | 事件名 | 说明 | 回调参数 | |------|------|------| +| click | 点击弹出层时触发 | - | | open | 打开弹出层时触发 | - | | opened | 打开弹出层且动画结束后触发 | - | | close | 关闭弹出层时触发 | - |