From 75bf984cec818b02e40308588bf984e78b19cfc3 Mon Sep 17 00:00:00 2001 From: Sujal Gupta Date: Tue, 18 Mar 2025 00:55:26 +0530 Subject: [PATCH] fix: prevent search menu from opening when dialog is open --- 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 75d9074c8..588d57aa1 100644 --- a/packages/excalidraw/actions/actionToggleSearchMenu.ts +++ b/packages/excalidraw/actions/actionToggleSearchMenu.ts @@ -19,6 +19,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 70d3f4f27..d234e8d08 100644 --- a/packages/excalidraw/components/SearchMenu.tsx +++ b/packages/excalidraw/components/SearchMenu.tsx @@ -254,6 +254,10 @@ export const SearchMenu = () => { event.preventDefault(); event.stopPropagation(); + if (app.state.openDialog) { + return; + } + if (!searchInputRef.current?.matches(":focus")) { if (app.state.openDialog) { setAppState({