Merge branch 'master' into favourite_locations

Author: karussell

src/sidebar/search/AddressInput.tsx

@@ -153,20 +153,21 @@ export default function AddressInput(props: AddressInputProps) {
                             saveRecentLocation(item.mainText, item.secondText, item.point)
                         }
                     }
-                    // Enter: focus next address input, or blur if last
-                    if (event.key === 'Enter') {
-                        const next = document
-                            .querySelector<HTMLElement>('[data-search-box]')!
-                            .querySelectorAll<HTMLInputElement>('input[type="text"]')[props.index + 1]
-                        if (next) next.focus()
-                        else searchInput.current!.blur()
-                    }
+                    if (event.key === 'Enter') focusNextOrBlur()
                     break
             }
         },
         [autocompleteItems, highlightedResult],
     )
 
+    const focusNextOrBlur = () => {
+        const next = document
+            .querySelector<HTMLElement>('[data-search-box]')!
+            .querySelectorAll<HTMLInputElement>('input[type="text"]')[props.index + 1]
+        if (next) next.focus()
+        else searchInput.current!.blur()
+    }
+
     // the "fullscreen" css is only defined for smallscreen
     const containerClass = hasFocus ? styles.fullscreen : ''
     const type = props.point.type
@@ -308,7 +309,7 @@ export default function AddressInput(props: AddressInputProps) {
                                     handlePoiSearch(poiSearch, item.result, props.map)
                                     setText(item.result.text(item.result.poi))
                                 }
-                                searchInput.current!.blur() // see also AutocompleteEntry->onMouseDown
+                                focusNextOrBlur()
                             }}
                             onClearRecents={() => {
                                 clearRecentLocations()