@prose-reader/core 1.70.0 → 1.72.0

package/dist/index.umd.cjs

@@ -1061,21 +1061,31 @@
     }
   }
   const observeState = (reader) => {
-    return reader.pagination.pagination$.pipe(
+    return reader.pagination.state$.pipe(
       rxjs.withLatestFrom(reader.context.manifest$, reader.settings.settings$),
-      rxjs.map(([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)
-        };
-      }),
+      rxjs.map(
+        ([
+          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)
+          };
+        }
+      ),
       rxjs.distinctUntilChanged(isShallowEqual)
     );
   };
@@ -1183,7 +1193,7 @@
   const trackTotalPages = (reader) => {
     const totalPages$ = reader.spine.layout$.pipe(
       rxjs.debounceTime(10, rxjs.animationFrameScheduler),
-      rxjs.withLatestFrom(reader.pagination.pagination$),
+      rxjs.withLatestFrom(reader.pagination.state$),
       rxjs.map(() => {
         const numberOfPagesPerItems = getNumberOfPagesForAllSpineItems(reader);
         return {
@@ -1250,16 +1260,16 @@
     const chaptersInfo$ = trackChapterInfo(reader);
     const totalPages$ = trackTotalPages(reader);
     const currentValue = new rxjs.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(
       rxjs.combineLatestWith(chaptersInfo$),
       rxjs.map(([info, chaptersInfo]) => ({
         ...info,
@@ -1300,10 +1310,10 @@
       ...reader,
       pagination: {
         ...reader.pagination,
-        get pagination() {
+        get state() {
           return getPaginationInfo();
         },
-        pagination$: paginationInfo$
+        state$: paginationInfo$
       }
     };
   };
@@ -1822,7 +1832,7 @@
         endSpineItemIndex: void 0,
         navigationId: void 0
       });
-      this.pagination$ = this.paginationSubject.pipe(
+      this.state$ = this.paginationSubject.pipe(
         rxjs.distinctUntilChanged(isShallowEqual),
         rxjs.tap((value) => {
           report$3.info(`update`, value);
@@ -1836,7 +1846,7 @@
         ...pagination
       });
     }
-    get pagination() {
+    get state() {
       return this.paginationSubject.value;
     }
     destroy() {
@@ -4439,7 +4449,7 @@
             rxjs.map(
               () => ({
                 ...navigation,
-                animation: "turn"
+                animation: "snap"
               })
             ),
             rxjs.finalize(() => {
@@ -4806,7 +4816,7 @@
         pageTurnMode: `controlled`,
         snapAnimationDuration: 300,
         navigationSnapThreshold: 0.3,
-        numberOfAdjacentSpineItemToPreLoad: 0
+        numberOfAdjacentSpineItemToPreLoad: 2
       };
     }
   }
@@ -4943,7 +4953,7 @@
             rxjs.withLatestFrom(this.context.bridgeEvent.navigation$),
             rxjs.tap(([, navigation]) => {
               const { position } = navigation;
-              const previousPagination = this.pagination.pagination;
+              const previousPagination = this.pagination.state;
               const {
                 beginIndex: beginSpineItemIndex,
                 endIndex: endSpineItemIndex
@@ -5005,7 +5015,7 @@
             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);
@@ -6915,7 +6925,18 @@
       const layoutHasChanged$ = spineItemsManager.layout$.pipe(
         rxjs.filter((hasChanged) => hasChanged)
       );
-      const loadSpineItems$ = rxjs.merge(navigationUpdate$, layoutHasChanged$).pipe(
+      const numberOfAdjacentSpineItemToPreLoad$ = settings.settings$.pipe(
+        rxjs.map(
+          ({ numberOfAdjacentSpineItemToPreLoad }) => numberOfAdjacentSpineItemToPreLoad
+        ),
+        rxjs.skip(1),
+        rxjs.distinctUntilChanged()
+      );
+      const loadSpineItems$ = rxjs.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.
@@ -7061,7 +7082,7 @@
     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;
@@ -7181,8 +7202,8 @@
       load,
       destroy,
       pagination: {
-        pagination: pagination.pagination,
-        pagination$: pagination.pagination$
+        state: pagination.state,
+        state$: pagination.state$
       },
       settings: settingsManager,
       element$,