@prose-reader/core 1.53.0 → 1.54.0

package/dist/index.d.ts

@@ -26,6 +26,23 @@ declare type Api = {
 
 declare type CfiLocator = ReturnType<typeof createCfiLocator>;
 
+declare type ChapterInfo = {
+    title: string;
+    subChapter?: {
+        title: string;
+        subChapter?: {
+            title: string;
+            subChapter?: {
+                title: string;
+                path: string;
+            };
+            path: string;
+        };
+        path: string;
+    };
+    path: string;
+};
+
 declare type Context = ReturnType<typeof createContext>;
 
 declare type Context_2 = {
@@ -2290,48 +2307,9 @@ export declare const createReader: (options: {
         }) => void);
         getPaginationInfo: () => PaginationInfo;
         paginationInfo$: Observable<PaginationInfo>;
-    }, "paginationInfo$"> & {
-        paginationInfo$: Observable<PaginationInfo & {
-        beginChapterInfo: {
-        title: string;
-        subChapter?: {
-        title: string;
-        subChapter?: {
-        title: string;
-        subChapter?: {
-        title: string;
-        path: string;
-        } | undefined;
-        path: string;
-        } | undefined;
-        path: string;
-        } | undefined;
-        path: string;
-        } | undefined;
-        beginSpineItemReadingDirection: "ltr" | "rtl" | undefined;
-        beginAbsolutePageIndex: number | undefined;
-        endChapterInfo: {
-        title: string;
-        subChapter?: {
-        title: string;
-        subChapter?: {
-        title: string;
-        subChapter?: {
-        title: string;
-        path: string;
-        } | undefined;
-        path: string;
-        } | undefined;
-        path: string;
-        } | undefined;
-        path: string;
-        } | undefined;
-        endSpineItemReadingDirection: "ltr" | "rtl" | undefined;
-        endAbsolutePageIndex: number | undefined;
-        percentageEstimateOfBook: number | undefined;
-        numberOfTotalPages: number | undefined;
-        isUsingSpread: boolean;
-        }>;
+    }, "paginationInfo$" | "getPaginationInfo"> & {
+        paginationInfo$: Observable<PaginationInfo & ExtraPaginationInfo>;
+        getPaginationInfo: () => PaginationInfo & ExtraPaginationInfo;
     };
 } & {
     theme: {
@@ -3150,48 +3128,9 @@ export declare const createReader: (options: {
         }) => void);
         getPaginationInfo: () => PaginationInfo;
         paginationInfo$: Observable<PaginationInfo>;
-    }, "paginationInfo$"> & {
-        paginationInfo$: Observable<PaginationInfo & {
-        beginChapterInfo: {
-        title: string;
-        subChapter?: {
-        title: string;
-        subChapter?: {
-        title: string;
-        subChapter?: {
-        title: string;
-        path: string;
-        } | undefined;
-        path: string;
-        } | undefined;
-        path: string;
-        } | undefined;
-        path: string;
-        } | undefined;
-        beginSpineItemReadingDirection: "ltr" | "rtl" | undefined;
-        beginAbsolutePageIndex: number | undefined;
-        endChapterInfo: {
-        title: string;
-        subChapter?: {
-        title: string;
-        subChapter?: {
-        title: string;
-        subChapter?: {
-        title: string;
-        path: string;
-        } | undefined;
-        path: string;
-        } | undefined;
-        path: string;
-        } | undefined;
-        path: string;
-        } | undefined;
-        endSpineItemReadingDirection: "ltr" | "rtl" | undefined;
-        endAbsolutePageIndex: number | undefined;
-        percentageEstimateOfBook: number | undefined;
-        numberOfTotalPages: number | undefined;
-        isUsingSpread: boolean;
-        }>;
+    }, "paginationInfo$" | "getPaginationInfo"> & {
+        paginationInfo$: Observable<PaginationInfo & ExtraPaginationInfo>;
+        getPaginationInfo: () => PaginationInfo & ExtraPaginationInfo;
     }, "paginationInfo$" | "getPaginationInfo">;
 };
 
@@ -4033,6 +3972,18 @@ declare type Event_2 = {
     data: ReturnType<typeof createSelection> | null;
 };
 
