Skip to content

Commit

Permalink
chore(format): run prettier
Browse files Browse the repository at this point in the history
  • Loading branch information
joshblack committed Oct 21, 2019
1 parent ad8e665 commit 6c556a6
Show file tree
Hide file tree
Showing 3 changed files with 5 additions and 4 deletions.
5 changes: 3 additions & 2 deletions packages/components/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -37,8 +37,9 @@ subject to breaking changes. Please use `es`/`umd`/`scss` directories instead)

# :books: Documentation

- See our [documentation site](https://www.carbondesignsystem.com/get-started/develop/vanilla) for full
how-to docs and guidelines
- See our
[documentation site](https://www.carbondesignsystem.com/get-started/develop/vanilla)
for full how-to docs and guidelines
- [Contributing](/.github/CONTRIBUTING.md): Guidelines for making contributions
to this repo.
- [🏃‍♀️ Migration Guides](./docs/migration)
Expand Down
2 changes: 1 addition & 1 deletion packages/components/docs/migration/migrate-to-10.x.md
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ initial `v10` release.
| Combobox | No breaking changes |
| Content Switcher | [Migrate](../../src/components/content-switcher/migrate-to-10.x.md) |
| Copy Button | [Migrate](../../src/components/copy-button/migrate-to-10.x.md) |
| Data Table V2 | [Migrate](../../src/components/data-table/migrate-to-10.x.md) |
| Data Table V2 | [Migrate](../../src/components/data-table/migrate-to-10.x.md) |
| Data Table | Removed |
| Date Picker | TODO |
| Dropdown | [Migrate](../../src/components/dropdown/migrate-to-10.x.md) |
Expand Down
2 changes: 1 addition & 1 deletion packages/react/src/components/Pagination/Pagination.js
Original file line number Diff line number Diff line change
Expand Up @@ -162,7 +162,7 @@ export default class Pagination extends Component {
return !pageSizesChanged && !pageChanged && !pageSizeChanged
? null
: {
page: pageSizeChanged && 1 || pageChanged && page || currentPage,
page: (pageSizeChanged && 1) || (pageChanged && page) || currentPage,
pageSize: pageSizeChanged ? pageSize : currentPageSize,
prevPageSizes: pageSizes,
prevPage: page,
Expand Down

0 comments on commit 6c556a6

Please sign in to comment.