From d842e2c0110451fb99ad23cd672509cd1b2a6a73 Mon Sep 17 00:00:00 2001 From: Tyler Jordan Wright Date: Wed, 9 Dec 2020 11:08:19 -0500 Subject: [PATCH 1/3] disabled autoResetSortBy to allow for sorting to persist when data changes. --- src/components/ItemTable/ItemTable.js | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/src/components/ItemTable/ItemTable.js b/src/components/ItemTable/ItemTable.js index e45dc63..c19454a 100644 --- a/src/components/ItemTable/ItemTable.js +++ b/src/components/ItemTable/ItemTable.js @@ -11,7 +11,7 @@ import { ArrowDownward, ArrowUpward } from "@material-ui/icons"; export default function ItemTable({ data, rowCanBeSelected }) { const [selectedRow, setSelectedRow] = useState({ queue: null, number: null}); - const theme = useTheme(); + const theme = useTheme(); const useStyles = makeStyles({ // Fully visible for active icons activeSortIcon: { @@ -57,6 +57,7 @@ export default function ItemTable({ data, rowCanBeSelected }) { { columns, data, + autoResetSortBy: false, defaultColumn: { Filter: ({ column: { Header, setFilter } }) => { return ( @@ -68,7 +69,7 @@ export default function ItemTable({ data, rowCanBeSelected }) { } }, }, - useFilters, useFlexLayout, useSortBy, + useFilters, useFlexLayout, useSortBy, ); const { getTableProps, getTableBodyProps, headerGroups, rows, prepareRow, } = tableInstance; @@ -136,7 +137,7 @@ export default function ItemTable({ data, rowCanBeSelected }) { classes={{ root: (isSelected && rowCanBeSelected) ? classes.rowSelected : classes.bandedRows }} {...row.getRowProps()} > {row.cells.map(cell => ( - From 2cccad286e1ac62907cb61815e08f95a0c08130a Mon Sep 17 00:00:00 2001 From: Tyler Jordan Wright Date: Fri, 11 Dec 2020 13:09:17 -0500 Subject: [PATCH 2/3] Set autoResetFilters to false in order to stop filters from resetting on data change. --- src/components/ItemTable/ItemTable.js | 1 + 1 file changed, 1 insertion(+) diff --git a/src/components/ItemTable/ItemTable.js b/src/components/ItemTable/ItemTable.js index c19454a..2839e33 100644 --- a/src/components/ItemTable/ItemTable.js +++ b/src/components/ItemTable/ItemTable.js @@ -58,6 +58,7 @@ export default function ItemTable({ data, rowCanBeSelected }) { columns, data, autoResetSortBy: false, + autoResetFilters:false, defaultColumn: { Filter: ({ column: { Header, setFilter } }) => { return ( From c20b9b870a3f5ea55cbf5dda1b60cc521e19bf59 Mon Sep 17 00:00:00 2001 From: Justin Campbell Date: Tue, 15 Dec 2020 21:54:39 -0500 Subject: [PATCH 3/3] Minor formatting --- src/components/ItemTable/ItemTable.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/components/ItemTable/ItemTable.js b/src/components/ItemTable/ItemTable.js index 2839e33..6c4df69 100644 --- a/src/components/ItemTable/ItemTable.js +++ b/src/components/ItemTable/ItemTable.js @@ -58,7 +58,7 @@ export default function ItemTable({ data, rowCanBeSelected }) { columns, data, autoResetSortBy: false, - autoResetFilters:false, + autoResetFilters: false, defaultColumn: { Filter: ({ column: { Header, setFilter } }) => { return (