[fixed] address review comments

reactjs · Oct 14, 2022 · 15e0711 · 15e0711
1 parent f3a19fc
commit 15e0711
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 4 deletions.
diff --git a/package-lock.json b/package-lock.json
diff --git a/src/components/ModalPortal.js b/src/components/ModalPortal.js
@@ -17,6 +17,18 @@ const CLASS_NAMES = {
   content: "ReactModal__Content"
 };
 
+/**
+ * We need to support the deprecated `KeyboardEvent.keyCode` in addition to
+ * `KeyboardEvent.code` for apps that still support IE11. Can be removed when
+ * `react-modal` only supports React >18 (which dropped IE support).
+ */
+const isTabKey = event => {
+  event.code === "Tab" || event.keyCode === 9;
+};
+const isEscKey = event => {
+  event.code === "Escape" || event.keyCode === 27;
+};
+
 let ariaHiddenInstances = 0;
 
 export default class ModalPortal extends Component {
@@ -281,11 +293,11 @@ export default class ModalPortal extends Component {
   };
 
   handleKeyDown = event => {
-    if (event.code === "Tab") {
+    if (isTabKey(event)) {
       scopeTab(this.content, event);
     }
 
-    if (this.props.shouldCloseOnEsc && event.code === "Escape") {
+    if (this.props.shouldCloseOnEsc && isEscKey(event)) {
       event.stopPropagation();
       this.requestClose(event);
     }