Skip to content

fix: store scroll pos when virtualized #8767

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
wants to merge 3 commits into
base: main
Choose a base branch
from
Open

fix: store scroll pos when virtualized #8767

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
f5c90e4
fix: store scroll pos when virtualized
BRobin55 Aug 25, 2025
4df6636
fix: removed isVirtualized prop
BRobin55 Aug 25, 2025
c3a6377
Merge branch 'main' into fix/virzalized-focus-restore
snowystinger Aug 25, 2025
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
7 changes: 3 additions & 4 deletions packages/@react-aria/selection/src/useSelectableCollection.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -118,7 +118,6 @@ export function useSelectableCollection(options: AriaSelectableCollectionOptions
disallowTypeAhead = false,
shouldUseVirtualFocus,
allowsTabNavigation = false,
isVirtualized,
// If no scrollRef is provided, assume the collection ref is the scrollable region
scrollRef = ref,
linkBehavior = 'action'
Expand Down Expand Up @@ -325,7 +324,7 @@ export function useSelectableCollection(options: AriaSelectableCollectionOptions
// Store the scroll position so we can restore it later.
/// TODO: should this happen all the time??
let scrollPos = useRef({top: 0, left: 0});
useEvent(scrollRef, 'scroll', isVirtualized ? undefined : () => {
useEvent(scrollRef, 'scroll', () => {
scrollPos.current = {
top: scrollRef.current?.scrollTop ?? 0,
left: scrollRef.current?.scrollLeft ?? 0
Expand Down Expand Up @@ -366,7 +365,7 @@ export function useSelectableCollection(options: AriaSelectableCollectionOptions
} else {
navigateToKey(manager.firstSelectedKey ?? delegate.getFirstKey?.());
}
} else if (!isVirtualized && scrollRef.current) {
} else if (scrollRef.current) {
// Restore the scroll position to what it was before.
scrollRef.current.scrollTop = scrollPos.current.top;
scrollRef.current.scrollLeft = scrollPos.current.left;
Expand Down Expand Up @@ -585,7 +584,7 @@ export function useSelectableCollection(options: AriaSelectableCollectionOptions
// This will be marshalled to either the first or last item depending on where focus came from.
let tabIndex: number | undefined = undefined;
if (!shouldUseVirtualFocus) {
tabIndex = manager.focusedKey == null ? 0 : -1;
tabIndex = manager.isFocused ? -1 : 0;
}

let collectionId = useCollectionId(manager.collection);
Expand Down
Loading