From 8b274c37138e464f6b7310eef43eaf03937d7a9d Mon Sep 17 00:00:00 2001
From: Tom Moor <tom.moor@gmail.com>
Date: Thu, 28 May 2020 19:44:52 -0700
Subject: [PATCH] fix: Keyboard shortcuts dialog shortcut should not be active
 when editing a document closes #1292

---
 app/components/Layout.js                                      | 1 +
 app/scenes/Document/components/Document.js                    | 4 ++--
 .../{KeyboardShortcuts.js => KeyboardShortcutsButton.js}      | 0
 3 files changed, 3 insertions(+), 2 deletions(-)
 rename app/scenes/Document/components/{KeyboardShortcuts.js => KeyboardShortcutsButton.js} (100%)

diff --git a/app/components/Layout.js b/app/components/Layout.js
index 04915caf2..acbdd4063 100644
--- a/app/components/Layout.js
+++ b/app/components/Layout.js
@@ -59,6 +59,7 @@ class Layout extends React.Component<Props> {
 
   @keydown('shift+/')
   handleOpenKeyboardShortcuts() {
+    if (this.props.ui.editMode) return;
     this.keyboardShortcutsOpen = true;
   }
 
diff --git a/app/scenes/Document/components/Document.js b/app/scenes/Document/components/Document.js
index a6a160740..20e3a4c52 100644
--- a/app/scenes/Document/components/Document.js
+++ b/app/scenes/Document/components/Document.js
@@ -19,7 +19,7 @@ import { emojiToUrl } from 'utils/emoji';
 
 import Header from './Header';
 import DocumentMove from './DocumentMove';
-import KeyboardShortcuts from './KeyboardShortcuts';
+import KeyboardShortcutsButton from './KeyboardShortcutsButton';
 import References from './References';
 import Loading from './Loading';
 import Container from './Container';
@@ -405,7 +405,7 @@ class DocumentScene extends React.Component<Props> {
             </MaxWidth>
           </Container>
         </Container>
-        {isShare ? <Branding /> : <KeyboardShortcuts />}
+        {isShare ? <Branding /> : <KeyboardShortcutsButton />}
       </ErrorBoundary>
     );
   }
diff --git a/app/scenes/Document/components/KeyboardShortcuts.js b/app/scenes/Document/components/KeyboardShortcutsButton.js
similarity index 100%
rename from app/scenes/Document/components/KeyboardShortcuts.js
rename to app/scenes/Document/components/KeyboardShortcutsButton.js