Fix nav hide bug

Shopify · Jan 8, 2020 · da4d402 · da4d402
1 parent 48c28a7
commit da4d402
Showing 1 changed file with 9 additions and 1 deletion.
diff --git a/src/components/Frame/Frame.tsx b/src/components/Frame/Frame.tsx
@@ -391,8 +391,16 @@ class Frame extends React.PureComponent<CombinedProps, State> {
 
   private handleNavKeydown = (event: React.KeyboardEvent<HTMLElement>) => {
     const {key} = event;
+    const {
+      polaris: {
+        mediaQuery: {isNavigationCollapsed},
+      },
+      showMobileNavigation,
+    } = this.props;
+
+    const mobileNavShowing = isNavigationCollapsed && showMobileNavigation;
 
-    if (key === 'Escape') {
+    if (mobileNavShowing && key === 'Escape') {
       this.handleNavigationDismiss();
     }
   };