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 01/16] =?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 a69bfbd3922..2ad9cbcfcd4 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 02/16] 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 2ad9cbcfcd4..7a074841550 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 03/16] =?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 7a074841550..522646af380 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 04/16] =?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 5083269b0de..2befc93d8a3 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 522646af380..d584d5de81a 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 05/16] =?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 d584d5de81a..7823ff742be 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>

From ad83d3134a118ca7139317d053ace5bf94db9d40 Mon Sep 17 00:00:00 2001
From: Bhwa233 <404174262@qq.com>
Date: Sat, 16 Mar 2024 11:13:24 +0800
Subject: [PATCH 06/16] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E5=A4=9C=E9=97=B4?=
 =?UTF-8?q?=E6=A8=A1=E5=BC=8F=E6=8A=98=E5=8F=A0=E6=8C=89=E9=92=AE=E7=9C=8B?=
 =?UTF-8?q?=E4=B8=8D=E5=88=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

diff --git a/themes/fukasawa/components/AsideLeft.js b/themes/fukasawa/components/AsideLeft.js
index 5083269b0de..0c8aa27d909 100644
--- a/themes/fukasawa/components/AsideLeft.js
+++ b/themes/fukasawa/components/AsideLeft.js
@@ -78,7 +78,7 @@ function AsideLeft(props) {
 
   return <div className={`sideLeft relative ${isCollapsed ? 'w-0' : 'w-80'} duration-300 transition-all bg-white dark:bg-hexo-black-gray min-h-screen hidden lg:block z-20`}>
         {/* 折叠按钮 */}
-        {siteConfig('FUKASAWA_SIDEBAR_COLLAPSE_BUTTON', null, CONFIG) && <div className={`${isCollapsed ? '' : 'ml-80'} hidden lg:block sticky top-0 mx-2 cursor-pointer hover:scale-110 duration-300 px-3 py-2`} onClick={toggleOpen}>
+    {siteConfig('FUKASAWA_SIDEBAR_COLLAPSE_BUTTON', null, CONFIG) && <div className={`${isCollapsed ? '' : 'ml-80'} hidden lg:block sticky top-0 mx-2 cursor-pointer hover:scale-110 duration-300 px-3 py-2   dark:text-white`} onClick={toggleOpen}>
             {isCollapsed ? <i className="fa-solid fa-indent text-xl"></i> : <i className='fas fa-bars text-xl'></i>}
         </div>}
 

From 2b70058f70f590b05b5de9cad2c5b2db37f97b9a Mon Sep 17 00:00:00 2001
From: Bhwa233 <404174262@qq.com>
Date: Sat, 16 Mar 2024 11:48:24 +0800
Subject: [PATCH 07/16] =?UTF-8?q?=E6=8A=98=E5=8F=A0=E6=8C=89=E9=92=AE?=
 =?UTF-8?q?=E9=80=82=E9=85=8D=E5=8F=B3=E8=BE=B9=E6=A0=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 themes/fukasawa/components/AsideLeft.js | 24 ++++++++++++++++++++----
 1 file changed, 20 insertions(+), 4 deletions(-)

diff --git a/themes/fukasawa/components/AsideLeft.js b/themes/fukasawa/components/AsideLeft.js
index 0c8aa27d909..984385cfbee 100644
--- a/themes/fukasawa/components/AsideLeft.js
+++ b/themes/fukasawa/components/AsideLeft.js
@@ -14,7 +14,7 @@ import { AdSlot } from '@/components/GoogleAdsense'
 import { siteConfig } from '@/lib/config'
 import MailChimpForm from './MailChimpForm'
 import { useGlobal } from '@/lib/global'
-import { useEffect, useState } from 'react'
+import { useEffect, useMemo, useState } from 'react'
 import { isBrowser } from '@/lib/utils'
 import { debounce } from 'lodash'
 
@@ -75,14 +75,30 @@ function AsideLeft(props) {
       }
     }
   }, [])
