Merge branch 'main' into release/4.0.0

themes/gitbook/components/NavPostList.js

@@ -10,13 +10,12 @@ import NavPostItem from './NavPostItem'
  * @constructor
  */
 const NavPostList = (props) => {
-  const { filteredPosts } = props
-
+  const { filteredPostGroups } = props
   const router = useRouter()
   let selectedSth = false
 
   // 处理是否选中
-  filteredPosts?.map((group) => {
+  filteredPostGroups.map((group) => {
     let groupSelected = false
     for (const post of group?.items) {
       if (router.asPath.split('?')[0] === '/' + post.slug) {
@@ -29,16 +28,16 @@ const NavPostList = (props) => {
   })
 
   // 如果都没有选中默认打开第一个
-  if (!selectedSth && filteredPosts && filteredPosts.length > 0) {
-    filteredPosts[0].selected = true
+  if (!selectedSth && filteredPostGroups && filteredPostGroups.length > 0) {
+    filteredPostGroups[0].selected = true
   }
 
-  if (!filteredPosts || filteredPosts.length === 0) {
+  if (!filteredPostGroups || filteredPostGroups.length === 0) {
     return <NavPostListEmpty />
   } else {
     return <div id='posts-wrapper' className='w-full flex-grow'>
             {/* 文章列表 */}
-            {filteredPosts?.map((group, index) => <NavPostItem key={index} group={group} onHeightChange={props.onHeightChange}/>)}
+            {filteredPostGroups?.map((group, index) => <NavPostItem key={index} group={group} onHeightChange={props.onHeightChange}/>)}
         </div>
   }
 }

themes/gitbook/index.js

@@ -47,16 +47,16 @@ const LayoutBase = (props) => {
   const router = useRouter()
   const [tocVisible, changeTocVisible] = useState(false)
   const [pageNavVisible, changePageNavVisible] = useState(false)
-  const [filteredPosts, setFilteredPosts] = useState(allNavPages)
+  const [filteredPostGroups, setFilteredPostGroups] = useState(allNavPages)
 
   const showTocButton = post?.toc?.length > 1
 
   useEffect(() => {
-    setFilteredPosts(allNavPages)
+    setFilteredPostGroups(allNavPages)
   }, [post])
 
   return (
-        <ThemeGlobalGitbook.Provider value={{ tocVisible, changeTocVisible, filteredPosts, setFilteredPosts, allNavPages, pageNavVisible, changePageNavVisible }}>
+        <ThemeGlobalGitbook.Provider value={{ tocVisible, changeTocVisible, filteredPostGroups, setFilteredPostGroups, allNavPages, pageNavVisible, changePageNavVisible }}>
             <CommonHead meta={meta} />
 
             <div id='theme-gitbook' className='bg-white dark:bg-hexo-black-gray w-full h-full min-h-screen justify-center dark:text-gray-300'>
@@ -71,7 +71,7 @@ const LayoutBase = (props) => {
                             {slotLeft}
                             <SearchInput className='my-3 rounded-md' />
                             {/* 所有文章列表 */}
-                            <NavPostList filteredPosts={filteredPosts} />
+                            <NavPostList filteredPostGroups={filteredPostGroups} />
 
                             <div className='mt-2'>
                                 <Footer {...props}/>
@@ -143,7 +143,7 @@ const LayoutBase = (props) => {
                 </div>}
 
                 {/* 移动端导航抽屉 */}
-                <PageNavDrawer {...props} filteredPosts={filteredPosts} />
+                <PageNavDrawer {...props} filteredPostGroups={filteredPostGroups} />
 
                 {/* 移动端底部导航栏 */}
                 {/* <BottomMenuBar {...props} className='block md:hidden' /> */}