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

feat(Popup): add click-close-icon event (#7599)

Browse Source
This commit is contained in:
neverland 2020-11-21 18:36:23 +08:00 committed by GitHub
parent 5605b0aa57
commit b53254e33a
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 38 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
src/popup/README.md
View File

@ -129,11 +129,12 @@ export default {
### Events
| Event | Description | Arguments |
| ------------- | ------------------------------- | -------------- |
| click | Emitted when Popup is clicked | _event: Event_ |
| open | Emitted when opening Popup | - |
| close | Emitted when closing Popup | - |
| opened | Emitted when Popup is opened | - |
| closed | Emitted when Popup is closed | - |
| click-overlay | Emitted when overlay is clicked | - |
| Event | Description | Arguments |
| --- | --- | --- |
| click | Emitted when Popup is clicked | _event: Event_ |
| click-overlay | Emitted when overlay is clicked | - |
| click-close-icon `v2.11.0` | Emitted when close icon is clicked | _event: Event_ |
| open | Emitted when opening Popup | - |
| close | Emitted when closing Popup | - |
| opened | Emitted when Popup is opened | - |
| closed | Emitted when Popup is closed | - |

17
src/popup/README.zh-CN.md
View File

@ -140,11 +140,12 @@ export default {
### Events
| 事件名 | 说明 | 回调参数 |
| ------------- | -------------------------- | -------------- |
| click | 点击弹出层时触发 | _event: Event_ |
| open | 打开弹出层时触发 | - |
| close | 关闭弹出层时触发 | - |
| opened | 打开弹出层且动画结束后触发 | - |
| closed | 关闭弹出层且动画结束后触发 | - |
| click-overlay | 点击遮罩层时触发 | - |
| 事件名 | 说明 | 回调参数 |
| -------------------------- | -------------------------- | -------------- |
| click | 点击弹出层时触发 | _event: Event_ |
| click-overlay | 点击遮罩层时触发 | - |
| click-close-icon `v2.11.0` | 点击关闭图标时触发 | _event: Event_ |
| open | 打开弹出层时触发 | - |
| close | 关闭弹出层时触发 | - |
| opened | 打开弹出层且动画结束后触发 | - |
| closed | 关闭弹出层且动画结束后触发 | - |

9
src/popup/index.js
View File

@ -44,6 +44,13 @@ export default createComponent({
this.onClosed = createEmitter('closed');
},
methods: {
onClickCloseIcon(event) {
this.$emit('click-close-icon', event);
this.close();
},
},
render() {
if (!this.shouldRender) {
return;
@ -86,7 +93,7 @@ export default createComponent({
tabindex="0"
name={this.closeIcon}
class={bem('close-icon', this.closeIconPosition)}
onClick={this.close}
onClick={this.onClickCloseIcon}
/>
)}
</div>

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

@ -252,6 +252,18 @@ test('closeable prop', () => {
expect(wrapper.emitted('input')[0][0]).toEqual(false);
});
test('should emit click-close-icon event when close icon is clicked', () => {
const wrapper = mount(Popup, {
propsData: {
value: true,
closeable: true,
},
});
wrapper.find('.van-popup__close-icon').trigger('click');
expect(wrapper.emitted('click-close-icon').length).toEqual(1);
});
test('close-icon prop', () => {
const wrapper = mount(Popup, {
propsData: {