fix: disable navigation hotkeys when editing, close #80

notea-org · Jun 22, 2021 · 904f6e5 · 904f6e5
1 parent 5c48f70
commit 904f6e5
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 1 deletion.
diff --git a/components/hotkey-tooltip.tsx b/components/hotkey-tooltip.tsx
@@ -25,6 +25,7 @@ const HotkeyTooltip: FC<{
   optionKey?: boolean
   onClose?: TooltipProps['onClose']
   onHotkey?: () => void
+  disableOnContentEditable?: boolean
 }> = ({
   text,
   keys = [],
@@ -33,6 +34,7 @@ const HotkeyTooltip: FC<{
   commandKey,
   optionKey,
   onHotkey = noop,
+  disableOnContentEditable = false,
 }) => {
   const {
     ua: { isMac },
@@ -56,7 +58,7 @@ const HotkeyTooltip: FC<{
     {
       enabled: !!keys.length,
       enableOnTags: ['INPUT', 'TEXTAREA'],
-      enableOnContentEditable: true,
+      enableOnContentEditable: !disableOnContentEditable,
     },
     [onHotkey]
   )

diff --git a/components/nav-button-group.tsx b/components/nav-button-group.tsx
@@ -71,6 +71,7 @@ const NavButtonGroup: FC = () => {
         onHotkey={back}
         keys={['Left']}
         commandKey
+        disableOnContentEditable
       >
         <IconButton disabled={!canBack} icon="ArrowSmLeft" onClick={back} />
       </HotkeyTooltip>
@@ -79,6 +80,7 @@ const NavButtonGroup: FC = () => {
         onHotkey={forward}
         keys={['Right']}
         commandKey
+        disableOnContentEditable
       >
         <IconButton
           disabled={!canForward}