fix(downloads): keep layout reset in header menu
This commit is contained in:
@@ -512,7 +512,6 @@ export interface DownloadsTableHeaderProps {
|
|||||||
actions: DownloadsTableActions;
|
actions: DownloadsTableActions;
|
||||||
columnOrder: readonly string[];
|
columnOrder: readonly string[];
|
||||||
gridTemplate: string;
|
gridTemplate: string;
|
||||||
onResetColumnLayout?: () => void;
|
|
||||||
sortColumn: DownloadSortColumn;
|
sortColumn: DownloadSortColumn;
|
||||||
sortDirection: "asc" | "desc";
|
sortDirection: "asc" | "desc";
|
||||||
selectedCount: number;
|
selectedCount: number;
|
||||||
@@ -534,7 +533,7 @@ function moveColumnWithPointerActions(column: string, direction: -1 | 1, element
|
|||||||
actions.onColumnPointerUp(column, pointerEvent(clientX));
|
actions.onColumnPointerUp(column, pointerEvent(clientX));
|
||||||
}
|
}
|
||||||
|
|
||||||
export function DownloadsTableHeader({ actions, columnOrder, gridTemplate, onResetColumnLayout, sortColumn, sortDirection, selectedCount, visibleIds }: DownloadsTableHeaderProps): ReactElement {
|
export function DownloadsTableHeader({ actions, columnOrder, gridTemplate, sortColumn, sortDirection, selectedCount, visibleIds }: DownloadsTableHeaderProps): ReactElement {
|
||||||
const allSelected = visibleIds.length > 0 && selectedCount === visibleIds.length;
|
const allSelected = visibleIds.length > 0 && selectedCount === visibleIds.length;
|
||||||
const mixedSelection = selectedCount > 0 && selectedCount < visibleIds.length;
|
const mixedSelection = selectedCount > 0 && selectedCount < visibleIds.length;
|
||||||
return (
|
return (
|
||||||
@@ -575,7 +574,7 @@ export function DownloadsTableHeader({ actions, columnOrder, gridTemplate, onRes
|
|||||||
</div>
|
</div>
|
||||||
);
|
);
|
||||||
})}
|
})}
|
||||||
<span className="downloads-action-cell downloads-header-action-cell" role="columnheader"><span>Aktion</span>{onResetColumnLayout ? <button aria-label="Spaltenlayout zurücksetzen" className="downloads-column-reset-button" onClick={onResetColumnLayout} title="Spaltenlayout zurücksetzen" type="button">↺</button> : null}</span>
|
<span className="downloads-action-cell" role="columnheader">Aktion</span>
|
||||||
</div>
|
</div>
|
||||||
);
|
);
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -149,7 +149,7 @@ export function DownloadsContent({ actions, model }: { actions: DownloadsViewAct
|
|||||||
return (
|
return (
|
||||||
<main className="downloads-content">
|
<main className="downloads-content">
|
||||||
<div className="downloads-table" role="table" aria-label="Downloads">
|
<div className="downloads-table" role="table" aria-label="Downloads">
|
||||||
<DownloadsTableHeader actions={actions} columnOrder={model.columnOrder} gridTemplate={model.gridTemplate} onResetColumnLayout={actions.onResetColumnLayout} selectedCount={model.actionableSelectedIds.length} sortColumn={model.sortColumn ?? "name"} sortDirection={model.sortDirection ?? "asc"} visibleIds={model.visibleRowIds} />
|
<DownloadsTableHeader actions={actions} columnOrder={model.columnOrder} gridTemplate={model.gridTemplate} selectedCount={model.actionableSelectedIds.length} sortColumn={model.sortColumn ?? "name"} sortDirection={model.sortDirection ?? "asc"} visibleIds={model.visibleRowIds} />
|
||||||
<VirtualizedDownloadsBody actions={actions} model={model} state={state} />
|
<VirtualizedDownloadsBody actions={actions} model={model} state={state} />
|
||||||
</div>
|
</div>
|
||||||
</main>
|
</main>
|
||||||
|
|||||||
@@ -527,21 +527,6 @@
|
|||||||
padding: 0;
|
padding: 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
.downloads-header-action-cell {
|
|
||||||
flex-direction: column;
|
|
||||||
gap: 1px;
|
|
||||||
line-height: 11px;
|
|
||||||
}
|
|
||||||
|
|
||||||
.downloads-header-action-cell .downloads-column-reset-button {
|
|
||||||
width: 20px;
|
|
||||||
height: 20px;
|
|
||||||
min-height: 20px;
|
|
||||||
border-radius: 4px;
|
|
||||||
font-size: 15px;
|
|
||||||
line-height: 1;
|
|
||||||
}
|
|
||||||
|
|
||||||
.downloads-collapse-button {
|
.downloads-collapse-button {
|
||||||
box-sizing: border-box;
|
box-sizing: border-box;
|
||||||
flex: 0 0 30px;
|
flex: 0 0 30px;
|
||||||
|
|||||||
@@ -95,28 +95,13 @@ describe("Downloadtabellen-Spalten", () => {
|
|||||||
expect(header.props.style.gridTemplateColumns).toBe(expected);
|
expect(header.props.style.gridTemplateColumns).toBe(expected);
|
||||||
});
|
});
|
||||||
|
|
||||||
it("exposes a header action that delegates resetting the column layout", () => {
|
it("keeps the column layout reset out of the table action header", () => {
|
||||||
const reset = vi.fn();
|
const actions = createActions();
|
||||||
const actions = createActions({ onResetColumnLayout: reset });
|
|
||||||
const model = withRuntime(createInput());
|
const model = withRuntime(createInput());
|
||||||
const content = renderToStaticMarkup(<DownloadsContent actions={actions} model={model} />);
|
const content = renderToStaticMarkup(<DownloadsContent actions={actions} model={model} />);
|
||||||
const header = DownloadsTableHeader({
|
|
||||||
actions,
|
|
||||||
columnOrder: model.columnOrder,
|
|
||||||
gridTemplate: model.gridTemplate,
|
|
||||||
onResetColumnLayout: actions.onResetColumnLayout,
|
|
||||||
selectedCount: 0,
|
|
||||||
sortColumn: "name",
|
|
||||||
sortDirection: "asc",
|
|
||||||
visibleIds: model.visibleRowIds
|
|
||||||
});
|
|
||||||
const button = findElement(header, (element) => element.type === "button" && element.props["aria-label"] === "Spaltenlayout zurücksetzen");
|
|
||||||
|
|
||||||
button.props.onClick();
|
expect(content).not.toContain('aria-label="Spaltenlayout zurücksetzen"');
|
||||||
|
expect(content).toMatch(/class="downloads-action-cell" role="columnheader">Aktion<\/span>/);
|
||||||
expect(content).toContain('aria-label="Spaltenlayout zurücksetzen"');
|
|
||||||
expect(button.props.title).toBe("Spaltenlayout zurücksetzen");
|
|
||||||
expect(reset).toHaveBeenCalledTimes(1);
|
|
||||||
});
|
});
|
||||||
|
|
||||||
it("never interpolates download grid tracks while column contents move", () => {
|
it("never interpolates download grid tracks while column contents move", () => {
|
||||||
|
|||||||
Reference in New Issue
Block a user