Merge branch 'develop' into 4314-aria-current-handling-via-observer-e…

…ntkoppeln
public-ui · Nov 16, 2023 · c6a9c18 · c6a9c18
2 parents 53c765f + 5ace636
commit c6a9c18
Showing 1 changed file with 12 additions and 13 deletions.
diff --git a/packages/components/src/components/table/component.tsx b/packages/components/src/components/table/component.tsx
@@ -178,21 +178,20 @@ export class KolTable implements API {
 				watchValidator(this, '_headers', (value): boolean => typeof value === 'object' && value !== null, new Set(['KoliBriTableHeaders']), value, {
 					hooks: {
 						beforePatch: (nextValue: unknown) => {
-							const headers: KoliBriTableHeaders = nextValue as KoliBriTableHeaders;
-							headers.horizontal?.forEach((header) => {
-								header.forEach((cell) => {
-									if (typeof cell.sort === 'function' && typeof cell.sortDirection === 'string') {
-										this.setSortDirection(cell.sort, cell.sortDirection);
-									}
-								});
-							});
-							headers.vertical?.forEach((header) => {
-								header.forEach((cell) => {
-									if (typeof cell.sort === 'function' && typeof cell.sortDirection === 'string') {
-										this.setSortDirection(cell.sort, cell.sortDirection);
+							const applySort = (headers: KoliBriTableHeaderCell[]) => {
+								headers.forEach((cell, i) => {
+									const sortDirection = cell.sortDirection;
+									if (typeof cell.sort === 'function' && (sortDirection === 'ASC' || sortDirection === 'DESC')) {
+										this.setSortDirection(cell.sort, sortDirection);
+										setTimeout(() => this.updateSortedData({ key: cell.key || `cell-${i}`, label: cell.label, sortDirection }));
 									}
 								});
-							});
+							};
+
+							const headers: KoliBriTableHeaders = nextValue as KoliBriTableHeaders;
+							headers.horizontal?.forEach(applySort);
+							headers.vertical?.forEach(applySort);
+
 							if (headers.horizontal && headers.vertical && headers.horizontal?.length > 0 && headers.vertical?.length > 0) {
 								this.disableSort = true;
 								devHint(