@prose-reader/core 1.69.0 → 1.71.0

package/dist/index.umd.cjs

@@ -705,7 +705,7 @@
       spineItemPosition
     );
     if (!isNewNavigationInCurrentItem) {
-      return navigationResolver.wrapPositionWithSafeEdge(
+      return navigationResolver.getAdjustedPositionWithSafeEdge(
         pageTurnDirection === `horizontal` ? { x: position.x + context.getPageSize().width, y: 0 } : { y: position.y + context.getPageSize().height, x: 0 }
       );
     } else {
@@ -739,7 +739,7 @@
     if (context.state.isUsingSpreadMode) {
       if ((spineItem == null ? void 0 : spineItem.isUsingVerticalWriting()) && position.x !== navigation.x) {
         return navigationResolver.getAdjustedPositionForSpread(
-          navigationResolver.wrapPositionWithSafeEdge(
+          navigationResolver.getAdjustedPositionWithSafeEdge(
             context.isRTL() ? {
               ...navigation,
               x: navigation.x - context.getPageSize().width
@@ -818,7 +818,7 @@
       spineItemPosition
     );
     if (!isNewNavigationInCurrentItem) {
-      return navigationResolver.wrapPositionWithSafeEdge(
+      return navigationResolver.getAdjustedPositionWithSafeEdge(
         pageTurnDirection === `horizontal` ? { x: position.x - context.getPageSize().width, y: 0 } : { y: position.y - context.getPageSize().height, x: 0 }
       );
     } else {
@@ -852,7 +852,7 @@
     if (context.state.isUsingSpreadMode) {
       if ((spineItem == null ? void 0 : spineItem.isUsingVerticalWriting()) && position.x !== navigation.x) {
         return navigationResolver.getAdjustedPositionForSpread(
-          navigationResolver.wrapPositionWithSafeEdge(
+          navigationResolver.getAdjustedPositionWithSafeEdge(
             context.isRTL() ? { ...navigation, x: navigation.x + context.getPageSize().width } : {
               ...navigation,
               x: navigation.x - context.getPageSize().width
@@ -1063,19 +1063,29 @@
   const observeState = (reader) => {
     return reader.pagination.pagination$.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)
     );
   };
@@ -2250,12 +2260,12 @@
     const correctedX = isOffsetNotAtEdge ? x - pageSizeWidth : x;
     return { x: correctedX, y };
   };
-  const wrapPositionWithSafeEdge = ({
+  const getAdjustedPositionWithSafeEdge = ({
     position,
     isRTL,
-    pageSizeWidth,
     pageSizeHeight,
-    spineItemsManager
+    spineItemsManager,
+    visibleAreaRectWidth
   }) => {
     const lastSpineItem = spineItemsManager.get(spineItemsManager.getLength() - 1);
     const distanceOfLastSpineItem = spineItemsManager.getAbsolutePositionOf(
@@ -2269,7 +2279,7 @@
         y
       };
     }
-    const maximumXOffset = distanceOfLastSpineItem.right - pageSizeWidth;
+    const maximumXOffset = distanceOfLastSpineItem.right - visibleAreaRectWidth;
     return {
       x: Math.min(Math.max(0, position.x), maximumXOffset),
       y
@@ -3400,14 +3410,14 @@
       const triggerPercentage = 0.5;
       const triggerXPosition = pageTurnDirection === `horizontal` ? viewportPosition.x + context.state.visibleAreaRect.width * triggerPercentage : 0;
       const triggerYPosition = pageTurnDirection === `horizontal` ? 0 : viewportPosition.y + context.state.visibleAreaRect.height * triggerPercentage;
-      const midScreenPositionSafePosition = wrapPositionWithSafeEdge({
+      const midScreenPositionSafePosition = getAdjustedPositionWithSafeEdge({
         position: {
           x: triggerXPosition,
           y: triggerYPosition
         },
         isRTL: context.isRTL(),
         pageSizeHeight: context.getPageSize().height,
-        pageSizeWidth: context.getPageSize().width,
+        visibleAreaRectWidth: context.state.visibleAreaRect.width,
         spineItemsManager
       });
       return getNavigationForPosition({
@@ -3456,11 +3466,11 @@
         spineLocator: locator
       }),
       getMostPredominantNavigationForPosition,
-      wrapPositionWithSafeEdge: (position) => wrapPositionWithSafeEdge({
+      getAdjustedPositionWithSafeEdge: (position) => getAdjustedPositionWithSafeEdge({
         position,
         isRTL: context.isRTL(),
         pageSizeHeight: context.getPageSize().height,
-        pageSizeWidth: context.getPageSize().width,
+        visibleAreaRectWidth: context.state.visibleAreaRect.width,
         spineItemsManager
       }),
       isNavigationGoingForwardFrom,
@@ -4149,7 +4159,7 @@
           return {
             navigation: {
               ...navigation,
-              position: navigationResolver.wrapPositionWithSafeEdge(
+              position: navigationResolver.getAdjustedPositionWithSafeEdge(
                 navigation.position
               )
             },
@@ -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
       };
     }
   }
@@ -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.