From 466fd5585cb32b33a19de303b93311e8fcaf9e2e Mon Sep 17 00:00:00 2001
From: Bhwa233 <404174262@qq.com>
Date: Fri, 15 Mar 2024 11:44:19 +0800
Subject: [PATCH 1/5] =?UTF-8?q?=E7=9B=AE=E5=BD=95=E4=BC=9A=E5=A1=AB?=
 =?UTF-8?q?=E5=85=85=E4=BE=A7=E8=BE=B9=E6=A0=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 themes/fukasawa/components/Catalog.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/themes/fukasawa/components/Catalog.js b/themes/fukasawa/components/Catalog.js
index a69bfbd3..2ad9cbcf 100644
--- a/themes/fukasawa/components/Catalog.js
+++ b/themes/fukasawa/components/Catalog.js
@@ -62,7 +62,7 @@ const Catalog = ({ toc }) => {
 
   return <div id='catalog'>
     <div className='w-full dark:text-gray-300 mb-2'><i className='mr-1 fas fa-stream' />{locale.COMMON.TABLE_OF_CONTENTS}</div>
-    <div className='h-96'>
+    <div >
       <nav ref={tRef} className='h-full overflow-y-auto overscroll-none scroll-hidden  text-black'>
         {toc.map((tocItem) => {
           const id = uuidToId(tocItem.id)

From 62275300115491dc0b9e3a0e92a727d8eb4b22ad Mon Sep 17 00:00:00 2001
From: Bhwa233 <404174262@qq.com>
Date: Fri, 15 Mar 2024 13:17:33 +0800
Subject: [PATCH 2/5] Remove unnecessary div element in Catalog.js

---
 themes/fukasawa/components/Catalog.js | 2 --
 1 file changed, 2 deletions(-)

diff --git a/themes/fukasawa/components/Catalog.js b/themes/fukasawa/components/Catalog.js
index 2ad9cbcf..7a074841 100644
--- a/themes/fukasawa/components/Catalog.js
+++ b/themes/fukasawa/components/Catalog.js
@@ -62,7 +62,6 @@ const Catalog = ({ toc }) => {
 
   return <div id='catalog'>
     <div className='w-full dark:text-gray-300 mb-2'><i className='mr-1 fas fa-stream' />{locale.COMMON.TABLE_OF_CONTENTS}</div>
-    <div >
       <nav ref={tRef} className='h-full overflow-y-auto overscroll-none scroll-hidden  text-black'>
         {toc.map((tocItem) => {
           const id = uuidToId(tocItem.id)
@@ -82,7 +81,6 @@ const Catalog = ({ toc }) => {
           )
         })}
       </nav>
-    </div>
   </div>
 }
 

From e39679a18c1acb1ca5593c07ab82442bc374bb78 Mon Sep 17 00:00:00 2001
From: Bhwa233 <404174262@qq.com>
Date: Fri, 15 Mar 2024 13:59:19 +0800
Subject: [PATCH 3/5] =?UTF-8?q?feat:=E9=80=82=E9=85=8D=E7=9B=AE=E5=BD=95?=
 =?UTF-8?q?=E5=B0=91=E7=9A=84=E6=83=85=E5=86=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 themes/fukasawa/components/Catalog.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/themes/fukasawa/components/Catalog.js b/themes/fukasawa/components/Catalog.js
index 7a074841..522646af 100644
--- a/themes/fukasawa/components/Catalog.js
+++ b/themes/fukasawa/components/Catalog.js
@@ -54,14 +54,13 @@ const Catalog = ({ toc }) => {
 
   // 目录自动滚动
   const tRef = useRef(null)
-
   // 无目录就直接返回空
   if (!toc || toc?.length < 1) {
     return <></>
   }
-
   return <div id='catalog'>
     <div className='w-full dark:text-gray-300 mb-2'><i className='mr-1 fas fa-stream' />{locale.COMMON.TABLE_OF_CONTENTS}</div>
+    <div className='max-h-[calc(100vh-8rem)]'>
       <nav ref={tRef} className='h-full overflow-y-auto overscroll-none scroll-hidden  text-black'>
         {toc.map((tocItem) => {
           const id = uuidToId(tocItem.id)
@@ -81,6 +80,7 @@ const Catalog = ({ toc }) => {
           )
         })}
       </nav>
+    </div>
   </div>
 }
 

From 725622621fcec5e7140854153b517b696eb124cb Mon Sep 17 00:00:00 2001
From: Bhwa233 <404174262@qq.com>
Date: Fri, 15 Mar 2024 18:00:03 +0800
Subject: [PATCH 4/5] =?UTF-8?q?catalog=20=E9=AB=98=E5=BA=A6=E8=87=AA?=
 =?UTF-8?q?=E9=80=82=E5=BA=94?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 themes/fukasawa/components/AsideLeft.js |  3 +-
 themes/fukasawa/components/Catalog.js   | 38 ++++++++++++-------------
 2 files changed, 19 insertions(+), 22 deletions(-)

diff --git a/themes/fukasawa/components/AsideLeft.js b/themes/fukasawa/components/AsideLeft.js
index 5083269b..2befc93d 100644
--- a/themes/fukasawa/components/AsideLeft.js
+++ b/themes/fukasawa/components/AsideLeft.js
@@ -133,13 +133,12 @@ function AsideLeft(props) {
                 <DarkModeButton />
             </section>
 
-            <section className='sticky top-0 pt-12'>
+            <section className='sticky top-0 pt-12  flex flex-col max-h-screen '>
                 <Catalog toc={post?.toc} />
                 <div className='flex justify-center'>
                     <div>{slot}</div>
                 </div>
             </section>
-
         </div>
     </div>
 }
diff --git a/themes/fukasawa/components/Catalog.js b/themes/fukasawa/components/Catalog.js
index 522646af..d584d5de 100644
--- a/themes/fukasawa/components/Catalog.js
+++ b/themes/fukasawa/components/Catalog.js
@@ -58,29 +58,27 @@ const Catalog = ({ toc }) => {
   if (!toc || toc?.length < 1) {
     return <></>
   }
-  return <div id='catalog'>
+  return <div id='catalog' className='flex-1 flex-col flex overflow-hidden'>
     <div className='w-full dark:text-gray-300 mb-2'><i className='mr-1 fas fa-stream' />{locale.COMMON.TABLE_OF_CONTENTS}</div>
-    <div className='max-h-[calc(100vh-8rem)]'>
-      <nav ref={tRef} className='h-full overflow-y-auto overscroll-none scroll-hidden  text-black'>
-        {toc.map((tocItem) => {
-          const id = uuidToId(tocItem.id)
-          return (
-            <a
-              key={id}
-              href={`#${id}`}
-              className={`notion-table-of-contents-item duration-300 transform font-light dark:text-gray-300
+    <nav ref={tRef} className='flex-1 overflow-auto  overscroll-none scroll-hidden   text-black mb-6'>
+      {toc.map((tocItem) => {
+        const id = uuidToId(tocItem.id)
+        return (
+          <a
+            key={id}
+            href={`#${id}`}
+            className={`notion-table-of-contents-item duration-300 transform font-light dark:text-gray-300
               notion-table-of-contents-item-indent-level-${tocItem.indentLevel} `}
+          >
+            <span style={{ display: 'inline-block', marginLeft: tocItem.indentLevel * 16 }}
+              className={`${activeSection === id && ' font-bold text-red-400 underline'}`}
             >
-              <span style={{ display: 'inline-block', marginLeft: tocItem.indentLevel * 16 }}
-                className={`${activeSection === id && ' font-bold text-red-400 underline'}`}
-              >
-                {tocItem.text}
-              </span>
-            </a>
-          )
-        })}
-      </nav>
-    </div>
+              {tocItem.text}
+            </span>
+          </a>
+        )
+      })}
+    </nav>
   </div>
 }
 

From 74add36f6332c8ba70605d10bb5538a840db82a2 Mon Sep 17 00:00:00 2001
From: Bhwa233 <404174262@qq.com>
Date: Fri, 15 Mar 2024 18:25:35 +0800
Subject: [PATCH 5/5] =?UTF-8?q?=E6=BA=A2=E5=87=BA=E6=96=87=E6=9C=AC?=
 =?UTF-8?q?=E5=A2=9E=E5=8A=A0tooltip?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 themes/fukasawa/components/Catalog.js | 1 +
 1 file changed, 1 insertion(+)

diff --git a/themes/fukasawa/components/Catalog.js b/themes/fukasawa/components/Catalog.js
index d584d5de..7823ff74 100644
--- a/themes/fukasawa/components/Catalog.js
+++ b/themes/fukasawa/components/Catalog.js
@@ -72,6 +72,7 @@ const Catalog = ({ toc }) => {
           >
             <span style={{ display: 'inline-block', marginLeft: tocItem.indentLevel * 16 }}
               className={`${activeSection === id && ' font-bold text-red-400 underline'}`}
+              title={tocItem.text}
             >
               {tocItem.text}
             </span>