From e708f3e8f5621b151fe07731ad6ecd4a8457ec56 Mon Sep 17 00:00:00 2001
From: Chen-I Lim <chenilim@gmail.com>
Date: Thu, 1 Apr 2021 09:39:50 -0700
Subject: [PATCH] Support Cmd+ alternative to Ctrl+ hotkeys

---
 webapp/src/components/centerPanel.tsx                 | 1 +
 webapp/src/components/viewHeader/viewHeaderSearch.tsx | 2 +-
 webapp/src/pages/boardPage.tsx                        | 6 +++---
 3 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/webapp/src/components/centerPanel.tsx b/webapp/src/components/centerPanel.tsx
index 4f74f8aaa..fd02641b4 100644
--- a/webapp/src/components/centerPanel.tsx
+++ b/webapp/src/components/centerPanel.tsx
@@ -58,6 +58,7 @@ class CenterPanel extends React.Component<Props, State> {
                 e.stopPropagation()
             }
 
+            // TODO: Might need a different hotkey, as Cmd+D is save bookmark on Chrome
             if (keyName === 'ctrl+d') {
                 // CTRL+D: Duplicate selected cards
                 this.duplicateSelectedCards()
diff --git a/webapp/src/components/viewHeader/viewHeaderSearch.tsx b/webapp/src/components/viewHeader/viewHeaderSearch.tsx
index 1ef3e007a..f58930e86 100644
--- a/webapp/src/components/viewHeader/viewHeaderSearch.tsx
+++ b/webapp/src/components/viewHeader/viewHeaderSearch.tsx
@@ -29,7 +29,7 @@ const ViewHeaderSearch = (props: Props) => {
         setSearchValue(boardTree.getSearchText())
     }, [boardTree])
 
-    useHotkeys('ctrl+shift+f', () => {
+    useHotkeys('ctrl+shift+f,cmd+shift+f', () => {
         setIsSearching(true)
         searchFieldRef.current?.focus(true)
     })
diff --git a/webapp/src/pages/boardPage.tsx b/webapp/src/pages/boardPage.tsx
index ce24a532d..9745c7617 100644
--- a/webapp/src/pages/boardPage.tsx
+++ b/webapp/src/pages/boardPage.tsx
@@ -96,7 +96,7 @@ class BoardPage extends React.Component<Props, State> {
             return
         }
 
-        if (keyName === 'ctrl+z') { // Cmd+Z
+        if (keyName === 'ctrl+z' || keyName === 'cmd+z') { // Cmd+Z
             Utils.log('Undo')
             if (mutator.canUndo) {
                 const description = mutator.undoDescription
@@ -109,7 +109,7 @@ class BoardPage extends React.Component<Props, State> {
             } else {
                 sendFlashMessage({content: 'Nothing to Undo', severity: 'low'})
             }
-        } else if (keyName === 'shift+ctrl+z') { // Shift+Cmd+Z
+        } else if (keyName === 'shift+ctrl+z' || keyName === 'shift+cmd+z') { // Shift+Cmd+Z
             Utils.log('Redo')
             if (mutator.canRedo) {
                 const description = mutator.redoDescription
@@ -161,7 +161,7 @@ class BoardPage extends React.Component<Props, State> {
         return (
             <div className='BoardPage'>
                 <HotKeys
-                    keyName='shift+ctrl+z,ctrl+z'
+                    keyName='shift+ctrl+z,shift+cmd+z,ctrl+z,cmd+z'
                     onKeyDown={this.undoRedoHandler}
                 />
                 <Workspace