From 8bfce09628e7ec46bd3c03501cb33312e1d7f13a Mon Sep 17 00:00:00 2001
From: Evan <LegendEffects@users.noreply.github.com>
Date: Tue, 28 Apr 2026 14:22:48 +0100
Subject: [PATCH] Fix search query autocomplete lagging behind (#10381)

---
 .../Autocomplete/useAutocomplete/index.ts     | 32 ++++++++++++-------
 1 file changed, 21 insertions(+), 11 deletions(-)

diff --git a/src/components/Autocomplete/useAutocomplete/index.ts b/src/components/Autocomplete/useAutocomplete/index.ts
index 41faad3db5..280faf1f60 100644
--- a/src/components/Autocomplete/useAutocomplete/index.ts
+++ b/src/components/Autocomplete/useAutocomplete/index.ts
@@ -1,4 +1,4 @@
-import {useCallback} from 'react'
+import {useCallback, useMemo} from 'react'
 import {moderateProfile, type ModerationOpts} from '@atproto/api'
 import {keepPreviousData, useQuery} from '@tanstack/react-query'
 
@@ -90,24 +90,34 @@ export function useAutocomplete({
           }
         }
 
-        if (showSearchFallback && q) {
-          results.unshift({
-            key: `search-${q}`,
-            type: 'search' as const,
-            value: q,
-          })
-        }
-
         return results
       },
-      [q, showSearchFallback, moderationOpts],
+      [q, moderationOpts],
     ),
     placeholderData: keepPreviousData,
   })
 
+  const items = useMemo(() => {
+    if (!query.data) {
+      return []
+    }
+
+    const results = [...query.data]
+
+    if (showSearchFallback && q) {
+      results.unshift({
+        key: `search-${q}`,
+        type: 'search' as const,
+        value: q,
+      })
+    }
+
+    return results
+  }, [query.data, showSearchFallback, q])
+
   return {
     query: q,
-    items: query.data || [],
+    items,
   }
 }