javascript/ionic-framework
1
0
Fork 0
mirror of https://github.com/ionic-team/ionic-framework.git synced 2025-11-09 08:09:32 +08:00
Code Issues Packages Projects Releases Wiki Activity

fix(toast): call button handler on cancel (#19793)

Browse Source 
fixes #19791
This commit is contained in:
Liam DeBeasi
2019-10-30 14:02:18 -04:00
committed by GitHub
parent 7988720b1c
commit 420aa66392
1 changed files with 10 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
core/src/components/toast/toast.tsx
View File

@ -191,7 +191,7 @@ export class Toast implements ComponentInterface, OverlayInterface {
} }
const shouldDismiss = await this.callButtonHandler(button); const shouldDismiss = await this.callButtonHandler(button);
if (shouldDismiss) { if (shouldDismiss) {
return this.dismiss(undefined, button.role); return this.dismiss(undefined, role);
} }
return Promise.resolve(); return Promise.resolve();
} }
@ -213,6 +213,14 @@ export class Toast implements ComponentInterface, OverlayInterface {
return true; return true;
} }
private dispatchCancelHandler = (ev: CustomEvent) => {
const role = ev.detail.role;
if (isCancel(role)) {
const cancelButton = this.getButtons().find(b => b.role === 'cancel');
this.callButtonHandler(cancelButton);
}
}
renderButtons(buttons: ToastButton[], side: 'start' | 'end') { renderButtons(buttons: ToastButton[], side: 'start' | 'end') {
if (buttons.length === 0) { if (buttons.length === 0) {
return; return;
@ -265,6 +273,7 @@ export class Toast implements ComponentInterface, OverlayInterface {
...getClassMap(this.cssClass), ...getClassMap(this.cssClass),
'toast-translucent': this.translucent 'toast-translucent': this.translucent
}} }}
onIonToastWillDismiss={this.dispatchCancelHandler}
> >
<div class={wrapperClass}> <div class={wrapperClass}>
<div class="toast-container"> <div class="toast-container">