From be32ea71eb7a889d0b114f31b6ef5da9ce160fab Mon Sep 17 00:00:00 2001 From: Brennan Benson <79079362+brennanb2025@users.noreply.github.com> Date: Mon, 16 Nov 2026 17:19:57 -0800 Subject: [PATCH] fix(settings): Enter in Settings search opens the first result and tighten its top gap (#43360) --- .../settings/navigation/SettingsSidebar.tsx | 20 +++++++++---------- .../navigation/SettingsSidebarSearch.tsx | 2 +- 2 files changed, 10 insertions(+), 12 deletions(-) diff --git a/src/renderer/src/components/settings/navigation/SettingsSidebar.tsx b/src/renderer/src/components/settings/navigation/SettingsSidebar.tsx index 1ba7e9d0f68..479d1937364 100644 --- a/src/renderer/src/components/settings/navigation/SettingsSidebar.tsx +++ b/src/renderer/src/components/settings/navigation/SettingsSidebar.tsx @@ -146,10 +146,13 @@ export function SettingsSidebar({ const searchResults = rankedResults.slice(0, SETTINGS_SEARCH_RESULT_LIMIT) const hiddenResultCount = rankedResults.length - searchResults.length const isSearching = searchQuery.trim() !== '' - // Nothing is selected until the user moves or picks; typing only changes the rows. + // The first result is highlighted until the user moves or picks, so Enter opens it. const [selectedResultKey, setSelectedResultKey] = useState(null) - const selectedResultIndex = searchResults.findIndex((result) => result.key === selectedResultKey) - const selectedResult = selectedResultIndex === -1 ? undefined : searchResults[selectedResultIndex] + const selectedResultIndex = Math.max( + 0, + searchResults.findIndex((result) => result.key === selectedResultKey) + ) + const selectedResult = isSearching ? searchResults[selectedResultIndex] : undefined const repoSectionById = useMemo( () => new Map(repoSections.map((section) => [section.id, section] as const)), [repoSections] @@ -178,23 +181,18 @@ export function SettingsSidebar({ changeSearchQuery('') return } - if (!isSearching || searchResults.length === 0) { + if (!selectedResult) { return } const count = searchResults.length if (event.key === 'ArrowDown' || event.key === 'ArrowUp') { event.preventDefault() - const nextIndex = - selectedResultIndex === -1 - ? event.key === 'ArrowDown' - ? 0 - : count - 1 - : (selectedResultIndex + (event.key === 'ArrowDown' ? 1 : -1) + count) % count + const nextIndex = (selectedResultIndex + (event.key === 'ArrowDown' ? 1 : -1) + count) % count setSelectedResultKey(searchResults[nextIndex].key) document.getElementById(getOptionId(nextIndex))?.scrollIntoView({ block: 'nearest' }) return } - if (event.key === 'Enter' && selectedResult) { + if (event.key === 'Enter') { event.preventDefault() pickResult(selectedResult) } diff --git a/src/renderer/src/components/settings/navigation/SettingsSidebarSearch.tsx b/src/renderer/src/components/settings/navigation/SettingsSidebarSearch.tsx index f1370a0a3ad..9d709c36c2d 100644 --- a/src/renderer/src/components/settings/navigation/SettingsSidebarSearch.tsx +++ b/src/renderer/src/components/settings/navigation/SettingsSidebarSearch.tsx @@ -116,7 +116,7 @@ export function SettingsSearchResultsList({ }: SettingsSearchResultsListProps): React.JSX.Element { const t = useTranslate() return ( -
+
{searchResults.length > 0 ? (