From 356181881b876bc454d6c070e0e61b5c390284ee Mon Sep 17 00:00:00 2001 From: JimmFly Date: Fri, 10 Mar 2023 11:45:20 +0800 Subject: [PATCH] fix: recent still show when recent is empty (#1487) --- .../pure/quick-search-modal/Results.tsx | 66 +++++++++---------- 1 file changed, 32 insertions(+), 34 deletions(-) diff --git a/apps/web/src/components/pure/quick-search-modal/Results.tsx b/apps/web/src/components/pure/quick-search-modal/Results.tsx index 112fc5a582..8313f15d7a 100644 --- a/apps/web/src/components/pure/quick-search-modal/Results.tsx +++ b/apps/web/src/components/pure/quick-search-modal/Results.tsx @@ -49,7 +49,14 @@ export const Results: React.FC = ({ const resultsPageMeta = pageList.filter( page => pageIds.indexOf(page.id) > -1 && !page.trash ); - + const recentlyViewedItem = recentlyViewed.filter(recent => { + const page = pageList.find(page => recent.id === page.id); + if (!page) { + return false; + } else { + return page.trash !== true; + } + }); useEffect(() => { setShowCreatePage(!resultsPageMeta.length); //Determine whether to display the ‘+ New page’ @@ -92,40 +99,31 @@ export const Results: React.FC = ({ ) ) : (
- {recentlyViewed.length > 0 && ( + {recentlyViewedItem.length > 0 && ( - {recentlyViewed - .filter(recent => { - const page = pageList.find(page => recent.id === page.id); - if (!page) { - return false; - } else { - return page.trash !== true; - } - }) - .map(recent => { - const page = pageList.find(page => recent.id === page.id); - assertExists(page); - return ( - { - onClose(); - jumpToPage(blockSuiteWorkspace.id, page.id); - }} - > - - {recent.mode === 'edgeless' ? ( - - ) : ( - - )} - {page.title || UNTITLED_WORKSPACE_NAME} - - - ); - })} + {recentlyViewedItem.map(recent => { + const page = pageList.find(page => recent.id === page.id); + assertExists(page); + return ( + { + onClose(); + jumpToPage(blockSuiteWorkspace.id, page.id); + }} + > + + {recent.mode === 'edgeless' ? ( + + ) : ( + + )} + {page.title || UNTITLED_WORKSPACE_NAME} + + + ); + })} )}