From 903dd2e5c82f7d15d44a9421b4c2da88c51b1cae Mon Sep 17 00:00:00 2001 From: AllenFang Date: Thu, 7 Feb 2019 15:34:03 +0800 Subject: [PATCH] rename listenerForPagination -> dataChangeListener --- .../src/context.js | 8 ++-- .../test/context.test.js | 14 +++---- .../src/state-context.js | 6 +-- .../test/state-context.test.js | 40 +++++++++---------- 4 files changed, 34 insertions(+), 34 deletions(-) diff --git a/packages/react-bootstrap-table2-filter/src/context.js b/packages/react-bootstrap-table2-filter/src/context.js index a430d94..0fcfa88 100644 --- a/packages/react-bootstrap-table2-filter/src/context.js +++ b/packages/react-bootstrap-table2-filter/src/context.js @@ -18,7 +18,7 @@ export default ( static propTypes = { data: PropTypes.array.isRequired, columns: PropTypes.array.isRequired, - listenerForPagination: PropTypes.object + dataChangeListener: PropTypes.object } constructor(props) { @@ -73,10 +73,10 @@ export default ( result = filter.props.onFilter(filterVal); } - const { listenerForPagination, data } = this.props; + const { dataChangeListener, data } = this.props; result = result || filters(data, this.props.columns, _)(this.currFilters); - if (listenerForPagination) { - listenerForPagination.emit('filterChanged', result.length); + if (dataChangeListener) { + dataChangeListener.emit('filterChanged', result.length); } this.setState({ data: result }); }; diff --git a/packages/react-bootstrap-table2-filter/test/context.test.js b/packages/react-bootstrap-table2-filter/test/context.test.js index b94ea00..20bba40 100644 --- a/packages/react-bootstrap-table2-filter/test/context.test.js +++ b/packages/react-bootstrap-table2-filter/test/context.test.js @@ -46,7 +46,7 @@ describe('FilterContext', () => { function shallowContext( enableRemote = false, tableColumns = columns, - listenerForPagination, + dataChangeListener, ) { mockBase.mockReset(); handleFilterChange.mockReset(); @@ -60,7 +60,7 @@ describe('FilterContext', () => { { @@ -289,20 +289,20 @@ describe('FilterContext', () => { }); }); - describe('when props.listenerForPagination is defined', () => { + describe('when props.dataChangeListener is defined', () => { const filterVal = '3'; const newDataLength = 0; - const listenerForPagination = { emit: jest.fn() }; + const dataChangeListener = { emit: jest.fn() }; beforeEach(() => { - wrapper = shallow(shallowContext(false, columns, listenerForPagination)); + wrapper = shallow(shallowContext(false, columns, dataChangeListener)); wrapper.render(); instance = wrapper.instance(); }); - it('should call listenerForPagination.emit correctly', () => { + it('should call dataChangeListener.emit correctly', () => { instance.onFilter(columns[1], FILTER_TYPE.TEXT)(filterVal); - expect(listenerForPagination.emit).toHaveBeenCalledWith('filterChanged', newDataLength); + expect(dataChangeListener.emit).toHaveBeenCalledWith('filterChanged', newDataLength); }); }); diff --git a/packages/react-bootstrap-table2-paginator/src/state-context.js b/packages/react-bootstrap-table2-paginator/src/state-context.js index ae5f26a..3b9e7a3 100644 --- a/packages/react-bootstrap-table2-paginator/src/state-context.js +++ b/packages/react-bootstrap-table2-paginator/src/state-context.js @@ -41,8 +41,8 @@ class StateProvider extends React.Component { this.currPage = currPage; this.dataSize = options.totalSize; this.currSizePerPage = currSizePerPage; - this.filterListener = new EventEmitter(); - this.filterListener.on('filterChanged', this.handleDataSizeChange); + this.dataChangeListener = new EventEmitter(); + this.dataChangeListener.on('filterChanged', this.handleDataSizeChange); } componentWillReceiveProps(nextProps) { @@ -174,7 +174,7 @@ class StateProvider extends React.Component { paginationTableProps: { pagination, setPaginationRemoteEmitter: this.setPaginationRemoteEmitter, - listenerForPagination: this.filterListener + dataChangeListener: this.dataChangeListener } } } > diff --git a/packages/react-bootstrap-table2-paginator/test/state-context.test.js b/packages/react-bootstrap-table2-paginator/test/state-context.test.js index 956b4ba..d6cbc09 100644 --- a/packages/react-bootstrap-table2-paginator/test/state-context.test.js +++ b/packages/react-bootstrap-table2-paginator/test/state-context.test.js @@ -107,7 +107,7 @@ describe('PaginationStateContext', () => { options: instance.getPaginationProps() }, setPaginationRemoteEmitter: instance.setPaginationRemoteEmitter, - listenerForPagination: instance.filterListener + dataChangeListener: instance.filterListener } }); }); @@ -374,7 +374,7 @@ describe('PaginationStateContext', () => { options: instance.getPaginationProps() }, setPaginationRemoteEmitter: instance.setPaginationRemoteEmitter, - listenerForPagination: instance.filterListener + dataChangeListener: instance.filterListener } }); }); @@ -406,7 +406,7 @@ describe('PaginationStateContext', () => { options: instance.getPaginationProps() }, setPaginationRemoteEmitter: instance.setPaginationRemoteEmitter, - listenerForPagination: instance.filterListener + dataChangeListener: instance.filterListener } }); }); @@ -434,7 +434,7 @@ describe('PaginationStateContext', () => { options: instance.getPaginationProps() }, setPaginationRemoteEmitter: instance.setPaginationRemoteEmitter, - listenerForPagination: instance.filterListener + dataChangeListener: instance.filterListener } }); }); @@ -462,7 +462,7 @@ describe('PaginationStateContext', () => { options: instance.getPaginationProps() }, setPaginationRemoteEmitter: instance.setPaginationRemoteEmitter, - listenerForPagination: instance.filterListener + dataChangeListener: instance.filterListener } }); }); @@ -490,7 +490,7 @@ describe('PaginationStateContext', () => { options: instance.getPaginationProps() }, setPaginationRemoteEmitter: instance.setPaginationRemoteEmitter, - listenerForPagination: instance.filterListener + dataChangeListener: instance.filterListener } }); }); @@ -518,7 +518,7 @@ describe('PaginationStateContext', () => { options: instance.getPaginationProps() }, setPaginationRemoteEmitter: instance.setPaginationRemoteEmitter, - listenerForPagination: instance.filterListener + dataChangeListener: instance.filterListener } }); }); @@ -546,7 +546,7 @@ describe('PaginationStateContext', () => { options: instance.getPaginationProps() }, setPaginationRemoteEmitter: instance.setPaginationRemoteEmitter, - listenerForPagination: instance.filterListener + dataChangeListener: instance.filterListener } }); }); @@ -574,7 +574,7 @@ describe('PaginationStateContext', () => { options: instance.getPaginationProps() }, setPaginationRemoteEmitter: instance.setPaginationRemoteEmitter, - listenerForPagination: instance.filterListener + dataChangeListener: instance.filterListener } }); }); @@ -602,7 +602,7 @@ describe('PaginationStateContext', () => { options: instance.getPaginationProps() }, setPaginationRemoteEmitter: instance.setPaginationRemoteEmitter, - listenerForPagination: instance.filterListener + dataChangeListener: instance.filterListener } }); }); @@ -630,7 +630,7 @@ describe('PaginationStateContext', () => { options: instance.getPaginationProps() }, setPaginationRemoteEmitter: instance.setPaginationRemoteEmitter, - listenerForPagination: instance.filterListener + dataChangeListener: instance.filterListener } }); }); @@ -658,7 +658,7 @@ describe('PaginationStateContext', () => { options: instance.getPaginationProps() }, setPaginationRemoteEmitter: instance.setPaginationRemoteEmitter, - listenerForPagination: instance.filterListener + dataChangeListener: instance.filterListener } }); }); @@ -686,7 +686,7 @@ describe('PaginationStateContext', () => { options: instance.getPaginationProps() }, setPaginationRemoteEmitter: instance.setPaginationRemoteEmitter, - listenerForPagination: instance.filterListener + dataChangeListener: instance.filterListener } }); }); @@ -714,7 +714,7 @@ describe('PaginationStateContext', () => { options: instance.getPaginationProps() }, setPaginationRemoteEmitter: instance.setPaginationRemoteEmitter, - listenerForPagination: instance.filterListener + dataChangeListener: instance.filterListener } }); }); @@ -742,7 +742,7 @@ describe('PaginationStateContext', () => { options: instance.getPaginationProps() }, setPaginationRemoteEmitter: instance.setPaginationRemoteEmitter, - listenerForPagination: instance.filterListener + dataChangeListener: instance.filterListener } }); }); @@ -770,7 +770,7 @@ describe('PaginationStateContext', () => { options: instance.getPaginationProps() }, setPaginationRemoteEmitter: instance.setPaginationRemoteEmitter, - listenerForPagination: instance.filterListener + dataChangeListener: instance.filterListener } }); }); @@ -798,7 +798,7 @@ describe('PaginationStateContext', () => { options: instance.getPaginationProps() }, setPaginationRemoteEmitter: instance.setPaginationRemoteEmitter, - listenerForPagination: instance.filterListener + dataChangeListener: instance.filterListener } }); }); @@ -826,7 +826,7 @@ describe('PaginationStateContext', () => { options: instance.getPaginationProps() }, setPaginationRemoteEmitter: instance.setPaginationRemoteEmitter, - listenerForPagination: instance.filterListener + dataChangeListener: instance.filterListener } }); }); @@ -854,7 +854,7 @@ describe('PaginationStateContext', () => { options: instance.getPaginationProps() }, setPaginationRemoteEmitter: instance.setPaginationRemoteEmitter, - listenerForPagination: instance.filterListener + dataChangeListener: instance.filterListener } }); }); @@ -882,7 +882,7 @@ describe('PaginationStateContext', () => { options: instance.getPaginationProps() }, setPaginationRemoteEmitter: instance.setPaginationRemoteEmitter, - listenerForPagination: instance.filterListener + dataChangeListener: instance.filterListener } }); });