fix(dialog): Unsubscribe from interactionEventSubscription (#1559)

Author: trimox

packages/dialog/dialog.component.ts

@@ -8,21 +8,18 @@ import {
   ElementRef,
   NgZone,
   OnDestroy,
-  OnInit,
   QueryList,
-  ViewChild,
   ViewEncapsulation
 } from '@angular/core';
 import { merge, Observable, fromEvent, Subject, Subscription } from 'rxjs';
 import { takeUntil } from 'rxjs/operators';
 
-import { Platform, toBoolean, ESCAPE } from '@angular-mdc/web/common';
+import { Platform } from '@angular-mdc/web/common';
 
 import {
   MdcDialogButton,
   MdcDialogContent,
-  MdcDialogSurface,
-  MdcDialogScrim
+  MdcDialogSurface
 } from './dialog-directives';
 import { MdcDialogRef } from './dialog-ref';
 import { MdcDialogConfig } from './dialog-config';
@@ -34,7 +31,7 @@ import {
   isScrollable,
   areTopsMisaligned
 } from '@material/dialog/util';
-import { strings, numbers } from '@material/dialog/constants';
+import { strings } from '@material/dialog/constants';
 import { closest, matches } from '@material/dom/ponyfill';
 import { MDCDialogFoundation } from '@material/dialog/index';
 
@@ -193,6 +190,9 @@ export class MdcDialogComponent implements AfterViewInit, OnDestroy {
     if (this._layoutEventSubscription) {
       this._layoutEventSubscription.unsubscribe();
     }
+    if (this._interactionEventSubscription) {
+      this._interactionEventSubscription.unsubscribe();
+    }
 
     if (this._foundation) {
       this._foundation.destroy();

test/dialog/dialog.test.ts

@@ -2,20 +2,14 @@ import { NgModule, Directive, Component, DebugElement, Injector, TemplateRef, Vi
 import { inject, ComponentFixture, fakeAsync, TestBed, flush, tick, flushMicrotasks } from '@angular/core/testing';
 import { Location } from '@angular/common';
 import { SpyLocation } from '@angular/common/testing';
-import { By } from '@angular/platform-browser';
-import { Subject } from 'rxjs';
 
 import { dispatchKeyboardEvent, dispatchFakeEvent } from '../testing/dispatch-events';
 
 import {
   ESCAPE,
   DOWN_ARROW,
   MdcDialog,
-  MdcDialogButton,
   MdcDialogModule,
-  MdcDialogComponent,
-  MdcDialogPortal,
-  MDC_DIALOG_DATA,
   MdcDialogRef,
   OverlayContainer
 } from '@angular-mdc/web';
@@ -24,7 +18,6 @@ describe('MdcDialog Service', () => {
   let dialog: MdcDialog;
   let overlayContainer: OverlayContainer;
   let overlayContainerElement: HTMLElement;
-  let scrolledSubject = new Subject();
 
   let testViewContainerRef: ViewContainerRef;
   let viewContainerFixture: ComponentFixture<ComponentWithChildViewContainer>;
@@ -59,7 +52,7 @@ describe('MdcDialog Service', () => {
   });
 
   it('should open a dialog with a component', () => {
-    let dialogRef = dialog.open(SimpleDialog, {
+    const dialogRef = dialog.open(SimpleDialog, {
       viewContainerRef: testViewContainerRef
     });
 
@@ -80,7 +73,7 @@ describe('MdcDialog Service', () => {
 
     const data = { value: 'Knees' };
 
-    let dialogRef = dialog.open(templateRefFixture.componentInstance.templateRef, { data });
+    const dialogRef = dialog.open(templateRefFixture.componentInstance.templateRef, { data });
 
     viewContainerFixture.detectChanges();
 
@@ -93,7 +86,7 @@ describe('MdcDialog Service', () => {
   });
 
   it('#should open a simple dialog', fakeAsync(() => {
-    let dialogRef = dialog.open(SimpleDialog);
+    const dialogRef = dialog.open(SimpleDialog);
     expect(dialogRef.componentInstance.dialogRef).toBe(dialogRef);
     viewContainerFixture.detectChanges();
     flush();
@@ -105,7 +98,7 @@ describe('MdcDialog Service', () => {
   }));
 
   it('#should close using escape key', fakeAsync(() => {
-    let dialogRef = dialog.open(SimpleDialog);
+    const dialogRef = dialog.open(SimpleDialog);
     viewContainerFixture.detectChanges();
     flush();
 
@@ -115,7 +108,7 @@ describe('MdcDialog Service', () => {
   }));
 
   it('#should open a simple dialog with options', fakeAsync(() => {
-    let dialogRef = dialog.open(SimpleDialog, {
+    const dialogRef = dialog.open(SimpleDialog, {
       clickOutsideToClose: false,
       escapeToClose: false,
       buttonsStacked: false