mirror of
https://github.com/CherryHQ/cherry-studio.git
synced 2025-12-22 00:13:09 +08:00
refactor(EmojiIcon): enhance EmojiIcon component to accept size and fontSize props for better customization; update styles accordingly.
fix(AddAssistantPopup): adjust body padding for improved layout consistency. style(Messages): modify padding in ScrollContainer for better spacing; add missing line for groupedMessages. style(Prompt): update padding and margin for improved layout aesthetics.
This commit is contained in:
parent
3eb6d08b34
commit
ba21a2c5fa
3
.vscode/settings.json
vendored
3
.vscode/settings.json
vendored
@ -1,7 +1,8 @@
|
|||||||
{
|
{
|
||||||
"editor.formatOnSave": true,
|
"editor.formatOnSave": true,
|
||||||
"editor.codeActionsOnSave": {
|
"editor.codeActionsOnSave": {
|
||||||
"source.fixAll.eslint": "explicit"
|
"source.fixAll.eslint": "explicit",
|
||||||
|
"source.organizeImports": "explicit"
|
||||||
},
|
},
|
||||||
"search.exclude": {
|
"search.exclude": {
|
||||||
"**/dist/**": true,
|
"**/dist/**": true,
|
||||||
|
|||||||
@ -4,26 +4,28 @@ import styled from 'styled-components'
|
|||||||
interface EmojiIconProps {
|
interface EmojiIconProps {
|
||||||
emoji: string
|
emoji: string
|
||||||
className?: string
|
className?: string
|
||||||
|
size?: number
|
||||||
|
fontSize?: number
|
||||||
}
|
}
|
||||||
|
|
||||||
const EmojiIcon: FC<EmojiIconProps> = ({ emoji, className }) => {
|
const EmojiIcon: FC<EmojiIconProps> = ({ emoji, className, size = 26, fontSize = 15 }) => {
|
||||||
return (
|
return (
|
||||||
<Container className={className}>
|
<Container className={className} $size={size} $fontSize={fontSize}>
|
||||||
<EmojiBackground>{emoji || '⭐️'}</EmojiBackground>
|
<EmojiBackground>{emoji || '⭐️'}</EmojiBackground>
|
||||||
{emoji}
|
{emoji}
|
||||||
</Container>
|
</Container>
|
||||||
)
|
)
|
||||||
}
|
}
|
||||||
|
|
||||||
const Container = styled.div`
|
const Container = styled.div<{ $size: number; $fontSize: number }>`
|
||||||
width: 26px;
|
width: ${({ $size }) => $size}px;
|
||||||
height: 26px;
|
height: ${({ $size }) => $size}px;
|
||||||
border-radius: 13px;
|
border-radius: ${({ $size }) => $size / 2}px;
|
||||||
display: flex;
|
display: flex;
|
||||||
align-items: center;
|
align-items: center;
|
||||||
justify-content: center;
|
justify-content: center;
|
||||||
flex-shrink: 0;
|
flex-shrink: 0;
|
||||||
font-size: 15px;
|
font-size: ${({ $fontSize }) => $fontSize}px;
|
||||||
position: relative;
|
position: relative;
|
||||||
overflow: hidden;
|
overflow: hidden;
|
||||||
margin-right: 3px;
|
margin-right: 3px;
|
||||||
|
|||||||
@ -157,6 +157,9 @@ const PopupContainer: React.FC<Props> = ({ resolve }) => {
|
|||||||
padding: 0,
|
padding: 0,
|
||||||
overflow: 'hidden',
|
overflow: 'hidden',
|
||||||
paddingBottom: 20
|
paddingBottom: 20
|
||||||
|
},
|
||||||
|
body: {
|
||||||
|
padding: 0
|
||||||
}
|
}
|
||||||
}}
|
}}
|
||||||
closeIcon={null}
|
closeIcon={null}
|
||||||
|
|||||||
@ -275,6 +275,7 @@ const Messages: React.FC<MessagesProps> = ({ assistant, topic, setActiveTopic, o
|
|||||||
}, [onComponentUpdate])
|
}, [onComponentUpdate])
|
||||||
|
|
||||||
const groupedMessages = useMemo(() => Object.entries(getGroupedMessages(displayMessages)), [displayMessages])
|
const groupedMessages = useMemo(() => Object.entries(getGroupedMessages(displayMessages)), [displayMessages])
|
||||||
|
|
||||||
return (
|
return (
|
||||||
<MessagesContainer
|
<MessagesContainer
|
||||||
id="messages"
|
id="messages"
|
||||||
@ -372,7 +373,7 @@ const LoaderContainer = styled.div`
|
|||||||
const ScrollContainer = styled.div`
|
const ScrollContainer = styled.div`
|
||||||
display: flex;
|
display: flex;
|
||||||
flex-direction: column-reverse;
|
flex-direction: column-reverse;
|
||||||
padding: 20px 10px 20px 16px;
|
padding: 10px 16px 20px;
|
||||||
.multi-select-mode & {
|
.multi-select-mode & {
|
||||||
padding-bottom: 60px;
|
padding-bottom: 60px;
|
||||||
}
|
}
|
||||||
|
|||||||
@ -30,11 +30,12 @@ const Prompt: FC<Props> = ({ assistant, topic }) => {
|
|||||||
}
|
}
|
||||||
|
|
||||||
const Container = styled.div<{ $isDark: boolean }>`
|
const Container = styled.div<{ $isDark: boolean }>`
|
||||||
padding: 10px 16px;
|
padding: 11px 16px;
|
||||||
border-radius: 10px;
|
border-radius: 10px;
|
||||||
cursor: pointer;
|
cursor: pointer;
|
||||||
border: 0.5px solid var(--color-border);
|
border: 0.5px solid var(--color-border);
|
||||||
margin: 10px 10px 0 10px;
|
margin: 15px 20px;
|
||||||
|
margin-bottom: 0;
|
||||||
`
|
`
|
||||||
|
|
||||||
const Text = styled.div`
|
const Text = styled.div`
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user