Commit 4dd39ae

committed

export onFilter function to allow user to access

1 parent a1477e2 commit 4dd39aeCopy full SHA for 4dd39ae

File tree

+41

-7

lines changed

+41

-7

lines changed

Lines changed: 15 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -1,3 +1,4 @@`
	`1`	`+/* eslint react/require-default-props: 0 */`
`1`	`2`	`/* eslint no-return-assign: 0 */`
`2`	`3`
`3`	`4`	`import React, { Component } from 'react';`
`@@ -30,12 +31,23 @@ class NumberFilter extends Component {`
`30`	`31`	`}`
`31`	`32`
`32`	`33`	`componentDidMount() {`
`33`		`- const { column, onFilter } = this.props;`
	`34`	`+ const { column, onFilter, getFilterBy } = this.props;`
`34`	`35`	`const comparator = this.numberFilterComparator.value;`
`35`	`36`	`const number = this.numberFilter.value;`
`36`	`37`	`if (comparator && number) {`
`37`	`38`	`onFilter(column, FILTER_TYPE.NUMBER)({ number, comparator });`
`38`	`39`	`}`
	`40`	`+`
	`41`	`+ // export onFilter function to allow users to access`
	`42`	`+ if (getFilterBy) {`
	`43`	`+ getFilterBy((filterVal) => {`
	`44`	`+ this.setState(() => ({ isSelected: (filterVal !== '') }));`
	`45`	`+ onFilter(column, FILTER_TYPE.NUMBER)({`
	`46`	`+ number: filterVal.number,`
	`47`	`+ comparator: filterVal.comparator`
	`48`	`+ });`
	`49`	`+ });`
	`50`	`+ }`
`39`	`51`	`}`
`40`	`52`
`41`	`53`	`componentWillUnmount() {`
`@@ -224,7 +236,8 @@ NumberFilter.propTypes = {`
`224`	`236`	`comparatorStyle: PropTypes.object,`
`225`	`237`	`comparatorClassName: PropTypes.string,`
`226`	`238`	`numberStyle: PropTypes.object,`
`227`		`- numberClassName: PropTypes.string`
	`239`	`+ numberClassName: PropTypes.string,`
	`240`	`+ getFilterBy: PropTypes.func`
`228`	`241`	`};`
`229`	`242`
`230`	`243`	`NumberFilter.defaultProps = {`

Lines changed: 14 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -25,9 +25,19 @@ class SelectFilter extends Component {`
`25`	`25`	`}`
`26`	`26`
`27`	`27`	`componentDidMount() {`
	`28`	`+ const { column, onFilter, getFilterBy } = this.props;`
	`29`	`+`
`28`	`30`	`const value = this.selectInput.value;`
`29`	`31`	`if (value && value !== '') {`
`30`		`- this.props.onFilter(this.props.column, FILTER_TYPE.SELECT)(value);`
	`32`	`+ onFilter(column, FILTER_TYPE.SELECT)(value);`
	`33`	`+ }`
	`34`	`+`
	`35`	`+ // export onFilter function to allow users to access`
	`36`	`+ if (getFilterBy) {`
	`37`	`+ getFilterBy((filterVal) => {`
	`38`	`+ this.setState(() => ({ isSelected: filterVal !== '' }));`
	`39`	`+ onFilter(column, FILTER_TYPE.SELECT)(filterVal);`
	`40`	`+ });`
`31`	`41`	`}`
`32`	`42`	`}`
`33`	`43`
`@@ -90,6 +100,7 @@ class SelectFilter extends Component {`
`90`	`100`	`comparator,`
`91`	`101`	`withoutEmptyOption,`
`92`	`102`	`caseSensitive,`
	`103`	`+ getFilterBy,`
`93`	`104`	`...rest`
`94`	`105`	`} = this.props;`
`95`	`106`
`@@ -121,7 +132,8 @@ SelectFilter.propTypes = {`
`121`	`132`	`className: PropTypes.string,`
`122`	`133`	`withoutEmptyOption: PropTypes.bool,`
`123`	`134`	`defaultValue: PropTypes.any,`
`124`		`- caseSensitive: PropTypes.bool`
	`135`	`+ caseSensitive: PropTypes.bool,`
	`136`	`+ getFilterBy: PropTypes.func`
`125`	`137`	`};`
`126`	`138`
`127`	`139`	`SelectFilter.defaultProps = {`

Lines changed: 12 additions & 3 deletions

Original file line number	Diff line number	Diff line change
`@@ -19,13 +19,20 @@ class TextFilter extends Component {`
`19`	`19`	`}`
`20`	`20`
`21`	`21`	`componentDidMount() {`
`22`		`- const { onFilter } = this.props;`
`23`		`-`
	`22`	`+ const { onFilter, getFilterBy, column } = this.props;`
`24`	`23`	`const defaultValue = this.input.value;`
`25`	`24`
`26`	`25`	`if (defaultValue) {`
`27`	`26`	`onFilter(this.props.column, FILTER_TYPE.TEXT)(defaultValue);`
`28`	`27`	`}`
	`28`	`+`
	`29`	`+ // export onFilter function to allow users to access`
	`30`	`+ if (getFilterBy) {`
	`31`	`+ getFilterBy((filterVal) => {`
	`32`	`+ this.setState(() => ({ value: filterVal }));`
	`33`	`+ onFilter(column, FILTER_TYPE.TEXT)(filterVal);`
	`34`	`+ });`
	`35`	`+ }`
`29`	`36`	`}`
`30`	`37`
`31`	`38`	`componentWillReceiveProps(nextProps) {`
`@@ -81,6 +88,7 @@ class TextFilter extends Component {`
`81`	`88`	`onFilter,`
`82`	`89`	`caseSensitive,`
`83`	`90`	`defaultValue,`
	`91`	`+ getFilterBy,`
`84`	`92`	`...rest`
`85`	`93`	`} = this.props;`
`86`	`94`
`@@ -110,7 +118,8 @@ TextFilter.propTypes = {`
`110`	`118`	`placeholder: PropTypes.string,`
`111`	`119`	`style: PropTypes.object,`
`112`	`120`	`className: PropTypes.string,`
`113`		`- caseSensitive: PropTypes.bool`
	`121`	`+ caseSensitive: PropTypes.bool,`
	`122`	`+ getFilterBy: PropTypes.func`
`114`	`123`	`};`
`115`	`124`
`116`	`125`	`TextFilter.defaultProps = {`

Comments

(0)