Commit 094c907

committed

1 parent 115b3ae commit 094c907Copy full SHA for 094c907

File tree

5 files changed

+16

-4

lines changed

packages
- react-bootstrap-table2-paginator/src
- react-bootstrap-table2/src/contexts
  - index.js

5 files changed

+16

-4

lines changed

`‎packages/react-bootstrap-table2-paginator/src/pagination.js`

Lines changed: 2 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -13,6 +13,7 @@ import Const from './const';`
`13`	`13`	`class Pagination extends pageResolver(Component) {`
`14`	`14`	`render() {`
`15`	`15`	`const {`
	`16`	`+ tableId,`
`16`	`17`	`currPage,`
`17`	`18`	`pageStartIndex,`
`18`	`19`	`showTotal,`
`@@ -43,6 +44,7 @@ class Pagination extends pageResolver(Component) {`
`43`	`44`	`<div className="row react-bootstrap-table-pagination">`
`44`	`45`	`<div className="col-md-6 col-xs-6 col-sm-6 col-lg-6">`
`45`	`46`	`<SizePerPageDropdownWithAdapter`
	`47`	`+ tableId={ tableId }`
`46`	`48`	`sizePerPageList={ sizePerPageList }`
`47`	`49`	`currSizePerPage={ currSizePerPage }`
`48`	`50`	`hideSizePerPage={ hideSizePerPage }`

`‎packages/react-bootstrap-table2-paginator/src/size-per-page-dropdown-adapter.js`

Lines changed: 2 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -30,6 +30,7 @@ const sizePerPageDropdownAdapter = WrappedComponent =>`
`30`	`30`
`31`	`31`	`render() {`
`32`	`32`	`const {`
	`33`	`+ tableId,`
`33`	`34`	`sizePerPageList,`
`34`	`35`	`currSizePerPage,`
`35`	`36`	`hideSizePerPage,`
`@@ -56,6 +57,7 @@ const sizePerPageDropdownAdapter = WrappedComponent =>`
`56`	`57`	`onClick={ this.toggleDropDown }`
`57`	`58`	`onBlur={ this.closeDropDown }`
`58`	`59`	`open={ open }`
	`60`	`+ tableId={ tableId }`
`59`	`61`	`/>`
`60`	`62`	`);`
`61`	`63`	`}`

`‎packages/react-bootstrap-table2-paginator/src/size-per-page-dropdown.js`

Lines changed: 9 additions & 3 deletions

Original file line number	Diff line number	Diff line change
`@@ -9,6 +9,7 @@ const sizePerPageDefaultClass = 'react-bs-table-sizePerPage-dropdown';`
`9`	`9`	`const SizePerPageDropDown = (props) => {`
`10`	`10`	`const {`
`11`	`11`	`open,`
	`12`	`+ tableId,`
`12`	`13`	`hidden,`
`13`	`14`	`onClick,`
`14`	`15`	`onBlur,`
`@@ -30,6 +31,8 @@ const SizePerPageDropDown = (props) => {`
`30`	`31`	`className,`
`31`	`32`	`);`
`32`	`33`
	`34`	+ const id = tableId ? `${tableId}-pageDropDown` : 'pageDropDown';
	`35`	`+`
`33`	`36`	`return (`
`34`	`37`	`<BootstrapContext.Consumer>`
`35`	`38`	`{`
`@@ -39,7 +42,8 @@ const SizePerPageDropDown = (props) => {`
`39`	`42`	`className={ dropdownClasses }`
`40`	`43`	`>`
`41`	`44`	`<button`
`42`		`- id="pageDropDown"`
	`45`	`+ id={ id }`
	`46`	`+ type="button"`
`43`	`47`	className={ `btn ${btnContextual} dropdown-toggle` }
`44`	`48`	`data-toggle="dropdown"`
`45`	`49`	`aria-expanded={ open }`
`@@ -59,7 +63,7 @@ const SizePerPageDropDown = (props) => {`
`59`	`63`	`<ul`
`60`	`64`	className={ `dropdown-menu ${openClass}` }
`61`	`65`	`role="menu"`
`62`		`- aria-labelledby="pageDropDown"`
	`66`	`+ aria-labelledby={id}`
`63`	`67`	`>`
`64`	`68`	`{`
`65`	`69`	`options.map((option) => {`
`@@ -93,6 +97,7 @@ SizePerPageDropDown.propTypes = {`
`93`	`97`	`onClick: PropTypes.func.isRequired,`
`94`	`98`	`onBlur: PropTypes.func.isRequired,`
`95`	`99`	`onSizePerPageChange: PropTypes.func.isRequired,`
	`100`	`+ tableId: PropTypes.string,`
`96`	`101`	`open: PropTypes.bool,`
`97`	`102`	`hidden: PropTypes.bool,`
`98`	`103`	`btnContextual: PropTypes.string,`
`@@ -106,7 +111,8 @@ SizePerPageDropDown.defaultProps = {`
`106`	`111`	`btnContextual: 'btn-default btn-secondary',`
`107`	`112`	`variation: 'dropdown',`
`108`	`113`	`className: '',`
`109`		`- optionRenderer: null`
	`114`	`+ optionRenderer: null,`
	`115`	`+ tableId: null`
`110`	`116`	`};`
`111`	`117`
`112`	`118`

`‎packages/react-bootstrap-table2-paginator/src/state-context.js`

Lines changed: 2 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -47,7 +47,7 @@ class StateProvider extends React.Component {`
`47`	`47`	`}`
`48`	`48`
`49`	`49`	`getPaginationProps = () => {`
`50`		`- const { pagination: { options }, bootstrap4 } = this.props;`
	`50`	`+ const { pagination: { options }, bootstrap4, tableId } = this.props;`
`51`	`51`	`const { currPage, currSizePerPage, dataSize } = this;`
`52`	`52`	`const withFirstAndLast = typeof options.withFirstAndLast === 'undefined' ?`
`53`	`53`	`Const.With_FIRST_AND_LAST : options.withFirstAndLast;`
`@@ -62,6 +62,7 @@ class StateProvider extends React.Component {`
`62`	`62`	`return {`
`63`	`63`	`...options,`
`64`	`64`	`bootstrap4,`
	`65`	`+ tableId,`
`65`	`66`	`page: currPage,`
`66`	`67`	`sizePerPage: currSizePerPage,`
`67`	`68`	`pageStartIndex,`

`‎packages/react-bootstrap-table2/src/contexts/index.js`

Lines changed: 1 addition & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -226,6 +226,7 @@ const withContext = Base =>`
`226`	`226`	`isRemotePagination={ this.isRemotePagination }`
`227`	`227`	`remoteEmitter={ this.remoteEmitter }`
`228`	`228`	`onDataSizeChange={ this.props.onDataSizeChange }`
	`229`	`+ tableId={ this.props.id }`
`229`	`230`	`>`
`230`	`231`	`<this.PaginationContext.Consumer>`
`231`	`232`	`{`

0 commit comments

Comments

(0)

Navigation Menu

Search code, repositories, users, issues, pull requests...

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

Commit 094c907

File tree

5 files changed

5 files changed

`‎packages/react-bootstrap-table2-paginator/src/pagination.js`

`‎packages/react-bootstrap-table2-paginator/src/size-per-page-dropdown-adapter.js`

`‎packages/react-bootstrap-table2-paginator/src/size-per-page-dropdown.js`

`‎packages/react-bootstrap-table2-paginator/src/state-context.js`

`‎packages/react-bootstrap-table2/src/contexts/index.js`

0 commit comments