Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
4 changes: 2 additions & 2 deletions src/ui/App.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -486,7 +486,7 @@ export function App({
showHelp,
showHunkHeaders,
showLineNumbers,
sidebarVisible,
renderSidebar,
toggleAgentNotes,
toggleFocusArea,
toggleHelp,
Expand All @@ -511,7 +511,7 @@ export function App({
showHelp,
showHunkHeaders,
showLineNumbers,
sidebarVisible,
renderSidebar,
toggleAgentNotes,
toggleFocusArea,
toggleHelp,
Expand Down
67 changes: 67 additions & 0 deletions src/ui/AppHost.responsive.test.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -108,6 +108,73 @@ describe("responsive app", () => {
expect(tight).not.toMatch(/▌.*▌/);
});

test("View menu sidebar checkmark follows actual medium-viewport visibility", async () => {
const setup = await testRender(<AppHost bootstrap={createBootstrap("auto")} />, {
width: 180,
height: 24,
});

try {
await act(async () => {
await setup.renderOnce();
});

const initialFrame = setup.captureCharFrame();
expect((initialFrame.match(/alpha\.ts/g) ?? []).length).toBe(1);

await act(async () => {
await setup.mockInput.pressKey("F10");
});
await act(async () => {
await setup.renderOnce();
});
await act(async () => {
await setup.mockInput.pressArrow("right");
});
await act(async () => {
await setup.renderOnce();
});

const menuFrame = setup.captureCharFrame();
expect(menuFrame).toContain("[ ] Sidebar");
expect(menuFrame).not.toContain("[x] Sidebar");
} finally {
await act(async () => {
setup.renderer.destroy();
});
}
});

test("sidebar shortcut opens the hidden sidebar on medium viewport", async () => {
const setup = await testRender(<AppHost bootstrap={createBootstrap("auto")} />, {
width: 180,
height: 24,
});

try {
await act(async () => {
await setup.renderOnce();
});

let frame = setup.captureCharFrame();
expect((frame.match(/alpha\.ts/g) ?? []).length).toBe(1);

await act(async () => {
await setup.mockInput.typeText("s");
});
await act(async () => {
await setup.renderOnce();
});

frame = setup.captureCharFrame();
expect((frame.match(/alpha\.ts/g) ?? []).length).toBe(2);
} finally {
await act(async () => {
setup.renderer.destroy();
});
}
});

test("explicit split and stack modes override responsive auto switching", async () => {
const forcedSplit = await captureFrameForBootstrap(createBootstrap("split"), 140);
const forcedStack = await captureFrameForBootstrap(createBootstrap("stack"), 240);
Expand Down
6 changes: 3 additions & 3 deletions src/ui/lib/appMenus.ts
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ export interface BuildAppMenusOptions {
showHelp: boolean;
showHunkHeaders: boolean;
showLineNumbers: boolean;
sidebarVisible: boolean;
renderSidebar: boolean;
toggleAgentNotes: () => void;
toggleFocusArea: () => void;
toggleHelp: () => void;
Expand Down Expand Up @@ -46,7 +46,7 @@ export function buildAppMenus({
showHelp,
showHunkHeaders,
showLineNumbers,
sidebarVisible,
renderSidebar,
toggleAgentNotes,
toggleFocusArea,
toggleHelp,
Expand Down Expand Up @@ -126,7 +126,7 @@ export function buildAppMenus({
kind: "item",
label: "Sidebar",
hint: "s",
checked: sidebarVisible,
checked: renderSidebar,
action: toggleSidebar,
},
{ kind: "separator" },
Expand Down
2 changes: 1 addition & 1 deletion src/ui/lib/ui-lib.test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -136,7 +136,7 @@ describe("ui helpers", () => {
showHelp: false,
showHunkHeaders: false,
showLineNumbers: true,
sidebarVisible: false,
renderSidebar: false,
toggleAgentNotes: () => {},
toggleFocusArea: () => {},
toggleHelp: () => {},
Expand Down
Loading