Skip to content

fix(sort): sort on grouped header column throws errors #405

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 1 commit into
base: main
Choose a base branch
from
Open

fix(sort): sort on grouped header column throws errors #405

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
16 changes: 7 additions & 9 deletions projects/ngx-datatable/src/lib/utils/sort.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -79,7 +79,8 @@ export const orderByComparator = (a: any, b: any): number => {
export const sortRows = <TRow>(
rows: TRow[],
columns: TableColumnInternal[],
dirs: SortPropDir[]
dirs: SortPropDir[],
sortOnGroupHeader?: SortPropDir
): TRow[] => {
if (!rows) {
return [];
Expand All @@ -102,12 +103,14 @@ export const sortRows = <TRow>(
// cache valueGetter and compareFn so that they
// do not need to be looked-up in the sort function body
const cachedDirs = dirs.map(dir => {
const prop = dir.prop;
// When sorting on group header, override prop to 'key'
const prop = sortOnGroupHeader?.prop === dir.prop ? 'key' : dir.prop;
const compareFn = cols[dir.prop];
return {
prop,
dir: dir.dir,
valueGetter: getterForProp(prop),
compareFn: cols[prop]
compareFn
};
});

Expand Down Expand Up @@ -148,12 +151,7 @@ export const sortGroupedRows = <TRow>(
sortOnGroupHeader: SortPropDir | undefined
): Group<TRow>[] => {
if (sortOnGroupHeader) {
groupedRows = sortRows(groupedRows, columns, [
{
dir: sortOnGroupHeader.dir,
prop: 'key'
}
]);
groupedRows = sortRows(groupedRows, columns, dirs, sortOnGroupHeader);
}
return groupedRows.map(group => ({ ...group, value: sortRows(group.value, columns, dirs) }));
};
Loading