Skip to content

Commit ff2f408

Browse files
committed
fix: fix ts
1 parent 0ab1393 commit ff2f408

File tree

4 files changed

+20
-7
lines changed

4 files changed

+20
-7
lines changed

packages/core/src/enhancers/pagination/enhancer.ts

+6-2
Original file line numberDiff line numberDiff line change
@@ -27,8 +27,12 @@ export const paginationEnhancer =
2727
locateResource: resourcesLocator.locateResource.bind(resourcesLocator),
2828
pagination: {
2929
...reader.pagination,
30-
getState: () => getPaginationInfo(),
31-
state$: paginationInfo$,
30+
get state() {
31+
return getPaginationInfo()
32+
},
33+
get state$() {
34+
return paginationInfo$
35+
},
3236
},
3337
} as unknown as PaginationOutput
3438
}

packages/core/src/enhancers/pagination/pagination.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -105,7 +105,7 @@ export const trackPaginationInfo = (reader: Reader & LayoutEnhancerOutput) => {
105105
const chaptersInfo$ = trackChapterInfo(reader)
106106
const totalPages$ = trackTotalPages(reader)
107107
const currentValue = new BehaviorSubject<EnhancerPaginationInto>({
108-
...reader.pagination.getState(),
108+
...reader.pagination.state,
109109
beginChapterInfo: undefined,
110110
beginCfi: undefined,
111111
beginPageIndexInSpineItem: undefined,

packages/core/src/reader.ts

+12-3
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,9 @@
1-
import { BehaviorSubject, Subject } from "rxjs"
1+
import {
2+
BehaviorSubject,
3+
type Observable,
4+
type ObservedValueOf,
5+
Subject,
6+
} from "rxjs"
27
import { filter, map } from "rxjs/operators"
38
import { generateCfiForSpineItemPage } from "./cfi/generate/generateCfiForSpineItemPage"
49
import { generateCfiFromRange } from "./cfi/generate/generateCfiFromRange"
@@ -203,8 +208,12 @@ export const createReader = (inputSettings: CreateReaderOptions) => {
203208
load,
204209
destroy,
205210
pagination: {
206-
getState: () => pagination.value,
207-
state$: pagination,
211+
get state() {
212+
return pagination.value
213+
},
214+
get state$(): Observable<ObservedValueOf<typeof pagination>> {
215+
return pagination
216+
},
208217
},
209218
settings: settingsManager as SettingsInterface<
210219
NonNullable<(typeof settingsManager)["inputSettings"]>,

packages/react-reader/src/quickmenu/Scrubber.tsx

+1-1
Original file line numberDiff line numberDiff line change
@@ -68,7 +68,7 @@ export const Scrubber = (props: ComponentProps<typeof ThemedSlider>) => {
6868
} else {
6969
reader?.navigation.goToPageOfSpineItem({
7070
pageIndex,
71-
spineItemId: reader.pagination.getState().beginSpineItemIndex ?? 0,
71+
spineItemId: reader.pagination.state.beginSpineItemIndex ?? 0,
7272
animation: false,
7373
})
7474
}

0 commit comments

Comments
 (0)