Skip to content
Merged
Changes from all commits
Commits
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
14 changes: 14 additions & 0 deletions frontend/app/src/components/v1/nav/side-nav.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,7 @@ import React, {
useMemo,
useRef,
useState,
useLayoutEffect,
} from 'react';

interface SideNavProps extends React.HTMLAttributes<HTMLDivElement> {
Expand Down Expand Up @@ -67,6 +68,8 @@ export type SideNavSection = {
items: SideNavItem[];
};

const savedScrollTop = { current: 0 };

export function SideNav({ className, navItems: navSections }: SideNavProps) {
const {
sidebarOpen,
Expand All @@ -89,6 +92,7 @@ export function SideNav({ className, navItems: navSections }: SideNavProps) {
const didDragRef = useRef(false);
const [showResizeToggle, setShowResizeToggle] = useState(false);
const sidebarRef = useRef<HTMLDivElement>(null);
const scrollRef = useRef<HTMLDivElement>(null);

const onNavLinkClick = useCallback(() => {
if (isWide) {
Expand Down Expand Up @@ -246,6 +250,12 @@ export function SideNav({ className, navItems: navSections }: SideNavProps) {
[tenantId],
);

useLayoutEffect(() => {
if (scrollRef.current) {
scrollRef.current.scrollTop = savedScrollTop.current;
}
}, []);

const toggleCollapsed = useCallback(() => {
setStoredCollapsed(!storedCollapsed);
setLiveWidth(null);
Expand Down Expand Up @@ -455,7 +465,11 @@ export function SideNav({ className, navItems: navSections }: SideNavProps) {
<>
{/* Scrollable navigation area (keep scrollbar flush to sidebar edge) */}
<div
ref={scrollRef}
data-cy="v1-sidebar-scroll"
onScroll={() => {
savedScrollTop.current = scrollRef.current?.scrollTop ?? 0;
}}
className="min-h-0 flex-1 overflow-auto overscroll-contain touch-pan-y [-webkit-overflow-scrolling:touch] [scrollbar-gutter:stable] scrollbar-thin scrollbar-track-transparent scrollbar-thumb-muted-foreground"
>
<div className="px-4 py-4">
Expand Down
Loading