change hooks order execution when sorting (#812)

jbetancur · Jun 13, 2021 · 074a676 · 074a676
1 parent 632f892
commit 074a676
Showing 1 changed file with 4 additions and 4 deletions.
diff --git a/src/DataTable/DataTable.tsx b/src/DataTable/DataTable.tsx
@@ -245,6 +245,10 @@ function DataTable<T extends RowRecord>(props: TableProps<T>): JSX.Element {
 		onSelectedRowsChange({ allSelected, selectedCount, selectedRows });
 	}, [selectedCount]);
 
+	useDidUpdateEffect(() => {
+		onSort(selectedColumn, sortDirection);
+	}, [selectedColumn, sortDirection]);
+
 	useDidUpdateEffect(() => {
 		onChangePage(currentPage, paginationTotalRows || rows.length);
 	}, [currentPage]);
@@ -253,10 +257,6 @@ function DataTable<T extends RowRecord>(props: TableProps<T>): JSX.Element {
 		onChangeRowsPerPage(rowsPerPage, currentPage);
 	}, [rowsPerPage]);
 
-	useDidUpdateEffect(() => {
-		onSort(selectedColumn, sortDirection);
-	}, [selectedColumn, sortDirection]);
-
 	useDidUpdateEffect(() => {
 		handleChangePage(paginationDefaultPage);
 	}, [paginationDefaultPage, paginationResetDefaultPage]);