fix(modals): fix minimize Safari after press esc

fix: after opening any modal and pressing Esc button, browser minimize and only after that modal dissappears close valor-software#3313
artolshansky · Jan 31, 2018 · 9f66f03 · 9f66f03
1 parent c09f0f9
commit 9f66f03
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 4 deletions.
diff --git a/src/modal/modal-container.component.ts b/src/modal/modal-container.component.ts
@@ -88,8 +88,12 @@ export class ModalContainerComponent implements OnInit, OnDestroy {
     this.hide();
   }
 
-  @HostListener('window:keydown.esc')
-  onEsc(): void {
+  @HostListener('keydown.esc', ['$event'])
+  onEsc(event: any): void {
+    if (event.keyCode === 27) {
+      event.preventDefault();
+    }
+
     if (
       this.config.keyboard &&
       this.level === this.bsModalService.getModalsCount()

diff --git a/src/modal/modal.directive.ts b/src/modal/modal.directive.ts
@@ -108,8 +108,12 @@ export class ModalDirective implements OnDestroy, OnInit {
   }
 
   // todo: consider preventing default and stopping propagation
-  @HostListener('keydown.esc')
-  onEsc(): void {
+  @HostListener('keydown.esc', ['$event'])
+  onEsc(event: any): void {
+    if (event.keyCode === 27) {
+      event.preventDefault();
+    }
+
     if (this.config.keyboard) {
       this.dismissReason = DISMISS_REASONS.ESC;
       this.hide();