fix: null router

Bocchi-Developers · Feb 10, 2023 · 9a74d72 · 9a74d72 · vercel · Feb 10, 2023
1 parent aae8573
commit 9a74d72
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 5 deletions.
diff --git a/src/components/in-page/Home/list.tsx b/src/components/in-page/Home/list.tsx
@@ -115,7 +115,9 @@ const PostNav = () => {
             pathname: '/',
             query: item.query
               ? { ...router.query, ...item.query }
-              : { category },
+              : category
+              ? { category }
+              : '',
           }}
           shallow
         >
@@ -129,6 +131,7 @@ const PostNav = () => {
 export const List = () => {
   const [postList, setPostList] = useState<IPostList[]>([])
   const router = useRouter()
+  const [lastRouterName, setLastRouterName] = useState(router.asPath)
   const [load, setLoad] = useState(true)
   const [hasMore, sethasMore] = useState(true)
   const fetchList = async (currentPage: number) => {
@@ -149,10 +152,13 @@ export const List = () => {
   }
 
   useEffect(() => {
-    setLoad(true)
-    sethasMore(true)
-    setPostList([])
-    fetchList(1)
+    if (router.asPath != lastRouterName || postList.length == 0) {
+      setLoad(true)
+      sethasMore(true)
+      setPostList([])
+      fetchList(1)
+      setLastRouterName(router.asPath)
+    }
   }, [router.query])
 
   return (

diff --git a/src/components/layouts/BasicLayout/Header/index.tsx b/src/components/layouts/BasicLayout/Header/index.tsx
@@ -36,6 +36,7 @@ const TabItem: FC<TabModule> = ({ slug, title, tag }) => {
       data-promote={tag?.slice(0, 5)}
       href={`${slug?.startsWith('http') ? '' : '/'}${slug || ''}`}
       target={slug?.startsWith('http') ? '_blank' : undefined}
+      shallow
     >
       {title}
     </Link>
-Original file line number
+Diff line change
@@ Expand Up / @@ -36,6 +36,7 @@ const TabItem: FC<TabModule> = ({ slug, title, tag }) => { @@
           data-promote={tag?.slice(0, 5)}
           href={`${slug?.startsWith('http') ? '' : '/'}${slug || ''}`}
           target={slug?.startsWith('http') ? '_blank' : undefined}
+          shallow
         >
           {title}
         </Link>
@@ Expand Down @@