diff --git a/src/renderer/src/pages/settings/AssistantSettings/AssistantPromptSettings.tsx b/src/renderer/src/pages/settings/AssistantSettings/AssistantPromptSettings.tsx index 424e852512..9f0c7d33e7 100644 --- a/src/renderer/src/pages/settings/AssistantSettings/AssistantPromptSettings.tsx +++ b/src/renderer/src/pages/settings/AssistantSettings/AssistantPromptSettings.tsx @@ -1,11 +1,18 @@ import 'emoji-picker-element' import CloseCircleFilled from '@ant-design/icons/lib/icons/CloseCircleFilled' -import { Box, RowFlex, SpaceBetweenRowFlex } from '@cherrystudio/ui' -import { CodeEditor } from '@cherrystudio/ui' -import { Button } from '@cherrystudio/ui' +import { + Box, + Button, + CodeEditor, + Popover, + PopoverContent, + PopoverTrigger, + RowFlex, + SpaceBetweenRowFlex, + Tooltip +} from '@cherrystudio/ui' import { usePreference } from '@data/hooks/usePreference' -import { Popover, PopoverContent, PopoverTrigger, Tooltip } from '@heroui/react' import EmojiPicker from '@renderer/components/EmojiPicker' import type { RichEditorRef } from '@renderer/components/RichEditor/types' import { useCodeStyle } from '@renderer/context/CodeStyleProvider' diff --git a/src/renderer/src/pages/settings/SelectionAssistantSettings/SelectionAssistantSettings.tsx b/src/renderer/src/pages/settings/SelectionAssistantSettings/SelectionAssistantSettings.tsx index 55bdb2ed0e..ce9e208920 100644 --- a/src/renderer/src/pages/settings/SelectionAssistantSettings/SelectionAssistantSettings.tsx +++ b/src/renderer/src/pages/settings/SelectionAssistantSettings/SelectionAssistantSettings.tsx @@ -1,12 +1,11 @@ import { Button, Switch, Tooltip } from '@cherrystudio/ui' import { usePreference } from '@data/hooks/usePreference' -import { Radio, RadioGroup } from '@heroui/react' import { isMac, isWin } from '@renderer/config/constant' import { useTheme } from '@renderer/context/ThemeProvider' import { getSelectionDescriptionLabel } from '@renderer/i18n/label' import SelectionToolbar from '@renderer/windows/selection/toolbar/SelectionToolbar' import type { SelectionFilterMode, SelectionTriggerMode } from '@shared/data/preference/preferenceTypes' -import { Row, Slider } from 'antd' +import { Radio, Row, Slider } from 'antd' import { CircleHelp, Edit2 } from 'lucide-react' import type { FC } from 'react' import { useEffect, useState } from 'react' @@ -129,11 +128,7 @@ const SelectionAssistantSettings: FC = () => { {t('selection.settings.toolbar.trigger_mode.description')} - setTriggerMode(value as SelectionTriggerMode)}> + setTriggerMode(e.target.value as SelectionTriggerMode)}> {t('selection.settings.toolbar.trigger_mode.selected')} @@ -154,7 +149,7 @@ const SelectionAssistantSettings: FC = () => { }> {t('selection.settings.toolbar.trigger_mode.shortcut')} - + @@ -230,15 +225,13 @@ const SelectionAssistantSettings: FC = () => { {t('selection.settings.advanced.filter_mode.title')} {t('selection.settings.advanced.filter_mode.description')} - setFilterMode(value as SelectionFilterMode)}> + onChange={(e) => setFilterMode(e.target.value as SelectionFilterMode)}> {t('selection.settings.advanced.filter_mode.default')} {t('selection.settings.advanced.filter_mode.whitelist')} {t('selection.settings.advanced.filter_mode.blacklist')} - + {filterMode && filterMode !== 'default' && (