@prose-reader/core 1.178.0 → 1.180.0

package/dist/context/Context.d.ts

@@ -1,11 +1,12 @@
-import { BehaviorSubject, Subject } from 'rxjs';
 import { Manifest } from '@prose-reader/shared';
+import { BehaviorSubject, Subject } from 'rxjs';
 import { BridgeEvent } from './BridgeEvent';
 export type ContextState = {
     containerElement?: HTMLElement;
     manifest?: Manifest;
     hasVerticalWriting?: boolean;
     isUsingSpreadMode?: boolean;
+    assumedRenditionLayout: "reflowable" | "pre-paginated";
     isFullyPrePaginated?: boolean;
     forceSinglePageMode?: boolean;
     calculatedInnerMargin: number;

package/dist/enhancers/navigation/navigators/manualNavigator.d.ts

@@ -1,6 +1,6 @@
-import { Reader } from '../../../reader';
-import { ViewportPosition } from '../../../navigation/viewport/ViewportNavigator';
 import { UserNavigationEntry } from '../../../navigation/UserNavigator';
+import { ViewportPosition } from '../../../navigation/viewport/ViewportNavigator';
+import { Reader } from '../../../reader';
 export declare class ManualNavigator {
     protected reader: Reader;
     movingLastDelta: {

package/dist/index.js

@@ -2629,7 +2629,8 @@ const mediaEnhancer = (next) => (options) => {
     destroy
   };
 };
-const getSpineItemPositionForRightPage = ({
+const report$4 = Report.namespace(`navigation`);
+const getSpineItemPositionForLeftPage = ({
   position,
   spineItem,
   pageHeight,
@@ -2637,13 +2638,13 @@ const getSpineItemPositionForRightPage = ({
   spineItemLocator
 }) => {
   let nextPotentialPosition = {
-    x: position.x + pageWidth,
+    x: position.x - pageWidth,
     y: position.y
   };
   if (spineItem.isUsingVerticalWriting()) {
     nextPotentialPosition = {
       x: position.x,
-      y: position.y - pageHeight
+      y: position.y + pageHeight
     };
   }
   const navigationPosition = spineItemLocator.getSpineItemClosestPositionFromUnsafePosition(
@@ -2652,7 +2653,7 @@ const getSpineItemPositionForRightPage = ({
   );
   return navigationPosition;
 };
-const getNavigationForRightSinglePage = ({
+const getNavigationForLeftSinglePage = ({
   position,
   navigationResolver,
   computedPageTurnDirection,
@@ -2670,7 +2671,7 @@ const getNavigationForRightSinglePage = ({
     position,
     spineItem
   );
-  const spineItemNavigationForRightPage = getSpineItemPositionForRightPage({
+  const spineItemNavigation = getSpineItemPositionForLeftPage({
     position: spineItemPosition,
     spineItem,
     pageHeight: context.getPageSize().height,
@@ -2678,21 +2679,21 @@ const getNavigationForRightSinglePage = ({
     spineItemLocator: spineLocator.spineItemLocator
   });
   const isNewNavigationInCurrentItem = navigationResolver.arePositionsDifferent(
-    spineItemNavigationForRightPage,
+    spineItemNavigation,
     spineItemPosition
   );
   if (!isNewNavigationInCurrentItem) {
     return navigationResolver.getAdjustedPositionWithSafeEdge(
-      pageTurnDirection === `horizontal` ? { x: position.x + context.getPageSize().width, y: 0 } : { y: position.y + context.getPageSize().height, x: 0 }
+      pageTurnDirection === `horizontal` ? { x: position.x - context.getPageSize().width, y: 0 } : { y: position.y - context.getPageSize().height, x: 0 }
     );
   }
   const readingOrderPosition = spineLocator.getSpinePositionFromSpineItemPosition({
-    spineItemPosition: spineItemNavigationForRightPage,
+    spineItemPosition: spineItemNavigation,
     spineItem
   });
   return readingOrderPosition;
 };
-const getNavigationForRightOrBottomPage = ({
+const getNavigationForLeftOrTopPage = ({
   position,
   spineItem,
   context,
@@ -2701,7 +2702,7 @@ const getNavigationForRightOrBottomPage = ({
   spineLocator,
   computedPageTurnDirection
 }) => {
-  const navigation = getNavigationForRightSinglePage({
+  const navigation = getNavigationForLeftSinglePage({
     position,
     context,
     navigationResolver,
@@ -2716,12 +2717,9 @@ const getNavigationForRightOrBottomPage = ({
     if ((spineItem == null ? void 0 : spineItem.isUsingVerticalWriting()) && position.x !== navigation.x) {
       return navigationResolver.getAdjustedPositionForSpread(
         navigationResolver.getAdjustedPositionWithSafeEdge(
-          context.isRTL() ? {
+          context.isRTL() ? { ...navigation, x: navigation.x + context.getPageSize().width } : {
             ...navigation,
             x: navigation.x - context.getPageSize().width
-          } : {
-            ...navigation,
-            x: navigation.x + context.getPageSize().width
           }
         )
       );
@@ -2729,7 +2727,7 @@ const getNavigationForRightOrBottomPage = ({
     if (computedPageTurnDirection === `vertical` && position.y !== navigation.y) {
       return navigationResolver.getAdjustedPositionForSpread(navigation);
     }
-    const doubleNavigation = getNavigationForRightSinglePage({
+    const doubleNavigation = getNavigationForLeftSinglePage({
       position: navigation,
       context,
       navigationResolver,
@@ -2741,7 +2739,7 @@ const getNavigationForRightOrBottomPage = ({
   }
   return navigationResolver.getAdjustedPositionForSpread(navigation);
 };
-const getSpineItemPositionForLeftPage = ({
+const getSpineItemPositionForRightPage = ({
   position,
   spineItem,
   pageHeight,
@@ -2749,13 +2747,13 @@ const getSpineItemPositionForLeftPage = ({
   spineItemLocator
 }) => {
   let nextPotentialPosition = {
-    x: position.x - pageWidth,
+    x: position.x + pageWidth,
     y: position.y
   };
   if (spineItem.isUsingVerticalWriting()) {
     nextPotentialPosition = {
       x: position.x,
-      y: position.y + pageHeight
+      y: position.y - pageHeight
     };
   }
   const navigationPosition = spineItemLocator.getSpineItemClosestPositionFromUnsafePosition(
@@ -2764,7 +2762,7 @@ const getSpineItemPositionForLeftPage = ({
   );
   return navigationPosition;
 };
-const getNavigationForLeftSinglePage = ({
+const getNavigationForRightSinglePage = ({
   position,
   navigationResolver,
   computedPageTurnDirection,
@@ -2782,7 +2780,7 @@ const getNavigationForLeftSinglePage = ({
     position,
     spineItem
   );
-  const spineItemNavigation = getSpineItemPositionForLeftPage({
+  const spineItemNavigationForRightPage = getSpineItemPositionForRightPage({
     position: spineItemPosition,
     spineItem,
     pageHeight: context.getPageSize().height,
@@ -2790,21 +2788,21 @@ const getNavigationForLeftSinglePage = ({
     spineItemLocator: spineLocator.spineItemLocator
   });
   const isNewNavigationInCurrentItem = navigationResolver.arePositionsDifferent(
-    spineItemNavigation,
+    spineItemNavigationForRightPage,
     spineItemPosition
   );
   if (!isNewNavigationInCurrentItem) {
     return navigationResolver.getAdjustedPositionWithSafeEdge(
-      pageTurnDirection === `horizontal` ? { x: position.x - context.getPageSize().width, y: 0 } : { y: position.y - context.getPageSize().height, x: 0 }
+      pageTurnDirection === `horizontal` ? { x: position.x + context.getPageSize().width, y: 0 } : { y: position.y + context.getPageSize().height, x: 0 }
     );
   }
   const readingOrderPosition = spineLocator.getSpinePositionFromSpineItemPosition({
-    spineItemPosition: spineItemNavigation,
+    spineItemPosition: spineItemNavigationForRightPage,
     spineItem
   });
   return readingOrderPosition;
 };
-const getNavigationForLeftOrTopPage = ({
+const getNavigationForRightOrBottomPage = ({
   position,
   spineItem,
   context,
@@ -2813,7 +2811,7 @@ const getNavigationForLeftOrTopPage = ({
   spineLocator,
   computedPageTurnDirection
 }) => {
-  const navigation = getNavigationForLeftSinglePage({
+  const navigation = getNavigationForRightSinglePage({
     position,
     context,
     navigationResolver,
@@ -2828,9 +2826,12 @@ const getNavigationForLeftOrTopPage = ({
     if ((spineItem == null ? void 0 : spineItem.isUsingVerticalWriting()) && position.x !== navigation.x) {
       return navigationResolver.getAdjustedPositionForSpread(
         navigationResolver.getAdjustedPositionWithSafeEdge(
-          context.isRTL() ? { ...navigation, x: navigation.x + context.getPageSize().width } : {
+          context.isRTL() ? {
             ...navigation,
             x: navigation.x - context.getPageSize().width
+          } : {
+            ...navigation,
+            x: navigation.x + context.getPageSize().width
           }
         )
       );
@@ -2838,7 +2839,7 @@ const getNavigationForLeftOrTopPage = ({
     if (computedPageTurnDirection === `vertical` && position.y !== navigation.y) {
       return navigationResolver.getAdjustedPositionForSpread(navigation);
     }
-    const doubleNavigation = getNavigationForLeftSinglePage({
+    const doubleNavigation = getNavigationForRightSinglePage({
       position: navigation,
       context,
       navigationResolver,
@@ -2850,7 +2851,6 @@ const getNavigationForLeftOrTopPage = ({
   }
   return navigationResolver.getAdjustedPositionForSpread(navigation);
 };
-const report$4 = Report.namespace(`navigation`);
 class ManualNavigator {
   constructor(reader) {
     this.reader = reader;
@@ -2943,7 +2943,8 @@ class ManualNavigator {
   }
   goToUrl(url) {
     this.reader.navigation.navigate({
-      url
+      url,
+      animation: false
     });
   }
   goToRightSpineItem() {
@@ -5260,20 +5261,6 @@ const resolveCfi = ({
     spineItem
   };
 };
-const isUsingSpreadMode = ({
-  manifest,
-  visibleAreaRect,
-  forceSinglePageMode
-}) => {
-  const { height, width } = visibleAreaRect;
-  const isLandscape = width > height;
-  if (forceSinglePageMode) return false;
-  if ((manifest == null ? void 0 : manifest.renditionFlow) === `scrolled-continuous`) return false;
-  if (!isLandscape && (manifest == null ? void 0 : manifest.renditionSpread) === `portrait`) {
-    return true;
-  }
-  return isLandscape && ((manifest == null ? void 0 : manifest.renditionSpread) === void 0 || (manifest == null ? void 0 : manifest.renditionSpread) === `auto` || (manifest == null ? void 0 : manifest.renditionSpread) === `landscape` || (manifest == null ? void 0 : manifest.renditionSpread) === `both`);
-};
 const isFullyPrePaginated = (manifest) => (manifest == null ? void 0 : manifest.renditionLayout) === "pre-paginated" || (manifest == null ? void 0 : manifest.spineItems.every((item) => item.renditionLayout === "pre-paginated"));
 class BridgeEvent {
   constructor() {
@@ -5296,12 +5283,27 @@ class BridgeEvent {
     this.navigation$ = this.navigationSubject.asObservable();
   }
 }
+const isUsingSpreadMode = ({
+  manifest,
+  visibleAreaRect,
+  forceSinglePageMode
+}) => {
+  const { height, width } = visibleAreaRect;
+  const isLandscape = width > height;
+  if (forceSinglePageMode) return false;
+  if ((manifest == null ? void 0 : manifest.renditionFlow) === `scrolled-continuous`) return false;
+  if (!isLandscape && (manifest == null ? void 0 : manifest.renditionSpread) === `portrait`) {
+    return true;
+  }
+  return isLandscape && ((manifest == null ? void 0 : manifest.renditionSpread) === void 0 || (manifest == null ? void 0 : manifest.renditionSpread) === `auto` || (manifest == null ? void 0 : manifest.renditionSpread) === `landscape` || (manifest == null ? void 0 : manifest.renditionSpread) === `both`);
+};
 class Context {
   constructor() {
     this._stateSubject = new BehaviorSubject({
       marginBottom: 0,
       marginTop: 0,
       calculatedInnerMargin: 0,
+      assumedRenditionLayout: "reflowable",
       visibleAreaRect: {
         width: 0,
         height: 0,
@@ -5359,7 +5361,8 @@ class Context {
         height: newState.visibleAreaRect.height - marginTop - marginBottom
       },
       ...newState.manifest && {
-        isFullyPrePaginated: isFullyPrePaginated(manifest)
+        isFullyPrePaginated: isFullyPrePaginated(manifest),
+        assumedRenditionLayout: (manifest == null ? void 0 : manifest.renditionLayout) ?? "reflowable"
       },
       isUsingSpreadMode: isUsingSpreadMode({
         manifest,