Skip to content

Commit

Permalink
fix: always show required columns (#1374)
Browse files Browse the repository at this point in the history
  • Loading branch information
artemmufazalov authored Sep 30, 2024
1 parent d200b4c commit 6cab2df
Showing 1 changed file with 7 additions and 2 deletions.
9 changes: 7 additions & 2 deletions src/utils/hooks/useSelectedColumns.ts
Original file line number Diff line number Diff line change
Expand Up @@ -16,8 +16,13 @@ export const useSelectedColumns = <T extends {name: string}>(
});

const columnsToShow = React.useMemo(() => {
return columns.filter((column) => selectedColumnsIds.find((name) => name === column.name));
}, [columns, selectedColumnsIds]);
return columns.filter((column) => {
const columnId = column.name;
const isSelected = selectedColumnsIds.includes(columnId);
const isRequired = requiredColumnsIds?.includes(columnId);
return isSelected || isRequired;
});
}, [columns, requiredColumnsIds, selectedColumnsIds]);

const columnsToSelect: TableColumnSetupItem[] = React.useMemo(() => {
const columnsIds = columns.map((column) => column.name);
Expand Down

0 comments on commit 6cab2df

Please sign in to comment.