From 32ca5a240b5c019299fb872ebdb4dc45ee4cd066 Mon Sep 17 00:00:00 2001 From: gargroh <42495927+gargroh@users.noreply.github.com> Date: Sat, 15 Feb 2020 01:45:38 +0530 Subject: [PATCH] Add `Column` data in `autoRemove` of Filters (#1906) * Update utils.js * Update useFilters.js --- src/plugin-hooks/useFilters.js | 4 ++-- src/utils.js | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/plugin-hooks/useFilters.js b/src/plugin-hooks/useFilters.js index f897493..0c3dc04 100755 --- a/src/plugin-hooks/useFilters.js +++ b/src/plugin-hooks/useFilters.js @@ -68,7 +68,7 @@ function reducer(state, action, previousState, instance) { ) // - if (shouldAutoRemoveFilter(filterMethod.autoRemove, newFilter)) { + if (shouldAutoRemoveFilter(filterMethod.autoRemove, newFilter, column)) { return { ...state, filters: state.filters.filter(d => d.id !== columnId), @@ -108,7 +108,7 @@ function reducer(state, action, previousState, instance) { filterTypes ) - if (shouldAutoRemoveFilter(filterMethod.autoRemove, filter.value)) { + if (shouldAutoRemoveFilter(filterMethod.autoRemove, filter.value, column)) { return false } return true diff --git a/src/utils.js b/src/utils.js index 480f6cb..02fe310 100755 --- a/src/utils.js +++ b/src/utils.js @@ -369,8 +369,8 @@ export function getFilterMethod(filter, userFilterTypes, filterTypes) { ) } -export function shouldAutoRemoveFilter(autoRemove, value) { - return autoRemove ? autoRemove(value) : typeof value === 'undefined' +export function shouldAutoRemoveFilter(autoRemove, value, column) { + return autoRemove ? autoRemove(value, column) : typeof value === 'undefined' } export function unpreparedAccessWarning() {