+declare type ExtraPaginationInfo = {
+    beginChapterInfo: ChapterInfo | undefined;
+    beginSpineItemReadingDirection: `rtl` | `ltr` | undefined;
+    beginAbsolutePageIndex: number | undefined;
+    endChapterInfo: ChapterInfo | undefined;
+    endSpineItemReadingDirection: `rtl` | `ltr` | undefined;
+    endAbsolutePageIndex: number | undefined;
+    percentageEstimateOfBook: number | undefined;
+    numberOfTotalPages: number | undefined;
+    isUsingSpread: boolean;
+};
+
 export declare const groupBy: <T, K extends string | number | symbol>(list: T[], getKey: (item: T) => K) => Record<K, T[]>;
 
 declare type Hook = ItemOnLoadHook | {

package/dist/index.js

@@ -1,5 +1,5 @@
-import { takeUntil, Subject, BehaviorSubject, map, combineLatest, switchMap, merge, EMPTY, fromEvent, withLatestFrom as withLatestFrom$1, NEVER, Observable, of, scheduled, animationFrameScheduler, distinctUntilChanged as distinctUntilChanged$1, filter as filter$1, from, interval, iif, identity, take as take$1, forkJoin } from "rxjs";
-import { withLatestFrom, distinctUntilChanged, shareReplay, tap, pairwise, switchMap as switchMap$1, filter, take, map as map$1, takeUntil as takeUntil$1, skip, debounceTime, startWith, share, exhaustMap, mergeMap, catchError, debounce, delay } from "rxjs/operators";
+import { takeUntil, Subject, BehaviorSubject, map, combineLatest, switchMap, merge, EMPTY, fromEvent, withLatestFrom as withLatestFrom$1, NEVER, Observable, of, scheduled, animationFrameScheduler, distinctUntilChanged as distinctUntilChanged$1, startWith, filter as filter$1, debounceTime, combineLatestWith, tap as tap$1, shareReplay as shareReplay$1, from, interval, iif, identity, take as take$1, forkJoin } from "rxjs";
+import { withLatestFrom, distinctUntilChanged, shareReplay, tap, pairwise, switchMap as switchMap$1, filter, take, map as map$1, takeUntil as takeUntil$1, skip, share, exhaustMap, mergeMap, catchError, debounce, debounceTime as debounceTime$1, startWith as startWith$1, delay } from "rxjs/operators";
 import { parseContentType, detectMimeTypeFromName } from "@prose-reader/shared";
 const chromeEnhancer = (next) => (options) => {
   const reader = next(options);
@@ -590,6 +590,63 @@ const navigationEnhancer = (next) => (options) => {
     }
   };
 };
