优化toc

This commit is contained in:
tangly1024
2022-01-12 10:47:01 +08:00
parent f4fb879852
commit e6b59f6013
2 changed files with 7 additions and 18 deletions

View File

@@ -7,7 +7,6 @@ import {
} from '@/lib/notion'
import { getGlobalNotionData } from '@/lib/notion/getNotionData'
import Custom404 from '@/pages/404'
import { getPageTableOfContents } from 'notion-utils'
import 'prismjs'
import 'prismjs/components/prism-bash'
import 'prismjs/components/prism-javascript'
@@ -21,7 +20,7 @@ import React from 'react'
* @param {*} param0
* @returns
*/
const About = ({ post, blockMap, tags, prev, next, postCount, categories }) => {
const About = ({ post, tags, prev, next, postCount, categories }) => {
if (!post) {
return <Custom404 />
}
@@ -42,7 +41,7 @@ const About = ({ post, blockMap, tags, prev, next, postCount, categories }) => {
postCount={postCount}
categories={categories}
>
<ArticleDetail post={post} blockMap={blockMap} prev={prev} next={next} />
<ArticleDetail post={post} prev={prev} next={next} />
</BaseLayout>
)
}
@@ -56,20 +55,14 @@ export async function getStaticProps () {
return { props: {}, revalidate: 1 }
}
const blockMap = await getPostBlocks(post.id, 'slug')
post.toc = []
if (blockMap) {
post.blockMap = blockMap
post.content = Object.keys(blockMap.block)
post.toc = getPageTableOfContents(post, blockMap)
}
post.blockMap = await getPostBlocks(post.id, 'slug')
const index = allPosts.indexOf(post)
const prev = allPosts.slice(index - 1, index)[0] ?? allPosts.slice(-1)[0]
const next = allPosts.slice(index + 1, index + 2)[0] ?? allPosts[0]
return {
props: { post, blockMap, tags, prev, next, categories, postCount, latestPosts },
props: { post, tags, prev, next, categories, postCount, latestPosts },
revalidate: 1
}
}

View File

@@ -37,6 +37,8 @@ const Slug = ({
const drawerRight = useRef(null)
const targetRef = typeof window !== 'undefined' ? document.getElementById('container') : null
post.content = Object.keys(post?.blockMap?.block)
post.toc = getPageTableOfContents(post, post.blockMap)
const floatSlot = post?.toc?.length > 1 ? <div className="block lg:hidden"><TocDrawerButton onClick={() => { drawerRight?.current?.handleSwitchVisible() }} /></div> : null
return (
@@ -95,13 +97,7 @@ export async function getStaticProps ({ params: { slug } }) {
return { props: {}, revalidate: 1 }
}
const blockMap = await getPostBlocks(post.id, 'slug')
if (blockMap) {
post.blockMap = blockMap
post.content = Object.keys(blockMap.block)
post.toc = getPageTableOfContents(post, blockMap)
delete post.content
}
post.blockMap = await getPostBlocks(post.id, 'slug')
// 上一篇、下一篇文章关联
const index = allPosts.indexOf(post)