Skip to content
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

Jump to bottom

fix(nuxt): scroll to top on page navigation when scroll-behavior: smo… #25817

Merged
merged 2 commits into from
Feb 22, 2024
Merged

fix(nuxt): scroll to top on page navigation when scroll-behavior: smo… #25817

Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
1e5cb58
fix(nuxt): scroll to top on page navigation when scroll-behavior: smo…
Chalks Feb 15, 2024
cf27356
style: semis
danielroe Feb 16, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
5 changes: 3 additions & 2 deletions packages/nuxt/src/pages/runtime/router.options.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
import type { RouteLocationNormalized, RouterScrollBehavior } from '#vue-router'
import { nextTick } from 'vue'
import type { RouterConfig } from 'nuxt/schema'
import { useNuxtApp } from '#app/nuxt'
import { isChangingPage } from '#app/components/utils'
Expand Down Expand Up @@ -36,14 +35,16 @@ export default <RouterConfig> {
if (to.hash) {
return { el: to.hash, top: _getHashElementScrollMarginTop(to.hash), behavior }
}
// The route isn't changing so keep current scroll position
Chalks marked this conversation as resolved.
Show resolved Hide resolved
return false;
danielroe marked this conversation as resolved.
Show resolved Hide resolved
}

// Wait for `page:transition:finish` or `page:finish` depending on if transitions are enabled or not
const hasTransition = (route: RouteLocationNormalized) => !!(route.meta.pageTransition ?? defaultPageTransition)
const hookToWait = (hasTransition(from) && hasTransition(to)) ? 'page:transition:finish' : 'page:finish'
return new Promise((resolve) => {
nuxtApp.hooks.hookOnce(hookToWait, async () => {
await nextTick()
await new Promise((resolve) => setTimeout(resolve, 0));
danielroe marked this conversation as resolved.
Show resolved Hide resolved
if (to.hash) {
position = { el: to.hash, top: _getHashElementScrollMarginTop(to.hash), behavior }
}
Expand Down