Skip to content

Fixed pagination in table #127

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Aug 12, 2020
Merged

Fixed pagination in table #127

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
3766dae
Fixed pagination in table
tpiaggio Aug 11, 2020
fbaaa1b
Merge branch 'master' into fix/pagination
tpiaggio Aug 12, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
26 changes: 13 additions & 13 deletions src/components/Table/index.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,11 +22,11 @@ const Table = ({ columns, data }) => {
nextPage,
setPageSize,
canPreviousPage,
canNextPage
canNextPage,
} = useTable(
{
columns,
data
data,
},
useSortBy,
usePagination
Expand All @@ -41,9 +41,9 @@ const Table = ({ columns, data }) => {
{...getTableProps()}
>
<thead>
{headerGroups.map(headerGroup => (
{headerGroups.map((headerGroup) => (
<tr {...headerGroup.getHeaderGroupProps()}>
{headerGroup.headers.map(column => (
{headerGroup.headers.map((column) => (
<th
className={classNames(
{ [classes.isCurrentSort]: column.isSorted },
Expand Down Expand Up @@ -72,18 +72,18 @@ const Table = ({ columns, data }) => {
))}
</thead>
<tbody {...getTableBodyProps()}>
{page.map(row => {
{page.map((row) => {
prepareRow(row);
return (
<tr {...row.getRowProps()}>
{row.cells.map(cell => {
{row.cells.map((cell) => {
return (
<td
className={classNames(
{ 'is-actions-cell': cell.column.id === 'actions' },
{
'has-no-head-mobile is-image-cell':
cell.column.id === 'logoUrl'
cell.column.id === 'logoUrl',
}
)}
data-label={cell.column.Header}
Expand All @@ -104,11 +104,11 @@ const Table = ({ columns, data }) => {
<span className="select">
<select
value={pageSize}
onChange={e => {
onChange={(e) => {
setPageSize(Number(e.target.value));
}}
>
{[5, 10, 15, 20, 50].map(size => (
{[5, 10, 15, 20, 50].map((size) => (
<option key={size} value={size}>
{size} {perPage}
</option>
Expand Down Expand Up @@ -162,7 +162,7 @@ const Table = ({ columns, data }) => {
<button
type="button"
className="pagination-link"
onClick={() => gotoPage(2)}
onClick={() => gotoPage(1)}
>
2
</button>
Expand Down Expand Up @@ -207,7 +207,7 @@ const Table = ({ columns, data }) => {
<button
type="button"
className="pagination-link"
onClick={() => gotoPage(pageCount - 1)}
onClick={() => gotoPage(pageCount - 2)}
>
{pageCount - 1}
</button>
Expand Down Expand Up @@ -246,9 +246,9 @@ Table.propTypes = {
Cell: PropTypes.func,
sortType: PropTypes.string,
id: PropTypes.string,
disableSortBy: PropTypes.bool
disableSortBy: PropTypes.bool,
})
).isRequired
).isRequired,
};

export default Table;