@prose-reader/core 1.70.0 → 1.72.0

package/dist/createReaderWithEnhancer.d.ts

@@ -90,8 +90,8 @@ export declare const createReaderWithEnhancers: (options: Partial<import('./sett
     load: (manifest: import('@prose-reader/shared').Manifest, loadOptions: import('./reader').LoadOptions) => void;
     destroy: () => void;
     pagination: {
-        pagination: import('./pagination/Pagination').PaginationInfo;
-        pagination$: import('rxjs').Observable<import('./pagination/Pagination').PaginationInfo>;
+        state: import('./pagination/Pagination').PaginationInfo;
+        state$: import('rxjs').Observable<import('./pagination/Pagination').PaginationInfo>;
     };
     settings: import('./settings/SettingsInterface').SettingsInterface<NonNullable<import('./settings/types').CoreInputSettings>, NonNullable<import('./settings/types').CoreOutputSettings | undefined>>;
     element$: import('rxjs').Observable<HTMLElement>;
@@ -122,11 +122,11 @@ export declare const createReaderWithEnhancers: (options: Partial<import('./sett
     };
 }, "pagination"> & {
     pagination: Omit<{
-        pagination: import('./pagination/Pagination').PaginationInfo;
-        pagination$: import('rxjs').Observable<import('./pagination/Pagination').PaginationInfo>;
-    }, "pagination" | "pagination$"> & {
-        pagination$: import('rxjs').Observable<import('./pagination/Pagination').PaginationInfo & import('./enhancers/pagination/types').ExtraPaginationInfo>;
-        pagination: import('./pagination/Pagination').PaginationInfo & import('./enhancers/pagination/types').ExtraPaginationInfo;
+        state: import('./pagination/Pagination').PaginationInfo;
+        state$: import('rxjs').Observable<import('./pagination/Pagination').PaginationInfo>;
+    }, "state" | "state$"> & {
+        state$: import('rxjs').Observable<import('./pagination/Pagination').PaginationInfo & import('./enhancers/pagination/types').ExtraPaginationInfo>;
+        state: import('./pagination/Pagination').PaginationInfo & import('./enhancers/pagination/types').ExtraPaginationInfo;
     };
 } & {
     theme: {

package/dist/enhancers/navigation/state.d.ts

@@ -2,6 +2,8 @@ import { Reader } from '../../reader';
 
 export type State = ReturnType<typeof observeState>;
 export declare const observeState: (reader: Reader) => import('rxjs').Observable<{
+    canTurnLeft: boolean;
+    canTurnRight: boolean;
     canGoTopSpineItem: boolean;
     canGoBottomSpineItem: boolean;
     canGoLeftSpineItem: boolean;

package/dist/enhancers/pagination/enhancer.d.ts

@@ -5,9 +5,9 @@ import { PaginationInfo } from '../../pagination/Pagination';
 import { ExtraPaginationInfo } from './types';
 
 type ProgressionEnhancer = typeof progressionEnhancer;
-export declare const paginationEnhancer: <InheritOptions, InheritOutput extends EnhancerOutput<ProgressionEnhancer>, PaginationOutput extends Omit<InheritOutput["pagination"], "pagination$" | "pagination"> & {
-    pagination$: Observable<PaginationInfo & ExtraPaginationInfo>;
-    pagination: PaginationInfo & ExtraPaginationInfo;
+export declare const paginationEnhancer: <InheritOptions, InheritOutput extends EnhancerOutput<ProgressionEnhancer>, PaginationOutput extends Omit<InheritOutput["pagination"], "state$" | "state"> & {
+    state$: Observable<PaginationInfo & ExtraPaginationInfo>;
+    state: PaginationInfo & ExtraPaginationInfo;
 }>(next: (options: InheritOptions) => InheritOutput) => (options: InheritOptions) => Omit<InheritOutput, "pagination"> & {
     pagination: PaginationOutput;
 };

package/dist/index.js

@@ -1060,21 +1060,31 @@ class PanNavigator {
   }
 }
 const observeState = (reader) => {
-  return reader.pagination.pagination$.pipe(
+  return reader.pagination.state$.pipe(
     withLatestFrom(reader.context.manifest$, reader.settings.settings$),
-    map$1(([paginationInfo, manifest, { computedPageTurnDirection }]) => {
-      const numberOfSpineItems = (manifest == null ? void 0 : manifest.spineItems.length) ?? 0;
-      const isAtAbsoluteBeginning = paginationInfo.beginSpineItemIndex === 0;
-      const isAtAbsoluteEnd = paginationInfo.endSpineItemIndex === Math.max(numberOfSpineItems - 1, 0);
-      const isAtEndSpineItem = paginationInfo.endSpineItemIndex === Math.max(numberOfSpineItems - 1, 0);
-      const isAtBeginSpineItem = paginationInfo.beginSpineItemIndex === 0;
-      return {
-        canGoTopSpineItem: computedPageTurnDirection === "vertical" && !isAtAbsoluteBeginning,
-        canGoBottomSpineItem: computedPageTurnDirection === "vertical" && !isAtAbsoluteEnd,
-        canGoLeftSpineItem: computedPageTurnDirection !== "vertical" && ((manifest == null ? void 0 : manifest.readingDirection) === "ltr" && !isAtAbsoluteBeginning || (manifest == null ? void 0 : manifest.readingDirection) === "rtl" && !isAtEndSpineItem),
-        canGoRightSpineItem: computedPageTurnDirection !== "vertical" && ((manifest == null ? void 0 : manifest.readingDirection) === "ltr" && !isAtAbsoluteEnd || (manifest == null ? void 0 : manifest.readingDirection) === "rtl" && !isAtBeginSpineItem)
-      };
-    }),
+    map$1(
+      ([
+        paginationInfo,
+        { spineItems, readingDirection },
+        { computedPageTurnDirection }
+      ]) => {
+        const numberOfSpineItems = spineItems.length ?? 0;
+        const isAtAbsoluteBeginning = paginationInfo.beginSpineItemIndex === 0;
+        const isAtAbsoluteEnd = paginationInfo.endSpineItemIndex === Math.max(numberOfSpineItems - 1, 0);
+        const isAtEndSpineItem = paginationInfo.endSpineItemIndex === Math.max(numberOfSpineItems - 1, 0);
+        const isAtBeginSpineItem = paginationInfo.beginSpineItemIndex === 0;
+        const isAtBeginFirstPage = paginationInfo.beginPageIndexInSpineItem === 0;
+        const isAtEndLastPage = paginationInfo.endPageIndexInSpineItem === paginationInfo.endNumberOfPagesInSpineItem - 1;
+        return {
+          canTurnLeft: computedPageTurnDirection === "vertical" ? false : !isAtBeginFirstPage,
+          canTurnRight: computedPageTurnDirection === "vertical" ? false : !isAtEndLastPage,
+          canGoTopSpineItem: computedPageTurnDirection === "vertical" && !isAtAbsoluteBeginning,
+          canGoBottomSpineItem: computedPageTurnDirection === "vertical" && !isAtAbsoluteEnd,
+          canGoLeftSpineItem: computedPageTurnDirection !== "vertical" && (readingDirection === "ltr" && !isAtAbsoluteBeginning || readingDirection === "rtl" && !isAtEndSpineItem),
+          canGoRightSpineItem: computedPageTurnDirection !== "vertical" && (readingDirection === "ltr" && !isAtAbsoluteEnd || readingDirection === "rtl" && !isAtBeginSpineItem)
+        };
+      }
+    ),
     distinctUntilChanged$1(isShallowEqual)
   );
 };
@@ -1182,7 +1192,7 @@ const getNumberOfPagesForAllSpineItems = (reader) => reader.spineItemsManager.it
 const trackTotalPages = (reader) => {
   const totalPages$ = reader.spine.layout$.pipe(
     debounceTime$1(10, animationFrameScheduler),
-    withLatestFrom(reader.pagination.pagination$),
+    withLatestFrom(reader.pagination.state$),
     map$1(() => {
       const numberOfPagesPerItems = getNumberOfPagesForAllSpineItems(reader);
       return {
@@ -1249,16 +1259,16 @@ const trackPaginationInfo = (reader) => {
   const chaptersInfo$ = trackChapterInfo(reader);
   const totalPages$ = trackTotalPages(reader);
   const currentValue = new BehaviorSubject({
-    ...reader.pagination.pagination,
+    ...reader.pagination.state,
     ...mapPaginationInfoToExtendedInfo(reader)(
-      reader.pagination.pagination,
+      reader.pagination.state,
       getChaptersInfo(reader)
     ),
     beginAbsolutePageIndex: 0,
     endAbsolutePageIndex: 0,
     numberOfTotalPages: 0
   });
-  const extandedBasePagination$ = reader.pagination.pagination$.pipe(
+  const extandedBasePagination$ = reader.pagination.state$.pipe(
     combineLatestWith(chaptersInfo$),
     map$1(([info, chaptersInfo]) => ({
       ...info,
@@ -1299,10 +1309,10 @@ const paginationEnhancer = (next) => (options) => {
     ...reader,
     pagination: {
       ...reader.pagination,
-      get pagination() {
+      get state() {
         return getPaginationInfo();
       },
-      pagination$: paginationInfo$
+      state$: paginationInfo$
     }
   };
 };
@@ -1821,7 +1831,7 @@ class Pagination extends DestroyableClass {
       endSpineItemIndex: void 0,
       navigationId: void 0
     });
-    this.pagination$ = this.paginationSubject.pipe(
+    this.state$ = this.paginationSubject.pipe(
       distinctUntilChanged$1(isShallowEqual),
       tap$1((value) => {
         report$3.info(`update`, value);
@@ -1835,7 +1845,7 @@ class Pagination extends DestroyableClass {
       ...pagination
     });
   }
-  get pagination() {
+  get state() {
     return this.paginationSubject.value;
   }
   destroy() {
@@ -4438,7 +4448,7 @@ class InternalNavigator extends DestroyableClass {
           map$1(
             () => ({
               ...navigation,
-              animation: "turn"
+              animation: "snap"
             })
           ),
           finalize(() => {
@@ -4805,7 +4815,7 @@ class ReaderSettingsManager extends SettingsManager3 {
       pageTurnMode: `controlled`,
       snapAnimationDuration: 300,
       navigationSnapThreshold: 0.3,
-      numberOfAdjacentSpineItemToPreLoad: 0
+      numberOfAdjacentSpineItemToPreLoad: 2
     };
   }
 }
@@ -4942,7 +4952,7 @@ class PaginationController extends DestroyableClass {
           withLatestFrom(this.context.bridgeEvent.navigation$),
           tap$1(([, navigation]) => {
             const { position } = navigation;
-            const previousPagination = this.pagination.pagination;
+            const previousPagination = this.pagination.state;
             const {
               beginIndex: beginSpineItemIndex,
               endIndex: endSpineItemIndex
@@ -5004,7 +5014,7 @@ class PaginationController extends DestroyableClass {
           endSpineItemIndex,
           beginPageIndexInSpineItem,
           endPageIndexInSpineItem
-        } = this.pagination.pagination;
+        } = this.pagination.state;
         if (beginPageIndexInSpineItem === void 0 || endPageIndexInSpineItem === void 0 || beginSpineItemIndex === void 0 || endSpineItemIndex === void 0)
           return;
         const beginSpineItem = this.spineItemsManager.get(beginSpineItemIndex);
@@ -6914,7 +6924,18 @@ class SpineItemsLoader extends DestroyableClass {
     const layoutHasChanged$ = spineItemsManager.layout$.pipe(
       filter$1((hasChanged) => hasChanged)
     );
-    const loadSpineItems$ = merge(navigationUpdate$, layoutHasChanged$).pipe(
+    const numberOfAdjacentSpineItemToPreLoad$ = settings.settings$.pipe(
+      map$1(
+        ({ numberOfAdjacentSpineItemToPreLoad }) => numberOfAdjacentSpineItemToPreLoad
+      ),
+      skip$1(1),
+      distinctUntilChanged$1()
+    );
+    const loadSpineItems$ = merge(
+      navigationUpdate$,
+      layoutHasChanged$,
+      numberOfAdjacentSpineItemToPreLoad$
+    ).pipe(
       // this can be changed by whatever we want and SHOULD not break navigation.
       // Ideally loading faster is better but loading too close to user navigating can
       // be dangerous.
@@ -7060,7 +7081,7 @@ const createReader = (inputSettings) => {
   navigator2.viewportState$.subscribe(context.bridgeEvent.viewportStateSubject);
   navigator2.navigation$.subscribe(context.bridgeEvent.navigationSubject);
   navigator2.isLocked$.subscribe(context.bridgeEvent.navigationIsLockedSubject);
-  pagination.pagination$.subscribe(context.bridgeEvent.paginationSubject);
+  pagination.state$.subscribe(context.bridgeEvent.paginationSubject);
   const layout = () => {
     var _a;
     const containerElement = (_a = elementSubject$.getValue()) == null ? void 0 : _a.parentElement;
@@ -7180,8 +7201,8 @@ const createReader = (inputSettings) => {
     load,
     destroy,
     pagination: {
-      pagination: pagination.pagination,
-      pagination$: pagination.pagination$
+      state: pagination.state,
+      state$: pagination.state$
     },
     settings: settingsManager,
     element$,