Skip to content

Commit

Permalink
Merge branch 'master' into stylelint-updates
Browse files Browse the repository at this point in the history
  • Loading branch information
andreancardona authored Jul 23, 2020
2 parents 045d3a2 + 6fed78d commit e478ca0
Show file tree
Hide file tree
Showing 3 changed files with 27 additions and 0 deletions.
25 changes: 25 additions & 0 deletions packages/react/__tests__/__snapshots__/PublicAPI-test.js.snap
Original file line number Diff line number Diff line change
Expand Up @@ -4123,6 +4123,31 @@ Map {
},
},
},
"PaginationNav" => Object {
"propTypes": Object {
"className": Object {
"type": "string",
},
"itemsShown": Object {
"type": "number",
},
"loop": Object {
"type": "bool",
},
"onChange": Object {
"type": "func",
},
"page": Object {
"type": "number",
},
"totalItems": Object {
"type": "number",
},
"translateWithId": Object {
"type": "func",
},
},
},
"PrimaryButton" => Object {},
"ProgressIndicator" => Object {
"defaultProps": Object {
Expand Down
1 change: 1 addition & 0 deletions packages/react/src/__tests__/index-test.js
Original file line number Diff line number Diff line change
Expand Up @@ -92,6 +92,7 @@ describe('Carbon Components React', () => {
"OverflowMenuItem",
"PageSelector",
"Pagination",
"PaginationNav",
"PaginationSkeleton",
"PrimaryButton",
"ProgressIndicator",
Expand Down
1 change: 1 addition & 0 deletions packages/react/src/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -83,6 +83,7 @@ export OrderedList from './components/OrderedList';
export OverflowMenu from './components/OverflowMenu';
export OverflowMenuItem from './components/OverflowMenuItem';
export Pagination from './components/Pagination';
export PaginationNav from './components/PaginationNav';
export PrimaryButton from './components/PrimaryButton';
export {
ProgressIndicator,
Expand Down

0 comments on commit e478ca0

Please sign in to comment.