Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly
Sign up
Appearance settings

Commit a1477e2

Browse files
filter column by new onFilter
1 parent f34cb4b commit a1477e2

File tree

3 files changed

+20
-15
lines changed

3 files changed

+20
-15
lines changed

‎packages/react-bootstrap-table2-filter/src/components/number.js‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ class NumberFilter extends Component {
3434
const comparator = this.numberFilterComparator.value;
3535
const number = this.numberFilter.value;
3636
if (comparator && number) {
37-
onFilter(column, { number, comparator },FILTER_TYPE.NUMBER);
37+
onFilter(column, FILTER_TYPE.NUMBER)({ number, comparator });
3838
}
3939
}
4040

@@ -53,7 +53,7 @@ class NumberFilter extends Component {
5353
}
5454
const filterValue = e.target.value;
5555
this.timeout = setTimeout(() => {
56-
onFilter(column, { number: filterValue, comparator },FILTER_TYPE.NUMBER);
56+
onFilter(column, FILTER_TYPE.NUMBER)({ number: filterValue, comparator });
5757
}, delay);
5858
}
5959

@@ -65,7 +65,7 @@ class NumberFilter extends Component {
6565
// if (comparator === '') {
6666
// return;
6767
// }
68-
onFilter(column, { number: value, comparator },FILTER_TYPE.NUMBER);
68+
onFilter(column, FILTER_TYPE.NUMBER)({ number: value, comparator });
6969
}
7070

7171
onChangeComparator(e) {
@@ -75,7 +75,7 @@ class NumberFilter extends Component {
7575
// if (value === '') {
7676
// return;
7777
// }
78-
onFilter(column, { number: value, comparator },FILTER_TYPE.NUMBER);
78+
onFilter(column, FILTER_TYPE.NUMBER)({ number: value, comparator });
7979
}
8080

8181
getComparatorOptions() {
@@ -116,7 +116,7 @@ class NumberFilter extends Component {
116116
this.setState(() => ({ isSelected: (number !== '') }));
117117
this.numberFilterComparator.value = comparator;
118118
this.numberFilter.value = number;
119-
onFilter(column, { number, comparator },FILTER_TYPE.NUMBER);
119+
onFilter(column, FILTER_TYPE.NUMBER)({ number, comparator });
120120
}
121121

122122
cleanFiltered() {
@@ -126,7 +126,7 @@ class NumberFilter extends Component {
126126
this.setState(() => ({ isSelected: (value !== '') }));
127127
this.numberFilterComparator.value = comparator;
128128
this.numberFilter.value = value;
129-
onFilter(column, { number: value, comparator },FILTER_TYPE.NUMBER);
129+
onFilter(column, FILTER_TYPE.NUMBER)({ number: value, comparator });
130130
}
131131

132132
render() {

‎packages/react-bootstrap-table2-filter/src/components/select.js‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ class SelectFilter extends Component {
2727
componentDidMount() {
2828
const value = this.selectInput.value;
2929
if (value && value !== '') {
30-
this.props.onFilter(this.props.column, value,FILTER_TYPE.SELECT);
30+
this.props.onFilter(this.props.column, FILTER_TYPE.SELECT)(value);
3131
}
3232
}
3333

@@ -41,7 +41,7 @@ class SelectFilter extends Component {
4141
if (needFilter) {
4242
const value = this.selectInput.value;
4343
if (value) {
44-
this.props.onFilter(this.props.column, value,FILTER_TYPE.SELECT);
44+
this.props.onFilter(this.props.column, FILTER_TYPE.SELECT)(value);
4545
}
4646
}
4747
}
@@ -64,19 +64,19 @@ class SelectFilter extends Component {
6464
const value = (this.props.defaultValue !== undefined) ? this.props.defaultValue : '';
6565
this.setState(() => ({ isSelected: value !== '' }));
6666
this.selectInput.value = value;
67-
this.props.onFilter(this.props.column, value,FILTER_TYPE.SELECT);
67+
this.props.onFilter(this.props.column, FILTER_TYPE.SELECT)(value);
6868
}
6969

7070
applyFilter(value) {
7171
this.selectInput.value = value;
7272
this.setState(() => ({ isSelected: value !== '' }));
73-
this.props.onFilter(this.props.column, value,FILTER_TYPE.SELECT);
73+
this.props.onFilter(this.props.column, FILTER_TYPE.SELECT)(value);
7474
}
7575

7676
filter(e) {
7777
const { value } = e.target;
7878
this.setState(() => ({ isSelected: value !== '' }));
79-
this.props.onFilter(this.props.column, value,FILTER_TYPE.SELECT);
79+
this.props.onFilter(this.props.column, FILTER_TYPE.SELECT)(value);
8080
}
8181

8282
render() {

‎packages/react-bootstrap-table2-filter/src/components/text.js‎

Lines changed: 9 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -17,10 +17,14 @@ class TextFilter extends Component {
1717
value: props.defaultValue
1818
};
1919
}
20+
2021
componentDidMount() {
22+
const { onFilter } = this.props;
23+
2124
const defaultValue = this.input.value;
25+
2226
if (defaultValue) {
23-
this.props.onFilter(this.props.column, defaultValue,FILTER_TYPE.TEXT);
27+
onFilter(this.props.column, FILTER_TYPE.TEXT)(defaultValue);
2428
}
2529
}
2630

@@ -40,7 +44,7 @@ class TextFilter extends Component {
4044
const filterValue = e.target.value;
4145
this.setState(() => ({ value: filterValue }));
4246
this.timeout = setTimeout(() => {
43-
this.props.onFilter(this.props.column, filterValue,FILTER_TYPE.TEXT);
47+
this.props.onFilter(this.props.column, FILTER_TYPE.TEXT)(filterValue);
4448
}, this.props.delay);
4549
}
4650

@@ -53,12 +57,12 @@ class TextFilter extends Component {
5357
cleanFiltered() {
5458
const value = this.props.defaultValue;
5559
this.setState(() => ({ value }));
56-
this.props.onFilter(this.props.column, value, FILTER_TYPE.TEXT);
60+
this.props.onFilter(this.props.column, value, FILTER_TYPE.TEXT)();
5761
}
5862

5963
applyFilter(filterText) {
6064
this.setState(() => ({ value: filterText }));
61-
this.props.onFilter(this.props.column, filterText,FILTER_TYPE.TEXT);
65+
this.props.onFilter(this.props.column, FILTER_TYPE.TEXT)(filterText);
6266
}
6367

6468
handleClick(e) {
@@ -79,6 +83,7 @@ class TextFilter extends Component {
7983
defaultValue,
8084
...rest
8185
} = this.props;
86+
8287
// stopPropagation for onClick event is try to prevent sort was triggered.
8388
return (
8489
<input

0 commit comments

Comments
(0)

AltStyle によって変換されたページ (->オリジナル) /