From afd6c88296ab38ba16e97ea575e743e86c8ccfcf Mon Sep 17 00:00:00 2001
From: Tajim <com.tajim@gmail.com>
Date: Tue, 22 Sep 2026 22:43:16 +0600
Subject: [PATCH] fix(peers): fetch pagination data via fetch to persist list
 in history state

---
 resources/js/pages/Peers/Index.vue | 67 +++++++++++++++++-------------
 1 file changed, 37 insertions(+), 30 deletions(-)

diff --git a/resources/js/pages/Peers/Index.vue b/resources/js/pages/Peers/Index.vue
index 488a7124..0d65ec44 100644
--- a/resources/js/pages/Peers/Index.vue
+++ b/resources/js/pages/Peers/Index.vue
@@ -1,5 +1,5 @@
 <script setup lang="ts">
-import { Head, Link, router, useRemember } from '@inertiajs/vue3';
+import { Head, Link, router, usePage, useRemember } from '@inertiajs/vue3';
 import { Search, X, Users, Heart, Loader2 } from 'lucide-vue-next';
 import { onUnmounted, ref, watch } from 'vue';
 import EmptyState from '@/components/EmptyState.vue';
@@ -34,6 +34,7 @@ interface Props {
 }
 
 const props = defineProps<Props>();
+const page = usePage();
 
 const peerList = useRemember<Peer[]>(
     [...props.peers.data],
@@ -51,10 +52,8 @@ const currentSort = ref(props.filters.sort || 'relevant');
 watch(
     () => props.peers,
     (newPeers) => {
-        if (!isLoadingMore.value) {
-            peerList.value = [...(newPeers?.data || [])];
-            nextPageUrl.value = newPeers?.next_page_url || null;
-        }
+        peerList.value = [...(newPeers?.data || [])];
+        nextPageUrl.value = newPeers?.next_page_url || null;
     },
 );
 
@@ -106,36 +105,44 @@ const setSort = (sortValue: string) => {
     applyFilters();
 };
 
-const loadMore = () => {
+const loadMore = async () => {
     if (!nextPageUrl.value || isLoadingMore.value) {
         return;
     }
 
     isLoadingMore.value = true;
-    router.get(
-        nextPageUrl.value,
-        {},
-        {
-            preserveState: true,
-            preserveScroll: true,
-            preserveUrl: true,
-            only: ['peers'],
-            onSuccess: (page) => {
-                const newPeersData =
-                    (page.props.peers as Props['peers'])?.data || [];
-                const existingIds = new Set(peerList.value.map((p) => p.id));
-                const uniqueNew = newPeersData.filter(
-                    (p) => !existingIds.has(p.id),
-                );
-                peerList.value.push(...uniqueNew);
-                nextPageUrl.value =
-                    (page.props.peers as Props['peers'])?.next_page_url || null;
-            },
-            onFinish: () => {
-                isLoadingMore.value = false;
-            },
-        },
-    );
+
+    try {
+        const headers: Record<string, string> = {
+            'X-Inertia': 'true',
+            'X-Inertia-Partial-Component': 'Peers/Index',
+            'X-Inertia-Partial-Data': 'peers',
+            'X-Requested-With': 'XMLHttpRequest',
+        };
+
+        if (page.version) {
+            headers['X-Inertia-Version'] = String(page.version);
+        }
+
+        const res = await fetch(nextPageUrl.value, { headers });
+
+        if (res.ok) {
+            const data = await res.json();
+            const newPeersData =
+                (data?.props?.peers as Props['peers'])?.data || [];
+            const existingIds = new Set(peerList.value.map((p) => p.id));
+            const uniqueNew = newPeersData.filter(
+                (p) => !existingIds.has(p.id),
+            );
+            peerList.value = [...peerList.value, ...uniqueNew];
+            nextPageUrl.value =
+                (data?.props?.peers as Props['peers'])?.next_page_url || null;
+        }
+    } catch (e) {
+        console.error('Failed to load more peers:', e);
+    } finally {
+        isLoadingMore.value = false;
+    }
 };
 
 onUnmounted(() => {