diff --git a/src/components/doormile/AddressAutocomplete.jsx b/src/components/doormile/AddressAutocomplete.jsx
index 34b52b9..c0b15b0 100644
--- a/src/components/doormile/AddressAutocomplete.jsx
+++ b/src/components/doormile/AddressAutocomplete.jsx
@@ -2,6 +2,7 @@ import PropTypes from 'prop-types';
import React, { useEffect, useRef, useState } from 'react';
import { Clock, Compass, Crosshair, Loader2, MapPin, Navigation, X } from 'lucide-react';
import {
+ cityNamedIn,
extractLandmark,
getAddressSuggestions,
geocodeAddress as serviceGeocodeAddress,
@@ -38,9 +39,17 @@ const AddressAutocomplete = ({
value,
onChange,
onPlaceSelected,
+ // Fired when the text stops describing the place that was picked — cleared,
+ // or rewritten to another area. The page should drop that place's pin: it
+ // used to stay, so the form saved one address with another address's pin.
+ onPlaceCleared,
onOpenMapPin,
onLandmarkExtracted,
bias,
+ // A city scope from buildCityScope(): suggestions only from that city. The
+ // operator can widen one search to all cities from the list's footer, for
+ // an intercity drop.
+ scope,
fullWidth = true,
disabled = false,
className = '',
@@ -60,21 +69,100 @@ const AddressAutocomplete = ({
const wrapRef = useRef(null);
const activeRef = useRef(0);
- const skipNextSearchRef = useRef(false);
+ // True only while the text is the operator's typing. Text the page sets (a
+ // hub location filling the pickup, a chosen customer's address) or a picked
+ // suggestion is not searched, not even when the hub's city scope changes
+ // underneath it: that re-search opened an unasked-for list of
+ // "124 Gandhipuram Main Rd" matches on every Create Order load.
+ const typedRef = useRef(false);
+ // The in-flight search, aborted when a newer one starts. Ignoring stale
+ // answers was not enough: the requests still ran against the free services'
+ // allowance and slowed the one that mattered.
+ const abortRef = useRef(null);
+ // Name of the picked place. Typing that keeps it ("12/A, " + it) keeps the
+ // pin; text that no longer contains it means the pin no longer applies.
+ const pickedNameRef = useRef('');
+
+ const editText = (text) => {
+ typedRef.current = true;
+ setInputValue(text);
+ onChange?.(text);
+ const picked = pickedNameRef.current;
+ if (picked && !text.toLowerCase().includes(picked)) {
+ pickedNameRef.current = '';
+ onPlaceCleared?.();
+ }
+ };
+
+ useEffect(() => () => abortRef.current?.abort(), []);
const listId = `${id || 'address'}-suggestions`;
const optionId = (index) => `${listId}-option-${index}`;
useEffect(() => {
if (value !== undefined && value !== inputValue) {
+ typedRef.current = false;
setInputValue(value || '');
}
}, [value]);
- const biasKey = `${bias?.lat ?? ''},${bias?.lng ?? ''},${bias?.city ?? ''}`;
+ // "Search all cities" for this field. Reset when the scope itself changes —
+ // choosing another hub location means searching that city again.
+ const [scopeOff, setScopeOff] = useState(false);
+ const scopeCity = scope?.city || '';
+ useEffect(() => setScopeOff(false), [scopeCity]);
+ const activeScope = scope && !scopeOff ? scope : undefined;
+
+ const biasKey = `${bias?.lat ?? ''},${bias?.lng ?? ''},${bias?.city ?? ''}|${activeScope ? activeScope.city : 'all'}`;
+
+ // A city named at the end of the text ("gandhi nagar coimbatore") is searched
+ // in that city whatever the hub; the footer says so rather than naming the hub.
+ const typedCity = cityNamedIn(inputValue);
+ const scopeFooter = scope ? (
+