From 56c05b30999957430e6854825d3c6367b5bd3fec Mon Sep 17 00:00:00 2001 From: Sujal Gupta <55016909+heysujal@users.noreply.github.com> Date: Tue, 3 Jun 2025 19:23:00 +0530 Subject: [PATCH] fix: prevent search menu from opening when dialog is open (#9279) --- packages/excalidraw/actions/actionToggleSearchMenu.ts | 4 ++++ packages/excalidraw/components/SearchMenu.tsx | 4 ++++ 2 files changed, 8 insertions(+) diff --git a/packages/excalidraw/actions/actionToggleSearchMenu.ts b/packages/excalidraw/actions/actionToggleSearchMenu.ts index bd2b0d68ba..e703b54dca 100644 --- a/packages/excalidraw/actions/actionToggleSearchMenu.ts +++ b/packages/excalidraw/actions/actionToggleSearchMenu.ts @@ -25,6 +25,10 @@ export const actionToggleSearchMenu = register({ predicate: (appState) => appState.gridModeEnabled, }, perform(elements, appState, _, app) { + if (appState.openDialog) { + return false; + } + if ( appState.openSidebar?.name === DEFAULT_SIDEBAR.name && appState.openSidebar.tab === CANVAS_SEARCH_TAB diff --git a/packages/excalidraw/components/SearchMenu.tsx b/packages/excalidraw/components/SearchMenu.tsx index 2912498515..7160d52211 100644 --- a/packages/excalidraw/components/SearchMenu.tsx +++ b/packages/excalidraw/components/SearchMenu.tsx @@ -297,6 +297,10 @@ export const SearchMenu = () => { event.preventDefault(); event.stopPropagation(); + if (app.state.openDialog) { + return; + } + if (!searchInputRef.current?.matches(":focus")) { if (app.state.openDialog) { setAppState({