Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

fix(dialog): improved type safety in dialog ref result #8766

Merged
merged 1 commit into from
Dec 13, 2017
Merged

fix(dialog): improved type safety in dialog ref result #8766

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 7 additions & 7 deletions src/lib/dialog/dialog-ref.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ let uniqueId = 0;
/**
* Reference to a dialog opened via the MatDialog service.
*/
export class MatDialogRef<T> {
export class MatDialogRef<T, R = any> {
/** The instance of component opened into the dialog. */
componentInstance: T;

Expand All @@ -34,13 +34,13 @@ export class MatDialogRef<T> {
private _afterOpen = new Subject<void>();

/** Subject for notifying the user that the dialog has finished closing. */
private _afterClosed = new Subject<any>();
private _afterClosed = new Subject<R | undefined>();

/** Subject for notifying the user that the dialog has started closing. */
private _beforeClose = new Subject<any>();
private _beforeClose = new Subject<R | undefined>();

/** Result to be passed to afterClosed. */
private _result: any;
private _result: R | undefined;

constructor(
private _overlayRef: OverlayRef,
Expand Down Expand Up @@ -74,7 +74,7 @@ export class MatDialogRef<T> {
* Close the dialog.
* @param dialogResult Optional result to return to the dialog opener.
*/
close(dialogResult?: any): void {
close(dialogResult?: R): void {
this._result = dialogResult;

// Transition the backdrop in parallel to the dialog.
Expand All @@ -101,14 +101,14 @@ export class MatDialogRef<T> {
/**
* Gets an observable that is notified when the dialog is finished closing.
*/
afterClosed(): Observable<any> {
afterClosed(): Observable<R | undefined> {
return this._afterClosed.asObservable();
}

/**
* Gets an observable that is notified when the dialog has started closing.
*/
beforeClose(): Observable<any> {
beforeClose(): Observable<R | undefined> {
return this._beforeClose.asObservable();
}

Expand Down