fix: Pagination fixed
This commit is contained in:
@@ -23,8 +23,12 @@
|
|||||||
// $inspect(page.url.searchParams.get('search'));
|
// $inspect(page.url.searchParams.get('search'));
|
||||||
|
|
||||||
let initialUrlParams = $state(new URLSearchParams());
|
let initialUrlParams = $state(new URLSearchParams());
|
||||||
|
let urlPage = $state(1);
|
||||||
|
|
||||||
$effect(() => {
|
$effect(() => {
|
||||||
|
const pageParam = page.url.searchParams.get('page');
|
||||||
|
urlPage = pageParam ? parseInt(pageParam, 10) : 1;
|
||||||
|
|
||||||
// Store initial URL params before any filtering
|
// Store initial URL params before any filtering
|
||||||
if (Object.keys(selectedFilters).length === 0) {
|
if (Object.keys(selectedFilters).length === 0) {
|
||||||
initialUrlParams = new URLSearchParams(page.url.search);
|
initialUrlParams = new URLSearchParams(page.url.search);
|
||||||
@@ -102,6 +106,16 @@
|
|||||||
params.set('categories', page.url.searchParams.get('categories')!);
|
params.set('categories', page.url.searchParams.get('categories')!);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
const currentPage = page.url.searchParams.get('page');
|
||||||
|
const currentPerPage = page.url.searchParams.get('per_page');
|
||||||
|
|
||||||
|
if (currentPage) {
|
||||||
|
params.set('page', currentPage);
|
||||||
|
}
|
||||||
|
if (currentPerPage) {
|
||||||
|
params.set('per_page', currentPerPage);
|
||||||
|
}
|
||||||
|
|
||||||
goto(`?${params.toString()}`, {
|
goto(`?${params.toString()}`, {
|
||||||
keepFocus: true,
|
keepFocus: true,
|
||||||
noScroll: true,
|
noScroll: true,
|
||||||
@@ -131,6 +145,19 @@
|
|||||||
);
|
);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
function goToPage(pageNumber: number) {
|
||||||
|
const params = new URLSearchParams(page.url.search);
|
||||||
|
|
||||||
|
params.set('page', pageNumber.toString());
|
||||||
|
|
||||||
|
goto(`?${params.toString()}`, {
|
||||||
|
keepFocus: true,
|
||||||
|
noScroll: true,
|
||||||
|
replaceState: true,
|
||||||
|
invalidateAll: true
|
||||||
|
});
|
||||||
|
}
|
||||||
|
|
||||||
$effect(() => {
|
$effect(() => {
|
||||||
data?.productCategory
|
data?.productCategory
|
||||||
?.then(
|
?.then(
|
||||||
@@ -327,12 +354,13 @@
|
|||||||
<Pagination.Root
|
<Pagination.Root
|
||||||
count={category?.pagination.total_items}
|
count={category?.pagination.total_items}
|
||||||
perPage={category?.pagination?.per_page}
|
perPage={category?.pagination?.per_page}
|
||||||
|
page={urlPage}
|
||||||
class="col-start-4 items-end"
|
class="col-start-4 items-end"
|
||||||
>
|
>
|
||||||
{#snippet children({ pages, currentPage })}
|
{#snippet children({ pages, currentPage })}
|
||||||
<Pagination.Content>
|
<Pagination.Content>
|
||||||
<Pagination.Item>
|
<Pagination.Item>
|
||||||
<Pagination.PrevButton />
|
<Pagination.PrevButton onclick={() => goToPage(currentPage - 1)} />
|
||||||
</Pagination.Item>
|
</Pagination.Item>
|
||||||
{#each pages as page (page.key)}
|
{#each pages as page (page.key)}
|
||||||
{#if page.type === 'ellipsis'}
|
{#if page.type === 'ellipsis'}
|
||||||
@@ -340,15 +368,19 @@
|
|||||||
<Pagination.Ellipsis />
|
<Pagination.Ellipsis />
|
||||||
</Pagination.Item>
|
</Pagination.Item>
|
||||||
{:else}
|
{:else}
|
||||||
<Pagination.Item isVisible={currentPage === page.value}>
|
<Pagination.Item>
|
||||||
<Pagination.Link {page} isActive={currentPage === page.value}>
|
<Pagination.Link
|
||||||
|
{page}
|
||||||
|
isActive={currentPage === page.value}
|
||||||
|
onclick={() => goToPage(page.value)}
|
||||||
|
>
|
||||||
{page.value}
|
{page.value}
|
||||||
</Pagination.Link>
|
</Pagination.Link>
|
||||||
</Pagination.Item>
|
</Pagination.Item>
|
||||||
{/if}
|
{/if}
|
||||||
{/each}
|
{/each}
|
||||||
<Pagination.Item>
|
<Pagination.Item>
|
||||||
<Pagination.NextButton />
|
<Pagination.NextButton onclick={() => goToPage(currentPage + 1)} />
|
||||||
</Pagination.Item>
|
</Pagination.Item>
|
||||||
</Pagination.Content>
|
</Pagination.Content>
|
||||||
{/snippet}
|
{/snippet}
|
||||||
|
|||||||
Reference in New Issue
Block a user