Skip to content

Commit 70994d1

Browse files
anmolsinghbhatiasriramveeraghanta
authored andcommitted
fix: resolve modal overlapping issue (#2885)
1 parent 6d46771 commit 70994d1

File tree

1 file changed

+15
-2
lines changed

1 file changed

+15
-2
lines changed

web/components/command-palette/command-pallette.tsx

+15-2
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ export const CommandPalette: FC = observer(() => {
3333
commandPalette,
3434
theme: { toggleSidebar },
3535
user: { currentUser },
36-
trackEvent: { setTrackElement }
36+
trackEvent: { setTrackElement },
3737
} = useMobxStore();
3838
const {
3939
toggleCommandPaletteModal,
@@ -57,6 +57,18 @@ export const CommandPalette: FC = observer(() => {
5757
toggleDeleteIssueModal,
5858
} = commandPalette;
5959

60+
const isAnyModalOpen = Boolean(
61+
isCreateIssueModalOpen ||
62+
isCreateCycleModalOpen ||
63+
isCreatePageModalOpen ||
64+
isCreateProjectModalOpen ||
65+
isCreateModuleModalOpen ||
66+
isCreateViewModalOpen ||
67+
isShortcutModalOpen ||
68+
isBulkDeleteIssueModalOpen ||
69+
isDeleteIssueModalOpen
70+
);
71+
6072
const { setToastAlert } = useToast();
6173

6274
const { data: issueDetails } = useSWR(
@@ -111,7 +123,7 @@ export const CommandPalette: FC = observer(() => {
111123
e.preventDefault();
112124
toggleSidebar();
113125
}
114-
} else {
126+
} else if (!isAnyModalOpen) {
115127
if (keyPressed === "c") {
116128
setTrackElement("SHORTCUT_KEY");
117129
toggleCreateIssueModal(true);
@@ -148,6 +160,7 @@ export const CommandPalette: FC = observer(() => {
148160
toggleCreateIssueModal,
149161
projectId,
150162
workspaceSlug,
163+
isAnyModalOpen,
151164
]
152165
);
153166

0 commit comments

Comments
 (0)