Commit 9dbb2b0c authored by tom goriunov's avatar tom goriunov Committed by GitHub

Merge pull request #1642 from blockscout/fe-1631

fix navigation reset
parents 06b9f970 4903ff2a
...@@ -24,6 +24,8 @@ export interface Params<Resource extends PaginatedResources> { ...@@ -24,6 +24,8 @@ export interface Params<Resource extends PaginatedResources> {
type NextPageParams = Record<string, unknown>; type NextPageParams = Record<string, unknown>;
const INITIAL_PAGE_PARAMS = { '1': {} };
function getPaginationParamsFromQuery(queryString: string | Array<string> | undefined) { function getPaginationParamsFromQuery(queryString: string | Array<string> | undefined) {
if (queryString) { if (queryString) {
try { try {
...@@ -136,7 +138,7 @@ export default function useQueryWithPages<Resource extends PaginatedResources>({ ...@@ -136,7 +138,7 @@ export default function useQueryWithPages<Resource extends PaginatedResources>({
router.push({ pathname: router.pathname, query: nextRouterQuery }, undefined, { shallow: true }).then(() => { router.push({ pathname: router.pathname, query: nextRouterQuery }, undefined, { shallow: true }).then(() => {
queryClient.removeQueries({ queryKey: [ resourceName ] }); queryClient.removeQueries({ queryKey: [ resourceName ] });
setPage(1); setPage(1);
setPageParams({}); setPageParams(INITIAL_PAGE_PARAMS);
window.setTimeout(() => { window.setTimeout(() => {
// FIXME after router is updated we still have inactive queries for previously visited page (e.g third), where we came from // FIXME after router is updated we still have inactive queries for previously visited page (e.g third), where we came from
// so have to remove it but with some delay :) // so have to remove it but with some delay :)
...@@ -166,7 +168,7 @@ export default function useQueryWithPages<Resource extends PaginatedResources>({ ...@@ -166,7 +168,7 @@ export default function useQueryWithPages<Resource extends PaginatedResources>({
).then(() => { ).then(() => {
setHasPages(false); setHasPages(false);
setPage(1); setPage(1);
setPageParams({}); setPageParams(INITIAL_PAGE_PARAMS);
}); });
}, [ router, resource.filterFields, scrollToTop ]); }, [ router, resource.filterFields, scrollToTop ]);
...@@ -186,7 +188,7 @@ export default function useQueryWithPages<Resource extends PaginatedResources>({ ...@@ -186,7 +188,7 @@ export default function useQueryWithPages<Resource extends PaginatedResources>({
).then(() => { ).then(() => {
setHasPages(false); setHasPages(false);
setPage(1); setPage(1);
setPageParams({}); setPageParams(INITIAL_PAGE_PARAMS);
}); });
}, [ router, scrollToTop ]); }, [ router, scrollToTop ]);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment