From bf4dd19aaa757953e85b550b92743482c6e30aa5 Mon Sep 17 00:00:00 2001
From: tangly1024 <tlyong1992@hotmail.com>
Date: Thu, 6 Jan 2022 16:54:20 +0800
Subject: [PATCH] =?UTF-8?q?=E5=8D=87=E7=BA=A7notion-client=E3=80=81?=
 =?UTF-8?q?=E5=8D=87=E7=BA=A7react-notion-x=EF=BC=9B=E6=89=8B=E5=8A=A8?=
 =?UTF-8?q?=E5=90=AF=E7=94=A8medium-zoom?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 components/ArticleDetail.js | 34 ++++++++++++++++++++++++----------
 lib/notion/getAllPageIds.js |  2 +-
 package.json                |  4 ++--
 3 files changed, 27 insertions(+), 13 deletions(-)

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 (<>
-      <div id="container" ref={targetRef} className="shadow md:hover:shadow-2xl duration-300 overflow-x-auto flex-grow mx-auto w-screen md:w-full ">
+      <div id="container" ref={targetRef} className="shadow md:hover:shadow-2xl overflow-x-auto flex-grow mx-auto w-screen md:w-full ">
           <article itemScope itemType="https://schema.org/Movie"
             className="subpixel-antialiased py-10 px-5 lg:pt-24 md:px-24  dark:border-gray-700 bg-white dark:bg-gray-800"
           >
 
             <header className='animate__slideInDown animate__animated'>
-                {post.type && !post.type.includes('Page') && post?.page_cover && (
+              {post.type && !post.type.includes('Page') && post?.page_cover && (
                   <div className="w-full relative md:flex-shrink-0 overflow-hidden">
                     {/* eslint-disable-next-line @next/next/no-img-element */}
-                    <img alt={post.title} ref={attachZoomRef}src={post?.page_cover} className='object-center w-full' />
+                    <img alt={post.title} src={post?.page_cover} className='object-center w-full' />
+                    {/* <div className="w-full h-60 relative lg:h-96 transform duration-200 md:flex-shrink-0 overflow-hidden">
+                      <Image
+                        src={post?.page_cover}
+                        loading="eager"
+                        objectFit="cover"
+                        layout="fill"
+                        alt={post.title}
+                      />
+                    </div> */}
                   </div>
-                )}
+              )}
 
                 {/* 文章Title */}
                 <div className="font-bold text-3xl text-black dark:text-white font-serif pt-10">
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"