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

feat(overlays): adds onDidDismiss and onWillDismiss

Browse Source
This commit is contained in:
Manu Mtz.-Almeida
2018-03-12 21:45:20 +01:00
parent 73f2f2b2b2
commit 7dcf8a5bd4
21 changed files with 207 additions and 164 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1,8 +1,8 @@
import { Component, Element, Event, EventEmitter, Listen, Method, Prop } from '@stencil/core';
import { Animation, AnimationBuilder, Config, OverlayDismissEvent, OverlayDismissEventDetail } from '../../index';
import { Animation, AnimationBuilder, Config } from '../../index';
import { createThemedClasses, getClassMap } from '../../utils/theme';
import { OverlayInterface, dismiss, present } from '../../utils/overlays';
import { OverlayEventDetail, OverlayInterface, dismiss, eventMethod, present } from '../../utils/overlays';
import iosEnterAnimation from './animations/ios.enter';
import iosLeaveAnimation from './animations/ios.leave';
@ -94,32 +94,32 @@ export class Toast implements OverlayInterface {
/**
* Emitted after the toast has loaded.
*/
@Event() ionToastDidLoad: EventEmitter<ToastEventDetail>;
@Event() ionToastDidLoad: EventEmitter<void>;
/**
* Emitted after the toast has presented.
*/
@Event({eventName: 'ionToastDidPresent'}) didPresent: EventEmitter<ToastEventDetail>;
@Event({eventName: 'ionToastDidPresent'}) didPresent: EventEmitter<void>;
/**
* Emitted before the toast has presented.
*/
@Event({eventName: 'ionToastWillPresent'}) willPresent: EventEmitter<ToastEventDetail>;
@Event({eventName: 'ionToastWillPresent'}) willPresent: EventEmitter<void>;
/**
* Emitted before the toast has dismissed.
*/
@Event({eventName: 'ionToastWillDismiss'}) willDismiss: EventEmitter<ToastDismissEventDetail>;
@Event({eventName: 'ionToastWillDismiss'}) willDismiss: EventEmitter<OverlayEventDetail>;
/**
* Emitted after the toast has dismissed.
*/
@Event({eventName: 'ionToastDidDismiss'}) didDismiss: EventEmitter<ToastDismissEventDetail>;
@Event({eventName: 'ionToastDidDismiss'}) didDismiss: EventEmitter<OverlayEventDetail>;
/**
* Emitted after the toast has unloaded.
*/
@Event() ionToastDidUnload: EventEmitter<ToastEventDetail>;
@Event() ionToastDidUnload: EventEmitter<void>;
componentDidLoad() {
this.ionToastDidLoad.emit();
@ -157,6 +157,15 @@ export class Toast implements OverlayInterface {
return dismiss(this, data, role, 'toastLeave', iosLeaveAnimation, mdLeaveAnimation, this.position);
}
@Method()
onDidDismiss(callback: (data?: any, role?: string) => void): Promise<OverlayEventDetail> {
return eventMethod(this.el, 'ionToastDidDismiss', callback);
}
@Method()
onWillDismiss(callback: (data?: any, role?: string) => void): Promise<OverlayEventDetail> {
return eventMethod(this.el, 'ionToastWillDismiss', callback);
}
hostData() {
const themedClasses = this.translucent ? createThemedClasses(this.mode, this.color, 'toast-translucent') : {};
@ -205,20 +214,3 @@ export interface ToastOptions {
enterAnimation?: AnimationBuilder;
leaveAnimation?: AnimationBuilder;
}
export interface ToastEvent extends CustomEvent {
target: HTMLIonToastElement;
detail: ToastEventDetail;
}
export interface ToastEventDetail {
}
export interface ToastDismissEventDetail extends OverlayDismissEventDetail {
// keep this just for the sake of static types and potential future extensions
}
export interface ToastDismissEvent extends OverlayDismissEvent {
// keep this just for the sake of static types and potential future extensions
}