From 39c6b5d359859ca6461bb0b589dc4daec6224d35 Mon Sep 17 00:00:00 2001 From: waleed Date: Tue, 16 Dec 2025 20:46:49 -0800 Subject: [PATCH 1/2] fix(cmd-k): when navigating to current workspace, close modal instead of navigating --- .../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 d641ad7d57..a4f0c8660b 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 From 34ecbd8b433f80fc55aa65b48063021823418919 Mon Sep 17 00:00:00 2001 From: waleed Date: Tue, 16 Dec 2025 20:51:17 -0800 Subject: [PATCH 2/2] ack PR comment --- .../sidebar/components/search-modal/search-modal.tsx | 6 +++--- 1 file changed, 3 insertions(+), 3 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 a4f0c8660b..cbe1880ded 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 @@ -433,10 +433,10 @@ export function SearchModal({ case 'workflow': if (!item.isCurrent && item.href) { router.push(item.href) + window.dispatchEvent( + new CustomEvent(SIDEBAR_SCROLL_EVENT, { detail: { itemId: item.id } }) + ) } - window.dispatchEvent( - new CustomEvent(SIDEBAR_SCROLL_EVENT, { detail: { itemId: item.id } }) - ) break case 'page': case 'doc':