show previous autocomplete elements

Author: karussell

src/sidebar/search/AddressInput.tsx

@@ -42,9 +42,10 @@ export default function AddressInput(props: AddressInputProps) {
     const [hasFocus, setHasFocus] = useState(false)
     const isSmallScreen = useMediaQuery({ query: '(max-width: 44rem)' })
 
-    // container for geocoding results which gets set by the geocoder class and set to empty if the underlying query point gets changed from outside
-    // also gets filled with an item to select the current location as input if input has focus and geocoding results are
-    // empty
+    // container for geocoding results which gets set by the geocoder class and set to empty if the underlying query
+    // point gets changed from outside also gets filled with an item to select the current location as input if input
+    // has focus and geocoding results are empty
+    const [origAutocompleteItems, setOrigAutocompleteItems] = useState<AutocompleteItem[]>([])
     const [autocompleteItems, setAutocompleteItems] = useState<AutocompleteItem[]>([])
     const [geocoder] = useState(
         new Geocoder(getApi(), (query, provider, hits) => {
@@ -58,10 +59,6 @@ export default function AddressInput(props: AddressInputProps) {
                 )
             })
 
-            // TODO autocompleteItems is empty here because query point changed from outside somehow
-            // const res = autocompleteItems.length > 1 ? autocompleteItems.slice(0, autocompleteItems.length - 2) : autocompleteItems
-            // res.concat(items)
-
             setOrigText(query)
             setAutocompleteItems(items)
         })
@@ -76,6 +73,7 @@ export default function AddressInput(props: AddressInputProps) {
 
     function hideSuggestions() {
         geocoder.cancel()
+        setOrigAutocompleteItems(autocompleteItems)
         setAutocompleteItems([])
     }
 
@@ -164,8 +162,6 @@ export default function AddressInput(props: AddressInputProps) {
     const type = props.point.type
 
     // get the bias point for the geocoder
-    // (the query point above the current one)
-    const autocompleteIndex = props.points.findIndex(point => !point.isInitialized)
     const lonlat = toLonLat(getMap().getView().getCenter()!)
     const biasCoord = { lng: lonlat[0], lat: lonlat[1] }
 
@@ -208,6 +204,7 @@ export default function AddressInput(props: AddressInputProps) {
                     onFocus={() => {
                         setHasFocus(true)
                         props.clearDragDrop()
+                        if (origAutocompleteItems.length > 0) setAutocompleteItems(origAutocompleteItems)
                     }}
                     onBlur={() => {
                         if (!isSmallScreen) hideSuggestions() // see #398

src/sidebar/search/Search.tsx

@@ -170,7 +170,8 @@ const SearchBox = ({
                     onCancel={() => console.log('cancel')}
                     onAddressSelected={(queryText, coordinate) => {
                         const initCount = points.filter(p => p.isInitialized).length
-                        if (coordinate && initCount == 0) Dispatcher.dispatch(new SetBBox(getBBoxFromCoord(coordinate)))
+                        if (coordinate && initCount != points.length)
+                            Dispatcher.dispatch(new SetBBox(getBBoxFromCoord(coordinate)))
 
                         Dispatcher.dispatch(
                             new SetPoint(