Skip to content

Commit eb204f6

Browse files
committed
fix #1060
1 parent 110744f commit eb204f6

File tree

1 file changed

+6
-2
lines changed
  • packages/react-bootstrap-table2-filter/src

1 file changed

+6
-2
lines changed

packages/react-bootstrap-table2-filter/src/filter.js

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -234,6 +234,7 @@ export const filters = (data, columns, _) => (currFilters) => {
234234
let result = data;
235235
let filterFn;
236236
Object.keys(currFilters).forEach((dataField) => {
237+
let currentResult;
237238
const filterObj = currFilters[dataField];
238239
filterFn = factory(filterObj.filterType);
239240
let filterValue;
@@ -248,9 +249,12 @@ export const filters = (data, columns, _) => (currFilters) => {
248249
}
249250
}
250251
if (customFilter) {
251-
result = customFilter(filterObj.filterVal, result);
252-
} else {
252+
currentResult = customFilter(filterObj.filterVal, result);
253+
}
254+
if (typeof currentResult === 'undefined') {
253255
result = filterFn(result, dataField, filterObj, filterValue);
256+
} else {
257+
result = currentResult;
254258
}
255259
});
256260
return result;

0 commit comments

Comments
 (0)