fix(frontend): make the grid actually follow keyboard focus
deploy / deploy (push) Successful in 20s

The previous attempt wrote scrollContainer.scrollTop, but <main> isn't the
scroll element here (the window/document scrolls, as getScroller and the
infinite-scroll listeners assume) — so it was a no-op and the grid stopped
following the focus. Move back to scrollIntoView({block:'nearest'}), which
scrolls whatever element actually scrolls, and give the card
scroll-margin-top/-bottom so it clears the sticky header and the fixed
navbar instead of sliding under them.

Co-Authored-By: Claude Opus 4.8 <noreply@anthropic.com>
This commit is contained in:
2026-06-11 20:19:08 +03:00
parent af9f4c77db
commit 48ea1fe720
2 changed files with 14 additions and 23 deletions
@@ -174,6 +174,10 @@
flex-shrink: 0;
user-select: none;
-webkit-user-select: none;
/* Keyboard scrollIntoView leaves room for the sticky header above and the
fixed bottom navbar below, so the focused card never hides under them. */
scroll-margin-top: 52px;
scroll-margin-bottom: calc(72px + env(safe-area-inset-bottom, 0px));
}
.thumb {
+9 -22
View File
@@ -71,29 +71,16 @@
focusedId = files[next]?.id ?? null;
if (next >= files.length - gridCols() * 2 && hasMore && !loading) void loadMore();
const id = focusedId;
requestAnimationFrame(() => keepFocusedInView(id));
}
// Keep the focused card within the scroller, leaving a margin at the bottom for
// the fixed navbar (which overlaps the scroll area and otherwise hides the row
// the focus moves onto). scrollIntoView can't account for that overlay.
const FOCUS_MARGIN_TOP = 8;
const FOCUS_MARGIN_BOTTOM = 72; // ~navbar height + gap
function keepFocusedInView(id: string | null) {
if (!id || !scrollContainer) return;
// scrollIntoView scrolls whichever element actually scrolls (the window
// here, not <main>), so the grid follows the focus. The card's
// scroll-margin-bottom leaves room for the fixed navbar so it doesn't slide
// underneath.
requestAnimationFrame(() => {
const idx = files.findIndex((f) => f.id === id);
const card = scrollContainer.querySelector<HTMLElement>(`[data-file-index="${idx}"]`);
if (!card) return;
const cardRect = card.getBoundingClientRect();
const scRect = scrollContainer.getBoundingClientRect();
const top = cardRect.top - scRect.top;
const bottom = cardRect.bottom - scRect.top;
if (top < FOCUS_MARGIN_TOP) {
scrollContainer.scrollTop += top - FOCUS_MARGIN_TOP;
} else if (bottom > scRect.height - FOCUS_MARGIN_BOTTOM) {
scrollContainer.scrollTop += bottom - (scRect.height - FOCUS_MARGIN_BOTTOM);
}
scrollContainer
?.querySelector<HTMLElement>(`[data-file-index="${idx}"]`)
?.scrollIntoView({ block: 'nearest' });
});
}
// Action keys operate on the selection; with nothing selected they fall back to