Merge pull request #178 from lobehub/platform-optimize

fix: Plausiable key & scrollbar
lobehub · Dec 4, 2024 · 35be185 · 35be185
2 parents a5d5797 + 15479f4
commit 35be185
Show file tree

Hide file tree

Showing 5 changed files with 14 additions and 19 deletions.
diff --git a/src/app/chat/ChatMode/ChatInfo/AgentDetail/index.tsx b/src/app/chat/ChatMode/ChatInfo/AgentDetail/index.tsx
@@ -4,7 +4,6 @@ import { Flexbox } from 'react-layout-kit';
 
 import AgentCard from '@/components/agent/AgentCard';
 import SystemRole from '@/components/agent/SystemRole';
-import { CHAT_HEADER_HEIGHT } from '@/constants/token';
 import useSessionContext from '@/hooks/useSessionContext';
 
 import EditRole from '../actions/EditRole';
@@ -17,7 +16,6 @@ const ChatInfo = () => {
   return (
     sessionAgent && (
       <AgentCard
-        style={{ height: `calc(100vh - ${CHAT_HEADER_HEIGHT}px)` }}
         agent={sessionAgent}
         actions={[
           <Flexbox horizontal justify={'space-between'} align="center" key="token-history">

diff --git a/src/app/chat/ChatMode/ChatInfo/index.tsx b/src/app/chat/ChatMode/ChatInfo/index.tsx
@@ -1,4 +1,4 @@
-import { DraggablePanel, DraggablePanelContainer } from '@lobehub/ui';
+import { DraggablePanel } from '@lobehub/ui';
 import { Skeleton, Space } from 'antd';
 import { createStyles, useResponsive } from 'antd-style';
 import isEqual from 'lodash-es/isEqual';
@@ -7,7 +7,7 @@ import { rgba } from 'polished';
 import React, { memo, useEffect, useState } from 'react';
 import { Flexbox } from 'react-layout-kit';
 
-import { SIDEBAR_WIDTH } from '@/constants/token';
+import { CHAT_HEADER_HEIGHT, SIDEBAR_WIDTH } from '@/constants/token';
 import { useGlobalStore } from '@/store/global';
 
 const AgentDetail = dynamic(() => import('./AgentDetail'), {
@@ -73,16 +73,9 @@ const ChatInfo = memo(() => {
       onExpandChange={handleExpand}
       expand={showAgentInfo}
     >
-      <DraggablePanelContainer
-        style={{
-          flex: 'none',
-          height: '100%',
-          maxHeight: '100vh',
-          minWidth: SIDEBAR_WIDTH,
-        }}
-      >
+      <div style={{ height: `calc(100vh - ${CHAT_HEADER_HEIGHT}px)`, overflowY: 'auto' }}>
         <AgentDetail />
-      </DraggablePanelContainer>
+      </div>
     </DraggablePanel>
   );
 });

diff --git a/src/app/chat/ChatMode/SideBar/SessionList/index.tsx b/src/app/chat/ChatMode/SideBar/SessionList/index.tsx
@@ -18,7 +18,6 @@ const List = dynamic(() => import('./List'), {
 
 const useStyles = createStyles(({ css, token, prefixCls }) => ({
   session: css`
-    overflow-y: auto;
     height: 100%;
   `,
   list: css`

diff --git a/src/app/chat/ChatMode/SideBar/index.tsx b/src/app/chat/ChatMode/SideBar/index.tsx
@@ -6,7 +6,7 @@ import isEqual from 'lodash-es/isEqual';
 import { rgba } from 'polished';
 import { memo, useEffect, useState } from 'react';
 
-import { SIDEBAR_WIDTH } from '@/constants/token';
+import { CHAT_HEADER_HEIGHT, SIDEBAR_WIDTH } from '@/constants/token';
 import { useGlobalStore } from '@/store/global';
 
 import SessionList from './SessionList';
@@ -58,7 +58,9 @@ const SideBar = memo(() => {
       onExpandChange={handleExpand}
       expand={showSessionList}
     >
-      <SessionList />
+      <div style={{ height: `calc(100vh - ${CHAT_HEADER_HEIGHT}px)`, overflowY: 'auto' }}>
+        <SessionList />
+      </div>
     </DraggablePanel>
   );
 });

diff --git a/src/components/Analytics/index.tsx b/src/components/Analytics/index.tsx
@@ -1,5 +1,3 @@
-import { siteUrl } from '@/server/utils/url';
-
 import Google from './Google';
 import Plausible from './Plausible';
 import Vercel from './Vercel';
@@ -9,7 +7,12 @@ const Analytics = () => {
     <>
       {<Vercel />}
       {<Google />}
-      {<Plausible scriptBaseUrl={process.env.PLAUSIBLE_SCRIPT_BASE_URL} domain={siteUrl} />}
+      {
+        <Plausible
+          scriptBaseUrl={process.env.PLAUSIBLE_SCRIPT_BASE_URL}
+          domain={process.env.PLAUSIBLE_DOMAIN}
+        />
+      }
     </>
   );
 };