From 26373f1ddc630948b8f18bc3fb7da584c707b9bc Mon Sep 17 00:00:00 2001
From: "tangly1024.com" <tlyong1992@hotmail.com>
Date: Fri, 18 Aug 2023 17:15:26 +0800
Subject: [PATCH] =?UTF-8?q?gitbook=E5=B9=BF=E5=91=8A=E5=BE=AE=E8=B0=83?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 themes/gitbook/components/Catalog.js | 5 ++---
 themes/gitbook/index.js              | 5 ++---
 themes/hexo/components/Catalog.js    | 8 ++++----
 3 files changed, 8 insertions(+), 10 deletions(-)

diff --git a/themes/gitbook/components/Catalog.js b/themes/gitbook/components/Catalog.js
index 5289c06c..ebee78ae 100644
--- a/themes/gitbook/components/Catalog.js
+++ b/themes/gitbook/components/Catalog.js
@@ -10,7 +10,6 @@ import { isBrowser } from '@/lib/utils'
  * @constructor
  */
 const Catalog = ({ post }) => {
-  const tocIds = []
   const toc = post?.toc
   // 同步选中目录事件
   const [activeSection, setActiveSection] = useState(null)
@@ -28,7 +27,7 @@ const Catalog = ({ post }) => {
   const actionSectionScrollSpy = useCallback(throttle(() => {
     const sections = document.getElementsByClassName('notion-h')
     let prevBBox = null
-    let currentSectionId = activeSection
+    let currentSectionId = null
     for (let i = 0; i < sections.length; ++i) {
       const section = sections[i]
       if (!section || !(section instanceof Element)) continue
@@ -48,6 +47,7 @@ const Catalog = ({ post }) => {
       break
     }
     setActiveSection(currentSectionId)
+    const tocIds = post?.toc?.map((t) => uuidToId(t.id)) || []
     const index = tocIds.indexOf(currentSectionId) || 0
     if (isBrowser && tocIds?.length > 0) {
       for (const tocWrapper of document?.getElementsByClassName('toc-wrapper')) {
@@ -66,7 +66,6 @@ const Catalog = ({ post }) => {
       <nav className='h-full  text-black'>
         {toc.map((tocItem) => {
           const id = uuidToId(tocItem.id)
-          tocIds.push(id)
           return (
             <a
               key={id}
diff --git a/themes/gitbook/index.js b/themes/gitbook/index.js
index b10fc765..c8d2a9a0 100644
--- a/themes/gitbook/index.js
+++ b/themes/gitbook/index.js
@@ -89,11 +89,10 @@ const LayoutBase = (props) => {
                         </div>
                     </div>
 
-                    <div id='center-wrapper' className='flex flex-col justify-between w-full relative z-10 pt-12 min-h-screen'>
+                    <div id='center-wrapper' className='flex flex-col justify-between w-full relative z-10 pt-14 min-h-screen'>
 
                         <div id='container-inner' className='w-full px-7 max-w-3xl justify-center mx-auto'>
                             {slotTop}
-                            <AdSlot type='in-article' />
                             <WWAds className='w-full' orientation='horizontal'/>
 
                             <Transition
@@ -134,7 +133,6 @@ const LayoutBase = (props) => {
 
                             <div className='py-4'>
                                 <Catalog {...props} />
-                                <WWAds/>
                                 {slotRight}
                                 {router.route === '/' && <>
                                     <InfoCard {...props} />
@@ -145,6 +143,7 @@ const LayoutBase = (props) => {
                                 <Announcement {...props} />
                             </div>
 
+                            <AdSlot type='in-article' />
                             <Live2D />
 
                         </div>
diff --git a/themes/hexo/components/Catalog.js b/themes/hexo/components/Catalog.js
index 980be47b..3c167594 100644
--- a/themes/hexo/components/Catalog.js
+++ b/themes/hexo/components/Catalog.js
@@ -1,4 +1,4 @@
-import React, { useRef } from 'react'
+import { useCallback, useEffect, useRef, useState } from 'react'
 import throttle from 'lodash.throttle'
 import { uuidToId } from 'notion-utils'
 import Progress from './Progress'
@@ -13,7 +13,7 @@ import { useGlobal } from '@/lib/global'
 const Catalog = ({ toc }) => {
   const { locale } = useGlobal()
   // 监听滚动事件
-  React.useEffect(() => {
+  useEffect(() => {
     window.addEventListener('scroll', actionSectionScrollSpy)
     actionSectionScrollSpy()
     return () => {
@@ -26,10 +26,10 @@ const Catalog = ({ toc }) => {
   const tocIds = []
 
   // 同步选中目录事件
-  const [activeSection, setActiveSection] = React.useState(null)
+  const [activeSection, setActiveSection] = useState(null)
 
   const throttleMs = 200
-  const actionSectionScrollSpy = React.useCallback(throttle(() => {
+  const actionSectionScrollSpy = useCallback(throttle(() => {
     const sections = document.getElementsByClassName('notion-h')
     let prevBBox = null
     let currentSectionId = activeSection