From 2ec55f6de91a0ff1c3983f3ca4fc9be7cd373b8a Mon Sep 17 00:00:00 2001 From: AllenFang Date: Sat, 28 Jul 2018 15:47:53 +0800 Subject: [PATCH] patch for default sort and filter have potential issue when remote --- packages/react-bootstrap-table2-filter/src/components/date.js | 4 ++-- .../test/components/date.test.js | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/packages/react-bootstrap-table2-filter/src/components/date.js b/packages/react-bootstrap-table2-filter/src/components/date.js index da751d2..be6ecd5 100644 --- a/packages/react-bootstrap-table2-filter/src/components/date.js +++ b/packages/react-bootstrap-table2-filter/src/components/date.js @@ -92,7 +92,7 @@ class DateFilter extends Component { return defaultDate; } - applyFilter(value, comparator) { + applyFilter(value, comparator, isInitial) { // if (!comparator || !value) { // return; // } @@ -103,7 +103,7 @@ class DateFilter extends Component { // 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 }); + onFilter(column, FILTER_TYPE.DATE, isInitial)({ date, comparator }); }; if (delay) { this.timeout = setTimeout(() => { execute(); }, delay); diff --git a/packages/react-bootstrap-table2-filter/test/components/date.test.js b/packages/react-bootstrap-table2-filter/test/components/date.test.js index b421333..9fb3776 100644 --- a/packages/react-bootstrap-table2-filter/test/components/date.test.js +++ b/packages/react-bootstrap-table2-filter/test/components/date.test.js @@ -124,7 +124,7 @@ describe('Date Filter', () => { it('should do onFilter correctly when exported function was executed', () => { expect(onFilter).toHaveBeenCalledTimes(1); - expect(onFilter).toHaveBeenCalledWith(column, FILTER_TYPE.DATE, false); + expect(onFilter).toHaveBeenCalledWith(column, FILTER_TYPE.DATE, undefined); expect(onFilterFirstReturn).toHaveBeenCalledTimes(1); expect(onFilterFirstReturn).toHaveBeenCalledWith({ comparator, date }); });