Skip to content

Fix DestinationPicker behavior #80751

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

Merged
roryabraham merged 3 commits into from
Jan 28, 2026
Merged

Fix DestinationPicker behavior #80751

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
cc7df3d
Fix destination picker behavior
zfurtak Jan 28, 2026
a518b23
Merge branch 'main' into @zfurtak/fix-per-diem
zfurtak Jan 28, 2026
5dd9033
Add shouldUpdateFocusedIndex prop
zfurtak Jan 28, 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
2 changes: 0 additions & 2 deletions src/components/DestinationPicker.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -76,7 +76,6 @@ function DestinationPicker({selectedDestination, policyID, onSubmit, ref}: Desti
return (
<SelectionList
ref={ref}
key={selectedDestination}
sections={sections}
shouldShowTextInput={shouldShowTextInput}
textInputOptions={textInputOptions}
Expand All @@ -85,7 +84,6 @@ function DestinationPicker({selectedDestination, policyID, onSubmit, ref}: Desti
initiallyFocusedItemKey={selectedOptionKey}
shouldHideKeyboardOnScroll={false}
shouldUpdateFocusedIndex
disableMaintainingScrollPosition
/>
);
}
Expand Down
2 changes: 1 addition & 1 deletion src/components/SelectionList/hooks/useFlattenedSections.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -67,7 +67,7 @@ function useFlattenedSections<TItem extends ListItem>(sections: Array<Section<TI
} as SectionListItem<TItem>;
data.push(itemData);

if (item.keyForList === initiallyFocusedItemKey) {
if (item.keyForList === initiallyFocusedItemKey && focusedIndex === -1) {
focusedIndex = currentIndex;
}

Expand Down
Loading