Northern_Lights/cherry-studio
1
0
Fork 0
mirror of https://github.com/CherryHQ/cherry-studio.git synced 2026-01-06 21:35:52 +08:00
Code Issues Actions 3 Packages Projects Releases Wiki Activity

fix: do not exit on emoji picker (#8702)

Browse Source 
* fix: do not exit on emoji picker

* fix: emoji picker in default assistant setting
This commit is contained in:
one 2025-07-31 10:31:12 +08:00 committed by GitHub
parent eb4f218c7d
commit 6d0867c27d
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/renderer/src/pages/agents/components/AddAgentPopup.tsx
View File

@ -199,7 +199,8 @@ const PopupContainer: React.FC<Props> = ({ resolve }) => {
}} }}
/> />
} }
arrow> arrow
trigger="click">
<Button icon={emoji && <span style={{ fontSize: 20 }}>{emoji}</span>}>{t('common.select')}</Button> <Button icon={emoji && <span style={{ fontSize: 20 }}>{emoji}</span>}>{t('common.select')}</Button>
</Popover> </Popover>
</Form.Item> </Form.Item>

2
src/renderer/src/pages/settings/ModelSettings/DefaultAssistantSettings.tsx
View File

@ -109,7 +109,7 @@ const AssistantSettings: FC = () => {
theme={theme}> theme={theme}>
<SettingSubtitle style={{ marginTop: 0 }}>{t('common.name')}</SettingSubtitle> <SettingSubtitle style={{ marginTop: 0 }}>{t('common.name')}</SettingSubtitle>
<HStack gap={8} alignItems="center"> <HStack gap={8} alignItems="center">
<Popover content={<EmojiPicker onEmojiClick={handleEmojiSelect} />} arrow> <Popover content={<EmojiPicker onEmojiClick={handleEmojiSelect} />} arrow trigger="click">
<EmojiButtonWrapper> <EmojiButtonWrapper>
<Button style={{ fontSize: 20, padding: '4px', minWidth: '30px', height: '30px' }}>{emoji}</Button> <Button style={{ fontSize: 20, padding: '4px', minWidth: '30px', height: '30px' }}>{emoji}</Button>
{emoji && ( {emoji && (