javascript/ionic-framework
1
0
Fork 0
mirror of https://github.com/ionic-team/ionic-framework.git synced 2025-08-22 21:48:42 +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

43
core/src/components/picker/picker.tsx
View File

@ -1,8 +1,8 @@
import { Component, Element, Event, EventEmitter, Listen, Method, Prop, State } from '@stencil/core';
import { Animation, AnimationBuilder, Config, CssClassMap, OverlayDismissEvent, OverlayDismissEventDetail } from '../../index';
import { Animation, AnimationBuilder, Config, CssClassMap } from '../../index';
import { 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';
@ -83,32 +83,32 @@ export class Picker implements OverlayInterface {
/**
* Emitted after the picker has loaded.
*/
@Event() ionPickerDidLoad: EventEmitter<PickerEventDetail>;
@Event() ionPickerDidLoad: EventEmitter<void>;
/**
* Emitted after the picker has presented.
*/
@Event({eventName: 'ionPickerDidPresent'}) didPresent: EventEmitter<PickerEventDetail>;
@Event({eventName: 'ionPickerDidPresent'}) didPresent: EventEmitter<void>;
/**
* Emitted before the picker has presented.
*/
@Event({eventName: 'ionPickerWillPresent'}) willPresent: EventEmitter<PickerEventDetail>;
@Event({eventName: 'ionPickerWillPresent'}) willPresent: EventEmitter<void>;
/**
* Emitted before the picker has dismissed.
*/
@Event({eventName: 'ionPickerWillDismiss'}) willDismiss: EventEmitter<PickerDismissEventDetail>;
@Event({eventName: 'ionPickerWillDismiss'}) willDismiss: EventEmitter<OverlayEventDetail>;
/**
* Emitted after the picker has dismissed.
*/
@Event({eventName: 'ionPickerDidDismiss'}) didDismiss: EventEmitter<PickerDismissEventDetail>;
@Event({eventName: 'ionPickerDidDismiss'}) didDismiss: EventEmitter<OverlayEventDetail>;
/**
* Emitted after the picker has unloaded.
*/
@Event() ionPickerDidUnload: EventEmitter<PickerEventDetail>;
@Event() ionPickerDidUnload: EventEmitter<void>;
componentWillLoad() {
@ -167,6 +167,16 @@ export class Picker implements OverlayInterface {
return dismiss(this, data, role, 'pickerLeave', iosLeaveAnimation, iosLeaveAnimation, undefined);
}
@Method()
onDidDismiss(callback: (data?: any, role?: string) => void): Promise<OverlayEventDetail> {
return eventMethod(this.el, 'ionPickerDidDismiss', callback);
}
@Method()
onWillDismiss(callback: (data?: any, role?: string) => void): Promise<OverlayEventDetail> {
return eventMethod(this.el, 'ionPickerWillDismiss', callback);
}
@Method()
addButton(button: any) {
this.buttons.push(button);
@ -354,20 +364,3 @@ export interface PickerColumnOption {
transform?: string;
selected?: boolean;
}
export interface PickerEvent extends CustomEvent {
target: HTMLIonPickerElement;
detail: PickerEventDetail;
}
export interface PickerEventDetail {
}
export interface PickerDismissEventDetail extends OverlayDismissEventDetail {
// keep this just for the sake of static types and potential future extensions
}
export interface PickerDismissEvent extends OverlayDismissEvent {
// keep this just for the sake of static types and potential future extensions
}

6
core/src/components/picker/readme.md
View File

@ -200,6 +200,12 @@ Dismiss the picker overlay after it has been presented.
#### getColumns()
#### onDidDismiss()
#### onWillDismiss()
#### present()
Present the picker overlay after it has been created.