-
+  const position = useMemo(()=>{
+    const isReverse = JSON.parse(siteConfig('LAYOUT_SIDEBAR_REVERSE'))
+    if(isCollapsed){
+      if(isReverse){
+        return 'right-2'
+      }else{
+        return 'left-2'
+      }
+    }else{
+      if(isReverse){
+        return 'right-80'
+      }else{
+        return 'left-80'
+      }
+    }
+  },[isCollapsed] )
+ 
   return <div className={`sideLeft relative ${isCollapsed ? 'w-0' : 'w-80'} duration-300 transition-all bg-white dark:bg-hexo-black-gray min-h-screen hidden lg:block z-20`}>
         {/* 折叠按钮 */}
-    {siteConfig('FUKASAWA_SIDEBAR_COLLAPSE_BUTTON', null, CONFIG) && <div className={`${isCollapsed ? '' : 'ml-80'} hidden lg:block sticky top-0 mx-2 cursor-pointer hover:scale-110 duration-300 px-3 py-2   dark:text-white`} onClick={toggleOpen}>
+    {siteConfig('FUKASAWA_SIDEBAR_COLLAPSE_BUTTON', null, CONFIG) && <div className={`${position} hidden lg:block fixed top-0 cursor-pointer hover:scale-110 duration-300 px-3 py-2   dark:text-white`} onClick={toggleOpen}>
             {isCollapsed ? <i className="fa-solid fa-indent text-xl"></i> : <i className='fas fa-bars text-xl'></i>}
         </div>}
 
-        <div className={`h-full ${isCollapsed ? 'hidden' : 'px-8'}`}>
+        <div className={`h-full ${isCollapsed ? 'hidden' : 'p-8'}`}>
 
             <Logo {...props} />
 

From b1ffa283034cd02e27923be7d7cdacb1643a7254 Mon Sep 17 00:00:00 2001
From: Bhwa233 <404174262@qq.com>
Date: Sat, 16 Mar 2024 14:34:03 +0800
Subject: [PATCH 08/16] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E6=93=8D=E4=BD=9C?=
 =?UTF-8?q?=E6=8F=90=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 components/AlgoliaSearchModal.js | 28 +++++++++++++++++++++++++++-
 components/ShortcutTag.js        |  7 +++++++
 2 files changed, 34 insertions(+), 1 deletion(-)
 create mode 100644 components/ShortcutTag.js

diff --git a/components/AlgoliaSearchModal.js b/components/AlgoliaSearchModal.js
index 5446582645c..49cad8b2d15 100644
--- a/components/AlgoliaSearchModal.js
+++ b/components/AlgoliaSearchModal.js
@@ -1,4 +1,4 @@
-import { useState, useImperativeHandle, useRef, useEffect } from 'react'
+import { useState, useImperativeHandle, useRef, useEffect, Fragment } from 'react'
 import algoliasearch from 'algoliasearch'
 import replaceSearchResult from '@/components/Mark'
 import Link from 'next/link'
@@ -6,6 +6,23 @@ import { useGlobal } from '@/lib/global'
 import throttle from 'lodash/throttle'
 import { siteConfig } from '@/lib/config'
 import { useHotkeys } from 'react-hotkeys-hook';
+import ShortcutTag from '@/components/ShortcutTag'
+
+const ShortCutActions = [
+  {
+    key: '↑ ↓',
+    action: '选择'
+  },
+  {
+    key: 'Enter',
+    action: '跳转'
+  },
+  {
+    key: 'Esc',
+    action: '关闭'
+  }
+
+]
 
 /**
  * 结合 Algolia 实现的弹出式搜索框
@@ -234,6 +251,15 @@ export default function AlgoliaSearchModal({ cRef }) {
         </ul>
         <Pagination totalPage={totalPage} page={page} switchPage={switchPage} />
         <div className='flex items-center justify-between mt-2 sm:text-sm text-xs dark:text-gray-300'>
+          {totalHit === 0 && (<div className='flex items-center'>
+            {
+              ShortCutActions.map((action, index) => {
+                return <Fragment key={index}><div className={`border-gray-300 dark:text-gray-400 text-gray-400 px-1 rounded border inline-block `}>{action.key}</div>
+                  <span className='ml-2 mr-4  text-gray-600 dark:text-gray-300'>{action.action}</span></Fragment>
+              })
+            }
+          </div>)
+          }
           <div>
             {totalHit > 0 && (
               <p>
diff --git a/components/ShortcutTag.js b/components/ShortcutTag.js
new file mode 100644
index 00000000000..4e36e8bec05
--- /dev/null
+++ b/components/ShortcutTag.js
@@ -0,0 +1,7 @@
+// 操作提示标签
+import React from 'react';
+
+const ShortcutTag = ({ children, className }) => {
+    return <div className={`border-gray-300 dark:text-gray-400 text-gray-400 text-xs px-1 rounded border inline-block ${className}`}>{children}</div>
+}
+export default ShortcutTag
\ No newline at end of file

From c0acdbff4336cf9c7d8f1cc55228395d86516b76 Mon Sep 17 00:00:00 2001
From: Bhwa233 <404174262@qq.com>
Date: Sat, 16 Mar 2024 14:50:07 +0800
Subject: [PATCH 09/16] =?UTF-8?q?=E8=B0=83=E6=95=B4=E6=A0=B7=E5=BC=8F?=
 =?UTF-8?q?=EF=BC=8C=E5=88=A0=E9=99=A4=E5=A4=9A=E4=BD=99=E4=BB=A3=E7=A0=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 components/AlgoliaSearchModal.js | 3 +--
 components/ShortcutTag.js        | 7 -------
 2 files changed, 1 insertion(+), 9 deletions(-)
 delete mode 100644 components/ShortcutTag.js

diff --git a/components/AlgoliaSearchModal.js b/components/AlgoliaSearchModal.js
index 49cad8b2d15..8fc62d919ee 100644
--- a/components/AlgoliaSearchModal.js
+++ b/components/AlgoliaSearchModal.js
@@ -6,7 +6,6 @@ import { useGlobal } from '@/lib/global'
 import throttle from 'lodash/throttle'
 import { siteConfig } from '@/lib/config'
 import { useHotkeys } from 'react-hotkeys-hook';
-import ShortcutTag from '@/components/ShortcutTag'
 
 const ShortCutActions = [
   {
@@ -254,7 +253,7 @@ export default function AlgoliaSearchModal({ cRef }) {
           {totalHit === 0 && (<div className='flex items-center'>
             {
               ShortCutActions.map((action, index) => {
-                return <Fragment key={index}><div className={`border-gray-300 dark:text-gray-400 text-gray-400 px-1 rounded border inline-block `}>{action.key}</div>
+                return <Fragment key={index}><div className={`border-gray-300 dark:text-gray-300 text-gray-600 px-2 rounded border inline-block `}>{action.key}</div>
                   <span className='ml-2 mr-4  text-gray-600 dark:text-gray-300'>{action.action}</span></Fragment>
               })
             }
diff --git a/components/ShortcutTag.js b/components/ShortcutTag.js
deleted file mode 100644
index 4e36e8bec05..00000000000
--- a/components/ShortcutTag.js
+++ /dev/null
@@ -1,7 +0,0 @@
-// 操作提示标签
-import React from 'react';
-
-const ShortcutTag = ({ children, className }) => {
-    return <div className={`border-gray-300 dark:text-gray-400 text-gray-400 text-xs px-1 rounded border inline-block ${className}`}>{children}</div>
-}
-export default ShortcutTag
\ No newline at end of file

From a407cd548d5eaff2a32e2ecfd91834f190809384 Mon Sep 17 00:00:00 2001
From: Bhwa233 <404174262@qq.com>
Date: Sat, 16 Mar 2024 15:01:18 +0800
Subject: [PATCH 10/16] =?UTF-8?q?format=20=E4=BB=A3=E7=A0=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

diff --git a/components/AlgoliaSearchModal.js b/components/AlgoliaSearchModal.js
index 8fc62d919ee..ea727a48dbb 100644
--- a/components/AlgoliaSearchModal.js
+++ b/components/AlgoliaSearchModal.js
@@ -253,7 +253,7 @@ export default function AlgoliaSearchModal({ cRef }) {
           {totalHit === 0 && (<div className='flex items-center'>
             {
               ShortCutActions.map((action, index) => {
-                return <Fragment key={index}><div className={`border-gray-300 dark:text-gray-300 text-gray-600 px-2 rounded border inline-block `}>{action.key}</div>
+                return <Fragment key={index}><div className='border-gray-300 dark:text-gray-300 text-gray-600 px-2 rounded border inline-block'>{action.key}</div>
                   <span className='ml-2 mr-4  text-gray-600 dark:text-gray-300'>{action.action}</span></Fragment>
               })
             }

From a8b7f37377327d3ecb69b79df27cfaab9ce8ff4f Mon Sep 17 00:00:00 2001
From: Bhwa233 <404174262@qq.com>
Date: Sat, 16 Mar 2024 16:16:17 +0800
Subject: [PATCH 11/16] =?UTF-8?q?=E4=BF=AE=E5=A4=8DuseMemo=E4=BD=8D?=
 =?UTF-8?q?=E7=BD=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 themes/fukasawa/components/AsideLeft.js | 34 +++++++++++++------------
 1 file changed, 18 insertions(+), 16 deletions(-)

diff --git a/themes/fukasawa/components/AsideLeft.js b/themes/fukasawa/components/AsideLeft.js
index 984385cfbee..f6025d0470d 100644
--- a/themes/fukasawa/components/AsideLeft.js
+++ b/themes/fukasawa/components/AsideLeft.js
@@ -45,6 +45,23 @@ function AsideLeft(props) {
     }
   }, [isCollapsed])
 
+  const position = useMemo(() => {
+    const isReverse = JSON.parse(siteConfig('LAYOUT_SIDEBAR_REVERSE'))
+    if (isCollapsed) {
+      if (isReverse) {
+        return 'right-2'
+      } else {
+        return 'left-2'
+      }
+    } else {
+      if (isReverse) {
+        return 'right-80'
+      } else {
+        return 'left-80'
+      }
+    }
+  }, [isCollapsed])
+
   // 折叠侧边栏
   const toggleOpen = () => {
     setIsCollapse(!isCollapsed)
@@ -75,22 +92,7 @@ function AsideLeft(props) {
       }
     }
   }, [])
-  const position = useMemo(()=>{
-    const isReverse = JSON.parse(siteConfig('LAYOUT_SIDEBAR_REVERSE'))
-    if(isCollapsed){
-      if(isReverse){
-        return 'right-2'
-      }else{
-        return 'left-2'
-      }
-    }else{
-      if(isReverse){
-        return 'right-80'
-      }else{
-        return 'left-80'
-      }
-    }
-  },[isCollapsed] )
+ 
  
   return <div className={`sideLeft relative ${isCollapsed ? 'w-0' : 'w-80'} duration-300 transition-all bg-white dark:bg-hexo-black-gray min-h-screen hidden lg:block z-20`}>
         {/* 折叠按钮 */}

