dennii/Termix
1
0
Fork 0
Code Issues Pull Requests 2 Actions Packages Projects Releases 22 Wiki Activity

FIX: Enable scrollbars in CodeMirror editors and complete missing i18n

Browse Source 
CodeMirror Scrollbar Fixes:
- Add EditorView.theme configurations with overflow: auto for .cm-scroller
- Configure scrollPastEnd: false in basicSetup for all CodeMirror instances
- Fix FileViewer, CredentialEditor, HostManagerEditor, and FileManagerFileEditor
- Ensure proper height: 100% styling for editor containers

i18n Completion:
- Add missing "movedItems" translation key for file move operations
- English: "Moved {{count}} items"
- Chinese: "已移动 {{count}} 个项目"

🤖 Generated with [Claude Code](https://claude.ai/code)

Co-Authored-By: Claude <noreply@anthropic.com>
This commit is contained in:
ZacharyZcR
2025-09-25 07:35:28 +08:00
parent dad9282dfa
commit c7f86d5ac8
6 changed files with 72 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
src/locales/en/translation.json
View File

@@ -737,6 +737,7 @@
"deleteFiles": "Delete {{count}} items",
"filesCopiedToClipboard": "{{count}} items copied to clipboard",
"filesCutToClipboard": "{{count}} items cut to clipboard",
"movedItems": "Moved {{count}} items",
"failedToDeleteItem": "Failed to delete item",
"itemRenamedSuccessfully": "{{type}} renamed successfully",
"failedToRenameItem": "Failed to rename item",

1
src/locales/zh/translation.json
View File

@@ -760,6 +760,7 @@
"deleteFiles": "删除 {{count}} 个项目",
"filesCopiedToClipboard": "{{count}} 个项目已复制到剪贴板",
"filesCutToClipboard": "{{count}} 个项目已剪切到剪贴板",
"movedItems": "已移动 {{count}} 个项目",
"failedToDeleteItem": "删除项目失败",
"itemRenamedSuccessfully": "{{type}}重命名成功",
"failedToRenameItem": "重命名项目失败",

17
src/ui/Desktop/Apps/Credentials/CredentialEditor.tsx
View File

@@ -30,6 +30,7 @@ import {
import { useTranslation } from "react-i18next";
import CodeMirror from "@uiw/react-codemirror";
import { oneDark } from "@codemirror/theme-one-dark";
import { EditorView } from "@codemirror/view";
import type {
Credential,
CredentialEditorProps,
@@ -934,7 +935,15 @@ export function CredentialEditor({
allowMultipleSelections: false,
highlightSelectionMatches: false,
searchKeymap: false,
scrollPastEnd: false,
}}
extensions={[
EditorView.theme({
".cm-scroller": {
overflow: "auto",
},
}),
]}
/>
</FormControl>
{detectedKeyType && (
@@ -1089,7 +1098,15 @@ export function CredentialEditor({
allowMultipleSelections: false,
highlightSelectionMatches: false,
searchKeymap: false,
scrollPastEnd: false,
}}
extensions={[
EditorView.theme({
".cm-scroller": {
overflow: "auto",
},
}),
]}
/>
</FormControl>
<div className="text-xs text-muted-foreground mt-1">

12
src/ui/Desktop/Apps/File Manager/FileManagerFileEditor.tsx
View File

@@ -320,16 +320,26 @@ export function FileManagerFileEditor({
EditorView.theme({
"&": {
backgroundColor: "var(--color-dark-bg-darkest) !important",
height: "100%",
},
".cm-gutters": {
backgroundColor: "var(--color-dark-bg) !important",
},
".cm-scroller": {
overflow: "auto",
},
".cm-editor": {
height: "100%",
},
}),
]}
onChange={(value: any) => onContentChange(value)}
theme={undefined}
height="100%"
basicSetup={{ lineNumbers: true }}
basicSetup={{
lineNumbers: true,
scrollPastEnd: false,
}}
className="min-h-full min-w-full flex-1"
/>
</div>

41
src/ui/Desktop/Apps/File Manager/components/FileViewer.tsx
View File

@@ -51,6 +51,7 @@ import { Input } from "@/components/ui/input";
import CodeMirror from "@uiw/react-codemirror";
import { oneDark } from "@codemirror/theme-one-dark";
import { languages, loadLanguage } from "@uiw/codemirror-extensions-langs";
import { EditorView } from "@codemirror/view";
interface FileItem {
name: string;
@@ -769,11 +770,22 @@ export function FileViewer({
<CodeMirror
value={editedContent}
onChange={(value) => handleContentChange(value)}
extensions={
getLanguageExtension(file.name)
extensions={[
...(getLanguageExtension(file.name)
? [getLanguageExtension(file.name)!]
: []
}
: []),
EditorView.theme({
"&": {
height: "100%",
},
".cm-scroller": {
overflow: "auto",
},
".cm-editor": {
height: "100%",
},
}),
]}
theme="dark"
basicSetup={{
lineNumbers: true,
@@ -785,6 +797,7 @@ export function FileViewer({
closeBrackets: true,
autocompletion: true,
highlightSelectionMatches: false,
scrollPastEnd: false,
}}
className="h-full overflow-auto"
readOnly={!isEditable}
@@ -806,11 +819,22 @@ export function FileViewer({
<CodeMirror
value={editedContent}
onChange={(value) => handleContentChange(value)}
extensions={
getLanguageExtension(file.name)
extensions={[
...(getLanguageExtension(file.name)
? [getLanguageExtension(file.name)!]
: []
}
: []),
EditorView.theme({
"&": {
height: "100%",
},
".cm-scroller": {
overflow: "auto",
},
".cm-editor": {
height: "100%",
},
}),
]}
theme={oneDark}
editable={isEditable}
placeholder={t("fileManager.startTyping")}
@@ -822,6 +846,7 @@ export function FileViewer({
allowMultipleSelections: false,
highlightSelectionMatches: false,
searchKeymap: true,
scrollPastEnd: false,
}}
/>
)}

9
src/ui/Desktop/Apps/Host Manager/HostManagerEditor.tsx
View File

@@ -37,6 +37,7 @@ import { useTranslation } from "react-i18next";
import { CredentialSelector } from "@/ui/Desktop/Apps/Credentials/CredentialSelector.tsx";
import CodeMirror from "@uiw/react-codemirror";
import { oneDark } from "@codemirror/theme-one-dark";
import { EditorView } from "@codemirror/view";
interface SSHHost {
id: number;
@@ -1000,7 +1001,15 @@ export function HostManagerEditor({
allowMultipleSelections: false,
highlightSelectionMatches: false,
searchKeymap: false,
scrollPastEnd: false,
}}
extensions={[
EditorView.theme({
".cm-scroller": {
overflow: "auto",
},
}),
]}
/>
</FormControl>
</FormItem>