Skip to content

fix(landing-nav): scroll to top on route change in shared shells #4676

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

Merged
waleedlatif1 merged 7 commits into from
May 20, 2026
Merged

fix(landing-nav): scroll to top on route change in shared shells #4676

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
2911924
fix(landing-nav): scroll to top on route change in shared shells
waleedlatif1 May 20, 2026
35b29e6
fix(landing-nav): hoist popstate flag to module scope and skip on has…
waleedlatif1 May 20, 2026
2ecfa51
fix(landing-nav): use popstate timestamp window so flag self-expires
waleedlatif1 May 20, 2026
fb02c2a
fix(landing-nav): use -Infinity sentinel and consume popstate timesta…
waleedlatif1 May 20, 2026
e156dba
fix(landing-nav): skip scroll on initial mount so reload restoration …
waleedlatif1 May 20, 2026
1f67317
fix(landing-nav): gate initial-mount skip on document.readyState
waleedlatif1 May 20, 2026
7e926fe
refactor(landing-nav): simplify scroll-to-top to conventional pattern
waleedlatif1 May 20, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions apps/sim/app/(landing)/blog/layout.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@ import { getNavBlogPosts } from '@/lib/blog/registry'
import { SITE_URL } from '@/lib/core/utils/urls'
import Footer from '@/app/(landing)/components/footer/footer'
import Navbar from '@/app/(landing)/components/navbar/navbar'
import { ScrollToTop } from '@/app/(landing)/components/scroll-to-top'

export default async function StudioLayout({ children }: { children: React.ReactNode }) {
const blogPosts = await getNavBlogPosts()
Expand Down Expand Up @@ -29,6 +30,7 @@ export default async function StudioLayout({ children }: { children: React.React

return (
<div className='flex min-h-screen flex-col bg-[var(--landing-bg)] font-[430] font-season text-[var(--landing-text)]'>
<ScrollToTop />
<script
type='application/ld+json'
dangerouslySetInnerHTML={{ __html: JSON.stringify(orgJsonLd) }}
Expand Down
22 changes: 22 additions & 0 deletions apps/sim/app/(landing)/components/scroll-to-top.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,22 @@
'use client'

import { useEffect } from 'react'
import { usePathname } from 'next/navigation'

/**
* Resets window scroll to the top on App Router pathname changes.
*
* Next.js's default scroll handling only brings the new Page element into view,
* which often resolves to "no scroll" inside shared layouts (see vercel/next.js#64435).
* Skipped when a hash anchor is targeted so the browser's native anchor scroll wins.
*/
export function ScrollToTop() {
const pathname = usePathname()

useEffect(() => {
if (window.location.hash) return
window.scrollTo(0, 0)
Comment thread
waleedlatif1 marked this conversation as resolved.
}, [pathname])
Comment thread
waleedlatif1 marked this conversation as resolved.
Comment thread
waleedlatif1 marked this conversation as resolved.
Comment thread
waleedlatif1 marked this conversation as resolved.
Comment thread
waleedlatif1 marked this conversation as resolved.

return null
}
2 changes: 2 additions & 0 deletions apps/sim/app/(landing)/integrations/(shell)/layout.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@ import { getNavBlogPosts } from '@/lib/blog/registry'
import { SITE_URL } from '@/lib/core/utils/urls'
import Footer from '@/app/(landing)/components/footer/footer'
import Navbar from '@/app/(landing)/components/navbar/navbar'
import { ScrollToTop } from '@/app/(landing)/components/scroll-to-top'

export default async function IntegrationsLayout({ children }: { children: React.ReactNode }) {
const blogPosts = await getNavBlogPosts()
Expand Down Expand Up @@ -29,6 +30,7 @@ export default async function IntegrationsLayout({ children }: { children: React

return (
<div className='dark flex min-h-screen flex-col bg-[var(--landing-bg)] font-[430] font-season text-[var(--landing-text)]'>
<ScrollToTop />
<script
type='application/ld+json'
dangerouslySetInnerHTML={{ __html: JSON.stringify(orgJsonLd) }}
Expand Down
2 changes: 2 additions & 0 deletions apps/sim/app/(landing)/models/(shell)/layout.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@ import { getNavBlogPosts } from '@/lib/blog/registry'
import { SITE_URL } from '@/lib/core/utils/urls'
import Footer from '@/app/(landing)/components/footer/footer'
import Navbar from '@/app/(landing)/components/navbar/navbar'
import { ScrollToTop } from '@/app/(landing)/components/scroll-to-top'

export default async function ModelsLayout({ children }: { children: React.ReactNode }) {
const blogPosts = await getNavBlogPosts()
Expand All @@ -24,6 +25,7 @@ export default async function ModelsLayout({ children }: { children: React.React

return (
<div className='dark flex min-h-screen flex-col bg-[var(--landing-bg)] font-[430] font-season text-[var(--landing-text)]'>
<ScrollToTop />
<script
type='application/ld+json'
dangerouslySetInnerHTML={{ __html: JSON.stringify(orgJsonLd) }}
Expand Down
Loading