Skip to content
Open
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
31 changes: 15 additions & 16 deletions internal/webui/src/hooks/useGridState.ts
Original file line number Diff line number Diff line change
Expand Up @@ -37,10 +37,7 @@ export const useGridState = (
...defaultVisibility,
...(savedState.columnVisibility || {})
},
columnSizing: {
...defaultSizing,
...(savedState.columnSizing || {})
}
columnSizing: savedState.columnSizing || {}
};
});

Expand Down Expand Up @@ -71,24 +68,26 @@ export const useGridState = (
}, [saveToStorage]);

const resetColumnSizes = useCallback(() => {
const defaultSizing = columns?.reduce((acc, col) => ({
...acc,
[col.field]: col.width || 150
}), {});

setGridState(prev => {
const newState = { ...prev, columnSizing: defaultSizing };
// reset to empty, restores original flex/width definition
setGridState(prev => {
const newState = { ...prev, columnSizing: {} };
saveToStorage(newState);
return newState;
});
}, [columns, saveToStorage]);
}, [saveToStorage]);

// Memoize columns with applied widths so objects are stable between renders
const columnsWithSizing = useMemo(() => columns?.map(col => ({
...col,
width: gridState.columnSizing[col.field] || col.width || 150
})), [columns, gridState.columnSizing]);
const columnsWithSizing = useMemo(() => columns?.map(col => {
const userWidth = gridState.columnSizing[col.field];

if (userWidth !== undefined) {
const { flex, minWidth, ...colWithoutFlex } = col as any;
return { ...colWithoutFlex, width: userWidth };
}
return col;
}),
[columns, gridState.columnSizing]
);
return {
columnVisibility: gridState.columnVisibility,
columnSizing: gridState.columnSizing,
Expand Down
Loading