small fix about link index

Yueup · Nov 26, 2023 · bf15970 · bf15970
1 parent 23ac219
commit bf15970
Show file tree

Hide file tree

Showing 15 changed files with 16 additions and 25 deletions.
diff --git a/themes/example/components/Nav.js b/themes/example/components/Nav.js
@@ -36,8 +36,7 @@ export const Nav = (props) => {
         <nav className="w-full bg-white md:pt-0 px-6 relative z-20 border-t border-b border-gray-light dark:border-hexo-black-gray dark:bg-black">
             <div className="container mx-auto max-w-4xl md:flex justify-between items-center text-sm md:text-md md:justify-start">
                 <ul className="w-full text-center md:text-left flex flex-wrap justify-center items-stretch md:justify-start md:items-start">
-                    {/* {links.map(link => <NormalMenuItem key={link?.id} link={link}/>)} */}
-                    {links.map(link => <MenuItemDrop key={link?.id} link={link} />)}
+                    {links.map((link, index) => <MenuItemDrop key={index} link={link} />)}
                 </ul>
                 {/* <div className="w-full md:w-1/3 text-center md:text-right"> */}
                     {/* <!-- extra links --> */}

diff --git a/themes/gitbook/components/MenuBarMobile.js b/themes/gitbook/components/MenuBarMobile.js
@@ -30,9 +30,7 @@ export const MenuBarMobile = (props) => {
 
   return (
     <nav id='nav' className=' text-md'>
-        {/* {links.map(link => <NormalMenu key={link?.id} link={link}/>)} */}
         {links?.map((link, index) => <MenuItemCollapse onHeightChange={props.onHeightChange} key={index} link={link}/>)}
-
     </nav>
   )
 }
diff --git a/themes/heo/components/MenuListSide.js b/themes/heo/components/MenuListSide.js
@@ -29,8 +29,7 @@ export const MenuListSide = (props) => {
 
   return (
         <nav className='flex-col space-y-2'>
-            {/* {links.map(link => <MenuItemNormal key={link?.id} link={link} />)} */}
-            {links?.map(link => <MenuItemCollapse key={link?.id} link={link} />)}
+            {links?.map((link, index) => <MenuItemCollapse key={index} link={link} />)}
         </nav>
   )
 }
diff --git a/themes/hexo/components/MenuListSide.js b/themes/hexo/components/MenuListSide.js
@@ -35,8 +35,7 @@ export const MenuListSide = (props) => {
 
   return (
         <nav>
-            {/* {links.map(link => <MenuItemNormal key={link?.id} link={link} />)} */}
-            {links?.map(link => <MenuItemCollapse key={link?.id} link={link} />)}
+            {links?.map((link, index) => <MenuItemCollapse key={index} link={link} />)}
         </nav>
   )
 }
diff --git a/themes/hexo/components/MenuListTop.js b/themes/hexo/components/MenuListTop.js
@@ -36,7 +36,7 @@ export const MenuListTop = (props) => {
 
   return (<>
         <nav id='nav-mobile' className='leading-8 justify-center font-light w-full flex'>
-            {links?.map(link => link && link.show && <MenuItemDrop key={link?.id} link={link} />)}
+            {links?.map((link, index) => link && link.show && <MenuItemDrop key={index} link={link} />)}
         </nav>
     </>)
 }
diff --git a/themes/matery/components/MenuListSide.js b/themes/matery/components/MenuListSide.js
@@ -29,8 +29,7 @@ export const MenuListSide = (props) => {
 
   return (
         <nav>
-            {/* {links.map(link => <MenuItemNormal key={link?.id} link={link} />)} */}
-            {links?.map(link => <MenuItemCollapse key={link?.id} link={link} />)}
+            {links?.map((link, index) => <MenuItemCollapse key={index} link={link} />)}
         </nav>
   )
 }
diff --git a/themes/matery/components/MenuListTop.js b/themes/matery/components/MenuListTop.js
@@ -29,7 +29,7 @@ export const MenuListTop = (props) => {
 
   return (
     <nav id='nav' className='leading-8 flex justify-center  font-light w-full'>
-      {links?.map(link => <MenuItemDrop key={link?.id} link={link}/>)}
+      {links?.map((link, index) => <MenuItemDrop key={index} link={link}/>)}
     </nav>
   )
 }
diff --git a/themes/medium/components/MenuBarMobile.js b/themes/medium/components/MenuBarMobile.js
@@ -30,8 +30,7 @@ export const MenuBarMobile = (props) => {
 
   return (
     <nav id='nav' className=' text-md'>
-        {/* {links.map(link => <NormalMenu key={link?.id} link={link}/>)} */}
-        {links?.map(link => <MenuItemCollapse onHeightChange={props.onHeightChange} key={link?.id} link={link}/>)}
+        {links?.map((link, index) => <MenuItemCollapse onHeightChange={props.onHeightChange} key={index} link={link}/>)}
 
     </nav>
   )

diff --git a/themes/medium/components/TopNavBar.js b/themes/medium/components/TopNavBar.js
@@ -66,7 +66,7 @@ export default function TopNavBar(props) {
 
                 {/* 桌面端顶部菜单 */}
                 <div className='hidden md:flex'>
-                    {links && links?.map(link => <MenuItemDrop key={link?.id} link={link}/>)}
+                    {links && links?.map((link, index) => <MenuItemDrop key={index} link={link}/>)}
                 </div>
             </div>
         </div>

diff --git a/themes/nav/components/MenuBarMobile.js b/themes/nav/components/MenuBarMobile.js
@@ -35,9 +35,7 @@ export const MenuBarMobile = (props) => {
 
   return (
     <nav id='nav' className=' text-md'>
-        {/* {links.map(link => <NormalMenu key={link?.id} link={link}/>)} */}
         {links?.map((link, index) => <MenuItemCollapse onHeightChange={props.onHeightChange} key={index} link={link}/>)}
-
     </nav>
   )
 }
diff --git a/themes/nav/components/MenuItem.js b/themes/nav/components/MenuItem.js
@@ -24,7 +24,7 @@ export const MenuItem = ({ link }) => {
         {/* 菜单 */}
         <div
             onClick={toggleOpenSubMenu}
-            className='nav-menu dark:text-neutral-400 text-gray-500 hover:text-black dark:hover:text-white text-sm text-gray w-full items-center duration-300 pt-2 font-light select-none flex justify-between cursor-pointer' key={link?.name}>
+            className='nav-menu dark:text-neutral-400 text-gray-500 hover:text-black dark:hover:text-white text-sm text-gray w-full items-center duration-300 pt-2 font-light select-none flex justify-between cursor-pointer' key={link?.to}>
 
             {link?.subMenus
               ? (<>

diff --git a/themes/nobelium/components/Nav.js b/themes/nobelium/components/Nav.js
@@ -104,12 +104,12 @@ const NavBar = props => {
   return (
         <div className="flex-shrink-0 flex">
             <ul className="hidden md:flex flex-row">
-                {links?.map(link => <MenuItemDrop key={link?.id} link={link} />)}
+                {links?.map((link, index) => <MenuItemDrop key={index} link={link} />)}
             </ul>
             <div className='md:hidden'>
                 <Collapse collapseRef={collapseRef} isOpen={isOpen} type='vertical' className='fixed top-16 right-6'>
                     <div className='dark:border-black bg-white dark:bg-black rounded border p-2 text-sm'>
-                        {links?.map(link => <MenuItemCollapse key={link?.id} link={link} onHeightChange={(param) => collapseRef.current?.updateCollapseHeight(param)}/>)}
+                        {links?.map((link, index) => <MenuItemCollapse key={index} link={link} onHeightChange={(param) => collapseRef.current?.updateCollapseHeight(param)}/>)}
                     </div>
                 </Collapse>
             </div>

diff --git a/themes/plog/components/BottomNav.js b/themes/plog/components/BottomNav.js
@@ -54,7 +54,7 @@ const MenuList = props => {
   return (
         <div className="flex-shrink-0">
             <ul className="hidden md:flex flex-row">
-                {links?.map(link => <MenuItemDrop key={link?.id} link={link} />)}
+                {links?.map((link, index) => <MenuItemDrop key={index} link={link} />)}
                 <li className='my-auto px-2'>
                     <FullScreenButton />
                 </li>

diff --git a/themes/plog/components/Nav.js b/themes/plog/components/Nav.js
@@ -70,12 +70,12 @@ const NavBar = props => {
   return (
         <div className="flex-shrink-0">
             <ul className=" hidden md:flex flex-row">
-                {links?.map(link => <MenuItemDrop key={link?.id} link={link} />)}
+                {links?.map((link, index) => <MenuItemDrop key={index} link={link} />)}
             </ul>
             <div className='md:hidden'><i onClick={toggleOpen} className='fas fa-bars cursor-pointer px-5 block md:hidden'></i>
                 <Collapse collapseRef={collapseRef} isOpen={isOpen} type='vertical' className='fixed top-16 right-6'>
                     <div className='dark:border-black bg-white dark:bg-black rounded border p-2 text-sm'>
-                        {links?.map(link => <MenuItemCollapse key={link?.id} link={link} onHeightChange={(param) => collapseRef.current?.updateCollapseHeight(param)} />)}
+                        {links?.map((link, index) => <MenuItemCollapse key={index} link={link} onHeightChange={(param) => collapseRef.current?.updateCollapseHeight(param)} />)}
                     </div>
                 </Collapse>
             </div>

diff --git a/themes/simple/components/MenuList.js b/themes/simple/components/MenuList.js
@@ -51,7 +51,7 @@ export const MenuList = ({ customNav, customMenu }) => {
   return (<>
         {/* 大屏模式菜单 */}
         <div id='nav-menu-pc' className='hidden md:flex my-auto'>
-            {links?.map(link => <MenuItemDrop key={link?.id} link={link} />)}
+            {links?.map((link, index) => <MenuItemDrop key={index} link={link} />)}
         </div>
         {/* 移动端小屏菜单 */}
         <div id='nav-menu-mobile' className='flex md:hidden my-auto justify-start'>
@@ -62,7 +62,7 @@ export const MenuList = ({ customNav, customMenu }) => {
 
             <Collapse collapseRef={collapseRef} className='absolute w-full top-12 left-0' isOpen={isOpen}>
                 <div id='menu-wrap' className='bg-white dark:border-hexo-black-gray border'>
-                {links?.map(link => <MenuItemCollapse key={link?.id} link={link} onHeightChange={(param) => collapseRef.current?.updateCollapseHeight(param)}/>)}
+                {links?.map((link, index) => <MenuItemCollapse key={index} link={link} onHeightChange={(param) => collapseRef.current?.updateCollapseHeight(param)}/>)}
                 </div>
             </Collapse>
         </div>