File tree 4 files changed +20
-7
lines changed
4 files changed +20
-7
lines changed Original file line number Diff line number Diff line change @@ -27,8 +27,12 @@ export const paginationEnhancer =
27
27
locateResource : resourcesLocator . locateResource . bind ( resourcesLocator ) ,
28
28
pagination : {
29
29
...reader . pagination ,
30
- getState : ( ) => getPaginationInfo ( ) ,
31
- state$ : paginationInfo$ ,
30
+ get state ( ) {
31
+ return getPaginationInfo ( )
32
+ } ,
33
+ get state$ ( ) {
34
+ return paginationInfo$
35
+ } ,
32
36
} ,
33
37
} as unknown as PaginationOutput
34
38
}
Original file line number Diff line number Diff line change @@ -105,7 +105,7 @@ export const trackPaginationInfo = (reader: Reader & LayoutEnhancerOutput) => {
105
105
const chaptersInfo$ = trackChapterInfo ( reader )
106
106
const totalPages$ = trackTotalPages ( reader )
107
107
const currentValue = new BehaviorSubject < EnhancerPaginationInto > ( {
108
- ...reader . pagination . getState ( ) ,
108
+ ...reader . pagination . state ,
109
109
beginChapterInfo : undefined ,
110
110
beginCfi : undefined ,
111
111
beginPageIndexInSpineItem : undefined ,
Original file line number Diff line number Diff line change 1
- import { BehaviorSubject , Subject } from "rxjs"
1
+ import {
2
+ BehaviorSubject ,
3
+ type Observable ,
4
+ type ObservedValueOf ,
5
+ Subject ,
6
+ } from "rxjs"
2
7
import { filter , map } from "rxjs/operators"
3
8
import { generateCfiForSpineItemPage } from "./cfi/generate/generateCfiForSpineItemPage"
4
9
import { generateCfiFromRange } from "./cfi/generate/generateCfiFromRange"
@@ -203,8 +208,12 @@ export const createReader = (inputSettings: CreateReaderOptions) => {
203
208
load,
204
209
destroy,
205
210
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
+ } ,
208
217
} ,
209
218
settings : settingsManager as SettingsInterface <
210
219
NonNullable < ( typeof settingsManager ) [ "inputSettings" ] > ,
Original file line number Diff line number Diff line change @@ -68,7 +68,7 @@ export const Scrubber = (props: ComponentProps<typeof ThemedSlider>) => {
68
68
} else {
69
69
reader ?. navigation . goToPageOfSpineItem ( {
70
70
pageIndex,
71
- spineItemId : reader . pagination . getState ( ) . beginSpineItemIndex ?? 0 ,
71
+ spineItemId : reader . pagination . state . beginSpineItemIndex ?? 0 ,
72
72
animation : false ,
73
73
} )
74
74
}
You can’t perform that action at this time.
0 commit comments