fix(modal): prevent bubbling on ESC on inactive (#2313)

Fixes #2312.
carbon-design-system · Apr 17, 2019 · ceed10d · ceed10d
1 parent 4b55b79
commit ceed10d
Showing 1 changed file with 2 additions and 1 deletion.
diff --git a/src/components/modal/modal.js b/src/components/modal/modal.js
@@ -137,7 +137,8 @@ class Modal extends mixin(createComponent, initComponentByLauncher, eventedShowH
 
     this._handleKeydownListener = this.manage(
       on(this.element.ownerDocument.body, 'keydown', evt => {
-        if (evt.which === 27) {
+        // Avoid running `evt.stopPropagation()` only when modal is shown
+        if (evt.which === 27 && this.shouldStateBeChanged('hidden')) {
           evt.stopPropagation();
           this.hide(evt);
         }