From 05059a6b498b3c78f41bbcaa9b53a5d5613688fc Mon Sep 17 00:00:00 2001
From: tangly1024 <mail@tangly1024.com>
Date: Sun, 17 Mar 2024 11:18:15 +0800
Subject: [PATCH 12/16] =?UTF-8?q?=E6=9B=B4=E6=96=B0=20theme.js?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 themes/theme.js | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/themes/theme.js b/themes/theme.js
index 7b50b1ee0f1..794b0303ef5 100644
--- a/themes/theme.js
+++ b/themes/theme.js
@@ -101,9 +101,9 @@ export const initDarkMode = (updateDarkMode,defaultDarkMode) => {
   }
     
   // 如果站点强制设置默认深色，则优先级改过用
-  if(defaultDarkMode){
-    newDarkMode = defaultDarkMode
-  }
+  //if(defaultDarkMode){
+    //newDarkMode = defaultDarkMode
+  //}
 
   // url查询条件中是否深色模式
   const queryMode = getQueryVariable('mode')

From 1099571e85f288f24a8c86477f5582b7bbd0fe99 Mon Sep 17 00:00:00 2001
From: tangly1024 <mail@tangly1024.com>
Date: Sun, 17 Mar 2024 13:50:06 +0800
Subject: [PATCH 13/16] theme movie & dark mode

