@@ -357,7 +357,7 @@ export function addPageListeners() {
357
357
domEvent . preventDefault ( ) ;
358
358
}
359
359
360
- if ( domEvent . key === 'ArrowDown' ) handleDown: {
360
+ if ( domEvent . key === 'ArrowDown' ) {
361
361
if ( state . stoppedTypingTimeout ) {
362
362
clearTimeout ( state . stoppedTypingTimeout ) ;
363
363
state . stoppedTypingTimeout = null ;
@@ -368,13 +368,8 @@ export function addPageListeners() {
368
368
} , settings . pressDownToFocusFirstResultLatency ) ;
369
369
370
370
activateSidebarSearch ( info . searchInput . value ) ;
371
-
372
- break handleDown;
373
- }
374
-
375
- const elem = info . results . firstChild ;
376
- if ( elem ?. classList . contains ( 'wiki-search-result' ) ) {
377
- elem . focus ( { focusVisible : true } ) ;
371
+ } else {
372
+ focusFirstSidebarSearchResult ( ) ;
378
373
}
379
374
}
380
375
} ) ;
@@ -504,7 +499,7 @@ async function activateSidebarSearch(query) {
504
499
clearTimeout ( state . focusFirstResultTimeout ) ;
505
500
state . focusFirstResultTimeout = null ;
506
501
if ( ! state . stoppedTypingTimeout ) {
507
- info . results . firstChild ?. focus ( ) ;
502
+ focusFirstSidebarSearchResult ( ) ;
508
503
}
509
504
}
510
505
}
@@ -866,6 +861,15 @@ function hideSidebarSearchResults() {
866
861
cssProp ( info . endSearchLine , 'display' , 'none' ) ;
867
862
}
868
863
864
+ function focusFirstSidebarSearchResult ( ) {
865
+ const elem = info . results . firstChild ;
866
+ if ( ! elem ?. classList . contains ( 'wiki-search-result' ) ) {
867
+ return ;
868
+ }
869
+
870
+ elem . focus ( { focusVisible : true } ) ;
871
+ }
872
+
869
873
function saveSidebarSearchResultsScrollOffset ( ) {
870
874
const { session} = info ;
871
875
0 commit comments