Merge branch 'fix/sort-index-infinite-table' into alpha

gisce · Nov 4, 2024 · c277721 · c277721
2 parents 019704d + 0f2ef84
commit c277721
Showing 1 changed file with 4 additions and 1 deletion.
diff --git a/src/components/InfiniteTable/InfiniteTable.tsx b/src/components/InfiniteTable/InfiniteTable.tsx
@@ -189,7 +189,10 @@ const InfiniteTableComp = forwardRef<InfiniteTableRef, InfiniteTableProps>(
       | undefined => {
       const state = gridRef?.current?.api.getColumnState()!;
 
-      const columnsWithSort = state.filter((col) => col.sort);
+      const columnsWithSort = state
+        .filter((col) => col.sort)
+        .sort((a, b) => (a.sortIndex || 0) - (b.sortIndex || 0));
+
       if (columnsWithSort.length === 0) {
         return undefined;
       }