---
 lib/global.js         |  2 +-
 public/dplayer.htm    | 13 +++++++--
 themes/movie/index.js |  2 +-
 themes/theme.js       | 62 ++++++++++++++++++++++++-------------------
 4 files changed, 48 insertions(+), 31 deletions(-)

diff --git a/lib/global.js b/lib/global.js
index 57f5e41d0b2..4b24b0d294e 100644
--- a/lib/global.js
+++ b/lib/global.js
@@ -16,7 +16,7 @@ export function GlobalContextProvider(props) {
   const [lang, updateLang] = useState(NOTION_CONFIG?.LANG || LANG) // 默认语言
   const [locale, updateLocale] = useState(generateLocaleDict(NOTION_CONFIG?.LANG || LANG)) // 默认语言
   const [theme, setTheme] = useState(NOTION_CONFIG?.THEME || THEME) // 默认博客主题
-  const defaultDarkMode = NOTION_CONFIG?.APPEARANCE || APPEARANCE === 'dark'
+  const defaultDarkMode = NOTION_CONFIG?.APPEARANCE === 'dark' || APPEARANCE === 'dark'
   const [isDarkMode, updateDarkMode] = useState(defaultDarkMode) // 默认深色模式
   const [onLoading, setOnLoading] = useState(false) // 抓取文章数据
   const router = useRouter()
diff --git a/public/dplayer.htm b/public/dplayer.htm
index 67348de4e88..73760fa3380 100644
--- a/public/dplayer.htm
+++ b/public/dplayer.htm
@@ -8,8 +8,17 @@
     <!-- 引入 DPlayer 样式文件 -->
     <link rel="stylesheet" href="https://cdn.jsdelivr.net/npm/dplayer/dist/DPlayer.min.css">
     <style>
+        html,
         body {
-            margin: 0px 0px;
+            height: 100%;
+            margin: 0;
+            padding: 0;
+            overflow: hidden;
+        }
+
+        #dplayer-container {
+            width: 100%;
+            height: 100%;
         }
     </style>
 </head>
