Fixes for viewer pagination

MuckRock · Feb 22, 2024 · e6bd8bc · e6bd8bc
1 parent c4d0890
commit e6bd8bc
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 16 deletions.
diff --git a/src/common/Paginator.svelte b/src/common/Paginator.svelte
@@ -20,15 +20,15 @@
   $: inputWidth = String(page ?? 0).length;
   $: invalidValue = page > totalPages || !page;
 
-  export function previous() {
-    dispatch("previous");
+  function previous() {
+    dispatch("previous", page - 1);
   }
 
-  export function next() {
-    dispatch("next");
+  function next() {
+    dispatch("next", page + 1);
   }
 
-  export function goTo(page: number) {
+  function goTo(page: number) {
     dispatch("goTo", page);
   }
 

diff --git a/src/pages/viewer/controls/Paginator.svelte b/src/pages/viewer/controls/Paginator.svelte
@@ -3,26 +3,22 @@
   import { viewer } from "@/viewer/viewer.js";
   import Paginator from "../../../common/Paginator.svelte";
 
-  function gotoPage(readablePageNumber) {
+  function goToPage(readablePageNumber) {
     doc.jumpToPage(readablePageNumber - 1);
   }
 
-  function increment() {
-    gotoPage(Math.min(doc.visiblePageNumber + 1, viewer.document.pageCount));
-  }
-
-  function decrement() {
-    gotoPage(Math.max(doc.visiblePageNumber - 1, 1));
+  $: {
+    console.log(doc.visiblePageNumber, $doc.visiblePageNumber);
   }
 </script>
 
 {#if $viewer.loaded && $doc.mode !== "search" && $doc.mode !== "notes" && $doc.mode !== "thumbnail"}
   <Paginator
-    page={$doc.visiblePageNumber}
+    bind:page={$doc.visiblePageNumber}
     totalPages={$viewer.document.pageCount}
-    on:previous={decrement}
-    on:next={increment}
-    on:goTo={gotoPage}
+    on:previous={goToPage}
+    on:next={goToPage}
+    on:goTo={goToPage}
     goToNav
     has_next={$doc.visiblePageNumber < $viewer.document.pageCount}
     has_prev={$doc.visiblePageNumber > 1}