From 45bd37cf1ce37d3fc1c2d9acf95b711dfba989fa Mon Sep 17 00:00:00 2001 From: Daniel Date: Fri, 24 Jun 2022 10:17:34 -0400 Subject: [PATCH] Add sortDefaults to datatable to fix initial useEffect reseting sort (#168) --- src/components/DataTable/index.jsx | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/src/components/DataTable/index.jsx b/src/components/DataTable/index.jsx index cfb7ded2..252f17d8 100644 --- a/src/components/DataTable/index.jsx +++ b/src/components/DataTable/index.jsx @@ -19,6 +19,7 @@ const DataTable = ({ loading, options, columnDefaults, + sortDefaults, setSort, setConditions, conditionsTransform, @@ -122,7 +123,9 @@ const DataTable = ({ columns, data, filterTypes, - initialState: {}, + initialState: { + sortBy: sortDefaults + }, manualPagination: true, manualFilters: true, manualSortBy: true, @@ -136,7 +139,6 @@ const DataTable = ({ usePagination, layout === "block" ? useBlockLayout : useFlexLayout ); - useEffect(() => { if (columnSort) { const normalizedSort = sortTransform ? sortTransform(sortBy) : filters; @@ -317,6 +319,7 @@ DataTable.propTypes = { columnSort: PropTypes.bool, columnResize: PropTypes.bool, }), + sortDefaults: [], columns: PropTypes.arrayOf( PropTypes.shape({ Header: PropTypes.string.isRequired,