feat(modals): dont call hide() func on esc if modal is not shown (#4221)

valor-software · Apr 13, 2018 · 9254837 · 9254837
1 parent 605efd1
commit 9254837
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 0 deletions.
diff --git a/src/modal/modal-container.component.ts b/src/modal/modal-container.component.ts
@@ -91,6 +91,10 @@ export class ModalContainerComponent implements OnInit, OnDestroy {
 
   @HostListener('window:keydown.esc', ['$event'])
   onEsc(event: any): void {
+    if (!this.isShown) {
+      return;
+    }
+
     if (event.keyCode === 27) {
       event.preventDefault();
     }

diff --git a/src/modal/modal.directive.ts b/src/modal/modal.directive.ts
@@ -110,6 +110,10 @@ export class ModalDirective implements OnDestroy, OnInit {
   // todo: consider preventing default and stopping propagation
   @HostListener('window:keydown.esc', ['$event'])
   onEsc(event: any): void {
+    if (!this._isShown) {
+      return;
+    }
+
     if (event.keyCode === 27) {
       event.preventDefault();
     }