Skip to content

[CP Staging] Fix enter behaviour on currency picker #81840

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
lakchote merged 1 commit into from
Feb 9, 2026
Merged

[CP Staging] Fix enter behaviour on currency picker #81840

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
4 changes: 2 additions & 2 deletions src/components/SelectionList/SelectionListWithSections/BaseSelectionListWithSections.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -186,7 +186,7 @@ function BaseSelectionListWithSections<TItem extends ListItem>({

useKeyboardShortcut(CONST.KEYBOARD_SHORTCUTS.ENTER, selectFocusedItem, {
captureOnInputs: true,
shouldBubble: !getFocusedItem(),
shouldBubble: itemsCount > 0 && !getFocusedItem(),
shouldStopPropagation,
Comment on lines 187 to 190

@chatgpt-codex-connector chatgpt-codex-connector Bot Feb 9, 2026

Copy link
Copy Markdown

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

P2 Badge Allow Enter to bubble when list is empty

When filtering drives itemsCount to 0, useSearchFocusSync early‑returns on data.length === 0, so focusedIndex can remain ≥0 while getFocusedItem() returns undefined. With the new itemsCount > 0 guard, shouldBubble becomes false in that state, so the Enter handler stays active but blocks lower‑priority keyboard shortcuts (e.g., modal confirm or parent submit handlers) and Enter/Ctrl+Enter becomes a no‑op when the list is empty. This is a regression from the previous !getFocusedItem() behavior, which allowed bubbling in the empty‑list case.

Useful? React with 👍 / 👎.

isActive: !disableKeyboardShortcuts && isScreenFocused && focusedIndex >= 0 && !disableEnterShortcut,
});
Expand All @@ -203,7 +203,7 @@ function BaseSelectionListWithSections<TItem extends ListItem>({
},
{
captureOnInputs: true,
shouldBubble: !getFocusedItem(),
shouldBubble: itemsCount > 0 && !getFocusedItem(),
isActive: !disableKeyboardShortcuts && isScreenFocused && !confirmButtonOptions?.isDisabled,
},
);
Expand Down
Loading