diff --git a/web/components/command-palette/command-pallette.tsx b/web/components/command-palette/command-pallette.tsx index f30c8eb4f..e926c7474 100644 --- 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, ] );