Skip to content

fix: scroll restoration when navigating back from an OSS program detail page to the listing page #439

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

Open
yshishir wants to merge 2 commits into
base: main
Choose a base branch
from
Open

fix: scroll restoration when navigating back from an OSS program detail page to the listing page #439

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
2ebc602
fix:scroll current vertical scroll position
yshishir Jul 13, 2026
297d371
fix: oss-programs scroll restore
yshishir Jul 13, 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
4 changes: 2 additions & 2 deletions apps/web/src/app/(main)/dashboard/layout.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@ export default function DashboardLayout({
Opensox
</Link>
</div>
<main className="flex-1 h-full overflow-auto bg-ox-content">
<main id="dashboard-scroll-container" className="flex-1 h-full overflow-auto bg-ox-content">
{children}
</main>
</div>
Expand All @@ -64,7 +64,7 @@ export default function DashboardLayout({
Opensox
</Link>
</div>
<main className="flex-1 h-full overflow-auto bg-ox-content">
<main id="dashboard-scroll-container" className="flex-1 h-full overflow-auto bg-ox-content">
{children}
</main>
</div>
Expand Down
12 changes: 11 additions & 1 deletion apps/web/src/app/(main)/dashboard/oss-programs/ProgramsList.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
"use client";

import { useState, useMemo, useCallback } from "react";
import { useState, useMemo, useCallback, useEffect } from "react";
import { Program } from "@/data/oss-programs/types";
import { SearchInput, TagFilter, ProgramCard } from "@/components/oss-programs";

Expand All @@ -13,6 +13,16 @@ export default function ProgramsList({ programs, tags }: ProgramsListProps) {
const [searchQuery, setSearchQuery] = useState("");
const [selectedTags, setSelectedTags] = useState<string[]>([]);

useEffect(() => {
const savedScroll = sessionStorage.getItem("oss-programs-scroll");

if (savedScroll) {
const scrollContainer = document.getElementById("dashboard-scroll-container");
scrollContainer?.scrollTo(0, Number(savedScroll));
sessionStorage.removeItem("oss-programs-scroll");
}
}, []);

// Memoize handlers to prevent child re-renders
const handleSearchChange = useCallback((value: string) => {
setSearchQuery(value);
Expand Down
7 changes: 7 additions & 0 deletions apps/web/src/components/oss-programs/ProgramCard.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,13 @@ function ProgramCard({ program }: ProgramCardProps) {
return (
<Link
href={`/dashboard/oss-programs/${program.slug}`}
onClick={() => {
const scrollContainer = document.getElementById("dashboard-scroll-container");
sessionStorage.setItem(
"oss-programs-scroll",
String(scrollContainer?.scrollTop ?? window.scrollY)
);
}}
className="group block w-full min-w-0"
>
<div className="w-full bg-dash-surface border border-dash-border rounded-xl px-4 py-3 md:px-5 md:py-4 hover:border-brand-purple/50 hover:bg-dash-hover transition-all duration-200 flex items-center justify-between gap-3 md:gap-4 min-w-0">
Expand Down