+
)
diff --git a/themes/fukasawa/components/AsideLeft.js b/themes/fukasawa/components/AsideLeft.js
index adec77fa..ef67cc44 100644
--- a/themes/fukasawa/components/AsideLeft.js
+++ b/themes/fukasawa/components/AsideLeft.js
@@ -1,6 +1,6 @@
import Logo from './Logo'
import GroupCategory from './GroupCategory'
-import GroupMenu from './GroupMenu'
+import { MenuList } from './MenuList'
import GroupTag from './GroupTag'
import SearchInput from './SearchInput'
import SiteInfo from './SiteInfo'
@@ -11,12 +11,12 @@ import DarkModeButton from '@/components/DarkModeButton'
function AsideLeft (props) {
const { tagOptions, currentTag, categoryOptions, currentCategory, post, slot, siteInfo } = props
const router = useRouter()
- return
+ return
diff --git a/themes/fukasawa/components/GroupMenu.js b/themes/fukasawa/components/GroupMenu.js
deleted file mode 100644
index dc6e5fac..00000000
--- a/themes/fukasawa/components/GroupMenu.js
+++ /dev/null
@@ -1,51 +0,0 @@
-import React from 'react'
-import Link from 'next/link'
-import { useRouter } from 'next/router'
-import { useGlobal } from '@/lib/global'
-import CONFIG_FUKA from '../config_fuka'
-
-function GroupMenu ({ customNav }) {
- const { locale } = useGlobal()
- const router = useRouter()
-
- let links = [
- { name: locale.NAV.INDEX, to: '/' || '/', show: true },
- { name: locale.COMMON.CATEGORY, to: '/category', show: CONFIG_FUKA.MENU_CATEGORY },
- { name: locale.COMMON.TAGS, to: '/tag', show: CONFIG_FUKA.MENU_TAG },
- { name: locale.NAV.ARCHIVE, to: '/archive', show: CONFIG_FUKA.MENU_ARCHIVE },
- { name: locale.NAV.SEARCH, to: '/search', show: CONFIG_FUKA.MENU_SEARCH }
- ]
-
- if (customNav) {
- links = links.concat(customNav)
- }
-
- return (
-
- )
-}
-
-export default GroupMenu
diff --git a/themes/fukasawa/components/MenuItemCollapse.js b/themes/fukasawa/components/MenuItemCollapse.js
new file mode 100644
index 00000000..4cb99db5
--- /dev/null
+++ b/themes/fukasawa/components/MenuItemCollapse.js
@@ -0,0 +1,62 @@
+import Collapse from '@/components/Collapse'
+import Link from 'next/link'
+import { useRouter } from 'next/router'
+import { useState } from 'react'
+
+/**
+ * 折叠菜单
+ * @param {*} param0
+ * @returns
+ */
+export const MenuItemCollapse = (props) => {
+ const { link } = props
+ const [show, changeShow] = useState(false)
+ const hasSubMenu = link?.subMenus?.length > 0
+
+ const [isOpen, changeIsOpen] = useState(false)
+
+ const router = useRouter()
+
+ if (!link || !link.show) {
+ return null
+ }
+
+ const selected = (router.pathname === link.to) || (router.asPath === link.to)
+
+ const toggleShow = () => {
+ changeShow(!show)
+ }
+
+ const toggleOpenSubMenu = () => {
+ changeIsOpen(!isOpen)
+ }
+
+ return <>
+
+
+ {!hasSubMenu &&
+
+ }
+
+ {hasSubMenu &&
}
+
+
+ {/* 折叠子菜单 */}
+ {hasSubMenu &&
+ {link.subMenus.map(sLink => {
+ return
+ })}
+ }
+ >
+}
diff --git a/themes/fukasawa/components/MenuItemDrop.js b/themes/fukasawa/components/MenuItemDrop.js
new file mode 100644
index 00000000..0d438a1d
--- /dev/null
+++ b/themes/fukasawa/components/MenuItemDrop.js
@@ -0,0 +1,36 @@
+import Link from 'next/link'
+import { useState } from 'react'
+
+export const MenuItemDrop = ({ link }) => {
+ const [show, changeShow] = useState(false)
+ const hasSubMenu = link?.subMenus?.length > 0
+
+ return changeShow(true)} onMouseOut={() => changeShow(false)}
+ className='relative py-1 duration-500 justify-between text-gray-500 dark:text-gray-300 hover:text-black hover:underline cursor-pointer flex flex-nowrap items-center '>
+
+ {!hasSubMenu &&
+
+
+ {link.slot}
+ }
+
+ {hasSubMenu &&
+
+
+ {link.slot}
+ {hasSubMenu &&
}
+
}
+
+ {/* 子菜单 */}
+ {hasSubMenu &&
+ {link.subMenus.map(sLink => {
+ return -
+
+
{sLink.name}
+ {sLink.slot}
+
+ })}
+
}
+
+
+}
diff --git a/themes/fukasawa/components/MenuItemNormal.js b/themes/fukasawa/components/MenuItemNormal.js
new file mode 100644
index 00000000..5910babb
--- /dev/null
+++ b/themes/fukasawa/components/MenuItemNormal.js
@@ -0,0 +1,24 @@
+import Link from 'next/link'
+import { useRouter } from 'next/router'
+
+export const MenuItemNormal = props => {
+ const { link } = props
+ const router = useRouter()
+ const selected = (router.pathname === link.to) || (router.asPath === link.to)
+ if (!link || !link.show) {
+ return null
+ }
+ return
+
+
+ {link.slot}
+
+
+}
diff --git a/themes/fukasawa/components/MenuList.js b/themes/fukasawa/components/MenuList.js
new file mode 100644
index 00000000..2ec96622
--- /dev/null
+++ b/themes/fukasawa/components/MenuList.js
@@ -0,0 +1,38 @@
+import { useGlobal } from '@/lib/global'
+import CONFIG_FUKA from '../config_fuka'
+import BLOG from '@/blog.config'
+import { MenuItemDrop } from './MenuItemDrop'
+import { MenuItemCollapse } from './MenuItemCollapse'
+
+export const MenuList = (props) => {
+ const { customNav, customMenu } = props
+ const { locale } = useGlobal()
+
+ let links = [
+ { name: locale.NAV.INDEX, to: '/' || '/', show: true },
+ { name: locale.COMMON.CATEGORY, to: '/category', show: CONFIG_FUKA.MENU_CATEGORY },
+ { name: locale.COMMON.TAGS, to: '/tag', show: CONFIG_FUKA.MENU_TAG },
+ { name: locale.NAV.ARCHIVE, to: '/archive', show: CONFIG_FUKA.MENU_ARCHIVE },
+ { name: locale.NAV.SEARCH, to: '/search', show: CONFIG_FUKA.MENU_SEARCH }
+ ]
+
+ if (customNav) {
+ links = links.concat(customNav)
+ }
+
+ // 如果 开启自定义菜单,则覆盖Page生成的菜单
+ if (BLOG.CUSTOM_MENU) {
+ links = customMenu
+ }
+
+ return (<>
+
+
+ >
+
+ )
+}
diff --git a/themes/fukasawa/components/TopNav.js b/themes/fukasawa/components/TopNav.js
index 8c5e620a..fa4902db 100644
--- a/themes/fukasawa/components/TopNav.js
+++ b/themes/fukasawa/components/TopNav.js
@@ -1,6 +1,6 @@
-import { useState } from 'react'
+import { useState, useRef } from 'react'
import Collapse from '@/components/Collapse'
-import GroupMenu from './GroupMenu'
+import { MenuList } from './MenuList'
import Logo from './Logo'
import SearchInput from './SearchInput'
@@ -11,6 +11,7 @@ import SearchInput from './SearchInput'
*/
const TopNav = props => {
const [isOpen, changeShow] = useState(false)
+ const collapseRef = useRef(null)
const toggleMenuOpen = () => {
changeShow(!isOpen)
@@ -20,9 +21,9 @@ const TopNav = props => {
{/* 导航栏 */}
-
+
-
+ collapseRef.current?.updateCollapseHeight(param)} />
diff --git a/themes/medium/components/MenuItemDrop.js b/themes/medium/components/MenuItemDrop.js
index b125ba89..26a0b913 100644
--- a/themes/medium/components/MenuItemDrop.js
+++ b/themes/medium/components/MenuItemDrop.js
@@ -34,7 +34,7 @@ export const MenuItemDrop = ({ link }) => {
}
{/* 子菜单 */}
- {hasSubMenu &&
+ {hasSubMenu &&
{link.subMenus.map(sLink => {
return -
diff --git a/themes/medium/components/TopNavBar.js b/themes/medium/components/TopNavBar.js
index 3217fa84..500c7c1d 100644
--- a/themes/medium/components/TopNavBar.js
+++ b/themes/medium/components/TopNavBar.js
@@ -1,5 +1,5 @@
import LogoBar from './LogoBar'
-import React, { useRef } from 'react'
+import { useRef, useState } from 'react'
import Collapse from '@/components/Collapse'
import { MenuBarMobile } from './MenuBarMobile'
import { useGlobal } from '@/lib/global'
@@ -14,7 +14,7 @@ import { MenuItemDrop } from './MenuItemDrop'
*/
export default function TopNavBar(props) {
const { className, customNav, customMenu } = props
- const [isOpen, changeShow] = React.useState(false)
+ const [isOpen, changeShow] = useState(false)
const collapseRef = useRef(null)
const { locale } = useGlobal()
diff --git a/themes/next/components/DropMenu.js b/themes/next/components/MenuItemDrop.js
similarity index 88%
rename from themes/next/components/DropMenu.js
rename to themes/next/components/MenuItemDrop.js
index 179604a0..33de20f1 100644
--- a/themes/next/components/DropMenu.js
+++ b/themes/next/components/MenuItemDrop.js
@@ -1,7 +1,7 @@
import Link from 'next/link'
import { useState } from 'react'
-export const DropMenu = ({ link }) => {
+export const MenuItemDrop = ({ link }) => {
const [show, changeShow] = useState(false)
const hasSubMenu = link?.subMenus?.length > 0
@@ -22,7 +22,7 @@ export const DropMenu = ({ link }) => {
}
{/* 子菜单 */}
- {hasSubMenu &&
+ {hasSubMenu &&
{link.subMenus.map(sLink => {
return -
diff --git a/themes/next/components/MenuButtonGroup.js b/themes/next/components/MenuList.js
similarity index 88%
rename from themes/next/components/MenuButtonGroup.js
rename to themes/next/components/MenuList.js
index 7e525696..4023fd4a 100644
--- a/themes/next/components/MenuButtonGroup.js
+++ b/themes/next/components/MenuList.js
@@ -2,10 +2,10 @@ import React from 'react'
import { useGlobal } from '@/lib/global'
import CONFIG_NEXT from '../config_next'
import BLOG from '@/blog.config'
-import { DropMenu } from './DropMenu'
+import { MenuItemDrop } from './MenuItemDrop'
import { CollapseMenu } from './CollapseMenu'
-const MenuButtonGroup = (props) => {
+export const MenuList = (props) => {
const { postCount, customNav, customMenu } = props
const { locale } = useGlobal()
const archiveSlot =
{postCount}
@@ -16,6 +16,7 @@ const MenuButtonGroup = (props) => {
{ 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 }
]
+
let links = [].concat(defaultLinks)
if (customNav) {
links = defaultLinks.concat(customNav)
@@ -30,7 +31,7 @@ const MenuButtonGroup = (props) => {
<>
{/* 大屏模式菜单 */}
{/* 移动端菜单 */}
@@ -40,4 +41,3 @@ const MenuButtonGroup = (props) => {
>
)
}
-export default MenuButtonGroup
diff --git a/themes/next/components/SideAreaLeft.js b/themes/next/components/SideAreaLeft.js
index 9471d4fb..901f29cc 100644
--- a/themes/next/components/SideAreaLeft.js
+++ b/themes/next/components/SideAreaLeft.js
@@ -1,5 +1,5 @@
import InfoCard from './InfoCard'
-import MenuButtonGroup from './MenuButtonGroup'
+import { MenuList } from './MenuList'
import SearchInput from './SearchInput'
import Toc from './Toc'
import { useGlobal } from '@/lib/global'
@@ -35,7 +35,7 @@ const SideAreaLeft = props => {
-
+
{CONFIG_NEXT.MENU_SEARCH &&
diff --git a/themes/next/components/TopNav.js b/themes/next/components/TopNav.js
index 2f205239..3644e875 100644
--- a/themes/next/components/TopNav.js
+++ b/themes/next/components/TopNav.js
@@ -5,7 +5,7 @@ import { useCallback, useEffect, useRef, useState } from 'react'
import CategoryGroup from './CategoryGroup'
import Collapse from '@/components/Collapse'
import Logo from './Logo'
-import MenuButtonGroup from './MenuButtonGroup'
+import { MenuList } from './MenuList'
import SearchDrawer from './SearchDrawer'
import TagGroups from './TagGroups'
import CONFIG_NEXT from '../config_next'
@@ -117,7 +117,7 @@ const TopNav = (props) => {
- collapseRef.current?.updateCollapseHeight(param)} {...props} from='top' />
+ collapseRef.current?.updateCollapseHeight(param)} {...props} from='top' />
diff --git a/themes/nobelium/components/DropMenu.js b/themes/nobelium/components/DropMenu.js
index c1b4442f..2680f0ca 100644
--- a/themes/nobelium/components/DropMenu.js
+++ b/themes/nobelium/components/DropMenu.js
@@ -24,7 +24,7 @@ export const DropMenu = ({ link }) => {
}
{/* 子菜单 */}
- {hasSubMenu &&
+ {hasSubMenu &&
{link.subMenus.map(sLink => {
return -
diff --git a/themes/simple/components/DropMenu.js b/themes/simple/components/DropMenu.js
index 53a611a9..b5bb1e0a 100644
--- a/themes/simple/components/DropMenu.js
+++ b/themes/simple/components/DropMenu.js
@@ -23,7 +23,7 @@ export const DropMenu = ({ link }) => {
>}
{/* 子菜单 */}
- {hasSubMenu &&
+ {hasSubMenu &&
{link.subMenus.map(sLink => {
return -