Use Next router more appropriately

This commit is contained in:
Marshall Polaris 2022-07-19 00:28:01 -07:00
parent 781de79b97
commit f841c9acd2

View File

@ -53,9 +53,12 @@ export function useInitialQueryAndSort(options?: {
console.log('ready loading from storage ', sort ?? defaultSort)
const localSort = getSavedSort()
if (localSort) {
router.query.s = localSort
// Use replace to not break navigating back.
router.replace(router, undefined, { shallow: true })
router.replace(
{ query: { ...router.query, s: localSort } },
undefined,
{ shallow: true }
)
}
setInitialSort(localSort ?? defaultSort)
} else {
@ -79,7 +82,9 @@ export function useUpdateQueryAndSort(props: {
const setSort = (sort: Sort | undefined) => {
if (sort !== router.query.s) {
router.query.s = sort
router.push(router, undefined, { shallow: true })
router.push({ query: { ...router.query, s: sort } }, undefined, {
shallow: true,
})
if (shouldLoadFromStorage) {
localStorage.setItem(MARKETS_SORT, sort || '')
}
@ -97,7 +102,9 @@ export function useUpdateQueryAndSort(props: {
} else {
delete router.query.q
}
router.push(router, undefined, { shallow: true })
router.push({ query: router.query }, undefined, {
shallow: true,
})
track('search', { query })
}, 500),
[router]