From ae886fac0c5d7625e0f72dce7e1fb3e56858d650 Mon Sep 17 00:00:00 2001
From: "tangly1024.com" <tlyong1992@hotmail.com>
Date: Fri, 24 Mar 2023 14:34:14 +0800
Subject: [PATCH] menu-drop-ui

---
 themes/example/components/MenuItemDrop.js     |  2 +-
 .../fukasawa/components/MenuItemCollapse.js   |  2 +-
 themes/medium/components/MenuItemDrop.js      | 10 +--
 themes/next/components/CollapseMenu.js        |  2 +-
 themes/next/components/MenuItemDrop.js        |  4 +-
 themes/nobelium/components/MenuItemDrop.js    | 61 +++++++++++--------
 themes/nobelium/components/Nav.js             |  4 +-
 themes/simple/components/MenuItemDrop.js      |  2 +-
 8 files changed, 47 insertions(+), 40 deletions(-)

diff --git a/themes/example/components/MenuItemDrop.js b/themes/example/components/MenuItemDrop.js
index 85c350bc..a61f608b 100644
--- a/themes/example/components/MenuItemDrop.js
+++ b/themes/example/components/MenuItemDrop.js
@@ -24,7 +24,7 @@ export const MenuItemDrop = ({ link }) => {
         }
 
         {/* 子菜单 */}
