@prose-reader/core 1.196.0 → 1.197.0

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

@@ -1,6 +1,5 @@
 import { Observable } from 'rxjs';
 import { Reader } from '../../reader';
-export declare const getNumberOfPagesForAllSpineItems: (reader: Reader) => number[];
 export declare const trackTotalPages: (reader: Reader) => Observable<{
     numberOfPagesPerItems: number[];
     numberOfTotalPages: number;

package/dist/index.js

@@ -3371,29 +3371,22 @@ const getPercentageEstimate = (reader, currentSpineIndex, pageIndex, currentPosi
     })
   );
 };
-const getNumberOfPagesForAllSpineItems = (reader) => reader.spineItemsManager.items.map((item) => {
-  const { height, width } = item.layout.layoutInfo;
-  return reader.spine.spineItemLocator.getSpineItemNumberOfPages({
-    isUsingVerticalWriting: !!item.isUsingVerticalWriting(),
-    itemHeight: height,
-    itemWidth: width
-  });
-}, 0);
 const trackTotalPages = (reader) => {
   const totalPages$ = reader.layout$.pipe(
     debounceTime$1(10, animationFrameScheduler),
     withLatestFrom(reader.pagination.state$),
     map(() => {
-      const numberOfPagesPerItems = getNumberOfPagesForAllSpineItems(reader);
       return {
-        numberOfPagesPerItems,
+        numberOfPagesPerItems: reader.spineItemsManager.items.reduce(
+          (acc, item) => {
+            return [...acc, item.numberOfPages];
+          },
+          []
+        ),
         /**
          * This may be not accurate for reflowable due to dynamic load / unload.
          */
-        numberOfTotalPages: numberOfPagesPerItems.reduce(
-          (acc, numberOfPagesForItem) => acc + numberOfPagesForItem,
-          0
-        )
+        numberOfTotalPages: reader.spine.spineLayout.numberOfPages
       };
     }),
     distinctUntilChanged$1(isShallowEqual),
@@ -5668,12 +5661,7 @@ const createSpineItemLocator = ({
         settings,
         itemLayout: item.layout.layoutInfo
       });
-    },
-    getSpineItemNumberOfPages: (params) => getSpineItemNumberOfPages({
-      context,
-      settings,
-      ...params
-    })
+    }
   };
 };
 const createNavigationResolver$1 = ({
@@ -5682,12 +5670,7 @@ const createNavigationResolver$1 = ({
 }) => {
   const spineItemLocator = createSpineItemLocator({ context, settings });
   const getNavigationForLastPage = (spineItem) => {
-    const { height, width } = spineItem.layout.layoutInfo;
-    const numberOfPages = spineItemLocator.getSpineItemNumberOfPages({
-      isUsingVerticalWriting: !!spineItem.isUsingVerticalWriting(),
-      itemHeight: height,
-      itemWidth: width
-    });
+    const numberOfPages = spineItem.numberOfPages;
     return spineItemLocator.getSpineItemPositionFromPageIndex({
       pageIndex: numberOfPages - 1,
       isUsingVerticalWriting: !!spineItem.isUsingVerticalWriting(),
@@ -7381,18 +7364,8 @@ class PaginationController extends DestroyableClass {
             const shouldUpdateEndCfi = previousPagination.endSpineItemIndex !== endSpineItemIndex || endLastCfi === void 0 || isRootCfi(endLastCfi);
             const beginCfi = shouldUpdateBeginCfi ? getRootCfi(beginSpineItem) : beginLastCfi;
             const endCfi = shouldUpdateEndCfi ? getRootCfi(endSpineItem) : endLastCfi;
-            const beginSpineItemDimensions = beginSpineItem.layout.layoutInfo;
-            const beginNumberOfPagesInSpineItem = this.spineItemLocator.getSpineItemNumberOfPages({
-              itemHeight: beginSpineItemDimensions.height,
-              itemWidth: beginSpineItemDimensions.width,
-              isUsingVerticalWriting: !!beginSpineItem.isUsingVerticalWriting()
-            });
-            const endSpineItemDimensions = endSpineItem.layout.layoutInfo;
-            const endNumberOfPagesInSpineItem = this.spineItemLocator.getSpineItemNumberOfPages({
-              itemHeight: endSpineItemDimensions.height,
-              itemWidth: endSpineItemDimensions.width,
-              isUsingVerticalWriting: !!endSpineItem.isUsingVerticalWriting()
-            });
+            const beginNumberOfPagesInSpineItem = beginSpineItem.numberOfPages;
+            const endNumberOfPagesInSpineItem = endSpineItem.numberOfPages;
             this.pagination.update({
               beginCfi,
               beginNumberOfPagesInSpineItem,
@@ -7565,10 +7538,7 @@ class ReaderSettingsManager extends SettingsManager3 {
 const getAbsolutePageIndexFromPageIndex = ({
   pageIndex,
   spineItemOrId,
-  spineLayout,
-  spineItemsManager,
-  context,
-  settings
+  spineItemsManager
 }) => {
   const items = spineItemsManager.items;
   const spineItem = spineItemsManager.get(spineItemOrId);
@@ -7576,14 +7546,7 @@ const getAbsolutePageIndexFromPageIndex = ({
   const { currentAbsolutePage } = items.reduce(
     (acc, item) => {
       if (acc.found) return acc;
-      const itemLayout = spineLayout.getSpineItemRelativeLayoutInfo(item);
-      const numberOfPages = getSpineItemNumberOfPages({
-        isUsingVerticalWriting: !!item.isUsingVerticalWriting(),
-        itemHeight: itemLayout.height,
-        itemWidth: itemLayout.width,
-        context,
-        settings
-      });
+      const numberOfPages = item.numberOfPages;
       if (spineItem === item) {
         if (pageIndex <= numberOfPages - 1) {
           return {
@@ -7677,23 +7640,13 @@ const getItemVisibilityForPosition = ({
 };
 const getSpineInfoFromAbsolutePageIndex = ({
   absolutePageIndex,
-  spineLayout,
-  spineItemsManager,
-  context,
-  settings
+  spineItemsManager
 }) => {
   const items = spineItemsManager.items;
   const { found, currentAbsolutePage } = items.reduce(
     (acc, item) => {
       if (acc.found) return acc;
-      const itemLayout = spineLayout.getSpineItemRelativeLayoutInfo(item);
-      const numberOfPages = getSpineItemNumberOfPages({
-        isUsingVerticalWriting: !!item.isUsingVerticalWriting(),
-        itemHeight: itemLayout.height,
-        itemWidth: itemLayout.width,
-        context,
-        settings
-      });
+      const numberOfPages = item.numberOfPages;
       const possiblePageIndex = absolutePageIndex - acc.currentAbsolutePage;
       const currentAbsolutePage2 = acc.currentAbsolutePage + numberOfPages;
       if (possiblePageIndex <= numberOfPages - 1) {
@@ -7849,12 +7802,7 @@ const createSpineLocator = ({
     spineItem,
     restrictToScreen
   }) => {
-    const { height, width } = spineItem.layout.layoutInfo;
-    const numberOfPages = spineItemLocator.getSpineItemNumberOfPages({
-      isUsingVerticalWriting: !!spineItem.isUsingVerticalWriting(),
-      itemHeight: height,
-      itemWidth: width
-    });
+    const numberOfPages = spineItem.numberOfPages;
     const pages = Array.from(Array(numberOfPages)).map((_, index) => {
       const spineItemPosition = spineItemLocator.getSpineItemPositionFromPageIndex({
         pageIndex: index,
@@ -7926,17 +7874,11 @@ const createSpineLocator = ({
     },
     getAbsolutePageIndexFromPageIndex: (params) => getAbsolutePageIndexFromPageIndex({
       ...params,
-      context,
-      settings,
-      spineItemsManager,
-      spineLayout
+      spineItemsManager
     }),
     getSpineInfoFromAbsolutePageIndex: (params) => getSpineInfoFromAbsolutePageIndex({
       ...params,
-      context,
-      settings,
-      spineItemsManager,
-      spineLayout
+      spineItemsManager
     }),
     getSpinePositionFromSpineItem,
     getSpineItemPositionFromSpinePosition,
@@ -8269,18 +8211,11 @@ class SpineLayout extends DestroyableClass {
       }),
       map(() => {
         const items = spineItemsManager.items;
-        const spineItemsPagesAbsolutePositions = items.map((item) => {
+        const pages = items.reduce((acc, item, itemIndex) => {
           const itemLayout = this.getSpineItemRelativeLayoutInfo(item);
-          const numberOfPages = getSpineItemNumberOfPages({
-            isUsingVerticalWriting: !!item.isUsingVerticalWriting(),
-            itemHeight: itemLayout.height,
-            itemWidth: itemLayout.width,
-            context,
-            settings
-          });
-          const pages2 = new Array(numberOfPages).fill(void 0);
-          return pages2.map(
-            (_, pageIndex) => convertSpinePositionToLayoutPosition({
+          const pages2 = new Array(item.numberOfPages).fill(void 0);
+          const pagesAbsolutePositions = pages2.map((_, pageIndex) => {
+            return convertSpinePositionToLayoutPosition({
               pageSize: this.context.getPageSize(),
               position: getSpinePositionFromSpineItemPosition({
                 itemLayout,
@@ -8291,24 +8226,16 @@ class SpineLayout extends DestroyableClass {
                   context
                 })
               })
-            })
-          );
-        });
-        const pages = spineItemsPagesAbsolutePositions.reduce(
-          (acc, itemPages, itemIndex) => {
-            const itemPagesInfo = itemPages.map(
-              (absolutePosition, pageIndex) => ({
-                itemIndex,
-                absolutePageIndex: itemIndex + pageIndex,
-                absolutePosition
-              })
-            );
-            return [...acc, ...itemPagesInfo];
-          },
-          []
-        );
+            });
+          });
+          const itemPagesInfo = pagesAbsolutePositions.map((absolutePosition, pageIndex) => ({
+            itemIndex,
+            absolutePageIndex: itemIndex + pageIndex,
+            absolutePosition
+          }));
+          return [...acc, ...itemPagesInfo];
+        }, []);
         return {
-          spineItemsAbsolutePositions: [...this.spineItemsRelativeLayouts],
           pages
         };
       }),
@@ -8338,6 +8265,11 @@ class SpineLayout extends DestroyableClass {
       y: 0
     };
   }
+  get numberOfPages() {
+    return this.spineItemsManager.items.reduce((acc, item) => {
+      return acc + item.numberOfPages;
+    }, 0);
+  }
   destroy() {
     super.destroy();
     this.layoutSubject.complete();
@@ -8607,6 +8539,15 @@ class SpineItem extends DestroyableClass {
   get renditionLayout() {
     return this.renderer.renditionLayout;
   }
+  get numberOfPages() {
+    return getSpineItemNumberOfPages({
+      isUsingVerticalWriting: !!this.isUsingVerticalWriting(),
+      itemHeight: this.layout.layoutInfo.height,
+      itemWidth: this.layout.layoutInfo.width,
+      context: this.context,
+      settings: this.settings
+    });
+  }
 }
 const createContainerElement = (containerElement, item, hookManager) => {
   const element = containerElement.ownerDocument.createElement(`div`);