From 424f86122544c47e1919bab73f522c6957f31bd8 Mon Sep 17 00:00:00 2001
From: moonrailgun <moonrailgun@gmail.com>
Date: Fri, 3 Nov 2023 00:29:18 +0800
Subject: [PATCH] refactor: change position of search message button

---
 .../src/components/Panel/group/TextPanel.tsx  | 24 ++++++++---------
 .../Panel/personal/ConversePanel.tsx          | 26 +++++++++----------
 2 files changed, 25 insertions(+), 25 deletions(-)

diff --git a/client/web/src/components/Panel/group/TextPanel.tsx b/client/web/src/components/Panel/group/TextPanel.tsx
index 5f181453900..d5cc78a61ff 100644
--- a/client/web/src/components/Panel/group/TextPanel.tsx
+++ b/client/web/src/components/Panel/group/TextPanel.tsx
@@ -120,30 +120,30 @@ export const TextPanel: React.FC<TextPanelProps> = React.memo(
         ]}
         suffixActions={({ setRightPanel }) => [
           <IconBtn
-            key="members"
-            title={t('成员列表')}
+            key="search"
+            title={t('聊天记录搜索')}
             shape="square"
-            icon="mdi:account-supervisor-outline"
+            icon="mdi:text-search"
             iconClassName="text-2xl"
             onClick={() =>
               setRightPanel({
-                name: t('成员') + ` (${groupMembers.length})`,
-                panel: <MembersPanel groupId={groupId} />,
+                name: t('聊天记录'),
+                panel: (
+                  <MessageSearchPanel groupId={groupId} converseId={panelId} />
+                ),
               })
             }
           />,
           <IconBtn
-            key="search"
-            title={t('聊天记录搜索')}
+            key="members"
+            title={t('成员列表')}
             shape="square"
-            icon="mdi:text-search"
+            icon="mdi:account-supervisor-outline"
             iconClassName="text-2xl"
             onClick={() =>
               setRightPanel({
-                name: t('聊天记录'),
-                panel: (
-                  <MessageSearchPanel groupId={groupId} converseId={panelId} />
-                ),
+                name: t('成员') + ` (${groupMembers.length})`,
+                panel: <MembersPanel groupId={groupId} />,
               })
             }
           />,
diff --git a/client/web/src/components/Panel/personal/ConversePanel.tsx b/client/web/src/components/Panel/personal/ConversePanel.tsx
index 6e930da9d95..077e209c377 100644
--- a/client/web/src/components/Panel/personal/ConversePanel.tsx
+++ b/client/web/src/components/Panel/personal/ConversePanel.tsx
@@ -120,6 +120,19 @@ export const ConversePanel: React.FC<ConversePanelProps> = React.memo(
                 }
               />
             ),
+            <IconBtn
+              key="search"
+              title={t('聊天记录搜索')}
+              shape="square"
+              icon="mdi:text-search"
+              iconClassName="text-2xl"
+              onClick={() =>
+                setRightPanel({
+                  name: t('聊天记录'),
+                  panel: <MessageSearchPanel converseId={converseId} />,
+                })
+              }
+            />,
             // 当成员数大于2时，显示成员列表按钮
             converse.members.length > 2 && (
               <IconBtn
@@ -136,19 +149,6 @@ export const ConversePanel: React.FC<ConversePanelProps> = React.memo(
                 }
               />
             ),
-            <IconBtn
-              key="search"
-              title={t('聊天记录搜索')}
-              shape="square"
-              icon="mdi:text-search"
-              iconClassName="text-2xl"
-              onClick={() =>
-                setRightPanel({
-                  name: t('聊天记录'),
-                  panel: <MessageSearchPanel converseId={converseId} />,
-                })
-              }
-            />,
           ]);
         }}
       >