fixed Back navigation should also show previous search result

MobilityData · Aug 13, 2024 · 516d2cb · 516d2cb
1 parent 9f6000e
commit 516d2cb
Showing 1 changed file with 9 additions and 3 deletions.
diff --git a/web-app/src/app/screens/Feeds/index.tsx b/web-app/src/app/screens/Feeds/index.tsx
@@ -127,9 +127,15 @@ export default function Feed(): React.ReactElement {
   }, [activeSearch, activePagination]);
 
   useEffect(() => {
-    const newQeury = searchParams.get('q') ?? '';
-    if (newQeury !== searchQuery) {
-      setSearchQuery(newQeury);
+    const newQuery = searchParams.get('q') ?? '';
+    if (newQuery !== searchQuery) {
+      setSearchQuery(newQuery);
+      setActiveSearch(newQuery);
+    }
+    const newOffset =
+      searchParams.get('o') !== null ? Number(searchParams.get('o')) : 1;
+    if (newOffset !== activePagination) {
+      setActivePagination(newOffset);
     }
   }, [searchParams]);