-
Notifications
You must be signed in to change notification settings - Fork 0
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.
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
feat(Pagination): Avoir une valeur props pour la page courante. #206
Merged
Merged
Changes from 9 commits
Commits
Show all changes
10 commits
Select commit
Hold shift + click to select a range
2778e53
feat(Pagination): Add activePage props to have more control with the …
9ecc32a
feat(Storybook): Add example of currentPage state on two Pagination
9ac7515
fix(Pagination): ESLint fix
86fe94a
fix(Pagination): ESLint fix 2
f782896
fix(Table): Adjust storybook name and activePage refresh without useE…
hdeschenes-equisoft 2315c76
feat(ESLint): linebreak-style rule is now off for storybook and react
hdeschenes-equisoft f514062
feat(Pagination): Adjust storybook for pagination
hdeschenes-equisoft ad060cb
feat(Pagination): Add useEffect and remove fragment in storybook
hdeschenes-equisoft ba65e9a
feat(Pagination): Always fallback to activePage even when defaultActi…
hdeschenes-equisoft 39c1ba5
Merge branch 'master' into dev/DS-173
meriouma File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,4 +1,4 @@ | ||
import React, { ReactElement, useState, VoidFunctionComponent } from 'react'; | ||
import React, { ReactElement, useState, VoidFunctionComponent, useEffect } from 'react'; | ||
import styled from 'styled-components'; | ||
import { useTranslation } from '../../i18n/use-translation'; | ||
import { focus } from '../../utils/css-state'; | ||
|
@@ -107,6 +107,11 @@ interface PaginationProps { | |
* Function callback when page is changed | ||
*/ | ||
onPageChange?(pageNumber: number): void; | ||
|
||
/** | ||
* The current active page of the pagination | ||
*/ | ||
activePage?: number; | ||
} | ||
|
||
export function Pagination({ | ||
|
@@ -116,16 +121,23 @@ export function Pagination({ | |
defaultActivePage = 1, | ||
pagesShown = 3, | ||
onPageChange = () => undefined, | ||
activePage, | ||
}: PaginationProps): ReactElement { | ||
const { t } = useTranslation('pagination'); | ||
const { isMobile } = useDeviceContext(); | ||
const pagesDisplayed = Math.min(pagesShown, totalPages); | ||
const [currentPage, setCurrentPage] = useState(clamp(defaultActivePage, 1, totalPages)); | ||
const [currentPage, setCurrentPage] = useState(clamp(activePage || defaultActivePage, 1, totalPages)); | ||
const canNavigatePrevious = currentPage > 1; | ||
const canNavigateNext = currentPage < totalPages; | ||
const firstLastNavActive = totalPages > 5; | ||
const forwardBackwardNavActive = totalPages > 3 || pagesDisplayed < totalPages; | ||
|
||
useEffect(() => { | ||
if (activePage && currentPage !== activePage) { | ||
setCurrentPage(activePage); | ||
} | ||
}, [activePage, currentPage]); | ||
|
||
function changePage(page: number): void { | ||
setCurrentPage(page); | ||
maxime-gendron marked this conversation as resolved.
Show resolved
Hide resolved
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Sinon, peut-être juste appeler There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. C'est fait ! |
||
onPageChange(page); | ||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Petit dernier détail, il faudrait changer la ligne 129 pour changer
const [currentPage, setCurrentPage] = useState(clamp(defaultActivePage, 1, totalPages));
pour
const [currentPage, setCurrentPage] = useState(clamp(activePage || defaultActivePage, 1, totalPages));
pour prendre en compte le
activePage
au premier render.There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
C'est fait