From a7c1e0f9b5ea6a978fc58383a8cfedecbcd6d35c Mon Sep 17 00:00:00 2001
From: tangly1024 <mail@tangly1024.com>
Date: Sun, 26 Mar 2023 15:56:09 +0800
Subject: [PATCH] simple menu

---
 themes/simple/components/MenuItemCollapse.js | 6 +++---
 themes/simple/components/MenuItemDrop.js     | 8 ++++----
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/themes/simple/components/MenuItemCollapse.js b/themes/simple/components/MenuItemCollapse.js
index 6abe88d8..0643d3d4 100644
--- a/themes/simple/components/MenuItemCollapse.js
+++ b/themes/simple/components/MenuItemCollapse.js
@@ -31,12 +31,12 @@ export const MenuItemCollapse = (props) => {
             {!hasSubMenu && <Link
                 href={link?.to}
                 className="font-extralight items-center flex justify-between pl-2 pr-4 dark:text-gray-200 no-underline tracking-widest pb-1">
-                <span className='text-blue-400 hover:text-red-400 transition-all items-center duration-200'>{link?.name}</span>
+                <span className='text-blue-400 hover:text-red-400 transition-all items-center duration-200'>{link?.icon && <span className='mr-2'><i className={link.icon}/></span>}{link?.name}</span>
             </Link>}
              {hasSubMenu && <div
                 onClick={hasSubMenu ? toggleOpenSubMenu : null}
                 className="font-extralight items-center flex justify-between pl-2 pr-4 cursor-pointer  dark:text-gray-200 no-underline tracking-widest pb-1">
-                <span className='text-blue-400 hover:text-red-400 transition-all items-center duration-200'>{link?.name}</span>
+                <span className='text-blue-400 hover:text-red-400 transition-all items-center duration-200'>{link?.icon && <span className='mr-2'><i className={link.icon}/></span>}{link?.name}</span>
                <i className={`px-2 fa fa-plus transition-all duration-200 ${isOpen && 'rotate-45'} text-gray-400`}></i>
             </div>}
         </div>
@@ -46,7 +46,7 @@ export const MenuItemCollapse = (props) => {
             {link.subMenus.map(sLink => {
               return <div key={sLink.id} className='font-extralight dark:bg-black text-left px-10 justify-start text-blue-400 bg-gray-50 hover:bg-gray-50 dark:hover:bg-gray-900 tracking-widest transition-all duration-200 border-b dark:border-gray-800 py-3 pr-6'>
                     <Link href={sLink.to}>
-                        <span className='text-xs'>{sLink.title}</span>
+                        <span className='ml-4 text-xs'>{sLink?.icon && <span className='mr-2 w-4'><i className={sLink.icon}/></span>}{sLink.title}</span>
                     </Link>
                 </div>
             })}
diff --git a/themes/simple/components/MenuItemDrop.js b/themes/simple/components/MenuItemDrop.js
index 355d357a..8be2d7e7 100644
--- a/themes/simple/components/MenuItemDrop.js
+++ b/themes/simple/components/MenuItemDrop.js
@@ -15,13 +15,13 @@ export const MenuItemDrop = ({ link }) => {
             <Link
                 href={link?.to}
                 className="font-sans menu-link pl-2 pr-4 text-gray-700 dark:text-gray-200 no-underline tracking-widest pb-1">
-                {link?.name}
-                {hasSubMenu && <i className='px-2 fa fa-angle-down'></i>}
+                <>{link?.icon && <span className='mr-2'><i className={link.icon} /></span>}{link?.name}
+                    {hasSubMenu && <i className='px-2 fa fa-angle-down'></i>}</>
             </Link>}
 
         {hasSubMenu && <>
             <div className='cursor-pointer font-sans menu-link pl-2 pr-4 text-gray-700 dark:text-gray-200 no-underline tracking-widest pb-1'>
-                {link?.name}
+                {link?.icon && <span className='mr-2'><i className={link.icon} /></span>} {link?.name}
                 <i className={`px-2 fas fa-chevron-down duration-500 transition-all ${show ? ' rotate-180' : ''}`}></i>
             </div>
         </>}
@@ -31,7 +31,7 @@ export const MenuItemDrop = ({ link }) => {
             {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}>
-                    <span className='text-sm text-nowrap font-extralight'>{link?.icon && <i className={sLink?.icon} > &nbsp; </i>}{sLink.title}</span>
+                        <span className='text-sm text-nowrap font-extralight'>{link?.icon && <i className={sLink?.icon} > &nbsp; </i>}{sLink.title}</span>
                     </Link>
                 </li>
             })}