From d2ca6f10410ace3ae003f0c7a6310f0c6dbe124a Mon Sep 17 00:00:00 2001
From: kangfenmao <kangfenmao@qq.com>
Date: Tue, 12 Nov 2024 19:18:29 +0800
Subject: [PATCH] feat: add new button to inputbar component and remove
 unnecessary toolbar button

---
 .../src/pages/home/Inputbar/Inputbar.tsx      |  6 ++++
 .../src/pages/home/Inputbar/TokenCount.tsx    | 29 +++++++------------
 2 files changed, 17 insertions(+), 18 deletions(-)

diff --git a/src/renderer/src/pages/home/Inputbar/Inputbar.tsx b/src/renderer/src/pages/home/Inputbar/Inputbar.tsx
index 756e4c62..ecaa84a2 100644
--- a/src/renderer/src/pages/home/Inputbar/Inputbar.tsx
+++ b/src/renderer/src/pages/home/Inputbar/Inputbar.tsx
@@ -7,6 +7,7 @@ import {
   PauseCircleOutlined,
   QuestionCircleOutlined
 } from '@ant-design/icons'
+import { PicCenterOutlined } from '@ant-design/icons'
 import { documentExts, imageExts, textExts } from '@renderer/config/constant'
 import { isVisionModel } from '@renderer/config/models'
 import db from '@renderer/databases'
@@ -342,6 +343,11 @@ const Inputbar: FC<Props> = ({ assistant, setActiveTopic }) => {
               </ToolbarButton>
             </Tooltip>
             <AttachmentButton model={model} files={files} setFiles={setFiles} ToolbarButton={ToolbarButton} />
+            <ToolbarButton type="text" onClick={onNewContext}>
+              <Tooltip placement="top" title={t('chat.input.new.context')}>
+                <PicCenterOutlined />
+              </Tooltip>
+            </ToolbarButton>
             <Tooltip placement="top" title={expended ? t('chat.input.collapse') : t('chat.input.expand')} arrow>
               <ToolbarButton type="text" onClick={onToggleExpended}>
                 {expended ? <FullscreenExitOutlined /> : <FullscreenOutlined />}
diff --git a/src/renderer/src/pages/home/Inputbar/TokenCount.tsx b/src/renderer/src/pages/home/Inputbar/TokenCount.tsx
index 8d142185..0a8209db 100644
--- a/src/renderer/src/pages/home/Inputbar/TokenCount.tsx
+++ b/src/renderer/src/pages/home/Inputbar/TokenCount.tsx
@@ -1,7 +1,7 @@
-import { ArrowUpOutlined, MenuOutlined, PicCenterOutlined } from '@ant-design/icons'
+import { ArrowUpOutlined, MenuOutlined } from '@ant-design/icons'
 import { HStack, VStack } from '@renderer/components/Layout'
 import { useSettings } from '@renderer/hooks/useSettings'
-import { Divider, Popover, Tooltip } from 'antd'
+import { Divider, Popover } from 'antd'
 import { FC } from 'react'
 import { useTranslation } from 'react-i18next'
 import styled from 'styled-components'
@@ -13,7 +13,7 @@ type Props = {
   ToolbarButton: any
 } & React.HTMLAttributes<HTMLDivElement>
 
-const TokenCount: FC<Props> = ({ estimateTokenCount, inputTokenCount, contextCount, ToolbarButton, ...props }) => {
+const TokenCount: FC<Props> = ({ estimateTokenCount, inputTokenCount, contextCount }) => {
   const { t } = useTranslation()
   const { showInputEstimatedTokens } = useSettings()
 
@@ -38,21 +38,14 @@ const TokenCount: FC<Props> = ({ estimateTokenCount, inputTokenCount, contextCou
   }
 
   return (
-    <>
-      <ToolbarButton type="text" onClick={props.onClick}>
-        <Tooltip placement="top" title={t('chat.input.new.context')}>
-          <PicCenterOutlined />
-        </Tooltip>
-      </ToolbarButton>
-      <Container>
-        <Popover content={PopoverContent}>
-          <MenuOutlined /> {contextCount}
-          <Divider type="vertical" style={{ marginTop: 0, marginLeft: 5, marginRight: 5 }} />
-          <ArrowUpOutlined />
-          {inputTokenCount} / {estimateTokenCount}
-        </Popover>
-      </Container>
-    </>
+    <Container>
+      <Popover content={PopoverContent}>
+        <MenuOutlined /> {contextCount}
+        <Divider type="vertical" style={{ marginTop: 0, marginLeft: 5, marginRight: 5 }} />
+        <ArrowUpOutlined />
+        {inputTokenCount} / {estimateTokenCount}
+      </Popover>
+    </Container>
   )
 }