From 8d23c810fe01e3639670f1d5f1b107133e4ab187 Mon Sep 17 00:00:00 2001
From: kangfenmao <kangfenmao@qq.com>
Date: Fri, 13 Jun 2025 20:44:08 +0800
Subject: [PATCH] refactor(App, MainSidebar, OpenedMinapps): streamline
 component code and enhance layout

- Simplified the handleClick function in App component by removing unnecessary line breaks.
- Adjusted MainMenu component in MainSidebar to remove inline margin styling for cleaner layout.
- Updated OpenedMinapps to apply margin styling directly to TabsContainer for improved spacing.
- Removed the PinnedApps component to declutter the sidebar and enhance performance.
---
 src/renderer/src/pages/apps/App.tsx           |  4 +-
 .../pages/home/MainSidebar/MainSidebar.tsx    |  2 +-
 .../pages/home/MainSidebar/OpenedMinapps.tsx  |  2 +-
 .../src/pages/home/MainSidebar/PinnedApps.tsx | 67 -------------------
 4 files changed, 3 insertions(+), 72 deletions(-)
 delete mode 100644 src/renderer/src/pages/home/MainSidebar/PinnedApps.tsx

diff --git a/src/renderer/src/pages/apps/App.tsx b/src/renderer/src/pages/apps/App.tsx
index f03e5f934d..0c4c46951e 100644
--- a/src/renderer/src/pages/apps/App.tsx
+++ b/src/renderer/src/pages/apps/App.tsx
@@ -29,9 +29,7 @@ const App: FC<Props> = ({ app, onClick, size = 60, isLast }) => {
 
   const handleClick = () => {
     if (!isHome) {
-      setTimeout(() => {
-        navigate('/')
-      }, 300)
+      setTimeout(() => navigate('/'), 300)
     }
 
     openMinappKeepAlive(app)
diff --git a/src/renderer/src/pages/home/MainSidebar/MainSidebar.tsx b/src/renderer/src/pages/home/MainSidebar/MainSidebar.tsx
index 57c5a22a6f..984595d206 100644
--- a/src/renderer/src/pages/home/MainSidebar/MainSidebar.tsx
+++ b/src/renderer/src/pages/home/MainSidebar/MainSidebar.tsx
@@ -173,7 +173,7 @@ const MainSidebar: FC = () => {
         overflow: showAssistants ? 'initial' : 'hidden'
       }}>
       <MainNavbar />
-      <MainMenu style={{ marginBottom: 4 }}>
+      <MainMenu>
         <MainMenuItem active={isAppMenuExpanded} onClick={() => setIsAppMenuExpanded(!isAppMenuExpanded)}>
           <MainMenuItemLeft>
             <MainMenuItemIcon>
diff --git a/src/renderer/src/pages/home/MainSidebar/OpenedMinapps.tsx b/src/renderer/src/pages/home/MainSidebar/OpenedMinapps.tsx
index 87023187ef..8aa94d5455 100644
--- a/src/renderer/src/pages/home/MainSidebar/OpenedMinapps.tsx
+++ b/src/renderer/src/pages/home/MainSidebar/OpenedMinapps.tsx
@@ -81,7 +81,7 @@ const OpenedMinapps: FC = () => {
   if (!isShowApps) return <TabsContainer className="TabsContainer" />
 
   return (
-    <TabsContainer className="TabsContainer">
+    <TabsContainer className="TabsContainer" style={{ marginBottom: 4 }}>
       <Divider />
       <TabsWrapper>
         <DragableList
diff --git a/src/renderer/src/pages/home/MainSidebar/PinnedApps.tsx b/src/renderer/src/pages/home/MainSidebar/PinnedApps.tsx
deleted file mode 100644
index ab77cd2893..0000000000
--- a/src/renderer/src/pages/home/MainSidebar/PinnedApps.tsx
+++ /dev/null
@@ -1,67 +0,0 @@
-import DragableList from '@renderer/components/DragableList'
-import MinAppIcon from '@renderer/components/Icons/MinAppIcon'
-import { useMinappPopup } from '@renderer/hooks/useMinappPopup'
-import { useMinapps } from '@renderer/hooks/useMinapps'
-import { useRuntime } from '@renderer/hooks/useRuntime'
-import type { MenuProps } from 'antd'
-import { Dropdown } from 'antd'
-import { isEmpty } from 'lodash'
-import { FC } from 'react'
-import { useTranslation } from 'react-i18next'
-import styled from 'styled-components'
-
-import { MainMenuItem, MainMenuItemIcon, MainMenuItemLeft, MainMenuItemText } from './MainSidebarStyles'
-
-const PinnedApps: FC = () => {
-  const { pinned, updatePinnedMinapps } = useMinapps()
-  const { t } = useTranslation()
-  const { openMinappKeepAlive } = useMinappPopup()
-  const { openedKeepAliveMinapps } = useRuntime()
-
-  if (isEmpty(pinned)) {
-    return null
-  }
-
-  return (
-    <div style={{ marginBottom: -10 }}>
-      <Divider style={{ marginBottom: 5, marginTop: 5 }} />
-      <DragableList list={pinned} onUpdate={updatePinnedMinapps} listStyle={{ margin: '5px 0', marginBottom: 0 }}>
-        {(app) => {
-          const menuItems: MenuProps['items'] = [
-            {
-              key: 'togglePin',
-              label: t('minapp.sidebar.remove.title'),
-              onClick: () => {
-                const newPinned = pinned.filter((item) => item.id !== app.id)
-                updatePinnedMinapps(newPinned)
-              }
-            }
-          ]
-
-          return (
-            <Dropdown menu={{ items: menuItems }} trigger={['contextMenu']} overlayStyle={{ zIndex: 10000 }}>
-              <MainMenuItem key={app.id} onClick={() => openMinappKeepAlive(app)}>
-                <MainMenuItemLeft>
-                  <MainMenuItemIcon>
-                    <MinAppIcon size={22} app={app} style={{ borderRadius: 6 }} sidebar />
-                  </MainMenuItemIcon>
-                  <MainMenuItemText>{app.name}</MainMenuItemText>
-                </MainMenuItemLeft>
-              </MainMenuItem>
-            </Dropdown>
-          )
-        }}
-      </DragableList>
-      {isEmpty(openedKeepAliveMinapps) && <Divider style={{ marginBottom: 5, marginTop: 5 }} />}
-    </div>
-  )
-}
-
-const Divider = styled.div`
-  width: 100%;
-  height: 1px;
-  background-color: var(--color-border);
-  opacity: 0.5;
-`
-
-export default PinnedApps