fix: resolve modal overlapping issue (#2885)

makeplane · Nov 27, 2023 · eb78fd6 · eb78fd6
1 parent 202ecd2
commit eb78fd6
Showing 1 changed file with 15 additions and 2 deletions.
diff --git a/web/components/command-palette/command-pallette.tsx b/web/components/command-palette/command-pallette.tsx
@@ -33,7 +33,7 @@ export const CommandPalette: FC = observer(() => {
     commandPalette,
     theme: { toggleSidebar },
     user: { currentUser },
-    trackEvent: { setTrackElement }
+    trackEvent: { setTrackElement },
   } = useMobxStore();
   const {
     toggleCommandPaletteModal,
@@ -57,6 +57,18 @@ export const CommandPalette: FC = observer(() => {
     toggleDeleteIssueModal,
   } = commandPalette;
 
+  const isAnyModalOpen = Boolean(
+    isCreateIssueModalOpen ||
+      isCreateCycleModalOpen ||
+      isCreatePageModalOpen ||
+      isCreateProjectModalOpen ||
+      isCreateModuleModalOpen ||
+      isCreateViewModalOpen ||
+      isShortcutModalOpen ||
+      isBulkDeleteIssueModalOpen ||
+      isDeleteIssueModalOpen
+  );
+
   const { setToastAlert } = useToast();
 
   const { data: issueDetails } = useSWR(
@@ -111,7 +123,7 @@ export const CommandPalette: FC = observer(() => {
           e.preventDefault();
           toggleSidebar();
         }
-      } else {
+      } else if (!isAnyModalOpen) {
         if (keyPressed === "c") {
           setTrackElement("SHORTCUT_KEY");
           toggleCreateIssueModal(true);
@@ -148,6 +160,7 @@ export const CommandPalette: FC = observer(() => {
       toggleCreateIssueModal,
       projectId,
       workspaceSlug,
+      isAnyModalOpen,
     ]
   );