Skip to content

Commit 1e7b8db

Browse files
fix: error of pagination when I import svelte project in svelte skeleton project and upgrade the version
1 parent dacf8cc commit 1e7b8db

File tree

3 files changed

+23
-23
lines changed

3 files changed

+23
-23
lines changed

package-lock.json

+2-2
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "svelte-spectre",
3-
"version": "0.4.16",
3+
"version": "0.4.17",
44
"description": "UI-kit based on spectre.css and powered by SvelteJS",
55
"main": "./package/index.js",
66
"files": [

src/lib/components/Pagination/Pagination.svelte

+20-20
Original file line numberDiff line numberDiff line change
@@ -7,55 +7,55 @@
77
</slot>
88
</a>
99
</li>
10-
{#each { length } as _, p (++p)}
10+
{#each Array(length).fill() as _, p (p)}
1111
{#if !rest}
12-
<li class="page-item" class:active={page === p}>
13-
<a href="#_" on:click|preventDefault={() => (page = p)}>{p}</a>
12+
<li class="page-item" class:active={page === p + 1}>
13+
<a href="#_" on:click|preventDefault={() => (page = p + 1)}>{p + 1}</a>
1414
</li>
1515
{:else if page <= rest}
16-
{#if p <= rest + 1 || p === length}
17-
<li class="page-item" class:active={page === p}>
18-
<a href="#_" on:click|preventDefault={() => (page = p)}>{p}</a>
16+
{#if p + 1 <= rest + 1 || p + 1 === length}
17+
<li class="page-item" class:active={page === p + 1}>
18+
<a href="#_" on:click|preventDefault={() => (page = p + 1)}>{p + 1}</a>
1919
</li>
2020
{/if}
21-
{#if p === rest + 1}
22-
<li class="page-item" class:active={page === p}>
21+
{#if p + 1 === rest + 1}
22+
<li class="page-item" class:active={page === p + 1}>
2323
<slot name="rest">
2424
<span>...</span>
2525
</slot>
2626
</li>
2727
{/if}
2828
{:else if page > rest && page <= length - rest}
29-
{#if p === length}
30-
<li class="page-item" class:active={page === p}>
29+
{#if p + 1 === length}
30+
<li class="page-item" class:active={page === p + 1}>
3131
<slot name="rest">
3232
<span>...</span>
3333
</slot>
3434
</li>
3535
{/if}
36-
{#if (p >= page - shift && p < page + (rest - shift)) || p === length || p === 1}
37-
<li class="page-item" class:active={page === p}>
38-
<a href="#_" on:click|preventDefault={() => (page = p)}>{p}</a>
36+
{#if (p + 1 >= page - shift && p + 1 < page + (rest - shift)) || p + 1 === length || p + 1 === 1}
37+
<li class="page-item" class:active={page === p + 1}>
38+
<a href="#_" on:click|preventDefault={() => (page = p + 1)}>{p + 1}</a>
3939
</li>
4040
{/if}
41-
{#if p === 1}
42-
<li class="page-item" class:active={page === p}>
41+
{#if p + 1 === 1}
42+
<li class="page-item" class:active={page === p + 1}>
4343
<slot name="rest">
4444
<span>...</span>
4545
</slot>
4646
</li>
4747
{/if}
4848
{:else if page > length - rest}
49-
{#if p === length - rest}
50-
<li class="page-item" class:active={page === p}>
49+
{#if p + 1 === length - rest}
50+
<li class="page-item" class:active={page === p + 1}>
5151
<slot name="rest">
5252
<span>...</span>
5353
</slot>
5454
</li>
5555
{/if}
56-
{#if p >= length - rest || p === 1}
57-
<li class="page-item" class:active={page === p}>
58-
<a href="#_" on:click|preventDefault={() => (page = p)}>{p}</a>
56+
{#if p + 1 >= length - rest || p + 1 === 1}
57+
<li class="page-item" class:active={page === p + 1}>
58+
<a href="#_" on:click|preventDefault={() => (page = p + 1)}>{p + 1}</a>
5959
</li>
6060
{/if}
6161
{/if}

0 commit comments

Comments
 (0)