+const buildChaptersInfo = (href, tocItem, manifest) => {
+  const spineItemIndex = manifest.spineItems.findIndex((item) => item.href === href);
+  return tocItem.reduce((acc, tocItem2) => {
+    const indexOfHash = tocItem2.href.indexOf(`#`);
+    const tocItemPathWithoutAnchor = indexOfHash > 0 ? tocItem2.href.substr(0, indexOfHash) : tocItem2.href;
+    const tocItemHrefWithoutFilename = tocItemPathWithoutAnchor.substring(0, tocItemPathWithoutAnchor.lastIndexOf("/"));
+    const hrefWithoutFilename = href.substring(0, href.lastIndexOf("/"));
+    const hrefIsChapterHref = href.endsWith(tocItemPathWithoutAnchor);
+    const hrefIsWithinChapter = hrefWithoutFilename !== "" && hrefWithoutFilename.endsWith(tocItemHrefWithoutFilename);
+    const isPossibleTocItemCandidate = hrefIsChapterHref || hrefIsWithinChapter;
+    if (isPossibleTocItemCandidate) {
+      const spineItemIndexOfPossibleCandidate = manifest.spineItems.findIndex((item) => item.href === tocItem2.href);
+      const spineItemIsBeforeThisTocItem = spineItemIndex < spineItemIndexOfPossibleCandidate;
+      if (spineItemIsBeforeThisTocItem)
+        return acc;
+      const info = {
+        title: tocItem2.title,
+        path: tocItem2.path
+      };
+      const subInfo = buildChaptersInfo(href, tocItem2.contents, manifest);
+      if (subInfo) {
+        return {
+          ...info,
+          subChapter: subInfo
+        };
+      }
+      return info;
+    }
+    return acc;
+  }, void 0);
+};
+const buildChapterInfoFromSpineItem = (manifest, item) => {
+  var _a;
+  const { href } = item;
+  return buildChaptersInfo(href, ((_a = manifest.nav) == null ? void 0 : _a.toc) ?? [], manifest);
+};
+const getChaptersInfo = (reader) => {
+  const manifest = reader.context.getManifest();
+  const items = reader.getSpineItems();
+  if (!manifest)
+    return {};
+  return items.reduce(
+    (acc, { item }) => {
+      return {
+        ...acc,
+        [item.id]: buildChapterInfoFromSpineItem(manifest, item)
+      };
+    },
+    {}
+  );
+};
+const trackChapterInfo = (reader) => {
+  return reader.spineItems$.pipe(
+    startWith([]),
+    map(() => getChaptersInfo(reader))
+  );
+};
 const NAMESPACE$6 = `pagination`;
 const createPagination = ({ context }) => {
   const paginationSubject$ = new BehaviorSubject({
@@ -602,16 +659,16 @@ const createPagination = ({ context }) => {
     endCfi: void 0,
     endSpineItemIndex: void 0
   });
-  const getSpineItemNumberOfPages = (spineItem) => {
+  const getSpineItemNumberOfPages2 = (spineItem) => {
     const writingMode = spineItem.spineItemFrame.getWritingMode();
     const { width, height } = spineItem.getElementDimensions();
     if (writingMode === `vertical-rl`) {
-      return getNumberOfPages(height, context.getPageSize().height);
+      return calculateNumberOfPagesForItem(height, context.getPageSize().height);
     }
-    return getNumberOfPages(width, context.getPageSize().width);
+    return calculateNumberOfPagesForItem(width, context.getPageSize().width);
   };
   const getInfoForUpdate = (info) => {
-    const numberOfPages = getSpineItemNumberOfPages(info.spineItem);
+    const numberOfPages = getSpineItemNumberOfPages2(info.spineItem);
     return {
       numberOfPages,
       pageIndex: info.pageIndex,
@@ -661,103 +718,39 @@ const getItemOffsetFromPageIndex = (pageWidth, pageIndex, itemWidth) => {
   const logicalOffset = itemWidth * (pageIndex * pageWidth) / itemWidth;
   return Math.max(0, Math.min(lastPageOffset, logicalOffset));
 };
-const getNumberOfPages = (itemWidth, pageWidth) => {
+const calculateNumberOfPagesForItem = (itemWidth, pageWidth) => {
   if ((pageWidth || 0) === 0 || (itemWidth || 0) === 0)
     return 1;
   return Math.floor(Math.max(1, itemWidth / pageWidth));
 };
 const getClosestValidOffsetFromApproximateOffsetInPages = (offset, pageWidth, itemWidth) => {
-  const numberOfPages = getNumberOfPages(itemWidth, pageWidth);
+  const numberOfPages = calculateNumberOfPagesForItem(itemWidth, pageWidth);
   const offsetValues = [...Array(numberOfPages)].map((_, i) => i * pageWidth);
   if (offset >= numberOfPages * pageWidth)
     return offsetValues[offsetValues.length - 1] || 0;
   return offsetValues.find((offsetRange) => offset < offsetRange + pageWidth) || 0;
 };
-const NAMESPACE$5 = `paginationEnhancer`;
-Report.namespace(NAMESPACE$5);
-const paginationEnhancer = (next) => (options) => {
-  const reader = next(options);
-  const chaptersInfo = {};
-  const getChapterInfo2 = (item) => {
-    const manifest = reader.context.getManifest();
-    return item && manifest && buildChapterInfoFromSpineItem(manifest, item);
-  };
-  const mapPaginationInfoToExtendedInfo = (paginationInfo) => {
-    const context = reader.context;
-    const beginItem = paginationInfo.beginSpineItemIndex !== void 0 ? reader.getSpineItem(paginationInfo.beginSpineItemIndex) : void 0;
-    const endItem = paginationInfo.endSpineItemIndex !== void 0 ? reader.getSpineItem(paginationInfo.endSpineItemIndex) : void 0;
-    return {
-      ...paginationInfo,
-      beginChapterInfo: beginItem ? chaptersInfo[beginItem.item.id] : void 0,
-      // chapterIndex: number;
-      // pages: number;
-      // pageIndexInBook: number;
-      // pageIndexInChapter: number;
-      // pagesOfChapter: number;
-      // pagePercentageInChapter: number;
-      // offsetPercentageInChapter: number;
-      // domIndex: number;
-      // charOffset: number;
-      // serializeString?: string;
-      beginSpineItemReadingDirection: beginItem == null ? void 0 : beginItem.getReadingDirection(),
-      endChapterInfo: endItem ? chaptersInfo[endItem.item.id] : void 0,
-      endSpineItemReadingDirection: endItem == null ? void 0 : endItem.getReadingDirection(),
-      // spineItemReadingDirection: focusedSpineItem?.getReadingDirection(),
-      /**
-       * This percentage is based of the weight (kb) of every items and the number of pages.
-       * It is not accurate but gives a general good idea of the overall progress.
-       * It is recommended to use this progress only for reflow books. For pre-paginated books
-       * the number of pages and current index can be used instead since 1 page = 1 chapter.
-       */
-      percentageEstimateOfBook: endItem ? reader.progression.getPercentageEstimate(
-        context,
-        paginationInfo.endSpineItemIndex ?? 0,
-        paginationInfo.endNumberOfPagesInSpineItem,
-        paginationInfo.endPageIndexInSpineItem || 0,
-        reader.getCurrentViewportPosition(),
-        endItem
-      ) : 0,
-      isUsingSpread: context.isUsingSpreadMode() ?? false
-      // hasNextChapter: (reader.spine.spineItemIndex || 0) < (manifest.readingOrder.length - 1),
-      // hasPreviousChapter: (reader.spine.spineItemIndex || 0) < (manifest.readingOrder.length - 1),
-      // numberOfSpineItems: context.getManifest()?.readingOrder.length,
-    };
-  };
-  const getSpineItemNumberOfPages = (spineItem) => {
-    const writingMode = spineItem.spineItemFrame.getWritingMode();
-    const { width, height } = spineItem.getElementDimensions();
-    const settings = reader.settings.getSettings();
-    if (settings.pageTurnDirection === `vertical` && settings.pageTurnMode === `scrollable`) {
-      return 1;
-    }
-    if (writingMode === `vertical-rl`) {
-      return getNumberOfPages(height, reader.context.getPageSize().height);
-    }
-    return getNumberOfPages(width, reader.context.getPageSize().width);
-  };
-  const getNumberOfPagesPerItems = () => reader.getSpineItems().map((item) => {
-    return getSpineItemNumberOfPages(item);
-  }, 0);
-  reader.spineItems$.pipe(
-    tap(
-      (items) => items.forEach(({ item }) => {
-        chaptersInfo[item.id] = getChapterInfo2(item);
-      })
-    ),
-    takeUntil$1(reader.$.destroy$)
-  ).subscribe();
-  const innerPaginationExtendedInfo$ = reader.pagination.paginationInfo$.pipe(
-    map$1((info) => ({
-      ...info,
-      ...mapPaginationInfoToExtendedInfo(info)
-    })),
-    distinctUntilChanged(isShallowEqual)
-  );
+const getSpineItemNumberOfPages = ({ spineItem, reader }) => {
+  const writingMode = spineItem.spineItemFrame.getWritingMode();
+  const { width, height } = spineItem.getElementDimensions();
+  const settings = reader.settings.getSettings();
+  if (settings.pageTurnDirection === `vertical` && settings.pageTurnMode === `scrollable`) {
+    return 1;
+  }
+  if (writingMode === `vertical-rl`) {
+    return calculateNumberOfPagesForItem(height, reader.context.getPageSize().height);
+  }
+  return calculateNumberOfPagesForItem(width, reader.context.getPageSize().width);
+};
+const getNumberOfPagesForAllSpineItems = (reader) => reader.getSpineItems().map((item) => {
+  return getSpineItemNumberOfPages({ spineItem: item, reader });
+}, 0);
+const trackTotalPages = (reader) => {
   const totalPages$ = reader.$.layout$.pipe(
     debounceTime(10, animationFrameScheduler),
-    withLatestFrom(reader.pagination.paginationInfo$),
-    map$1(() => {
-      const numberOfPagesPerItems = getNumberOfPagesPerItems();
+    withLatestFrom$1(reader.pagination.paginationInfo$),
+    map(() => {
+      const numberOfPagesPerItems = getNumberOfPagesForAllSpineItems(reader);
       return {
         numberOfPagesPerItems,
         /**
@@ -766,69 +759,102 @@ const paginationEnhancer = (next) => (options) => {
         numberOfTotalPages: numberOfPagesPerItems.reduce((acc, numberOfPagesForItem) => acc + numberOfPagesForItem, 0)
       };
     }),
-    distinctUntilChanged(isShallowEqual),
+    distinctUntilChanged$1(isShallowEqual),
     startWith({
       numberOfPagesPerItems: [],
       numberOfTotalPages: 0
     })
   );
-  const paginationInfo$ = combineLatest([
-    innerPaginationExtendedInfo$,
-    totalPages$
-  ]).pipe(
-    map$1(([pageInfo, totalPageInfo]) => ({
+  return totalPages$;
+};
+const mapPaginationInfoToExtendedInfo = (reader) => (paginationInfo, chaptersInfo) => {
+  const context = reader.context;
+  const beginItem = paginationInfo.beginSpineItemIndex !== void 0 ? reader.getSpineItem(paginationInfo.beginSpineItemIndex) : void 0;
+  const endItem = paginationInfo.endSpineItemIndex !== void 0 ? reader.getSpineItem(paginationInfo.endSpineItemIndex) : void 0;
+  return {
+    ...paginationInfo,
+    beginChapterInfo: beginItem ? chaptersInfo[beginItem.item.id] : void 0,
+    // chapterIndex: number;
+    // pages: number;
+    // pageIndexInBook: number;
+    // pageIndexInChapter: number;
+    // pagesOfChapter: number;
+    // pagePercentageInChapter: number;
+    // offsetPercentageInChapter: number;
+    // domIndex: number;
+    // charOffset: number;
+    // serializeString?: string;
+    beginSpineItemReadingDirection: beginItem == null ? void 0 : beginItem.getReadingDirection(),
+    endChapterInfo: endItem ? chaptersInfo[endItem.item.id] : void 0,
+    endSpineItemReadingDirection: endItem == null ? void 0 : endItem.getReadingDirection(),
+    // spineItemReadingDirection: focusedSpineItem?.getReadingDirection(),
+    /**
+     * This percentage is based of the weight (kb) of every items and the number of pages.
+     * It is not accurate but gives a general good idea of the overall progress.
+     * It is recommended to use this progress only for reflow books. For pre-paginated books
+     * the number of pages and current index can be used instead since 1 page = 1 chapter.
+     */
+    percentageEstimateOfBook: endItem ? reader.progression.getPercentageEstimate(
+      context,
+      paginationInfo.endSpineItemIndex ?? 0,
+      paginationInfo.endNumberOfPagesInSpineItem,
+      paginationInfo.endPageIndexInSpineItem || 0,
+      reader.getCurrentViewportPosition(),
+      endItem
+    ) : 0,
+    isUsingSpread: context.isUsingSpreadMode() ?? false
+    // hasNextChapter: (reader.spine.spineItemIndex || 0) < (manifest.readingOrder.length - 1),
+    // hasPreviousChapter: (reader.spine.spineItemIndex || 0) < (manifest.readingOrder.length - 1),
+    // numberOfSpineItems: context.getManifest()?.readingOrder.length,
+  };
+};
+const trackPaginationInfo = (reader) => {
+  const chaptersInfo$ = trackChapterInfo(reader);
+  const totalPages$ = trackTotalPages(reader);
+  const currentValue = new BehaviorSubject({
+    ...reader.pagination.getPaginationInfo(),
+    ...mapPaginationInfoToExtendedInfo(reader)(reader.pagination.getPaginationInfo(), getChaptersInfo(reader)),
+    beginAbsolutePageIndex: 0,
+    endAbsolutePageIndex: 0,
+    numberOfTotalPages: 0
+  });
+  const extandedBasePagination$ = reader.pagination.paginationInfo$.pipe(
+    combineLatestWith(chaptersInfo$),
+    map(([info, chaptersInfo]) => ({
+      ...info,
+      ...mapPaginationInfoToExtendedInfo(reader)(info, chaptersInfo)
+    })),
+    distinctUntilChanged$1(isShallowEqual)
+  );
+  const paginationInfo$ = combineLatest([extandedBasePagination$, totalPages$]).pipe(
+    map(([pageInfo, totalPageInfo]) => ({
       ...pageInfo,
       ...totalPageInfo,
       beginAbsolutePageIndex: totalPageInfo.numberOfPagesPerItems.slice(0, pageInfo.beginSpineItemIndex).reduce((acc, numberOfPagesForItem) => acc + numberOfPagesForItem, pageInfo.beginPageIndexInSpineItem ?? 0),
       endAbsolutePageIndex: totalPageInfo.numberOfPagesPerItems.slice(0, pageInfo.endSpineItemIndex).reduce((acc, numberOfPagesForItem) => acc + numberOfPagesForItem, pageInfo.endPageIndexInSpineItem ?? 0)
     })),
-    shareReplay(1),
-    takeUntil$1(reader.$.destroy$)
+    tap$1((value) => {
+      currentValue.next(value);
+    }),
+    shareReplay$1(1)
   );
+  return { paginationInfo$, getPaginationInfo: () => currentValue.value };
+};
+const NAMESPACE$5 = `paginationEnhancer`;
+Report.namespace(NAMESPACE$5);
+const paginationEnhancer = (next) => (options) => {
+  const reader = next(options);
+  const { paginationInfo$, getPaginationInfo } = trackPaginationInfo(reader);
+  paginationInfo$.pipe(takeUntil(reader.$.destroy$)).subscribe();
   return {
     ...reader,
     pagination: {
       ...reader.pagination,
+      getPaginationInfo,
       paginationInfo$
     }
   };
 };
-const buildChapterInfoFromSpineItem = (manifest, item) => {
-  var _a;
-  const { href } = item;
-  return getChapterInfo(href, ((_a = manifest.nav) == null ? void 0 : _a.toc) ?? [], manifest);
-};
-const getChapterInfo = (href, tocItem, manifest) => {
-  const spineItemIndex = manifest.spineItems.findIndex((item) => item.href === href);
-  return tocItem.reduce((acc, tocItem2) => {
-    const indexOfHash = tocItem2.href.indexOf(`#`);
-    const tocItemPathWithoutAnchor = indexOfHash > 0 ? tocItem2.href.substr(0, indexOfHash) : tocItem2.href;
-    const tocItemHrefWithoutFilename = tocItemPathWithoutAnchor.substring(0, tocItemPathWithoutAnchor.lastIndexOf("/"));
-    const hrefWithoutFilename = href.substring(0, href.lastIndexOf("/"));
-    const hrefIsChapterHref = href.endsWith(tocItemPathWithoutAnchor);
-    const hrefIsWithinChapter = hrefWithoutFilename !== "" && hrefWithoutFilename.endsWith(tocItemHrefWithoutFilename);
-    const isPossibleTocItemCandidate = hrefIsChapterHref || hrefIsWithinChapter;
-    if (isPossibleTocItemCandidate) {
-      const spineItemIndexOfPossibleCandidate = manifest.spineItems.findIndex((item) => item.href === tocItem2.href);
-      const spineItemIsBeforeThisTocItem = spineItemIndex < spineItemIndexOfPossibleCandidate;
-      if (spineItemIsBeforeThisTocItem)
-        return acc;
-      const info = {
-        title: tocItem2.title,
-        path: tocItem2.path
-      };
-      const subInfo = getChapterInfo(href, tocItem2.contents, manifest);
-      if (subInfo) {
-        return {
-          ...info,
-          subChapter: subInfo
-        };
-      }
-      return info;
-    }
-    return acc;
-  }, void 0);
-};
 const defaultThemes = [
   {
     name: `bright`,
@@ -4313,10 +4339,10 @@ const createLocationResolver$1 = ({ context }) => {
     const safePosition = getSafePosition(position, spineItem);
     const offset = context.isRTL() ? itemWidth - safePosition.x - context.getPageSize().width : safePosition.x;
     if (spineItem.isUsingVerticalWriting()) {
-      const numberOfPages = getNumberOfPages(itemHeight, pageHeight);
+      const numberOfPages = calculateNumberOfPagesForItem(itemHeight, pageHeight);
       return getPageFromOffset(position.y, pageHeight, numberOfPages);
     } else {
-      const numberOfPages = getNumberOfPages(itemWidth, pageWidth);
+      const numberOfPages = calculateNumberOfPagesForItem(itemWidth, pageWidth);
       const pageIndex = getPageFromOffset(offset, pageWidth, numberOfPages);
       return pageIndex;
     }
@@ -4437,11 +4463,11 @@ const createNavigationResolver$1 = ({ context }) => {
   const getNavigationForLastPage = (spineItem) => {
     if (spineItem.isUsingVerticalWriting()) {
       const pageHeight = context.getPageSize().height;
-      const numberOfPages = getNumberOfPages(spineItem.getElementDimensions().height, pageHeight);
+      const numberOfPages = calculateNumberOfPagesForItem(spineItem.getElementDimensions().height, pageHeight);
       return getNavigationForPage(numberOfPages - 1, spineItem);
     } else {
       const pageWidth = context.getPageSize().width;
-      const numberOfPages = getNumberOfPages(spineItem.getElementDimensions().width, pageWidth);
+      const numberOfPages = calculateNumberOfPagesForItem(spineItem.getElementDimensions().width, pageWidth);
       return getNavigationForPage(numberOfPages - 1, spineItem);
     }
   };
@@ -4763,7 +4789,7 @@ const createScrollViewportNavigator = ({
     return getScaledDownPosition({ x: ((_a = element$.getValue()) == null ? void 0 : _a.scrollLeft) ?? 0, y: ((_b = element$.getValue()) == null ? void 0 : _b.scrollTop) ?? 0 });
   };
   const navigationOnScroll$ = userScroll$.pipe(
-    debounceTime(SCROLL_FINISHED_DEBOUNCE_TIMEOUT, animationFrameScheduler),
+    debounceTime$1(SCROLL_FINISHED_DEBOUNCE_TIMEOUT, animationFrameScheduler),
     withLatestFrom(currentNavigationSubject$),
     switchMap$1(() => {
       var _a, _b;
@@ -4775,7 +4801,7 @@ const createScrollViewportNavigator = ({
     share()
   );
   const userScrollEnd$ = userScroll$.pipe(
-    debounceTime(SCROLL_FINISHED_DEBOUNCE_TIMEOUT, animationFrameScheduler),
+    debounceTime$1(SCROLL_FINISHED_DEBOUNCE_TIMEOUT, animationFrameScheduler),
     share(),
     takeUntil$1(context.$.destroy$)
   );
@@ -4785,7 +4811,7 @@ const createScrollViewportNavigator = ({
       distinctUntilChanged()
     ),
     userScrollEnd$.pipe(map$1(() => `end`))
-  ).pipe(startWith(`end`));
+  ).pipe(startWith$1(`end`));
   return {
     destroy: () => {
     },
@@ -5344,7 +5370,7 @@ const createViewportNavigator = ({
     share()
   );
   const processManualAdjust$ = merge(manualAdjust$).pipe(
-    startWith(void 0),
+    startWith$1(void 0),
     pairwise(),
     tap(([prevEvent, currentEvent]) => {
       if ((prevEvent == null ? void 0 : prevEvent.type) === `manualAdjust` && (currentEvent == null ? void 0 : currentEvent.type) !== `manualAdjust`) {