@one-paragon/angular-utilities 2.4.1 → 2.4.3

package/fesm2022/one-paragon-angular-utilities.mjs

@@ -3163,12 +3163,12 @@ class TableStore extends ComponentStore {
             let nextSort;
             switch (currentGroupBy.sort) {
                 case '':
-                    nextSort = 'asc';
-                    break;
-                case 'asc':
                     nextSort = 'desc';
                     break;
                 case 'desc':
+                    nextSort = 'asc';
+                    break;
+                case 'asc':
                     nextSort = '';
                     break;
             }
@@ -4509,7 +4509,11 @@ class GenericTableComponent {
             const trackBy = this.$trackBy();
             if (!trackBy)
                 return (index, item) => isGroupHeader(item) ? `${item.level}-${item[initIndexSymbol]}` : item[initIndexSymbol];
-            return ((index, item) => isGroupHeader(item) ? `${item.level}-${item[initIndexSymbol]}` : item[trackBy]);
+            return ((index, item) => {
+                if (isGroupHeader(item))
+                    return `${item.level}-${item[initIndexSymbol]}`;
+                return typeof trackBy === 'function' ? trackBy(item) : item[trackBy];
+            });
         });
         this.$hasFooterMeta = computed(() => this.state.$metaDataArray().some(md => !!md.additional?.footer));
         this.$hasCustomFooter = computed(() => this.$columnInfos()?.some(ci => !!ci.customCell?.columnDef?.footerCell));
@@ -4603,7 +4607,8 @@ class GenericTableComponent {
         this.$selection = computed(() => {
             const trackBy = this.$trackBy();
             if (trackBy) {
-                return new SelectionModel(true, [], true, (a, b) => a[trackBy] === b[trackBy]);
+                const trackByFn = typeof trackBy === 'function' ? trackBy : (item) => item[trackBy];
+                return new SelectionModel(true, [], true, (a, b) => trackByFn(a) === trackByFn(b));
             }
             return new SelectionModel(true, []);
         });
@@ -4662,7 +4667,12 @@ class GenericTableComponent {
                 if (!selected.length)
                     return;
                 const trackBy = this.$trackBy();
-                const trackByFunc = trackBy ? (s) => selectableData.every(d => d[trackBy] !== s[trackBy]) : s => !selectableData.includes(s);
+                const trackByFunc = trackBy ?
+                    (s) => {
+                        const trackByFn = typeof trackBy === 'function' ? trackBy : (item) => item[trackBy];
+                        return selectableData.every(d => trackByFn(d) !== trackByFn(s));
+                    }
+                    : s => !selectableData.includes(s);
                 const removed = selected.filter(trackByFunc);
                 this.$selection().deselect(...removed);
             });