use response to latest request

yext · Nov 18, 2021 · f6b53ad · f6b53ad
1 parent 5385506
commit f6b53ad
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 5 deletions.
diff --git a/sample-app/src/components/SearchBar.tsx b/sample-app/src/components/SearchBar.tsx
@@ -37,8 +37,8 @@ export default function SearchBar({
   ] = useAutocomplete(isVertical);
 
   async function executeQuery () {
-    await responseToLatestRequestRef.current;
-    if (autocompleteResponse?.inputIntents.includes(SearchIntent.NearMe)) {
+    const responseToLatestRequest = await responseToLatestRequestRef.current;
+    if (responseToLatestRequest?.inputIntents.includes(SearchIntent.NearMe)) {
       const position = await SearchHandler.getUserLocation(geolocationOptions);
       answersActions.setUserLocation({
         latitude: position.coords.latitude,

diff --git a/sample-app/src/hooks/useAutocomplete.tsx b/sample-app/src/hooks/useAutocomplete.tsx
@@ -3,11 +3,16 @@ import { AutocompleteResponse, useAnswersActions } from '@yext/answers-headless-
 
 export function useAutocomplete(
   isVertical: boolean
-): [ AutocompleteResponse|undefined, MutableRefObject<Promise<void>>, () => Promise<void> ] {
+): [ 
+    AutocompleteResponse|undefined,
+    MutableRefObject<Promise<AutocompleteResponse|undefined>>,
+    () => Promise<void> 
+  ]
+{
   const answersActions = useAnswersActions();
   const autocompleteNetworkIds = useRef({ latestRequest: 0, responseInState: 0 });
   const [ autocompleteResponse, setAutocompleteResponse ] = useState<AutocompleteResponse>();
-  const responseToLatestRequestRef = useRef<Promise<void>>(Promise.resolve());
+  const responseToLatestRequestRef = useRef<Promise<AutocompleteResponse|undefined>>(Promise.resolve(undefined));
   async function executeAutocomplete () {
     const requestId = ++autocompleteNetworkIds.current.latestRequest;
     responseToLatestRequestRef.current = new Promise(async (resolve) => {
@@ -19,7 +24,7 @@ export function useAutocomplete(
         autocompleteNetworkIds.current.responseInState = requestId;
       }
       if (requestId === autocompleteNetworkIds.current.latestRequest) {
-        resolve();
+        resolve(response);
       }
     });
   }