From bb01d3eeccbca4db324d5997db1507ca919a274c Mon Sep 17 00:00:00 2001 From: Aarav Sareen <96787824+arvsrn@users.noreply.github.com> Date: Wed, 18 Nov 2026 19:26:22 +0530 Subject: [PATCH] fix(app): keep Home's date headers visible while scrolling (#64665) --- packages/app/src/home/scroll.ts | 26 +++++++++++++++++++++---- packages/app/src/home/sessions/view.tsx | 8 +++++++- 2 files changed, 29 insertions(+), 5 deletions(-) diff --git a/packages/app/src/home/scroll.ts b/packages/app/src/home/scroll.ts index 2a8d59dad23..545b3e7a630 100644 --- a/packages/app/src/home/scroll.ts +++ b/packages/app/src/home/scroll.ts @@ -12,8 +12,8 @@ export function createHomeScrollController(groups: Accessor) const [thumbTrack, setThumbTrack] = createSignal() const [hoverTarget, setHoverTarget] = createSignal() - const [state, setState] = createStore({ - titleOpacity: {} as Partial>, + const [state, setState] = createStore<{ titleOpacity: Partial> }>({ + titleOpacity: {}, }) const headerRefs = new Map() @@ -68,16 +68,30 @@ export function createHomeScrollController(groups: Accessor) .map((group) => headerRefs.get(group.id)) .find((element) => element !== undefined) - if (header && typeof getComputedStyle === "function") { + if (header) { const top = Number.parseFloat(getComputedStyle(header).top) if (Number.isFinite(top)) stickyTop = top } + // offsetTop counts from the headers' positioned list, below the sticky search; scrollTop counts from the top of + // the scroll content. The list never sticks, so measure it once to put both in the scroll content's frame. + const parent = header?.offsetParent + + const listTop = + parent instanceof HTMLElement + ? parent.getBoundingClientRect().top - viewport.getBoundingClientRect().top + viewport.scrollTop + : 0 + + // A stuck header's offsetTop includes its sticky shift, so it depends on the scroll position at measurement time. + // The group's rows right after it never stick: their top minus the header's height is the header's resting place. groups().forEach((group) => { const element = headerRefs.get(group.id) - if (element) headerOffsets.set(group.id, element.offsetTop) + if (!element) return + const rows = element.nextElementSibling + const top = rows instanceof HTMLElement ? rows.offsetTop - element.offsetHeight : element.offsetTop + headerOffsets.set(group.id, listTop + top) }) update(viewport.scrollTop) } @@ -151,6 +165,10 @@ export function createHomeScrollController(groups: Accessor) queuePositionUpdate() }, setHeader: (id: HomeSessionGroup["id"], element: HTMLDivElement) => { + // Header elements are reused by position, so one can move to another group when the groups change. + headerRefs.forEach((registered, key) => { + if (registered === element && key !== id) headerRefs.delete(key) + }) headerRefs.set(id, element) queuePositionUpdate() }, diff --git a/packages/app/src/home/sessions/view.tsx b/packages/app/src/home/sessions/view.tsx index af4e51f2d2d..9fc92fb0d2f 100644 --- a/packages/app/src/home/sessions/view.tsx +++ b/packages/app/src/home/sessions/view.tsx @@ -631,9 +631,15 @@ function HomeSessionGroupHeader(props: { onSetRef: (element: HTMLDivElement) => void elevated?: boolean }) { + let element!: HTMLDivElement + + // Index reuses a header in place for whichever group lands at its position, so it reports itself again when its + // group changes; a one-time ref would leave it registered under the group it was created for. + createEffect(() => props.onSetRef(element)) + return (