From ffe897d58c9e1bd822d9533763b5b2e065159efd Mon Sep 17 00:00:00 2001 From: fullex <0xfullex@gmail.com> Date: Tue, 16 Sep 2025 11:56:10 +0800 Subject: [PATCH] chore: update yarn.lock and refactor SettingsTab component - Added "@typescript-eslint/visitor-keys@npm:8.43.0" to yarn.lock. - Refactored getVirtualIndexes in DraggableVirtualList to use item.index. - Replaced useSettings with usePreference for codeFancyBlock in SettingsTab. - Updated Switch component to use setCodeFancyBlock directly. --- .../DraggableList/virtual-list.tsx | 2 +- .../src/pages/home/Tabs/SettingsTab.tsx | 14 ++----------- yarn.lock | 20 +++++++++---------- 3 files changed, 13 insertions(+), 23 deletions(-) diff --git a/packages/ui/src/components/interactive/DraggableList/virtual-list.tsx b/packages/ui/src/components/interactive/DraggableList/virtual-list.tsx index 0ce148eee5..a792697197 100644 --- a/packages/ui/src/components/interactive/DraggableList/virtual-list.tsx +++ b/packages/ui/src/components/interactive/DraggableList/virtual-list.tsx @@ -122,7 +122,7 @@ function DraggableVirtualList({ resizeItem: (index, size) => virtualizer.resizeItem(index, size), getTotalSize: () => virtualizer.getTotalSize(), getVirtualItems: () => virtualizer.getVirtualItems(), - getVirtualIndexes: () => virtualizer.getVirtualIndexes() + getVirtualIndexes: () => virtualizer.getVirtualItems().map((item) => item.index) }), [virtualizer] ) diff --git a/src/renderer/src/pages/home/Tabs/SettingsTab.tsx b/src/renderer/src/pages/home/Tabs/SettingsTab.tsx index b85b525761..c5630da836 100644 --- a/src/renderer/src/pages/home/Tabs/SettingsTab.tsx +++ b/src/renderer/src/pages/home/Tabs/SettingsTab.tsx @@ -11,14 +11,11 @@ import { useCodeStyle } from '@renderer/context/CodeStyleProvider' import { useTheme } from '@renderer/context/ThemeProvider' import { useAssistant } from '@renderer/hooks/useAssistant' import { useProvider } from '@renderer/hooks/useProvider' -import { useSettings } from '@renderer/hooks/useSettings' import useTranslate from '@renderer/hooks/useTranslate' import { SettingDivider, SettingRow, SettingRowTitle } from '@renderer/pages/settings' import AssistantSettingsPopup from '@renderer/pages/settings/AssistantSettings' import { CollapsibleSettingGroup } from '@renderer/pages/settings/SettingGroup' import { getDefaultModel } from '@renderer/services/AssistantService' -import { useAppDispatch } from '@renderer/store' -import { setCodeFancyBlock } from '@renderer/store/settings' import { Assistant, AssistantSettings, CodeStyleVarious, MathEngine } from '@renderer/types' import { modalConfirm } from '@renderer/utils' import { getSendMessageShortcutLabel } from '@renderer/utils/input' @@ -85,6 +82,7 @@ const SettingsTab: FC = (props) => { enabled: 'chat.code.execution.enabled', timeoutMinutes: 'chat.code.execution.timeout_minutes' }) + const [codeFancyBlock, setCodeFancyBlock] = usePreference('chat.code.fancy_block') const { assistant, updateAssistantSettings } = useAssistant(props.assistant.id) const { provider } = useProvider(assistant.model.provider) @@ -103,10 +101,6 @@ const SettingsTab: FC = (props) => { const { t } = useTranslation() - const dispatch = useAppDispatch() - - const { codeFancyBlock } = useSettings() - const onUpdateAssistantSettings = (settings: Partial) => { updateAssistantSettings(settings) } @@ -446,11 +440,7 @@ const SettingsTab: FC = (props) => { {t('chat.settings.code_fancy_block.label')} - dispatch(setCodeFancyBlock(checked))} - /> + setCodeFancyBlock(checked)} /> diff --git a/yarn.lock b/yarn.lock index bcaacacf07..657e6ce5a6 100644 --- a/yarn.lock +++ b/yarn.lock @@ -14051,6 +14051,16 @@ __metadata: languageName: node linkType: hard +"@typescript-eslint/visitor-keys@npm:8.43.0": + version: 8.43.0 + resolution: "@typescript-eslint/visitor-keys@npm:8.43.0" + dependencies: + "@typescript-eslint/types": "npm:8.43.0" + eslint-visitor-keys: "npm:^4.2.1" + checksum: 10c0/5d576eaf7bea41933ba726f4b24410bd3fc2521ef286967c3dc630c6a90fabff2a2d7c4d12cb841d3f946d2e5e6fb2605e7edd84e3360308fe379dbf2b8dc2fa + languageName: node + linkType: hard + "@typescript/native-preview-darwin-arm64@npm:7.0.0-dev.20250915.1": version: 7.0.0-dev.20250915.1 resolution: "@typescript/native-preview-darwin-arm64@npm:7.0.0-dev.20250915.1" @@ -14132,16 +14142,6 @@ __metadata: languageName: node linkType: hard -"@typescript-eslint/visitor-keys@npm:8.43.0": - version: 8.43.0 - resolution: "@typescript-eslint/visitor-keys@npm:8.43.0" - dependencies: - "@typescript-eslint/types": "npm:8.43.0" - eslint-visitor-keys: "npm:^4.2.1" - checksum: 10c0/5d576eaf7bea41933ba726f4b24410bd3fc2521ef286967c3dc630c6a90fabff2a2d7c4d12cb841d3f946d2e5e6fb2605e7edd84e3360308fe379dbf2b8dc2fa - languageName: node - linkType: hard - "@uiw/codemirror-extensions-basic-setup@npm:4.25.1": version: 4.25.1 resolution: "@uiw/codemirror-extensions-basic-setup@npm:4.25.1"