-        {hasSubMenu && <ul className={`${show ? 'visible opacity-100  top-12' : 'invisible opacity-0 top-0'} border-gray-100  bg-white  dark:bg-black dark:border-gray-800 transition-all duration-300 z-20 absolute block drop-shadow-lg `}>
+        {hasSubMenu && <ul className={`${show ? 'visible opacity-100  top-12' : 'invisible opacity-0 top-10'} border-gray-100  bg-white  dark:bg-black dark:border-gray-800 transition-all duration-300 z-20 absolute block drop-shadow-lg `}>
             {link.subMenus.map(sLink => {
               return <li key={sLink.id} className='not:last-child:border-b-0 border-b text-gray-700 dark:text-gray-200  hover:bg-gray-50 dark:hover:bg-gray-900 tracking-widest transition-all duration-200  dark:border-gray-800 py-3 pr-6 pl-2'>
                     <Link href={sLink.to}>
diff --git a/themes/fukasawa/components/MenuItemCollapse.js b/themes/fukasawa/components/MenuItemCollapse.js
index 4cb99db5..a8514875 100644
--- a/themes/fukasawa/components/MenuItemCollapse.js
+++ b/themes/fukasawa/components/MenuItemCollapse.js
@@ -49,7 +49,7 @@ export const MenuItemCollapse = (props) => {
         {/* 折叠子菜单 */}
         {hasSubMenu && <Collapse isOpen={isOpen} onHeightChange={props.onHeightChange}>
             {link.subMenus.map(sLink => {
-              return <div key={sLink.id} className='
+              return <div key={sLink.id} className='whitespace-nowrap
               not:last-child:border-b-0 border-b dark:border-gray-800 py-2 px-14 cursor-pointer hover:bg-gray-100
               font-extralight dark:bg-black text-left justify-start text-gray-600 bg-gray-50 dark:hover:bg-gray-900 tracking-widest transition-all duration-200'>
                     <Link href={sLink.to}>
diff --git a/themes/medium/components/MenuItemDrop.js b/themes/medium/components/MenuItemDrop.js
index 454ff22d..18cae944 100644
--- a/themes/medium/components/MenuItemDrop.js
+++ b/themes/medium/components/MenuItemDrop.js
@@ -4,6 +4,8 @@ import { useRouter } from 'next/router'
 
 export const MenuItemDrop = ({ link }) => {
   const [show, changeShow] = useState(false)
+  //   const show = true
+  //   const changeShow = () => {}
   const router = useRouter()
 
   if (!link || !link.show) {
@@ -12,10 +14,10 @@ export const MenuItemDrop = ({ link }) => {
   const hasSubMenu = link?.subMenus?.length > 0
   const selected = (router.pathname === link.to) || (router.asPath === link.to)
 
-  return <li className='cursor-pointer list-none items-center flex' onMouseOver={() => changeShow(true)} onMouseOut={() => changeShow(false)} >
+  return <li className='cursor-pointer list-none items-center flex mx-2' onMouseOver={() => changeShow(true)} onMouseOut={() => changeShow(false)} >
 
         {hasSubMenu &&
-            <div className={'h-full whitespace-nowrap px-2 duration-300 text-sm justify-between dark:text-gray-300 cursor-pointer flex flex-nowrap items-center ' +
+            <div className={'h-full whitespace-nowrap duration-300 text-sm justify-between dark:text-gray-300 cursor-pointer flex flex-nowrap items-center ' +
                 (selected ? 'bg-green-600 text-white hover:text-white' : 'hover:text-green-600')}>
                 <div className='px-1'>
                     {link?.icon && <i className={link?.icon} />} {link?.name}
@@ -25,7 +27,7 @@ export const MenuItemDrop = ({ link }) => {
         }
 
         {!hasSubMenu &&
-            <div className={'h-full whitespace-nowrap px-2 duration-300 text-sm justify-between dark:text-gray-300 cursor-pointer flex flex-nowrap items-center ' +
+            <div className={'h-full whitespace-nowrap duration-300 text-sm justify-between dark:text-gray-300 cursor-pointer flex flex-nowrap items-center ' +
                 (selected ? 'bg-green-600 text-white hover:text-white' : 'hover:text-green-600')}>
                 <Link href={link?.to} className='px-1'>
                     {link?.icon && <i className={link?.icon} />} {link?.name}
@@ -34,7 +36,7 @@ export const MenuItemDrop = ({ link }) => {
         }
 
         {/* 子菜单 */}
-        {hasSubMenu && <ul className={`${show ? 'visible opacity-100 top-12 ' : 'invisible opacity-0 top-0 '} border-gray-100  bg-white  dark:bg-black dark:border-gray-800 transition-all duration-300 z-20 absolute block drop-shadow-lg `}>
+        {hasSubMenu && <ul className={`${show ? 'visible opacity-100 top-12 ' : 'invisible opacity-0 top-10 '} border-gray-100  bg-white  dark:bg-black dark:border-gray-800 transition-all duration-300 z-20 absolute block drop-shadow-lg `}>
             {link.subMenus.map(sLink => {
               return <li key={sLink.id} className='not:last-child:border-b-0 border-b text-gray-700 dark:text-gray-200  hover:bg-gray-50 dark:hover:bg-gray-900 tracking-widest transition-all duration-200  dark:border-gray-800 py-3 pr-6 pl-2'>
                     <Link href={sLink.to}>
diff --git a/themes/next/components/CollapseMenu.js b/themes/next/components/CollapseMenu.js
index e2a1b1e6..6a39e153 100644
--- a/themes/next/components/CollapseMenu.js
+++ b/themes/next/components/CollapseMenu.js
@@ -41,7 +41,7 @@ export const CollapseMenu = (props) => {
         {/* 折叠子菜单 */}
         {hasSubMenu && <Collapse isOpen={isOpen} onHeightChange={props.onHeightChange}>
             {link.subMenus.map(sLink => {
-              return <div key={sLink.id} className='
+              return <div key={sLink.id} className='whitespace-nowrap
               not:last-child:border-b-0 border-b dark:border-gray-800 py-2 px-14 cursor-pointer hover:bg-gray-100
               font-extralight dark:bg-black text-left justify-start text-gray-600 bg-gray-50 dark:hover:bg-gray-900 tracking-widest transition-all duration-200'>
                     <Link href={sLink.to}>
diff --git a/themes/next/components/MenuItemDrop.js b/themes/next/components/MenuItemDrop.js
index 8b046844..15067029 100644
--- a/themes/next/components/MenuItemDrop.js
+++ b/themes/next/components/MenuItemDrop.js
@@ -22,10 +22,10 @@ export const MenuItemDrop = ({ link }) => {
             </div>}
 
         {/* 子菜单 */}
-        {hasSubMenu && <ul className={`${show ? 'visible opacity-100 left-56' : 'invisible opacity-0 left-40'} absolute right-0 top-0 w-full border-gray-100  bg-white  dark:bg-black dark:border-gray-800 transition-all duration-300 drop-shadow-lg `}>
+        {hasSubMenu && <ul className={`${show ? 'visible opacity-100 left-56' : 'invisible opacity-0 left-40'} whitespace-nowrap absolute right-0 top-0 w-full border-gray-100  bg-white  dark:bg-black dark:border-gray-800 transition-all duration-300 drop-shadow-lg `}>
             {link.subMenus.map(sLink => {
               return <li key={sLink.id} className='my-auto h-9 px-2 items-center justify-start flex not:last-child:border-b-0 border-b text-gray-700 dark:text-gray-200  hover:bg-gray-50 dark:hover:bg-gray-900 tracking-widest transition-all duration-200  dark:border-gray-800 '>
-                    <i className={`${sLink.icon} w-4 text-center`} />
+                    {sLink.icon && <i className={`${sLink.icon} w-4 text-center`} />}
                     <div className={'ml-4'}>{sLink.name}</div>
                     {sLink.slot}
                 </li>
diff --git a/themes/nobelium/components/MenuItemDrop.js b/themes/nobelium/components/MenuItemDrop.js
index 8207a35c..38753b06 100644
--- a/themes/nobelium/components/MenuItemDrop.js
+++ b/themes/nobelium/components/MenuItemDrop.js
@@ -3,36 +3,43 @@ import { useState } from 'react'
 
 export const MenuItemDrop = ({ link }) => {
   const [show, changeShow] = useState(false)
+  //   const show = true
+  //   const changeShow = () => {}
+  if (!link || !link.show) {
+    return null
+  }
+
   const hasSubMenu = link?.subMenus?.length > 0
 
-  return <li className='cursor-pointer' onMouseOver={() => changeShow(true)} onMouseOut={() => changeShow(false)} >
-
-        {!hasSubMenu &&
-            <div className="block ml-4 text-black dark:text-gray-50 nav">
-                <Link href={link?.to} >
-                    {link?.icon && <i className={link?.icon} />} {link?.name}
-                    {hasSubMenu && <i className='px-2 fa fa-angle-down'></i>}
-                </Link>
-            </div>
-        }
-
-        {hasSubMenu &&
-            <div className='block ml-4 text-black dark:text-gray-50 nav'>
-                {link?.icon && <i className={link?.icon} />} {link?.name}
-                <i className={`px-2 fas fa-chevron-down duration-500 transition-all ${show ? ' rotate-180' : ''}`}></i>
-            </div>
-        }
-
-        {/* 子菜单 */}
-        {hasSubMenu && <ul className={`${show ? 'visible opacity-100 top-12 ' : 'invisible opacity-0 top-0 '} border-gray-100  bg-white  dark:bg-black dark:border-gray-800 transition-all duration-300 z-20 absolute block drop-shadow-lg `}>
-            {link.subMenus.map(sLink => {
-              return <li key={sLink.id} className='not:last-child:border-b-0 border-b text-gray-700 dark:text-gray-200  hover:bg-gray-50 dark:hover:bg-gray-900 tracking-widest transition-all duration-200  dark:border-gray-800 py-3 pr-6 pl-2'>
-                    <Link href={sLink.to}>
-                    <span className='text-sm text-nowrap font-extralight'>{link?.icon && <i className={sLink?.icon} > &nbsp; </i>}{sLink.title}</span>
+  return <li className='mx-3 my-2' >
+        <div className='cursor-pointer ' onMouseOver={() => changeShow(true)} onMouseOut={() => changeShow(false)}>
+            {!hasSubMenu &&
+                <div className="block text-black dark:text-gray-50 nav" >
+                    <Link href={link?.to} >
+                        {link?.icon && <i className={link?.icon} />} {link?.name}
                     </Link>
-                </li>
-            })}
-        </ul>}
+                </div>
+            }
+
+            {hasSubMenu &&
+                <div className='block text-black dark:text-gray-50 nav'>
+                    {link?.icon && <i className={link?.icon} />} {link?.name}
+                    <i className={`px-2 fas fa-chevron-down duration-500 transition-all ${show ? ' rotate-180' : ''}`}></i>
+                </div>
+            }
+
+            {/* 子菜单 */}
+            {hasSubMenu && <ul className={`${show ? 'visible opacity-100 top-12 ' : 'invisible opacity-0 top-10 '} border-gray-100  bg-white  dark:bg-black dark:border-gray-800 transition-all duration-300 z-20 absolute block drop-shadow-lg `}>
+                {link.subMenus.map(sLink => {
+                  return <li key={sLink.id} className='not:last-child:border-b-0 border-b text-gray-700 dark:text-gray-200  hover:bg-gray-50 dark:hover:bg-gray-900 tracking-widest transition-all duration-200  dark:border-gray-800 py-3 pr-6 pl-2'>
+                        <Link href={sLink.to}>
+                            <span className='text-sm text-nowrap font-extralight'>{link?.icon && <i className={sLink?.icon} > &nbsp; </i>}{sLink.title}</span>
+                        </Link>
+                    </li>
+                })}
+            </ul>}
+
+        </div>
 
     </li>
 }
diff --git a/themes/nobelium/components/Nav.js b/themes/nobelium/components/Nav.js
index 5440f5ac..995b5ab8 100644
--- a/themes/nobelium/components/Nav.js
+++ b/themes/nobelium/components/Nav.js
@@ -94,9 +94,7 @@ const NavBar = props => {
   return (
     <div className="flex-shrink-0">
       <ul className="flex flex-row">
-        {links.map(
-          link => link && link.show && <MenuItemDrop key={link.id} link={link}/>
-        )}
+        {links.map(link => <MenuItemDrop key={link.id} link={link}/>)}
       </ul>
     </div>
   )
diff --git a/themes/simple/components/MenuItemDrop.js b/themes/simple/components/MenuItemDrop.js
index dd6a0299..355d357a 100644
--- a/themes/simple/components/MenuItemDrop.js
+++ b/themes/simple/components/MenuItemDrop.js
@@ -27,7 +27,7 @@ export const MenuItemDrop = ({ link }) => {
         </>}
 
         {/* 子菜单 */}
-        {hasSubMenu && <ul className={`${show ? 'visible opacity-100 top-12' : 'invisible opacity-0 top-0'} border-gray-100  bg-white  dark:bg-black dark:border-gray-800 transition-all duration-300 z-20 absolute block drop-shadow-lg `}>
+        {hasSubMenu && <ul className={`${show ? 'visible opacity-100 top-12' : 'invisible opacity-0 top-10'} border-gray-100  bg-white  dark:bg-black dark:border-gray-800 transition-all duration-300 z-20 absolute block drop-shadow-lg `}>
             {link.subMenus.map(sLink => {
               return <li key={sLink.id} className='not:last-child:border-b-0 border-b text-blue-500 hover:bg-gray-50 dark:hover:bg-gray-900 tracking-widest transition-all duration-200 dark:border-gray-800  py-3 pr-6 pl-2'>
                     <Link href={sLink.to}>