@one-paragon/angular-utilities 2.4.2 → 2.4.4

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

@@ -4409,7 +4409,11 @@ function updateGroupByState(groupedData, { data, groups, expanded, sorts }, firs
     if (firstRun
         || dataUpdated(data, groups, expanded, sorts)
         || groupsUpdated(groups, expanded, sorts)) {
-        groupedData = groups.value.length ? getGroupedData(data.value, groups.value, metaData) : data.value;
+        const combinedGroupsAndSorts = groups.value.map(g => {
+            const sortForGroup = sorts.value.find(s => s.key === g.key);
+            return { ...g, sort: sortForGroup?.sort || '' };
+        });
+        groupedData = groups.value.length ? getGroupedData(data.value, combinedGroupsAndSorts, metaData) : data.value;
     }
     else {
         let curr = [...sorts.value];
@@ -4509,7 +4513,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 +4611,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 +4671,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);
             });