@prose-reader/core 1.69.0 → 1.70.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/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
@@ -2249,12 +2249,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 +2268,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 +3399,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 +3455,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 +4148,7 @@ const withFallbackPosition = ({
         return {
           navigation: {
             ...navigation,
-            position: navigationResolver.wrapPositionWithSafeEdge(
+            position: navigationResolver.getAdjustedPositionWithSafeEdge(
               navigation.position
             )
           },