From b42d9fd025ca4711f5162ac3e8c6868f4be5cf97 Mon Sep 17 00:00:00 2001
From: moonrailgun <moonrailgun@gmail.com>
Date: Thu, 6 Jul 2023 14:49:06 +0800
Subject: [PATCH] refactor: change custom panel position "navbar-group" render
 position

---
 client/web/src/routes/Main/Navbar/GroupNav.tsx | 8 ++++++++
 client/web/src/routes/Main/Navbar/index.tsx    | 8 +-------
 2 files changed, 9 insertions(+), 7 deletions(-)

diff --git a/client/web/src/routes/Main/Navbar/GroupNav.tsx b/client/web/src/routes/Main/Navbar/GroupNav.tsx
index b0c4382c..b842556f 100644
--- a/client/web/src/routes/Main/Navbar/GroupNav.tsx
+++ b/client/web/src/routes/Main/Navbar/GroupNav.tsx
@@ -13,6 +13,8 @@ import {
 import { NavbarNavItem } from './NavItem';
 import { Dropdown } from 'antd';
 import { useGroupUnreadState } from '@/hooks/useGroupUnreadState';
+import { pluginCustomPanel } from '@/plugin/common';
+import { NavbarCustomNavItem } from './CustomNavItem';
 
 /**
  * 群组导航栏栏项
@@ -99,6 +101,12 @@ export const GroupNav: React.FC = React.memo(() => {
           <Icon className="text-3xl text-white" icon="mdi:plus" />
         </NavbarNavItem>
       )}
+
+      {pluginCustomPanel
+        .filter((p) => p.position === 'navbar-group')
+        .map((p) => (
+          <NavbarCustomNavItem key={p.name} panelInfo={p} withBg={true} />
+        ))}
     </div>
   );
 });
diff --git a/client/web/src/routes/Main/Navbar/index.tsx b/client/web/src/routes/Main/Navbar/index.tsx
index a761d3b6..d9dbb7c0 100644
--- a/client/web/src/routes/Main/Navbar/index.tsx
+++ b/client/web/src/routes/Main/Navbar/index.tsx
@@ -43,17 +43,11 @@ export const Navbar: React.FC = React.memo(() => {
         <div className="overflow-y-hidden hover:overflow-y-smart scroll overflow-x-hidden thin-scrollbar">
           <GroupNav />
         </div>
-
-        {pluginCustomPanel
-          .filter((p) => p.position === 'navbar-group')
-          .map((p) => (
-            <NavbarCustomNavItem key={p.name} panelInfo={p} withBg={true} />
-          ))}
       </div>
 
       <div
         data-tc-role="navbar-settings"
-        className="flex flex-col items-center space-y-2"
+        className="flex flex-col items-center space-y-2 pt-3"
       >
         {pluginCustomPanel
           .filter((p) => p.position === 'navbar-more')