Commit 2ec55f6

committed

patch for default sort and filter have potential issue when remote

1 parent f7406bc commit 2ec55f6Copy full SHA for 2ec55f6

File tree

-3

lines changed

packages/react-bootstrap-table2-filter
- src/components
  - date.js
- test/components
  - date.test.js

-3

lines changed

Lines changed: 2 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -92,7 +92,7 @@ class DateFilter extends Component {`
`92`	`92`	`return defaultDate;`
`93`	`93`	`}`
`94`	`94`
`95`		`- applyFilter(value, comparator) {`
	`95`	`+ applyFilter(value, comparator,isInitial) {`
`96`	`96`	`// if (!comparator \|\| !value) {`
`97`	`97`	`// return;`
`98`	`98`	`// }`
`@@ -103,7 +103,7 @@ class DateFilter extends Component {`
`103`	`103`	`// instead of parsing an invalid Date. The filter function will interpret`
`104`	`104`	`// null as an empty date field`
`105`	`105`	`const date = value === '' ? null : new Date(value);`
`106`		`- onFilter(column, FILTER_TYPE.DATE, )({ date, comparator });`
	`106`	`+ onFilter(column, FILTER_TYPE.DATE, isInitial)({ date, comparator });`
`107`	`107`	`};`
`108`	`108`	`if (delay) {`
`109`	`109`	`this.timeout = setTimeout(() => { execute(); }, delay);`

Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -124,7 +124,7 @@ describe('Date Filter', () => {`
`124`	`124`
`125`	`125`	`it('should do onFilter correctly when exported function was executed', () => {`
`126`	`126`	`expect(onFilter).toHaveBeenCalledTimes(1);`
`127`		`- expect(onFilter).toHaveBeenCalledWith(column, FILTER_TYPE.DATE, false);`
	`127`	`+ expect(onFilter).toHaveBeenCalledWith(column, FILTER_TYPE.DATE, undefined);`
`128`	`128`	`expect(onFilterFirstReturn).toHaveBeenCalledTimes(1);`
`129`	`129`	`expect(onFilterFirstReturn).toHaveBeenCalledWith({ comparator, date });`
`130`	`130`	`});`

Comments

(0)