diff --git a/packages/react-bootstrap-table2-filter/README.md b/packages/react-bootstrap-table2-filter/README.md index 0af54da..6cf47a0 100644 --- a/packages/react-bootstrap-table2-filter/README.md +++ b/packages/react-bootstrap-table2-filter/README.md @@ -131,7 +131,7 @@ const columns = [..., { Numner filter is same as other filter, you can custom the number filter via `numberFilter` factory function: ```js -import filterFactory, { selectFilter, Comparator } from 'react-bootstrap-table2-filter'; +import filterFactory, { selectFilter, Comparator, numberFilter } from 'react-bootstrap-table2-filter'; // omit... const numberFilter = numberFilter({ @@ -240,4 +240,4 @@ Following properties is valid in `FILTER_TYPES`: * TEXT * SELECT * NUMBER -* DATE \ No newline at end of file +* DATE diff --git a/packages/react-bootstrap-table2-filter/src/components/date.js b/packages/react-bootstrap-table2-filter/src/components/date.js index 02468aa..8e31724 100644 --- a/packages/react-bootstrap-table2-filter/src/components/date.js +++ b/packages/react-bootstrap-table2-filter/src/components/date.js @@ -93,12 +93,16 @@ class DateFilter extends Component { } applyFilter(value, comparator) { - if (!comparator || !value) { - return; - } + // if (!comparator || !value) { + // return; + // } const { column, onFilter, delay } = this.props; const execute = () => { - const date = typeof value !== 'object' ? new Date(value) : value; + // Incoming value should always be a string, and the defaultDate + // above is implemented as an empty string, so we can just check for that. + // instead of parsing an invalid Date. The filter function will interpret + // null as an empty date field + const date = value === '' ? null : new Date(value); onFilter(column, FILTER_TYPE.DATE)({ date, comparator }); }; if (delay) {