diff --git a/components/ArticleDetail.js b/components/ArticleDetail.js index 66245caa..6ef528fe 100644 --- a/components/ArticleDetail.js +++ b/components/ArticleDetail.js @@ -19,7 +19,7 @@ import 'prismjs/components/prism-javascript' import 'prismjs/components/prism-markup' import 'prismjs/components/prism-python' import 'prismjs/components/prism-typescript' -import { useRef } from 'react' +import { useEffect, useRef } from 'react' import { Code, Collection, CollectionRow, Equation, NotionRenderer } from 'react-notion-x' import ArticleCopyright from './ArticleCopyright' import Live2D from './Live2D' @@ -43,26 +43,40 @@ export default function ArticleDetail ({ post, blockMap, recommendPosts, prev, n margin: getMediumZoomMargin() }) const zoomRef = useRef(zoom ? zoom.clone() : null) - function attachZoom (image) { - if (zoomRef.current) { - (zoomRef.current).attach(image) + + useEffect(() => { + // 将所有container下的所有图片添加medium-zoom + const container = document.getElementById('container') + const imgList = container.getElementsByTagName('img') + if (imgList && zoomRef.current) { + for (let i = 0; i < imgList.length; i++) { + (zoomRef.current).attach(imgList[i]) + } } - } - const attachZoomRef = attachZoom + }) return (<> -
+
- {post.type && !post.type.includes('Page') && post?.page_cover && ( + {post.type && !post.type.includes('Page') && post?.page_cover && (
{/* eslint-disable-next-line @next/next/no-img-element */} - {post.title} + {post.title} + {/*
+ {post.title} +
*/}
- )} + )} {/* 文章Title */}
diff --git a/lib/notion/getAllPageIds.js b/lib/notion/getAllPageIds.js index 6821925e..f70e7f9a 100644 --- a/lib/notion/getAllPageIds.js +++ b/lib/notion/getAllPageIds.js @@ -15,7 +15,7 @@ export default function getAllPageIds (collectionQuery, viewId) { } else { const pageSet = new Set() Object.values(views).forEach(view => { - view?.blockIds?.forEach(id => pageSet.add(id)) + view?.collection_group_results?.blockIds?.forEach(id => pageSet.add(id)) }) pageIds = [...pageSet] } diff --git a/package.json b/package.json index 869f099a..3328bd09 100644 --- a/package.json +++ b/package.json @@ -33,7 +33,7 @@ "lodash.throttle": "^4.1.1", "memory-cache": "^0.2.0", "next": "^12.0.5", - "notion-client": "4.12.0", + "notion-client": "4.13.0", "notion-utils": "4.12.0", "preact": "^10.5.15", "qrcode.react": "^1.0.1", @@ -41,7 +41,7 @@ "react-cookies": "^0.1.1", "react-cusdis": "^2.0.1", "react-dom": "17.0.2", - "react-notion-x": "4.6.5", + "react-notion-x": "4.13.0", "smoothscroll-polyfill": "^0.4.4", "typed.js": "^2.0.12", "use-ackee": "^3.0.0"