feat(FN-3528): add line-number gutter toggle to FileEditor and Files modal
This merge adds a line-number toggle to the Files modal with persisted preference, introduces an AgentAvatar component with server-side avatar storage routes, and adds documentation for both the toggle and avatar storage. It also includes a regression test for runtime plugin alias behavior and updat Fusion-Task-Id: FN-3528
This commit is contained in:
@@ -417,6 +417,35 @@
|
||||
padding: var(--space-lg);
|
||||
}
|
||||
|
||||
.file-editor-textarea-shell {
|
||||
flex: 1;
|
||||
min-height: 0;
|
||||
display: flex;
|
||||
}
|
||||
|
||||
.file-editor-textarea-shell--line-numbers {
|
||||
background: var(--surface);
|
||||
}
|
||||
|
||||
.file-editor-line-numbers {
|
||||
width: calc(var(--space-xl) * 2);
|
||||
padding: var(--space-lg) var(--space-sm);
|
||||
border-right: 1px solid var(--border);
|
||||
color: var(--text-dim);
|
||||
background: var(--surface);
|
||||
font-family: var(--font-mono);
|
||||
font-size: 14px;
|
||||
line-height: 1.5;
|
||||
text-align: right;
|
||||
overflow: hidden;
|
||||
user-select: none;
|
||||
flex-shrink: 0;
|
||||
}
|
||||
|
||||
.file-editor-line-number {
|
||||
min-height: calc(var(--space-xl) - var(--space-xs));
|
||||
}
|
||||
|
||||
/* Textarea-based file editor */
|
||||
.file-editor-textarea {
|
||||
flex: 1;
|
||||
@@ -627,6 +656,12 @@
|
||||
gap: var(--space-md);
|
||||
}
|
||||
|
||||
.file-browser-line-numbers-toggle {
|
||||
display: inline-flex;
|
||||
align-items: center;
|
||||
gap: var(--space-xs);
|
||||
}
|
||||
|
||||
.file-browser-modal-header .modal-close {
|
||||
position: static;
|
||||
}
|
||||
@@ -918,6 +953,12 @@
|
||||
|
||||
/* Mobile responsive */
|
||||
@media (max-width: 768px) {
|
||||
.file-editor-line-numbers {
|
||||
width: calc(var(--space-xl) * 1.75);
|
||||
padding-left: var(--space-xs);
|
||||
padding-right: var(--space-xs);
|
||||
}
|
||||
|
||||
/* On mobile the file browser is presented as a full-screen sheet — drop
|
||||
the overlay's default top padding so the modal actually fills the
|
||||
viewport instead of being pushed below it. */
|
||||
@@ -967,6 +1008,11 @@
|
||||
.file-browser-header-actions {
|
||||
flex-shrink: 0;
|
||||
justify-content: flex-end;
|
||||
flex-wrap: wrap;
|
||||
}
|
||||
|
||||
.file-browser-line-numbers-toggle {
|
||||
min-height: var(--mobile-nav-height);
|
||||
}
|
||||
|
||||
.file-browser-modal-header .modal-close {
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
import "./FileBrowser.css";
|
||||
import { useState, useCallback, useEffect, useMemo, useRef } from "react";
|
||||
import { X, Save, RotateCcw, Folder, FileType, ArrowLeft } from "lucide-react";
|
||||
import { X, Save, RotateCcw, Folder, FileType, ArrowLeft, ListOrdered } from "lucide-react";
|
||||
import { useWorkspaceFileBrowser } from "../hooks/useWorkspaceFileBrowser";
|
||||
import { useWorkspaceFileEditor } from "../hooks/useWorkspaceFileEditor";
|
||||
import { useWorkspaces } from "../hooks/useWorkspaces";
|
||||
@@ -10,12 +10,14 @@ import { downloadFileUrl } from "../api";
|
||||
import { FileBrowser } from "./FileBrowser";
|
||||
import { FileEditor } from "./FileEditor";
|
||||
import { WorkspaceSelector } from "./WorkspaceSelector";
|
||||
import { getScopedItem, setScopedItem } from "../utils/projectStorage";
|
||||
|
||||
const MOBILE_BREAKPOINT = 768;
|
||||
const SIDEBAR_DEFAULT_WIDTH = 280;
|
||||
const SIDEBAR_MIN_WIDTH = 180;
|
||||
const SIDEBAR_MAX_WIDTH = 500;
|
||||
const SIDEBAR_STORAGE_KEY = "fusion:file-browser-sidebar-width";
|
||||
const FILES_LINE_NUMBERS_STORAGE_KEY = "kb-files-line-numbers";
|
||||
|
||||
/**
|
||||
* Image file extensions that should be rendered as image previews.
|
||||
@@ -74,6 +76,7 @@ export function FileBrowserModal({
|
||||
const [isMobile, setIsMobile] = useState(false);
|
||||
const [mobileView, setMobileView] = useState<"list" | "editor">("list");
|
||||
const [sidebarWidth, setSidebarWidth] = useState(SIDEBAR_DEFAULT_WIDTH);
|
||||
const [showLineNumbers, setShowLineNumbers] = useState(false);
|
||||
|
||||
const {
|
||||
entries,
|
||||
@@ -130,6 +133,11 @@ export function FileBrowserModal({
|
||||
}
|
||||
}, []);
|
||||
|
||||
useEffect(() => {
|
||||
const savedPreference = getScopedItem(FILES_LINE_NUMBERS_STORAGE_KEY, projectId);
|
||||
setShowLineNumbers(savedPreference === "true");
|
||||
}, [projectId]);
|
||||
|
||||
useEffect(() => {
|
||||
const handleKeyDown = (e: KeyboardEvent) => {
|
||||
if (e.key === "Escape") {
|
||||
@@ -236,6 +244,14 @@ export function FileBrowserModal({
|
||||
persistSidebarWidth(nextWidth);
|
||||
}, [isMobile, persistSidebarWidth, sidebarWidth]);
|
||||
|
||||
const handleToggleLineNumbers = useCallback(() => {
|
||||
setShowLineNumbers((previousValue) => {
|
||||
const nextValue = !previousValue;
|
||||
setScopedItem(FILES_LINE_NUMBERS_STORAGE_KEY, String(nextValue), projectId);
|
||||
return nextValue;
|
||||
});
|
||||
}, [projectId]);
|
||||
|
||||
const workspaceLabel = useMemo(() => {
|
||||
if (currentWorkspace === "project") {
|
||||
return "Project";
|
||||
@@ -272,6 +288,16 @@ export function FileBrowserModal({
|
||||
)}
|
||||
</div>
|
||||
<div className="file-browser-header-actions">
|
||||
<button
|
||||
className={`btn btn-sm file-browser-line-numbers-toggle ${showLineNumbers ? "btn-primary" : ""}`}
|
||||
onClick={handleToggleLineNumbers}
|
||||
aria-label="Toggle line numbers"
|
||||
aria-pressed={showLineNumbers}
|
||||
title="Toggle line numbers"
|
||||
>
|
||||
<ListOrdered size={14} />
|
||||
<span>Line #</span>
|
||||
</button>
|
||||
<WorkspaceSelector
|
||||
currentWorkspace={currentWorkspace}
|
||||
projectName={projectName}
|
||||
@@ -392,6 +418,7 @@ export function FileBrowserModal({
|
||||
onChange={setContent}
|
||||
filePath={selectedFile}
|
||||
readOnly={isBinaryFile(selectedFile)}
|
||||
showLineNumbers={showLineNumbers && !isBinaryFile(selectedFile)}
|
||||
/>
|
||||
</div>
|
||||
)}
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
import { useState, useCallback } from "react";
|
||||
import { useState, useCallback, useMemo, useRef, type UIEvent } from "react";
|
||||
import ReactMarkdown from "react-markdown";
|
||||
import remarkGfm from "remark-gfm";
|
||||
import { FileEdit, Eye, WrapText } from "lucide-react";
|
||||
@@ -8,6 +8,7 @@ interface FileEditorProps {
|
||||
onChange: (content: string) => void;
|
||||
readOnly?: boolean;
|
||||
filePath?: string;
|
||||
showLineNumbers?: boolean;
|
||||
}
|
||||
|
||||
function isMarkdownFile(filePath?: string): boolean {
|
||||
@@ -16,13 +17,22 @@ function isMarkdownFile(filePath?: string): boolean {
|
||||
return lowerPath.endsWith(".md") || lowerPath.endsWith(".markdown") || lowerPath.endsWith(".mdx");
|
||||
}
|
||||
|
||||
export function FileEditor({ content, onChange, readOnly, filePath }: FileEditorProps) {
|
||||
export function FileEditor({ content, onChange, readOnly, filePath, showLineNumbers = false }: FileEditorProps) {
|
||||
const [showPreview, setShowPreview] = useState(false);
|
||||
const [wordWrap, setWordWrap] = useState(true);
|
||||
const lineNumbersRef = useRef<HTMLDivElement>(null);
|
||||
const isMarkdown = isMarkdownFile(filePath);
|
||||
|
||||
// For markdown files in readOnly mode, default to preview
|
||||
const effectiveShowPreview = isMarkdown && (readOnly ? true : showPreview);
|
||||
const shouldRenderLineNumbers = showLineNumbers && !readOnly && !effectiveShowPreview;
|
||||
const lineCount = useMemo(() => {
|
||||
if (!shouldRenderLineNumbers) {
|
||||
return 0;
|
||||
}
|
||||
|
||||
return content.split("\n").length;
|
||||
}, [content, shouldRenderLineNumbers]);
|
||||
|
||||
const handleEditClick = useCallback(() => {
|
||||
setShowPreview(false);
|
||||
@@ -36,6 +46,14 @@ export function FileEditor({ content, onChange, readOnly, filePath }: FileEditor
|
||||
setWordWrap((prev) => !prev);
|
||||
}, []);
|
||||
|
||||
const handleTextareaScroll = useCallback((event: UIEvent<HTMLTextAreaElement>) => {
|
||||
if (!lineNumbersRef.current) {
|
||||
return;
|
||||
}
|
||||
|
||||
lineNumbersRef.current.scrollTop = event.currentTarget.scrollTop;
|
||||
}, []);
|
||||
|
||||
return (
|
||||
<div className="file-editor-container">
|
||||
{isMarkdown ? (
|
||||
@@ -96,14 +114,26 @@ export function FileEditor({ content, onChange, readOnly, filePath }: FileEditor
|
||||
</ReactMarkdown>
|
||||
</div>
|
||||
) : (
|
||||
<textarea
|
||||
className={`file-editor-textarea ${wordWrap ? "file-editor-textarea--wrap" : ""}`}
|
||||
value={content}
|
||||
onChange={(e) => onChange(e.target.value)}
|
||||
readOnly={readOnly}
|
||||
spellCheck={false}
|
||||
aria-label={filePath ? `Editor for ${filePath}` : "File editor"}
|
||||
/>
|
||||
<div className={`file-editor-textarea-shell ${shouldRenderLineNumbers ? "file-editor-textarea-shell--line-numbers" : ""}`}>
|
||||
{shouldRenderLineNumbers && (
|
||||
<div className="file-editor-line-numbers" ref={lineNumbersRef} aria-hidden="true">
|
||||
{Array.from({ length: lineCount }, (_, index) => (
|
||||
<div key={`line-${index + 1}`} className="file-editor-line-number">
|
||||
{index + 1}
|
||||
</div>
|
||||
))}
|
||||
</div>
|
||||
)}
|
||||
<textarea
|
||||
className={`file-editor-textarea ${wordWrap ? "file-editor-textarea--wrap" : ""}`}
|
||||
value={content}
|
||||
onChange={(e) => onChange(e.target.value)}
|
||||
onScroll={handleTextareaScroll}
|
||||
readOnly={readOnly}
|
||||
spellCheck={false}
|
||||
aria-label={filePath ? `Editor for ${filePath}` : "File editor"}
|
||||
/>
|
||||
</div>
|
||||
)}
|
||||
</div>
|
||||
);
|
||||
|
||||
@@ -723,6 +723,85 @@ describe("FileBrowserModal", () => {
|
||||
});
|
||||
});
|
||||
|
||||
describe("line number toggle", () => {
|
||||
it("renders a header toggle and persists preference per project", async () => {
|
||||
render(
|
||||
<FileBrowserModal
|
||||
initialWorkspace="project"
|
||||
isOpen={true}
|
||||
onClose={mockOnClose}
|
||||
projectId="proj-1"
|
||||
/>,
|
||||
);
|
||||
|
||||
const toggle = screen.getByRole("button", { name: /toggle line numbers/i });
|
||||
expect(toggle).toHaveAttribute("aria-pressed", "false");
|
||||
|
||||
fireEvent.click(toggle);
|
||||
expect(toggle).toHaveAttribute("aria-pressed", "true");
|
||||
expect(localStorage.getItem("kb:proj-1:kb-files-line-numbers")).toBe("true");
|
||||
});
|
||||
|
||||
it("loads persisted preference when project changes", () => {
|
||||
localStorage.setItem("kb:proj-a:kb-files-line-numbers", "true");
|
||||
localStorage.setItem("kb:proj-b:kb-files-line-numbers", "false");
|
||||
|
||||
const { rerender } = render(
|
||||
<FileBrowserModal
|
||||
initialWorkspace="project"
|
||||
isOpen={true}
|
||||
onClose={mockOnClose}
|
||||
projectId="proj-a"
|
||||
/>,
|
||||
);
|
||||
|
||||
expect(screen.getByRole("button", { name: /toggle line numbers/i })).toHaveAttribute("aria-pressed", "true");
|
||||
|
||||
rerender(
|
||||
<FileBrowserModal
|
||||
initialWorkspace="project"
|
||||
isOpen={true}
|
||||
onClose={mockOnClose}
|
||||
projectId="proj-b"
|
||||
/>,
|
||||
);
|
||||
|
||||
expect(screen.getByRole("button", { name: /toggle line numbers/i })).toHaveAttribute("aria-pressed", "false");
|
||||
});
|
||||
|
||||
it("only shows gutter for editable text files", async () => {
|
||||
mockUseWorkspaceFileBrowser.mockReturnValue({
|
||||
...defaultBrowserState,
|
||||
entries: [
|
||||
{ name: "editable.ts", type: "file" as const, size: 64, mtime: "2024-01-01" },
|
||||
{ name: "readme.pdf", type: "file" as const, size: 64, mtime: "2024-01-01" },
|
||||
],
|
||||
});
|
||||
|
||||
render(
|
||||
<FileBrowserModal
|
||||
initialWorkspace="project"
|
||||
isOpen={true}
|
||||
onClose={mockOnClose}
|
||||
/>,
|
||||
);
|
||||
|
||||
fireEvent.click(screen.getByRole("button", { name: /toggle line numbers/i }));
|
||||
|
||||
await act(async () => {
|
||||
fireEvent.click(screen.getByText("editable.ts"));
|
||||
});
|
||||
|
||||
expect(document.querySelector(".file-editor-line-numbers")).toBeInTheDocument();
|
||||
|
||||
await act(async () => {
|
||||
fireEvent.click(screen.getByText("readme.pdf"));
|
||||
});
|
||||
|
||||
expect(document.querySelector(".file-editor-line-numbers")).not.toBeInTheDocument();
|
||||
});
|
||||
});
|
||||
|
||||
describe("modal height constraint regression", () => {
|
||||
it("max-height uses calc() to stay within viewport padding", async () => {
|
||||
const { loadAllAppCss } = await import("../../test/cssFixture");
|
||||
|
||||
@@ -242,6 +242,42 @@ describe("FileEditor", () => {
|
||||
});
|
||||
});
|
||||
|
||||
describe("line numbers", () => {
|
||||
it("shows line numbers for editable text mode when enabled", () => {
|
||||
render(
|
||||
<FileEditor
|
||||
content={"first\nsecond\nthird"}
|
||||
onChange={vi.fn()}
|
||||
filePath="src/app.ts"
|
||||
showLineNumbers
|
||||
/>,
|
||||
);
|
||||
|
||||
const gutter = document.querySelector(".file-editor-line-numbers");
|
||||
expect(gutter).toBeInTheDocument();
|
||||
expect(screen.getByText("1")).toBeInTheDocument();
|
||||
expect(screen.getByText("2")).toBeInTheDocument();
|
||||
expect(screen.getByText("3")).toBeInTheDocument();
|
||||
});
|
||||
|
||||
it("hides line numbers in markdown preview mode", () => {
|
||||
render(
|
||||
<FileEditor content="# Heading" onChange={vi.fn()} filePath="readme.md" showLineNumbers />,
|
||||
);
|
||||
|
||||
fireEvent.click(screen.getByRole("button", { name: /preview mode/i }));
|
||||
expect(document.querySelector(".file-editor-line-numbers")).not.toBeInTheDocument();
|
||||
});
|
||||
|
||||
it("hides line numbers for read-only files", () => {
|
||||
render(
|
||||
<FileEditor content={"one\ntwo"} onChange={vi.fn()} filePath="file.bin" readOnly showLineNumbers />,
|
||||
);
|
||||
|
||||
expect(document.querySelector(".file-editor-line-numbers")).not.toBeInTheDocument();
|
||||
});
|
||||
});
|
||||
|
||||
describe("markdown preview scrollability", () => {
|
||||
it("preview container has correct CSS classes for scrolling", () => {
|
||||
render(<FileEditor content="# Hello World" onChange={vi.fn()} filePath="readme.md" />);
|
||||
|
||||
Reference in New Issue
Block a user