Fix immutability issue with pagination and sortBy

This commit is contained in:
tannerlinsley
2019-07-25 13:38:33 -06:00
parent e1060db327
commit d8599817ad
2 changed files with 6 additions and 6 deletions
+3 -3
View File
@@ -32,7 +32,7 @@ export const useFilters = props => {
debug,
rows,
columns,
filterTypes: userFilterTypes = {},
filterTypes: userFilterTypes,
defaultFilter = filterTypes.text,
manualFilters,
disableFilters,
@@ -125,10 +125,10 @@ export const useFilters = props => {
// default string lookup on built-in filters
const filterMethod =
isFunction(column.filter) ||
userFilterTypes[column.filter] ||
(userFilterTypes || {})[column.filter] ||
filterTypes[column.filter] ||
isFunction(defaultFilter) ||
userFilterTypes[defaultFilter] ||
(userFilterTypes || {})[defaultFilter] ||
filterTypes[defaultFilter]
if (!filterMethod) {
+3 -3
View File
@@ -44,7 +44,7 @@ export const useSortBy = props => {
columns,
orderByFn = defaultOrderByFn,
defaultSort = 'alphanumeric',
sortTypes: userSortTypes = {},
sortTypes: userSortTypes,
manualSorting,
disableSorting,
defaultSortDesc,
@@ -237,10 +237,10 @@ export const useSortBy = props => {
// default string lookup on built-in sortType
const sortMethod =
isFunction(columnSort) ||
userSortTypes[columnSort] ||
(userSortTypes || {})[columnSort] ||
sortTypes[columnSort] ||
isFunction(defaultSort) ||
userSortTypes[defaultSort] ||
(userSortTypes || {})[defaultSort] ||
sortTypes[defaultSort]
// Return the correct sortFn