LBRYCommunity/lbry-desktop
1
0
Fork 0
Code Issues 596 Pull requests 6 Projects Releases 238 Packages Wiki Activity

fix Paginate form submit

Browse source
This commit is contained in:
Sean Yesmunt 2019-09-26 11:38:48 -04:00
parent 6e38cb5ded
commit bca759b522
2 changed files with 11 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
src/ui/component/common/paginate.jsx
View file

@ -5,7 +5,6 @@ import { Form, FormField } from 'component/common/form';
import ReactPaginate from 'react-paginate'; import ReactPaginate from 'react-paginate';
const PAGINATE_PARAM = 'page'; const PAGINATE_PARAM = 'page';
const ENTER_KEY_CODE = 13;
type Props = { type Props = {
loading: boolean, loading: boolean,
@ -18,6 +17,7 @@ type Props = {
function Paginate(props: Props) { function Paginate(props: Props) {
const { totalPages = 1, loading, location, history, onPageChange } = props; const { totalPages = 1, loading, location, history, onPageChange } = props;
const { search } = location; const { search } = location;
const [textValue, setTextValue] = React.useState('');
const urlParams = new URLSearchParams(search); const urlParams = new URLSearchParams(search);
const currentPage = Number(urlParams.get(PAGINATE_PARAM)) || 1; const currentPage = Number(urlParams.get(PAGINATE_PARAM)) || 1;
@ -31,11 +31,9 @@ function Paginate(props: Props) {
} }
} }
function handlePaginateKeyUp(e: SyntheticKeyboardEvent<*>) { function handlePaginateKeyUp() {
const newPage = Number(e.currentTarget.value); const newPage = Number(textValue);
const isEnterKey = e.keyCode === ENTER_KEY_CODE; if (newPage && newPage > 0 && newPage <= totalPages) {
if (newPage && isEnterKey && newPage > 0 && newPage <= totalPages) {
handleChangePage(newPage); handleChangePage(newPage);
} }
} }
@ -43,7 +41,7 @@ function Paginate(props: Props) {
return ( return (
// Hide the paginate controls if we are loading or there is only one page // Hide the paginate controls if we are loading or there is only one page
// It should still be rendered to trigger the onPageChange callback // It should still be rendered to trigger the onPageChange callback
<Form style={totalPages <= 1 || loading ? { display: 'none' } : null}> <Form style={totalPages <= 1 || loading ? { display: 'none' } : null} onSubmit={handlePaginateKeyUp}>
<fieldset-group class="fieldset-group--smushed fieldgroup--paginate"> <fieldset-group class="fieldset-group--smushed fieldgroup--paginate">
<fieldset-section> <fieldset-section>
<ReactPaginate <ReactPaginate
@ -64,8 +62,9 @@ function Paginate(props: Props) {
/> />
</fieldset-section> </fieldset-section>
<FormField <FormField
value={textValue}
onChange={e => setTextValue(e.target.value)}
className="paginate-channel" className="paginate-channel"
onKeyUp={handlePaginateKeyUp}
label={__('Go to page:')} label={__('Go to page:')}
type="text" type="text"
name="paginate-file" name="paginate-file"

6
static/app-strings.json
View file

@ -709,5 +709,7 @@
"This will add a Support button along side tipping. Similar to tips, supports help %discovery_link% but the LBC is returned to your wallet if revoked. Both also help secure your %vanity_names_link%.": "This will add a Support button along side tipping. Similar to tips, supports help %discovery_link% but the LBC is returned to your wallet if revoked. Both also help secure your %vanity_names_link%.", "This will add a Support button along side tipping. Similar to tips, supports help %discovery_link% but the LBC is returned to your wallet if revoked. Both also help secure your %vanity_names_link%.": "This will add a Support button along side tipping. Similar to tips, supports help %discovery_link% but the LBC is returned to your wallet if revoked. Both also help secure your %vanity_names_link%.",
"Tip %amount% LBC": "Tip %amount% LBC", "Tip %amount% LBC": "Tip %amount% LBC",
"Not enough credits": "Not enough credits", "Not enough credits": "Not enough credits",
"You have %credit_amount% in unclaimed rewards.": "You have %credit_amount% in unclaimed rewards." "You have %credit_amount% in unclaimed rewards.": "You have %credit_amount% in unclaimed rewards.",
} "You haven't downloaded anything from LBRY yet.": "You haven't downloaded anything from LBRY yet.",
"Explore new content": "Explore new content"
}