Skip to content

Improved editor design #455

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
stijnpotters1 wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Improved editor design #455

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
51aafb2
fix: improved editor design
stijnpotters1 Apr 23, 2026
a7cc134
fix: simplify folder button visibility logic and add local settings f…
stijnpotters1 Apr 23, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
94 changes: 91 additions & 3 deletions src/main/frontend/app/components/file-structure/editor-file-structure.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,9 @@ import '/styles/editor-files.css'
import AltArrowRightIcon from '../../../icons/solar/Alt Arrow Right.svg?react'
import AltArrowDownIcon from '../../../icons/solar/Alt Arrow Down.svg?react'
import CodeIcon from '../../../icons/solar/Code.svg?react'
import CodeFileIcon from '../../../icons/solar/Code File.svg?react'
import TrashBinIcon from '../../../icons/solar/Trash Bin.svg?react'
import RulerCrossPenIcon from '../../../icons/solar/Ruler Cross Pen.svg?react'
import { useShortcut } from '~/hooks/use-shortcut'
import type { ContextMenuState } from './use-file-tree-context-menu'

Expand Down Expand Up @@ -114,6 +117,15 @@ export default function EditorFileStructure() {
[selectedItemId, buildContextForItem],
)

const triggerItemAction = useCallback(
(itemId: TreeItemIndex, action: (menuState: ContextMenuState) => void) => {
void buildContextForItem(itemId).then((menuState) => {
if (menuState) action(menuState)
})
},
[buildContextForItem],
)

useShortcut({
'explorer.new-file': () => triggerExplorerAction(editorContextMenu.handleNewFile, false),
'explorer.new-folder': () => triggerExplorerAction(editorContextMenu.handleNewFolder, false),
Expand Down Expand Up @@ -285,6 +297,7 @@ export default function EditorFileStructure() {
context: TreeItemRenderContext
}) => {
const Icon = item.isFolder ? (context.isExpanded ? FolderOpenIcon : FolderIcon) : CodeIcon
const isRoot = (item.data as { projectRoot?: boolean }).projectRoot ?? false

const searchLower = searchTerm.toLowerCase()
const titleLower = title.toLowerCase()
Expand All @@ -310,28 +323,103 @@ export default function EditorFileStructure() {

const isHighlighted = highlightedItemId === item.index

const actionBtnClass = 'cursor-pointer rounded p-0.5 hover:bg-hover flex-shrink-0'

return (
<div
className="flex h-full w-full cursor-pointer items-center"
className="group/row flex h-full w-full items-center"
onContextMenu={(e) => editorContextMenu.openContextMenu(e, item.index)}
>
{Icon && <Icon className="fill-foreground w-4 flex-shrink-0" />}
<span
className={`ml-1 overflow-hidden text-nowrap text-ellipsis ${
className={`ml-1 min-w-0 flex-1 overflow-hidden text-nowrap text-ellipsis ${
isHighlighted ? 'outline-foreground-active rounded-sm px-1 outline-2' : ''
}`}
>
{highlightedTitle}
</span>
<div className="ml-1 hidden items-center gap-0.5 group-hover/row:flex">
{item.isFolder && (
<button
className={actionBtnClass}
title="New File"
onClick={(e) => {
e.stopPropagation()
triggerItemAction(item.index, editorContextMenu.handleNewFile)
}}
>
<CodeFileIcon className="fill-foreground h-3.5 w-3.5" />
</button>
)}
{item.isFolder && (
<button
className={actionBtnClass}
title="New Folder"
onClick={(e) => {
e.stopPropagation()
triggerItemAction(item.index, editorContextMenu.handleNewFolder)
}}
>
<FolderIcon className="fill-foreground h-3.5 w-3.5" />
</button>
)}
{!isRoot && (
<button
className={actionBtnClass}
title="Rename"
onClick={(e) => {
e.stopPropagation()
triggerItemAction(item.index, editorContextMenu.handleRename)
}}
>
<RulerCrossPenIcon className="fill-foreground h-3.5 w-3.5" />
</button>
)}
{!isRoot && (
<button
className={actionBtnClass}
title="Delete"
onClick={(e) => {
e.stopPropagation()
triggerItemAction(item.index, editorContextMenu.handleDelete)
}}
>
<TrashBinIcon className="fill-foreground h-3.5 w-3.5" />
</button>
)}
</div>
</div>
)
}

if (!dataProvider) return <LoadingSpinner message="Loading files..." className="p-8" />

const toolbarBtnClass = 'cursor-pointer rounded p-1 hover:bg-hover text-foreground'

return (
<>
<Search onChange={(e) => setSearchTerm(e.target.value)} />
<div className="border-border flex items-center justify-between border-b px-2 py-1">
<span className="text-foreground/50 text-xs font-semibold tracking-wider uppercase">Explorer</span>
<div className="flex items-center gap-0.5">
<button
className={toolbarBtnClass}
title="New File"
onClick={() => triggerExplorerAction(editorContextMenu.handleNewFile, false)}
>
<CodeFileIcon className="fill-foreground h-4 w-4" />
</button>
<button
className={toolbarBtnClass}
title="New Folder"
onClick={() => triggerExplorerAction(editorContextMenu.handleNewFolder, false)}
>
<FolderIcon className="fill-foreground h-4 w-4" />
</button>
</div>
</div>
<div className="mt-2">
<Search onChange={(e) => setSearchTerm(e.target.value)} />
</div>
<div
className="h-full overflow-auto pr-2"
onContextMenu={(e) => {
Expand Down
30 changes: 15 additions & 15 deletions src/main/frontend/app/routes/editor/editor.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -238,7 +238,7 @@
]
}

export default function CodeEditor() {

Check warning on line 241 in src/main/frontend/app/routes/editor/editor.tsx

View workflow job for this annotation

GitHub Actions / Build & Run All Tests 

Refactor this function to reduce its Cognitive Complexity from 16 to the 15 allowed
const theme = useTheme()
const project = useProjectStore.getState().project
const [activeTabFilePath, setActiveTabFilePath] = useState<string>(useEditorTabStore.getState().activeTabFilePath)
Expand Down Expand Up @@ -671,19 +671,19 @@
<>
<div className="flex h-12 items-center justify-between pr-4">
<SidebarHeader side={SidebarSide.LEFT} title="Files" />
<div className="border-border ml-auto flex overflow-hidden rounded border text-sm">
<button
onClick={() => setLeftTab('files')}
className={clsx(
'cursor-pointer px-3 py-1 transition-colors',
leftTab === 'files'
? 'bg-selected text-foreground font-medium'
: 'hover:bg-foreground-active text-muted-foreground',
)}
>
Files
</button>
{isGitRepo && (
{isGitRepo && (
<div className="border-border ml-auto flex overflow-hidden rounded border text-sm">
<button
onClick={() => setLeftTab('files')}
className={clsx(
'cursor-pointer px-3 py-1 transition-colors',
leftTab === 'files'
? 'bg-selected text-foreground font-medium'
: 'hover:bg-foreground-active text-muted-foreground',
)}
>
Files
</button>
<button
onClick={() => setLeftTab('git')}
className={clsx(
Expand All @@ -695,8 +695,8 @@
>
Git
</button>
)}
</div>
</div>
)}
</div>
{leftTab === 'files' && <EditorFileStructure />}
{leftTab !== 'files' && isGitRepo && (
Expand Down
Loading