Skip to content

Commit 9254837

Browse files
authored
feat(modals): dont call hide() func on esc if modal is not shown (#4221)
1 parent 605efd1 commit 9254837

File tree

2 files changed

+8
-0
lines changed

2 files changed

+8
-0
lines changed

src/modal/modal-container.component.ts

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -91,6 +91,10 @@ export class ModalContainerComponent implements OnInit, OnDestroy {
9191

9292
@HostListener('window:keydown.esc', ['$event'])
9393
onEsc(event: any): void {
94+
if (!this.isShown) {
95+
return;
96+
}
97+
9498
if (event.keyCode === 27) {
9599
event.preventDefault();
96100
}

src/modal/modal.directive.ts

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -110,6 +110,10 @@ export class ModalDirective implements OnDestroy, OnInit {
110110
// todo: consider preventing default and stopping propagation
111111
@HostListener('window:keydown.esc', ['$event'])
112112
onEsc(event: any): void {
113+
if (!this._isShown) {
114+
return;
115+
}
116+
113117
if (event.keyCode === 27) {
114118
event.preventDefault();
115119
}

0 commit comments

Comments
 (0)