From d8599817ad1e0411b4e0445d9dd4191941295cf8 Mon Sep 17 00:00:00 2001 From: tannerlinsley Date: Thu, 25 Jul 2019 13:38:33 -0600 Subject: [PATCH] Fix immutability issue with pagination and sortBy --- src/plugin-hooks/useFilters.js | 6 +++--- src/plugin-hooks/useSortBy.js | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/src/plugin-hooks/useFilters.js b/src/plugin-hooks/useFilters.js index 54a8590..0c7f6b9 100755 --- a/src/plugin-hooks/useFilters.js +++ b/src/plugin-hooks/useFilters.js @@ -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) { diff --git a/src/plugin-hooks/useSortBy.js b/src/plugin-hooks/useSortBy.js index 0b46078..b7acd47 100755 --- a/src/plugin-hooks/useSortBy.js +++ b/src/plugin-hooks/useSortBy.js @@ -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