From 08bc1125bd044018267f3f3f0c5f4fa0e3e60d10 Mon Sep 17 00:00:00 2001 From: Waleed Date: Wed, 17 Dec 2025 10:21:35 -0800 Subject: [PATCH] fix(cmd-k): when navigating to current workspace/workflow, close modal instead of navigating (#2420) * fix(cmd-k): when navigating to current workspace, close modal instead of navigating * ack PR comment --- .../components/search-modal/search-modal.tsx | 20 +++++++++++++------ 1 file changed, 14 insertions(+), 6 deletions(-) diff --git a/apps/sim/app/workspace/[workspaceId]/w/components/sidebar/components/search-modal/search-modal.tsx b/apps/sim/app/workspace/[workspaceId]/w/components/sidebar/components/search-modal/search-modal.tsx index d641ad7d5..cbe1880de 100644 --- a/apps/sim/app/workspace/[workspaceId]/w/components/sidebar/components/search-modal/search-modal.tsx +++ b/apps/sim/app/workspace/[workspaceId]/w/components/sidebar/components/search-modal/search-modal.tsx @@ -423,7 +423,21 @@ export function SearchModal({ } break case 'workspace': + if (item.isCurrent) { + break + } + if (item.href) { + router.push(item.href) + } + break case 'workflow': + if (!item.isCurrent && item.href) { + router.push(item.href) + window.dispatchEvent( + new CustomEvent(SIDEBAR_SCROLL_EVENT, { detail: { itemId: item.id } }) + ) + } + break case 'page': case 'doc': if (item.href) { @@ -431,12 +445,6 @@ export function SearchModal({ window.open(item.href, '_blank', 'noopener,noreferrer') } else { router.push(item.href) - // Scroll to the workflow in the sidebar after navigation - if (item.type === 'workflow') { - window.dispatchEvent( - new CustomEvent(SIDEBAR_SCROLL_EVENT, { detail: { itemId: item.id } }) - ) - } } } break