Skip to content

fix(cdk-experimental/dialog): not completing lifecycle observables #14180

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.

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

Merged
merged 1 commit into from
Nov 27, 2018
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
4 changes: 4 additions & 0 deletions src/cdk-experimental/dialog/dialog-container.ts
Original file line number Diff line number Diff line change
Expand Up @@ -133,11 +133,13 @@ export class CdkDialogContainer extends BasePortalOutlet implements OnDestroy {
if (event.toState === 'enter') {
this._autoFocusFirstTabbableElement();
this._afterEnter.next();
this._afterEnter.complete();
}

if (event.fromState === 'enter' && (event.toState === 'void' || event.toState === 'exit')) {
this._returnFocusAfterDialog();
this._afterExit.next();
this._afterExit.complete();
}
});
}
Expand Down Expand Up @@ -178,9 +180,11 @@ export class CdkDialogContainer extends BasePortalOutlet implements OnDestroy {
_onAnimationStart(event: AnimationEvent) {
if (event.toState === 'enter') {
this._beforeEnter.next();
this._beforeEnter.complete();
}
if (event.fromState === 'enter' && (event.toState === 'void' || event.toState === 'exit')) {
this._beforeExit.next();
this._beforeExit.complete();
}
}

Expand Down
23 changes: 23 additions & 0 deletions src/cdk-experimental/dialog/dialog.spec.ts
Original file line number Diff line number Diff line change
Expand Up @@ -632,6 +632,29 @@ describe('Dialog', () => {
expect(overlayContainerElement.querySelectorAll('cdk-dialog-container').length).toBe(0);
}));

it('should complete the various lifecycle streams on destroy', fakeAsync(() => {
let dialogRef = dialog.openFromComponent(PizzaMsg, { viewContainerRef: testViewContainerRef });
let beforeOpenedComplete = jasmine.createSpy('before opened complete spy');
let afterOpenedComplete = jasmine.createSpy('after opened complete spy');
let beforeClosedComplete = jasmine.createSpy('before closed complete spy');
let afterClosedComplete = jasmine.createSpy('after closed complete spy');

viewContainerFixture.detectChanges();
dialogRef.beforeOpened().subscribe({complete: beforeOpenedComplete});
dialogRef.afterOpened().subscribe({complete: afterOpenedComplete});
dialogRef.beforeClosed().subscribe({complete: beforeClosedComplete});
dialogRef.afterClosed().subscribe({complete: afterClosedComplete});

dialogRef.close('Charmander');
viewContainerFixture.detectChanges();
flush();

expect(beforeOpenedComplete).toHaveBeenCalled();
expect(afterOpenedComplete).toHaveBeenCalled();
expect(beforeClosedComplete).toHaveBeenCalled();
expect(afterClosedComplete).toHaveBeenCalled();
}));

describe('passing in data', () => {
it('should be able to pass in data', () => {
let config = {
Expand Down