From e91e68dc152e5c197208913065e5ad9a47c6e948 Mon Sep 17 00:00:00 2001
From: Dakshesh Jain <dakshesh.jain14@gmail.com>
Date: Fri, 4 Aug 2023 14:16:07 +0530
Subject: [PATCH 1/2] refactor: shortcuts if/else

---
 .../command-palette/command-pallette.tsx      | 46 ++++++++++---------
 1 file changed, 24 insertions(+), 22 deletions(-)

diff --git a/apps/app/components/command-palette/command-pallette.tsx b/apps/app/components/command-palette/command-pallette.tsx
index 0b4c9577bc8..d3e2f9c1860 100644
--- a/apps/app/components/command-palette/command-pallette.tsx
+++ b/apps/app/components/command-palette/command-pallette.tsx
@@ -74,37 +74,39 @@ export const CommandPalette: React.FC = () => {
 
   const handleKeyDown = useCallback(
     (e: KeyboardEvent) => {
-      const singleShortcutKeys = ["p", "v", "d", "h", "q", "m"];
+      // if on input, textarea or editor, don't do anything
+      if (
+        e.target instanceof HTMLTextAreaElement ||
+        e.target instanceof HTMLInputElement ||
+        (e.target as Element).classList?.contains("remirror-editor")
+      )
+        return;
+
       const { key, ctrlKey, metaKey, altKey, shiftKey } = e;
+
       if (!key) return;
+
       const keyPressed = key.toLowerCase();
-      if (
-        !(e.target instanceof HTMLTextAreaElement) &&
-        !(e.target instanceof HTMLInputElement) &&
-        !(e.target as Element).classList?.contains("remirror-editor")
-      ) {
-        if ((ctrlKey || metaKey) && keyPressed === "k") {
+
+      const cmdClicked = ctrlKey || metaKey;
+
+      if (cmdClicked) {
+        if (keyPressed === "k") {
           e.preventDefault();
           setIsPaletteOpen(true);
-        } else if ((ctrlKey || metaKey) && keyPressed === "c") {
-          if (altKey) {
-            e.preventDefault();
-            copyIssueUrlToClipboard();
-          }
-        } else if (keyPressed === "c") {
+        } else if (keyPressed === "c" && altKey) {
           e.preventDefault();
-          setIsIssueModalOpen(true);
-        } else if ((ctrlKey || metaKey) && keyPressed === "b") {
+          copyIssueUrlToClipboard();
+        } else if (keyPressed === "b") {
           e.preventDefault();
           toggleCollapsed();
-        } else if (key === "Delete") {
+        } else if (keyPressed === "backspace") {
           e.preventDefault();
           setIsBulkDeleteIssuesModalOpen(true);
-        } else if (
-          singleShortcutKeys.includes(keyPressed) &&
-          (ctrlKey || metaKey || altKey || shiftKey)
-        ) {
-          e.preventDefault();
+        }
+      } else {
+        if (keyPressed === "c") {
+          setIsIssueModalOpen(true);
         } else if (keyPressed === "p") {
           setIsProjectModalOpen(true);
         } else if (keyPressed === "v") {
@@ -120,7 +122,7 @@ export const CommandPalette: React.FC = () => {
         }
       }
     },
-    [toggleCollapsed, copyIssueUrlToClipboard]
+    [copyIssueUrlToClipboard, toggleCollapsed]
   );
 
   useEffect(() => {

From 0cb9bba56e1fea0fa0f09ce94b9612ecf5c2fe5d Mon Sep 17 00:00:00 2001
From: Dakshesh Jain <dakshesh.jain14@gmail.com>
Date: Wed, 9 Aug 2023 18:02:04 +0530
Subject: [PATCH 2/2] fix: merge conflict

---
 apps/app/components/command-palette/command-pallette.tsx | 6 ------
 1 file changed, 6 deletions(-)

diff --git a/apps/app/components/command-palette/command-pallette.tsx b/apps/app/components/command-palette/command-pallette.tsx
index b92fe4c73d7..be54c8f758c 100644
--- a/apps/app/components/command-palette/command-pallette.tsx
+++ b/apps/app/components/command-palette/command-pallette.tsx
@@ -103,14 +103,8 @@ export const CommandPalette: React.FC = () => {
           copyIssueUrlToClipboard();
         } else if (keyPressed === "b") {
           e.preventDefault();
-<<<<<<< HEAD
           toggleCollapsed();
         } else if (keyPressed === "backspace") {
-=======
-          // toggleCollapsed();
-          store.theme.setSidebarCollapsed(!store?.theme?.sidebarCollapsed);
-        } else if (key === "Delete") {
->>>>>>> be062ccd34e1150e8aa714e112a299721cedfd4a
           e.preventDefault();
           setIsBulkDeleteIssuesModalOpen(true);
         }