refactor(DataTable): sort functions has now access to sort direction

BREAKING CHANGE: DataTable sorting may not work like before.
valentingavran · Oct 18, 2022 · caab6cd · caab6cd
1 parent e05192b
commit caab6cd
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 5 deletions.
diff --git a/libs/anglify/src/components/data-table/data-table.interface.ts b/libs/anglify/src/components/data-table/data-table.interface.ts
@@ -4,7 +4,7 @@ export type DataTableHeader<T = any> = {
   filterable?: boolean;
   hidden?: boolean;
   hiddenOnMobile?: boolean;
-  sort?(a: DataTableItem<T>, b: DataTableItem<T>): number;
+  sort?(a: DataTableItem<T>, b: DataTableItem<T>, direction: SortSetting['direction']): number;
   sortable?: boolean;
   text: string;
   value: string;

diff --git a/libs/anglify/src/components/data-table/services/data.service.ts b/libs/anglify/src/components/data-table/services/data.service.ts
@@ -75,10 +75,9 @@ export class DataService {
         // if sort function is defined in headers, use it
         const header = headers.find(header => header.value === option.value);
         if (header?.sort) {
-          const sort = header.sort(a, b);
-
-          if (option.direction === 'desc') return sort * -1;
-          return sort;
+          const sort = header.sort(a, b, option.direction);
+          if (sort !== 0) return sort;
+          continue;
         }
 
         const aValue = a[option.value];