@@ -25,7 +34,7 @@
 
     <script>
         var myParam = decodeURIComponent(location.search.split('n=')[1]);
-        if(!myParam){
+        if (!myParam) {
             alert('无效的视频地址')
         }
         // 创建 DPlayer 实例
diff --git a/themes/movie/index.js b/themes/movie/index.js
index 5b7f918477a..af940150cc1 100644
--- a/themes/movie/index.js
+++ b/themes/movie/index.js
@@ -157,7 +157,7 @@ const LayoutSlug = props => {
 
       // 创建一个新的容器元素
       const videoWrapper = document.createElement('div')
-      videoWrapper.className = 'video-wrapper p-2 bg-gray-100 dark:bg-hexo-black-gray max-w-5xl mx-auto'
+      videoWrapper.className = 'video-wrapper p-2 bg-gray-100 dark:bg-hexo-black-gray max-w-4xl mx-auto'
 
       // 创建一个新的容器元素
       const carouselWrapper = document.createElement('div')
diff --git a/themes/theme.js b/themes/theme.js
index 794b0303ef5..9e545d8ee4e 100644
--- a/themes/theme.js
+++ b/themes/theme.js
@@ -12,7 +12,7 @@ export const { THEMES = [] } = getConfig().publicRuntimeConfig
  * @param {*} themeQuery
  * @returns
  */
-export const getGlobalLayoutByTheme = (themeQuery) => {
+export const getGlobalLayoutByTheme = themeQuery => {
   if (themeQuery !== BLOG.THEME) {
     return dynamic(() => import(`@/themes/${themeQuery}`).then(m => m[getLayoutNameByPath(-1)]), { ssr: true })
   } else {
@@ -29,22 +29,26 @@ export const getGlobalLayoutByTheme = (themeQuery) => {
 export const getLayoutByTheme = ({ router, theme }) => {
   const themeQuery = getQueryParam(router.asPath, 'theme') || theme
   if (themeQuery !== BLOG.THEME) {
-    return dynamic(() => import(`@/themes/${themeQuery}`).then(m => {
-      setTimeout(() => {
-        checkThemeDOM()
-      }, 500);
+    return dynamic(
+      () =>
+        import(`@/themes/${themeQuery}`).then(m => {
+          setTimeout(() => {
+            checkThemeDOM()
+          }, 500)
 
-      const components = m[getLayoutNameByPath(router.pathname, router.asPath)]
-      if (components) {
-        return components
-      } else {
-        return m.LayoutSlug
-      }
-    }), { ssr: true })
+          const components = m[getLayoutNameByPath(router.pathname, router.asPath)]
+          if (components) {
+            return components
+          } else {
+            return m.LayoutSlug
+          }
+        }),
+      { ssr: true }
+    )
   } else {
     setTimeout(() => {
       checkThemeDOM()
-    }, 100);
+    }, 100)
     const components = ThemeComponents[getLayoutNameByPath(router.pathname, router.asPath)]
     if (components) {
       return components
@@ -59,12 +63,12 @@ export const getLayoutByTheme = ({ router, theme }) => {
  * @param {*} path
  * @returns
  */
-const getLayoutNameByPath = (path) => {
+const getLayoutNameByPath = path => {
   if (LAYOUT_MAPPINGS[path]) {
-    return LAYOUT_MAPPINGS[path];
+    return LAYOUT_MAPPINGS[path]
   } else {
     // 没有特殊处理的路径返回默认layout名称
-    return 'LayoutSlug';
+    return 'LayoutSlug'
   }
 }
 
@@ -90,20 +94,20 @@ const checkThemeDOM = () => {
  * @param updateDarkMode 更改主题ChangeState函数
  * @description 读取cookie中存的用户主题
  */
-export const initDarkMode = (updateDarkMode,defaultDarkMode) => {
+export const initDarkMode = (updateDarkMode, defaultDarkMode) => {
   // 查看用户设备浏览器是否深色模型
   let newDarkMode = isPreferDark()
 
   // 查看localStorage中用户记录的是否深色模式
   const userDarkMode = loadDarkModeFromLocalStorage()
   if (userDarkMode) {
-    newDarkMode = userDarkMode
+    newDarkMode = JSON.parse(userDarkMode)
   }
-    
+
   // 如果站点强制设置默认深色，则优先级改过用
-  //if(defaultDarkMode){
-    //newDarkMode = defaultDarkMode
-  //}
+  if (typeof defaultDarkMode ==='boolean' && defaultDarkMode) {
+    newDarkMode = defaultDarkMode
+  }
 
   // url查询条件中是否深色模式
   const queryMode = getQueryVariable('mode')
@@ -128,7 +132,11 @@ export function isPreferDark() {
     // 系统深色模式或时间是夜间时，强行置为夜间模式
     const date = new Date()
     const prefersDarkMode = window.matchMedia('(prefers-color-scheme: dark)').matches
-    return prefersDarkMode || (BLOG.APPEARANCE_DARK_TIME && (date.getHours() >= BLOG.APPEARANCE_DARK_TIME[0] || date.getHours() < BLOG.APPEARANCE_DARK_TIME[1]))
+    return (
+      prefersDarkMode ||
+      (BLOG.APPEARANCE_DARK_TIME &&
+        (date.getHours() >= BLOG.APPEARANCE_DARK_TIME[0] || date.getHours() < BLOG.APPEARANCE_DARK_TIME[1]))
+    )
   }
   return false
 }
@@ -142,9 +150,9 @@ export const loadDarkModeFromLocalStorage = () => {
 }
 
 /**
-   * 保存深色模式
-   * @param newTheme
-   */
-export const saveDarkModeToLocalStorage = (newTheme) => {
+ * 保存深色模式
+ * @param newTheme
+ */
+export const saveDarkModeToLocalStorage = newTheme => {
   localStorage.setItem('darkMode', newTheme)
 }

From 3a32fe74100fec347d41279552a6c763431ec4f1 Mon Sep 17 00:00:00 2001
From: tangly1024 <mail@tangly1024.com>
Date: Sun, 17 Mar 2024 13:54:48 +0800
Subject: [PATCH 14/16] dark-mode

---
 lib/global.js   | 4 ++--
 themes/theme.js | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/lib/global.js b/lib/global.js
index 4b24b0d294e..17f31acec80 100644
--- a/lib/global.js
+++ b/lib/global.js
@@ -16,8 +16,8 @@ export function GlobalContextProvider(props) {
   const [lang, updateLang] = useState(NOTION_CONFIG?.LANG || LANG) // 默认语言
   const [locale, updateLocale] = useState(generateLocaleDict(NOTION_CONFIG?.LANG || LANG)) // 默认语言
   const [theme, setTheme] = useState(NOTION_CONFIG?.THEME || THEME) // 默认博客主题
-  const defaultDarkMode = NOTION_CONFIG?.APPEARANCE === 'dark' || APPEARANCE === 'dark'
-  const [isDarkMode, updateDarkMode] = useState(defaultDarkMode) // 默认深色模式
+  const defaultDarkMode = NOTION_CONFIG?.APPEARANCE  || APPEARANCE 
+  const [isDarkMode, updateDarkMode] = useState(defaultDarkMode === 'dark') // 默认深色模式
   const [onLoading, setOnLoading] = useState(false) // 抓取文章数据
   const router = useRouter()
 
diff --git a/themes/theme.js b/themes/theme.js
index 9e545d8ee4e..f09d3886dce 100644
--- a/themes/theme.js
+++ b/themes/theme.js
@@ -101,11 +101,11 @@ export const initDarkMode = (updateDarkMode, defaultDarkMode) => {
   // 查看localStorage中用户记录的是否深色模式
   const userDarkMode = loadDarkModeFromLocalStorage()
   if (userDarkMode) {
-    newDarkMode = JSON.parse(userDarkMode)
+    newDarkMode = userDarkMode
   }
 
   // 如果站点强制设置默认深色，则优先级改过用
-  if (typeof defaultDarkMode ==='boolean' && defaultDarkMode) {
+  if (defaultDarkMode==='dark') {
     newDarkMode = defaultDarkMode
   }
 

From b58e74d28dc9faba8f372ecb5c8311d13baedbe8 Mon Sep 17 00:00:00 2001
From: tangly1024 <mail@tangly1024.com>
Date: Sun, 17 Mar 2024 15:09:44 +0800
Subject: [PATCH 15/16] v4.4.0

---
 .env.local      | 2 +-
 themes/theme.js | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/.env.local b/.env.local
index 8a2ae88c2df..b8274ef0559 100644
--- a/.env.local
+++ b/.env.local
@@ -1,5 +1,5 @@
 # 环境变量 @see https://www.nextjs.cn/docs/basic-features/environment-variables
-NEXT_PUBLIC_VERSION=4.3.2
+NEXT_PUBLIC_VERSION=4.4.0
 
 
 # 可在此添加环境变量，去掉最左边的（# ）注释即可
diff --git a/themes/theme.js b/themes/theme.js
index f09d3886dce..4e7c3a6ee32 100644
--- a/themes/theme.js
+++ b/themes/theme.js
@@ -105,7 +105,7 @@ export const initDarkMode = (updateDarkMode, defaultDarkMode) => {
   }
 
   // 如果站点强制设置默认深色，则优先级改过用
-  if (defaultDarkMode==='dark') {
+  if (defaultDarkMode === 'dark') {
     newDarkMode = defaultDarkMode
   }
 

From e192815ed2b096de6fc8ed7d0423e4bc47650c73 Mon Sep 17 00:00:00 2001
From: tangly1024 <mail@tangly1024.com>
Date: Sun, 17 Mar 2024 15:19:06 +0800
Subject: [PATCH 16/16] v4.4.0 & darkmode

---
 lib/global.js   | 49 +++++++++++++++++++++++++------------------------
 package.json    |  2 +-
 themes/theme.js |  7 ++++---
 3 files changed, 30 insertions(+), 28 deletions(-)

diff --git a/lib/global.js b/lib/global.js
index 17f31acec80..77b94e2dfad 100644
--- a/lib/global.js
+++ b/lib/global.js
@@ -16,7 +16,7 @@ export function GlobalContextProvider(props) {
   const [lang, updateLang] = useState(NOTION_CONFIG?.LANG || LANG) // 默认语言
   const [locale, updateLocale] = useState(generateLocaleDict(NOTION_CONFIG?.LANG || LANG)) // 默认语言
   const [theme, setTheme] = useState(NOTION_CONFIG?.THEME || THEME) // 默认博客主题
-  const defaultDarkMode = NOTION_CONFIG?.APPEARANCE  || APPEARANCE 
+  const defaultDarkMode = NOTION_CONFIG?.APPEARANCE || APPEARANCE
   const [isDarkMode, updateDarkMode] = useState(defaultDarkMode === 'dark') // 默认深色模式
   const [onLoading, setOnLoading] = useState(false) // 抓取文章数据
   const router = useRouter()
@@ -58,13 +58,13 @@ export function GlobalContextProvider(props) {
   }
 
   useEffect(() => {
-    initDarkMode(updateDarkMode,defaultDarkMode)
+    initDarkMode(updateDarkMode, defaultDarkMode)
     initLocale(lang, locale, updateLang, updateLocale)
   }, [])
 
   // 加载进度条
   useEffect(() => {
-    const handleStart = (url) => {
+    const handleStart = url => {
       const { theme } = router.query
       if (theme && !url.includes(`theme=${theme}`)) {
         const newUrl = `${url}${url.includes('?') ? '&' : '?'}theme=${theme}`
@@ -87,27 +87,28 @@ export function GlobalContextProvider(props) {
   }, [router])
 
   return (
-        <GlobalContext.Provider value={{
-          fullWidth,
-          NOTION_CONFIG,
-          toggleDarkMode,
-          onLoading,
-          setOnLoading,
-          lang,
-          changeLang,
-          locale,
-          updateLocale,
-          isDarkMode,
-          updateDarkMode,
-          theme,
-          setTheme,
-          switchTheme,
-          siteInfo,
-          categoryOptions,
-          tagOptions
-        }}>
-            {children}
-        </GlobalContext.Provider>
+    <GlobalContext.Provider
+      value={{
+        fullWidth,
+        NOTION_CONFIG,
+        toggleDarkMode,
+        onLoading,
+        setOnLoading,
+        lang,
+        changeLang,
+        locale,
+        updateLocale,
+        isDarkMode,
+        updateDarkMode,
+        theme,
+        setTheme,
+        switchTheme,
+        siteInfo,
+        categoryOptions,
+        tagOptions
+      }}>
+      {children}
+    </GlobalContext.Provider>
   )
 }
 
diff --git a/package.json b/package.json
index 13b60baf01a..9dc7983b567 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
     "name": "notion-next",
-    "version": "4.3.2",
+    "version": "4.4.0",
     "homepage": "https://github.com/tangly1024/NotionNext.git",
     "license": "MIT",
     "repository": {
diff --git a/themes/theme.js b/themes/theme.js
index 4e7c3a6ee32..f872a12ed32 100644
--- a/themes/theme.js
+++ b/themes/theme.js
@@ -100,13 +100,14 @@ export const initDarkMode = (updateDarkMode, defaultDarkMode) => {
 
   // 查看localStorage中用户记录的是否深色模式
   const userDarkMode = loadDarkModeFromLocalStorage()
+  console.log('深色模式',userDarkMode)
   if (userDarkMode) {
-    newDarkMode = userDarkMode
+    newDarkMode = userDarkMode === 'dark' || userDarkMode === 'true'
   }
 
   // 如果站点强制设置默认深色，则优先级改过用
-  if (defaultDarkMode === 'dark') {
-    newDarkMode = defaultDarkMode
+  if (defaultDarkMode === 'true') {
+    newDarkMode = true
   }
 
   // url查询条件中是否深色模式