fix(dialog): stop listening for close events when dialog closes (#1860)

akveo · Jul 29, 2019 · 7ddbfbd · 7ddbfbd
1 parent 0542371
commit 7ddbfbd
Showing 1 changed file with 5 additions and 2 deletions.
diff --git a/src/framework/theme/components/dialog/dialog.service.ts b/src/framework/theme/components/dialog/dialog.service.ts
@@ -6,7 +6,7 @@
 
 import { ComponentFactoryResolver, Inject, Injectable, Injector, TemplateRef, Type } from '@angular/core';
 import { fromEvent as observableFromEvent } from 'rxjs';
-import { filter } from 'rxjs/operators';
+import { filter, takeUntil } from 'rxjs/operators';
 
 import {
   NbComponentPortal,
@@ -242,7 +242,10 @@ export class NbDialogService {
 
     if (config.closeOnEsc) {
       observableFromEvent(this.document, 'keyup')
-        .pipe(filter((event: KeyboardEvent) => event.keyCode === 27))
+        .pipe(
+          filter((event: KeyboardEvent) => event.keyCode === 27),
+          takeUntil(dialogRef.onClose),
+        )
         .subscribe(() => dialogRef.close());
     }
   }