From e559ae3490c66debe669c3c43bb0c12181ca6df8 Mon Sep 17 00:00:00 2001 From: JimmFly Date: Tue, 7 Feb 2023 13:14:19 +0800 Subject: [PATCH] Disable quicksearch on 404 page --- packages/app/src/components/quick-search/index.tsx | 14 ++++++-------- 1 file changed, 6 insertions(+), 8 deletions(-) diff --git a/packages/app/src/components/quick-search/index.tsx b/packages/app/src/components/quick-search/index.tsx index f1d2c094b9..77be860bb7 100644 --- a/packages/app/src/components/quick-search/index.tsx +++ b/packages/app/src/components/quick-search/index.tsx @@ -39,6 +39,10 @@ export const QuickSearch = ({ open, onClose }: TransitionsModalProps) => { }; // Add ‘⌘+K’ shortcut keys as switches useEffect(() => { + if (router.pathname.startsWith('/404')) { + triggerQuickSearchModal(false); + return; + } const down = (e: KeyboardEvent) => { if ((e.key === 'k' && e.metaKey) || (e.key === 'k' && e.ctrlKey)) { const selection = window.getSelection(); @@ -47,10 +51,7 @@ export const QuickSearch = ({ open, onClose }: TransitionsModalProps) => { triggerQuickSearchModal(false); return; } - if ( - selection?.isCollapsed && - router.pathname.startsWith('/404') !== true - ) { + if (selection?.isCollapsed) { triggerQuickSearchModal(!open); } } @@ -61,15 +62,12 @@ export const QuickSearch = ({ open, onClose }: TransitionsModalProps) => { }, [open, router.pathname, triggerQuickSearchModal]); useEffect(() => { - if (router.pathname.startsWith('/404')) { - return handleClose(); - } if (router.pathname.startsWith('/public-workspace')) { return setIsPublic(true); } else { return setIsPublic(false); } - }, [handleClose, router]); + }, [router]); return (