shouldCloseOnEsc: Add prop and logical check to keyHandler

reactjs · Aug 27, 2017 · f94481c · f94481c
1 parent 1685e59
commit f94481c
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 3 deletions.
diff --git a/src/components/Modal.js b/src/components/Modal.js
@@ -55,7 +55,8 @@ export default class Modal extends Component {
     parentSelector: PropTypes.func,
     aria: PropTypes.object,
     role: PropTypes.string,
-    contentLabel: PropTypes.string.isRequired
+    contentLabel: PropTypes.string.isRequired,
+    shouldCloseOnEsc: PropTypes.bool
   };
   /* eslint-enable react/no-unused-prop-types */
 

diff --git a/src/components/ModalPortal.js b/src/components/ModalPortal.js
@@ -18,6 +18,7 @@ const ESC_KEY = 27;
 
 export default class ModalPortal extends Component {
   static defaultProps = {
+    shouldCloseOnEsc: true,
     style: {
       overlay: {},
       content: {}
@@ -52,7 +53,8 @@ export default class ModalPortal extends Component {
     role: PropTypes.string,
     contentLabel: PropTypes.string,
     aria: PropTypes.object,
-    children: PropTypes.node
+    children: PropTypes.node,
+    shouldCloseOnEsc: PropTypes.bool
   };
 
   constructor(props) {
@@ -196,7 +198,8 @@ export default class ModalPortal extends Component {
     if (event.keyCode === TAB_KEY) {
       scopeTab(this.content, event);
     }
-    if (event.keyCode === ESC_KEY) {
+
+    if (this.props.shouldCloseOnEsc && event.keyCode === ESC_KEY) {
       event.preventDefault();
       this.requestClose(event);
     }