cleanup: use href for pagination
This commit is contained in:
1 parent
4b150679f9
commit
c85f98cdcb
12 files changed
+49
-49
No files matched your search
@@ -1,22 +1,20 @@
|
|||||||
<script lang="ts">
|
<script lang="ts">
|
||||||
import { t } from '$lib/translations'
|
import { t } from '$lib/translations'
|
||||||
import { Button } from 'mono-svelte'
|
import { Button } from 'mono-svelte'
|
||||||
import { createEventDispatcher } from 'svelte'
|
import { ChevronLeft, ChevronRight, Icon } from 'svelte-hero-icons'
|
||||||
import {
|
|
||||||
ArrowLeft,
|
|
||||||
ArrowRight,
|
|
||||||
ChevronLeft,
|
|
||||||
ChevronRight,
|
|
||||||
Icon,
|
|
||||||
} from 'svelte-hero-icons'
|
|
||||||
import { backOut } from 'svelte/easing'
|
import { backOut } from 'svelte/easing'
|
||||||
import { fly } from 'svelte/transition'
|
import { fly } from 'svelte/transition'
|
||||||
|
import { page as pageData } from '$app/state'
|
||||||
|
import { invalidate, invalidateAll } from '$app/navigation'
|
||||||
|
|
||||||
interface Props {
|
interface Props {
|
||||||
page?: number
|
page?: number
|
||||||
cursor?: { next?: string; back?: string } | undefined
|
cursor?: { next?: string; back?: string } | undefined
|
||||||
hasMore?: boolean
|
hasMore?: boolean
|
||||||
children?: import('svelte').Snippet
|
children?: import('svelte').Snippet
|
||||||
|
onchange?: (page: number) => void
|
||||||
|
onchangecursor?: (cursor: string) => void
|
||||||
|
href?: (current: number | string) => string
|
||||||
}
|
}
|
||||||
|
|
||||||
let {
|
let {
|
||||||
@@ -24,9 +22,25 @@
|
|||||||
cursor = undefined,
|
cursor = undefined,
|
||||||
hasMore = true,
|
hasMore = true,
|
||||||
children,
|
children,
|
||||||
|
onchange,
|
||||||
|
onchangecursor,
|
||||||
|
href,
|
||||||
}: Props = $props()
|
}: Props = $props()
|
||||||
|
|
||||||
const dispatcher = createEventDispatcher<{ change: number; cursor: string }>()
|
let customHref = (href?: string) => {
|
||||||
|
if (href?.startsWith('?')) {
|
||||||
|
const current = pageData.url.searchParams
|
||||||
|
const newParams = new URLSearchParams(href)
|
||||||
|
|
||||||
|
current.delete(newParams.keys().toArray()[0])
|
||||||
|
current.append(
|
||||||
|
newParams.entries().toArray()[0][0],
|
||||||
|
newParams.entries().toArray()[0][1],
|
||||||
|
)
|
||||||
|
|
||||||
|
return `?${current.toString()}`
|
||||||
|
} else return href
|
||||||
|
}
|
||||||
</script>
|
</script>
|
||||||
|
|
||||||
<nav
|
<nav
|
||||||
@@ -40,16 +54,19 @@
|
|||||||
<hr class="border-slate-200 dark:border-zinc-800 flex-1" />
|
<hr class="border-slate-200 dark:border-zinc-800 flex-1" />
|
||||||
{/if}
|
{/if}
|
||||||
<Button
|
<Button
|
||||||
|
href={customHref(href?.(cursor?.back ?? page - 1))}
|
||||||
color="ghost"
|
color="ghost"
|
||||||
onclick={() => {
|
onclick={() => {
|
||||||
if (cursor?.back) dispatcher('cursor', cursor?.back)
|
invalidateAll()
|
||||||
else dispatcher('change', --page)
|
if (cursor?.back) onchangecursor?.(cursor.back)
|
||||||
|
else onchange?.(--page)
|
||||||
}}
|
}}
|
||||||
title={$t('common.back')}
|
title={$t('common.back')}
|
||||||
size="square-md"
|
size="square-md"
|
||||||
rounding="pill"
|
rounding="pill"
|
||||||
class="text-inherit dark:text-inherit disabled:!opacity-20 disabled:!bg-transparent"
|
class="text-inherit dark:text-inherit disabled:!opacity-20 disabled:!bg-transparent"
|
||||||
disabled={(!cursor?.back && cursor?.next) || page <= 1}
|
disabled={!!((!cursor?.back && cursor?.next) || page <= 1)}
|
||||||
|
data-sveltekit-preload-data="off"
|
||||||
>
|
>
|
||||||
{#snippet suffix()}
|
{#snippet suffix()}
|
||||||
<Icon src={ChevronLeft} size="24" mini />
|
<Icon src={ChevronLeft} size="24" mini />
|
||||||
@@ -72,16 +89,19 @@
|
|||||||
{/if}
|
{/if}
|
||||||
|
|
||||||
<Button
|
<Button
|
||||||
|
href={customHref(href?.(cursor?.next ?? page + 1))}
|
||||||
color="ghost"
|
color="ghost"
|
||||||
onclick={() => {
|
onclick={() => {
|
||||||
if (cursor?.next) dispatcher('cursor', cursor?.next)
|
invalidateAll()
|
||||||
else dispatcher('change', ++page)
|
if (cursor?.next) onchangecursor?.(cursor?.next)
|
||||||
|
else onchange?.(++page)
|
||||||
}}
|
}}
|
||||||
title={$t('common.next')}
|
title={$t('common.next')}
|
||||||
size="square-md"
|
size="square-md"
|
||||||
rounding="pill"
|
rounding="pill"
|
||||||
class="text-inherit dark:text-inherit"
|
class="text-inherit dark:text-inherit"
|
||||||
disabled={!hasMore}
|
disabled={!hasMore}
|
||||||
|
data-sveltekit-preload-data="off"
|
||||||
>
|
>
|
||||||
{#snippet suffix()}
|
{#snippet suffix()}
|
||||||
<Icon src={ChevronRight} size="24" mini />
|
<Icon src={ChevronRight} size="24" mini />
|
||||||
|
|||||||
@@ -70,10 +70,8 @@
|
|||||||
>
|
>
|
||||||
<Pageination
|
<Pageination
|
||||||
cursor={{ next: data.cursor.next }}
|
cursor={{ next: data.cursor.next }}
|
||||||
on:change={(p) => searchParam(page.url, 'page', p.detail.toString())}
|
href={(page) =>
|
||||||
on:cursor={(c) => {
|
typeof page == 'number' ? `?page=${page}` : `?cursor=${page}`}
|
||||||
searchParam(page.url, 'cursor', c.detail)
|
|
||||||
}}
|
|
||||||
>
|
>
|
||||||
<span class="flex flex-row items-center gap-1">
|
<span class="flex flex-row items-center gap-1">
|
||||||
<Icon src={ChartBar} size="16" mini />
|
<Icon src={ChartBar} size="16" mini />
|
||||||
|
|||||||
@@ -28,10 +28,7 @@
|
|||||||
</div>
|
</div>
|
||||||
{#if data.applications.length >= 40}
|
{#if data.applications.length >= 40}
|
||||||
<div class="mt-auto">
|
<div class="mt-auto">
|
||||||
<Pageination
|
<Pageination page={data.page} href={(page) => `?page=${page}`} />
|
||||||
page={data.page}
|
|
||||||
on:change={(p) => searchParam(page.url, 'page', p.detail.toString())}
|
|
||||||
/>
|
|
||||||
</div>
|
</div>
|
||||||
{/if}
|
{/if}
|
||||||
{:else}
|
{:else}
|
||||||
|
|||||||
@@ -119,10 +119,8 @@
|
|||||||
<Pageination
|
<Pageination
|
||||||
page={data.page}
|
page={data.page}
|
||||||
cursor={{ next: data.cursor.next }}
|
cursor={{ next: data.cursor.next }}
|
||||||
on:change={(p) => searchParam(page.url, 'page', p.detail.toString())}
|
href={(page) =>
|
||||||
on:cursor={(c) => {
|
typeof page == 'number' ? `?page=${page}` : `?cursor=${page}`}
|
||||||
searchParam(page.url, 'cursor', c.detail)
|
|
||||||
}}
|
|
||||||
>
|
>
|
||||||
<span class="flex flex-row items-center gap-1">
|
<span class="flex flex-row items-center gap-1">
|
||||||
<Icon src={ChartBar} size="16" mini />
|
<Icon src={ChartBar} size="16" mini />
|
||||||
|
|||||||
@@ -186,7 +186,7 @@
|
|||||||
<Tabs routes={[]} class="mx-auto">
|
<Tabs routes={[]} class="mx-auto">
|
||||||
<Pageination
|
<Pageination
|
||||||
page={Number(page.url.searchParams.get('page')) || 1}
|
page={Number(page.url.searchParams.get('page')) || 1}
|
||||||
on:change={(p) => searchParam(page.url, 'page', p.detail.toString())}
|
href={(c) => `?page=${c}`}
|
||||||
/>
|
/>
|
||||||
</Tabs>
|
</Tabs>
|
||||||
</div>
|
</div>
|
||||||
|
|||||||
@@ -201,7 +201,7 @@ items-center px-2 w-max"
|
|||||||
<Pageination
|
<Pageination
|
||||||
hasMore={!(!inbox || (inbox?.length ?? 0) < (data?.limit ?? 0))}
|
hasMore={!(!inbox || (inbox?.length ?? 0) < (data?.limit ?? 0))}
|
||||||
page={data.page}
|
page={data.page}
|
||||||
on:change={(p) => searchParam(page.url, 'page', p.detail.toString())}
|
href={(page) => `?page=${page}`}
|
||||||
/>
|
/>
|
||||||
</Tabs>
|
</Tabs>
|
||||||
</div>
|
</div>
|
||||||
|
|||||||
@@ -33,7 +33,7 @@
|
|||||||
<div class="flex flex-row gap-2 flex-wrap items-end">
|
<div class="flex flex-row gap-2 flex-wrap items-end">
|
||||||
<Select
|
<Select
|
||||||
bind:value={data.type}
|
bind:value={data.type}
|
||||||
on:change={() => searchParam(page.url, 'type', data.type, 'page')}
|
onchange={() => searchParam(page.url, 'type', data.type, 'page')}
|
||||||
>
|
>
|
||||||
{#snippet customLabel()}
|
{#snippet customLabel()}
|
||||||
<span class="flex items-center gap-1">
|
<span class="flex items-center gap-1">
|
||||||
|
|||||||
@@ -219,10 +219,7 @@
|
|||||||
</table>
|
</table>
|
||||||
</div>
|
</div>
|
||||||
{/if}
|
{/if}
|
||||||
<Pageination
|
<Pageination page={data.page} href={(page) => `?page=${page}`} />
|
||||||
page={data.page}
|
|
||||||
on:change={(e) => searchParam(page.url, 'page', e.detail.toString())}
|
|
||||||
/>
|
|
||||||
{:else}
|
{:else}
|
||||||
<Placeholder
|
<Placeholder
|
||||||
title="No results"
|
title="No results"
|
||||||
|
|||||||
@@ -34,9 +34,7 @@
|
|||||||
{#if data.images.length == 20}
|
{#if data.images.length == 20}
|
||||||
<Pageination
|
<Pageination
|
||||||
page={Number(page.url.searchParams.get('page')) || 1}
|
page={Number(page.url.searchParams.get('page')) || 1}
|
||||||
on:change={(p) => {
|
href={(page) => `?page=${page}`}
|
||||||
searchParam(page.url, 'page', p.detail.toString())
|
|
||||||
}}
|
|
||||||
/>
|
/>
|
||||||
{/if}
|
{/if}
|
||||||
|
|
||||||
|
|||||||
@@ -93,9 +93,6 @@
|
|||||||
style="bottom: max(1.5rem, {$contentPadding.bottom}px);"
|
style="bottom: max(1.5rem, {$contentPadding.bottom}px);"
|
||||||
>
|
>
|
||||||
<Tabs routes={[]} class="mx-auto">
|
<Tabs routes={[]} class="mx-auto">
|
||||||
<Pageination
|
<Pageination href={(page) => `?page=${page}`} page={data.page} />
|
||||||
on:change={(p) => searchParam(page.url, 'page', p.detail.toString())}
|
|
||||||
page={data.page}
|
|
||||||
/>
|
|
||||||
</Tabs>
|
</Tabs>
|
||||||
</div>
|
</div>
|
||||||
@@ -213,9 +213,6 @@
|
|||||||
</div>
|
</div>
|
||||||
<div class="mt-4"></div>
|
<div class="mt-4"></div>
|
||||||
{#if data.results.length > 0}
|
{#if data.results.length > 0}
|
||||||
<Pageination
|
<Pageination bind:page={pageNum} href={(page) => `?page=${page}`} />
|
||||||
bind:page={pageNum}
|
|
||||||
on:change={(p) => searchParam(page.url, 'page', p.detail.toString())}
|
|
||||||
/>
|
|
||||||
{/if}
|
{/if}
|
||||||
{/if}
|
{/if}
|
||||||
@@ -38,9 +38,10 @@
|
|||||||
import { publishedToDate } from '$lib/components/util/date.js'
|
import { publishedToDate } from '$lib/components/util/date.js'
|
||||||
import { formatRelativeDate } from '$lib/components/util/RelativeDate.svelte'
|
import { formatRelativeDate } from '$lib/components/util/RelativeDate.svelte'
|
||||||
import Option from 'mono-svelte/forms/select/Option.svelte'
|
import Option from 'mono-svelte/forms/select/Option.svelte'
|
||||||
|
import type { PageData } from './$types'
|
||||||
|
|
||||||
interface Props {
|
interface Props {
|
||||||
data: any
|
data: PageData
|
||||||
inline?: boolean
|
inline?: boolean
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -342,9 +343,6 @@
|
|||||||
{/each}
|
{/each}
|
||||||
</div>
|
</div>
|
||||||
{/if}
|
{/if}
|
||||||
<Pageination
|
<Pageination page={data.page} href={(page) => `?page=${page}`} />
|
||||||
page={data.page}
|
|
||||||
on:change={(p) => searchParam(page.url, 'page', p.detail.toString())}
|
|
||||||
/>
|
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
Reference in new issue
Block a user