From 1054503b1131fcdf47745ea8a23410af28b8f78a Mon Sep 17 00:00:00 2001
From: tangly1024 <mail@tangly1024.com>
Date: Thu, 8 Dec 2022 16:33:36 +0800
Subject: [PATCH] =?UTF-8?q?=E5=BE=AE=E8=B0=83=E6=A0=B7=E5=BC=8F=E3=80=81?=
 =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E5=BC=82=E5=B8=B8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 components/WalineComponent.js             | 6 ++++--
 themes/next/LayoutBase.js                 | 1 +
 themes/next/components/MenuButtonGroup.js | 9 +++++----
 3 files changed, 10 insertions(+), 6 deletions(-)

diff --git a/components/WalineComponent.js b/components/WalineComponent.js
index 09983f23..c3da56ab 100644
--- a/components/WalineComponent.js
+++ b/components/WalineComponent.js
@@ -62,8 +62,10 @@ const WalineComponent = (props) => {
     }
 
     return () => {
-      waline.destroy()
-      waline = null
+      if (waline) {
+        waline.destroy()
+        waline = null
+      }
       router.events.off('routeChangeComplete', updateWaline)
     }
   }, [])
diff --git a/themes/next/LayoutBase.js b/themes/next/LayoutBase.js
index 3f0043a2..e178da0f 100644
--- a/themes/next/LayoutBase.js
+++ b/themes/next/LayoutBase.js
@@ -69,6 +69,7 @@ const LayoutBase = (props) => {
       <div className='h-0.5 w-full bg-gray-700 dark:bg-gray-600 hidden lg:block'/>
 
       <main id='wrapper' className='flex justify-center flex-1 pb-12'>
+          {/* 左侧栏样式 */}
           <SideAreaLeft slot={leftAreaSlot} targetRef={targetRef} {...props}/>
           <section id='container-inner' className={`${CONFIG_NEXT.NAV_TYPE !== 'normal' ? 'mt-40' : ''} lg:max-w-3xl xl:max-w-4xl flex-grow md:mt-0 min-h-screen w-full`} ref={targetRef}>
             {onLoading ? <LoadingCover/> : <> {children}</> }
diff --git a/themes/next/components/MenuButtonGroup.js b/themes/next/components/MenuButtonGroup.js
index 07cb95fc..b6930e5f 100644
--- a/themes/next/components/MenuButtonGroup.js
+++ b/themes/next/components/MenuButtonGroup.js
@@ -10,22 +10,23 @@ const MenuButtonGroup = (props) => {
   const router = useRouter()
   const archiveSlot = <div className='bg-gray-300 dark:bg-gray-500 rounded-md text-gray-50 px-1 text-xs'>{postCount}</div>
 
-  let links = [
+  const defaultLinks = [
     { icon: 'fas fa-home', name: locale.NAV.INDEX, to: '/' || '/', show: true },
     { icon: 'fas fa-th', name: locale.COMMON.CATEGORY, to: '/category', show: CONFIG_NEXT.MENU_CATEGORY },
     { icon: 'fas fa-tag', name: locale.COMMON.TAGS, to: '/tag', show: CONFIG_NEXT.MENU_TAG },
     { icon: 'fas fa-archive', name: locale.NAV.ARCHIVE, to: '/archive', slot: archiveSlot, show: CONFIG_NEXT.MENU_ARCHIVE },
     { icon: 'fas fa-user', name: locale.NAV.ABOUT, to: '/about', show: CONFIG_NEXT.MENU_ABOUT }
   ]
+  let links = [].concat(defaultLinks)
   if (customNav) {
-    links = links.concat(customNav)
+    links = defaultLinks.concat(customNav)
   }
 
   return <nav id='nav' className='leading-8 text-gray-500 dark:text-gray-400 font-sans'>
       {links.map(link => {
         if (link && link.show) {
           const selected = (router.pathname === link.to) || (router.asPath === link.to)
-          return <Link key={`${link.to}`} title={link.to} href={link.to} >
+          return <Link key={link.to} title={link.to} href={link.to} >
           <a target={link.to.indexOf('http') === 0 ? '_blank' : '_self'} className={'py-1.5 px-5 duration-300 text-base justify-between hover:bg-gray-700 hover:text-white hover:shadow-lg cursor-pointer font-light flex flex-nowrap items-center ' +
               (selected ? 'bg-gray-200 text-black' : ' ')} >
               <div className='my-auto items-center justify-center flex '>
@@ -36,7 +37,7 @@ const MenuButtonGroup = (props) => {
             </a>
           </Link>
         } else {
-          return null
+          return <></>
         }
       })}
     </nav>