Skip to content

Commit 42a972b

Browse files
committed
Refactor filterByNumber to return the result of comparator directly
Doing the same operation of comparator might be more straightforward and we don't need to declare a `valid` variable.
1 parent 52062dd commit 42a972b

File tree

1 file changed

+8
-27
lines changed
  • packages/react-bootstrap-table2-filter/src

1 file changed

+8
-27
lines changed

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

Lines changed: 8 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -39,55 +39,36 @@ export const filterByNumber = _ => (
3939
) => (
4040
data.filter((row) => {
4141
if (number === '' || !comparator) return true;
42-
let valid = true;
4342
let cell = _.get(row, dataField);
43+
4444
if (customFilterValue) {
4545
cell = customFilterValue(cell, row);
4646
}
4747

4848
switch (comparator) {
4949
case EQ: {
50-
if (cell != number) {
51-
valid = false;
52-
}
53-
break;
50+
return cell == number;
5451
}
5552
case GT: {
56-
if (cell <= number) {
57-
valid = false;
58-
}
59-
break;
53+
return cell > number;
6054
}
6155
case GE: {
62-
if (cell < number) {
63-
valid = false;
64-
}
65-
break;
56+
return cell >= number;
6657
}
6758
case LT: {
68-
if (cell >= number) {
69-
valid = false;
70-
}
71-
break;
59+
return cell < number;
7260
}
7361
case LE: {
74-
if (cell > number) {
75-
valid = false;
76-
}
77-
break;
62+
return cell <= number;
7863
}
7964
case NE: {
80-
if (cell == number) {
81-
valid = false;
82-
}
83-
break;
65+
return cell != number;
8466
}
8567
default: {
8668
console.error('Number comparator provided is not supported');
87-
break;
69+
return true;
8870
}
8971
}
90-
return valid;
9172
})
9273
);
9374

0 commit comments

Comments
 (0)