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

fix(action-sheet): allow async button handler returned value

Browse Source
This commit is contained in:
Adam Bradley
2018-09-20 13:21:07 -05:00
parent 6b87ead2dc
commit 3d3e6a4179
1 changed files with 5 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
core/src/components/action-sheet/action-sheet.tsx
View File

@ -170,24 +170,25 @@ export class ActionSheet implements ComponentInterface, OverlayInterface {
return eventMethod(this.el, 'ionActionSheetWillDismiss'); return eventMethod(this.el, 'ionActionSheetWillDismiss');
} }
private buttonClick(button: ActionSheetButton) { private async buttonClick(button: ActionSheetButton) {
const role = button.role; const role = button.role;
if (isCancel(role)) { if (isCancel(role)) {
return this.dismiss(undefined, role); return this.dismiss(undefined, role);
} }
const shouldDismiss = this.callButtonHandler(button); const shouldDismiss = await this.callButtonHandler(button);
if (shouldDismiss) { if (shouldDismiss) {
return this.dismiss(undefined, button.role); return this.dismiss(undefined, button.role);
} }
return Promise.resolve(); return Promise.resolve();
} }
private callButtonHandler(button: ActionSheetButton | undefined): boolean { private async callButtonHandler(button: ActionSheetButton | undefined) {
if (button && button.handler) { if (button && button.handler) {
// a handler has been provided, execute it // a handler has been provided, execute it
// pass the handler the values from the inputs // pass the handler the values from the inputs
try { try {
if (button.handler() === false) { const rtn = await button.handler();
if (rtn === false) {
// if the return value of the handler is false then do not dismiss // if the return value of the handler is false then do not dismiss
return false; return false;
} }