feat: upgrade prose

mbret · May 27, 2024 · 8e838e1 · 8e838e1
1 parent 4410d84
commit 8e838e1
Show file tree

Hide file tree

Showing 4 changed files with 35 additions and 130 deletions.
diff --git a/package-lock.json b/package-lock.json
diff --git a/packages/web/package.json b/packages/web/package.json
@@ -10,11 +10,11 @@
     "@mui/material": "^5.11.11",
     "@mui/styles": "^5.11.11",
     "@oboku/shared": "0.8.0",
-    "@prose-reader/core": "1.51.0",
-    "@prose-reader/enhancer-hammer-gesture": "1.51.0",
-    "@prose-reader/react": "1.51.0",
-    "@prose-reader/shared": "1.51.0",
-    "@prose-reader/streamer": "1.51.0",
+    "@prose-reader/core": "1.52.0",
+    "@prose-reader/enhancer-hammer-gesture": "1.52.0",
+    "@prose-reader/react": "1.52.0",
+    "@prose-reader/shared": "1.52.0",
+    "@prose-reader/streamer": "1.52.0",
     "@sentry/integrations": "^7.40.0",
     "@sentry/react": "^7.40.0",
     "buffer": "^6.0.3",

diff --git a/packages/web/src/reader/manifest.ts b/packages/web/src/reader/manifest.ts
diff --git a/packages/web/src/reader/states.ts b/packages/web/src/reader/states.ts
@@ -1,5 +1,5 @@
 import { createReader, Manifest } from "@prose-reader/core"
-import { EMPTY, filter, map, of, switchMap, tap } from "rxjs"
+import { filter, switchMap } from "rxjs"
 import { hammerGestureEnhancer } from "@prose-reader/enhancer-hammer-gesture"
 import { Props as GenericReactReaderProps } from "@prose-reader/react"
 import { isDefined, signal, useForeverQuery, useSignalValue } from "reactjrx"
@@ -41,29 +41,29 @@ export const usePagination = () =>
     queryFn: () => {
       return readerStateSignal.subject.pipe(
         filter(isDefined),
-        switchMap((reader) => reader.pagination$)
+        switchMap((reader) => reader.pagination.paginationInfo$)
       )
     }
   })
 
 export const useCurrentPage = () => {
   const reader = useSignalValue(readerStateSignal)
-  const { data: { beginPageIndexInChapter, beginSpineItemIndex } = {} } =
+  const { data: { beginPageIndexInSpineItem, beginSpineItemIndex } = {} } =
     usePagination()
   const { renditionLayout } = reader?.context.getManifest() ?? {}
 
-  if (renditionLayout === "reflowable") return beginPageIndexInChapter
+  if (renditionLayout === "reflowable") return beginPageIndexInSpineItem
 
   return beginSpineItemIndex
 }
 
 export const useTotalPage = () => {
   const reader = useSignalValue(readerStateSignal)
   const { renditionLayout } = reader?.context.getManifest() ?? {}
-  const { data: { numberOfTotalPages, beginNumberOfPagesInChapter } = {} } =
+  const { data: { numberOfTotalPages, beginNumberOfPagesInSpineItem } = {} } =
     usePagination()
 
-  if (renditionLayout === "reflowable") return beginNumberOfPagesInChapter
+  if (renditionLayout === "reflowable") return beginNumberOfPagesInSpineItem
 
   return numberOfTotalPages
 }