Skip to content
Open
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
5 changes: 3 additions & 2 deletions src/components/PaginatedTablePicker.test.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -471,11 +471,12 @@ describe("paginated table picker contract", () => {
);

expect(headerIndex).toBeGreaterThanOrEqual(0);
expect(stringWidth(lines[headerIndex + 1]!)).toBe(width);
expect(stringWidth(lines[headerIndex + 1]!)).toBe(width - 1);
expect(rowLines.every((line) => line !== undefined)).toBe(true);
expect(new Set(rowLines.map((line) => lines.indexOf(line!))).size).toBe(suffixes.length);
expect(rowLines.every((line) => stringWidth(line!) <= width)).toBe(true);
expect(rowLines.every((line) => stringWidth(line!) <= width - 1)).toBe(true);
expect(rowLines.every((line) => /runtime_\d-[A-Za-z0-9…]+\s+\d/.test(line!))).toBe(true);
expect(rowLines.every((line) => line!.includes("2026-07-19 01:02"))).toBe(true);
if (width >= 80) {
expect(rowLines.every((line, index) => line!.includes(suffixes[index]!))).toBe(true);
}
Expand Down
11 changes: 11 additions & 0 deletions src/components/ui/data-table/DataTable.test.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@ import { Box } from "ink";
import { cleanup, render } from "ink-testing-library";
import stringWidth from "string-width";
import { DataTable, type DataTableColumn } from "./DataTable";
import { TERMINAL_RIGHT_GUTTER_WIDTH } from "./columnWidths";

afterEach(cleanup);

Expand Down Expand Up @@ -40,6 +41,16 @@ function renderTableAt(columnsWide: number) {
}

describe("DataTable layout", () => {
test("reserves a one-column gutter at the terminal's right edge", () => {
const terminalWidth = 60;
const divider = renderTableAt(terminalWidth)
.split("\n")
.find((line) => /^─+$/.test(line));

expect(divider).toBeDefined();
expect(stringWidth(divider!)).toBe(terminalWidth - TERMINAL_RIGHT_GUTTER_WIDTH);
});

test("keeps the selection marker and each logical row on one line at 12 columns", () => {
const lines = renderTableAt(12).split("\n");
const rowLines = lines.filter(
Expand Down
4 changes: 3 additions & 1 deletion src/components/ui/data-table/DataTable.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@ import {
computeColumnWidths,
resolveBorderWidth,
SELECTION_MARKER_WIDTH,
TERMINAL_RIGHT_GUTTER_WIDTH,
} from "./columnWidths.js";
import type { ColumnSizing } from "./columnWidths.js";

Expand Down Expand Up @@ -200,7 +201,8 @@ export function DataTable<T extends Record<string, unknown>>({
left: borderLeft,
right: borderRight,
});
const computedWidths = computeColumnWidths(columns, terminalWidth, {
const tableWidth = Math.max(0, terminalWidth - TERMINAL_RIGHT_GUTTER_WIDTH);
const computedWidths = computeColumnWidths(columns, tableWidth, {
selectable,
borderWidth,
});
Expand Down
1 change: 1 addition & 0 deletions src/components/ui/data-table/columnWidths.ts
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
export const COLUMN_GAP = 1;
export const FLEX_MIN_WIDTH = 16;
export const SELECTION_MARKER_WIDTH = 1;
export const TERMINAL_RIGHT_GUTTER_WIDTH = 1;

export type ColumnSizing =
| { flex: true; width?: never; minWidth?: never }
Expand Down
Loading