@prose-reader/core 1.69.0 → 1.71.0

package/dist/createReaderWithEnhancer.d.ts

@@ -63,7 +63,7 @@ export declare const createReaderWithEnhancers: (options: Partial<import('./sett
             getNavigationForSpineIndexOrId: (indexOrId: number | string | import('./spineItem/createSpineItem').SpineItem) => import('./navigation/viewport/ViewportNavigator').ViewportPosition;
             getNavigationForPosition: (viewportPosition: import('./navigation/viewport/ViewportNavigator').ViewportPosition) => import('./navigation/viewport/ViewportNavigator').ViewportPosition;
             getMostPredominantNavigationForPosition: (viewportPosition: import('./navigation/viewport/ViewportNavigator').ViewportPosition) => import('./navigation/viewport/ViewportNavigator').ViewportPosition;
-            wrapPositionWithSafeEdge: (position: import('./navigation/viewport/ViewportNavigator').ViewportPosition) => {
+            getAdjustedPositionWithSafeEdge: (position: import('./navigation/viewport/ViewportNavigator').ViewportPosition) => {
                 x: number;
                 y: number;
             };

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/index.js

@@ -704,7 +704,7 @@ const getNavigationForRightSinglePage = ({
     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 {
@@ -738,7 +738,7 @@ const getNavigationForRightPage = ({
   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
@@ -817,7 +817,7 @@ const getNavigationForLeftSinglePage = ({
     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 {
@@ -851,7 +851,7 @@ const getNavigationForLeftPage = ({
   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
@@ -1062,19 +1062,29 @@ class PanNavigator {
 const observeState = (reader) => {
   return reader.pagination.pagination$.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)
   );
 };
@@ -2249,12 +2259,12 @@ const getAdjustedPositionForSpread = ({
   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(
@@ -2268,7 +2278,7 @@ const wrapPositionWithSafeEdge = ({
       y
     };
   }
-  const maximumXOffset = distanceOfLastSpineItem.right - pageSizeWidth;
+  const maximumXOffset = distanceOfLastSpineItem.right - visibleAreaRectWidth;
   return {
     x: Math.min(Math.max(0, position.x), maximumXOffset),
     y
@@ -3399,14 +3409,14 @@ const createNavigationResolver = ({
     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({
@@ -3455,11 +3465,11 @@ const createNavigationResolver = ({
       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,
@@ -4148,7 +4158,7 @@ const withFallbackPosition = ({
         return {
           navigation: {
             ...navigation,
-            position: navigationResolver.wrapPositionWithSafeEdge(
+            position: navigationResolver.getAdjustedPositionWithSafeEdge(
               navigation.position
             )
           },
@@ -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
     };
   }
 }
@@ -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.