@prose-reader/core 1.289.0 → 1.291.0

package/dist/navigation/InternalNavigator.d.ts

@@ -2,41 +2,26 @@ import { BehaviorSubject, Observable } from 'rxjs';
 import { Context } from '../context/Context';
 import { ReaderSettingsManager } from '../settings/ReaderSettingsManager';
 import { Spine } from '../spine/Spine';
-import { SpinePosition } from '../spine/types';
 import { DestroyableClass } from '../utils/DestroyableClass';
-import { ControlledNavigationController } from './controllers/ControlledNavigationController';
-import { ScrollNavigationController } from './controllers/ScrollNavigationController';
+import { Viewport } from '../viewport/Viewport';
 import { Locker } from './Locker';
 import { createNavigationResolver } from './resolvers/NavigationResolver';
-import { InternalNavigationEntry, UserNavigationEntry, NavigationConsolidation } from './types';
-import { UnboundSpinePosition } from '..';
+import { InternalNavigationEntry, NavigationModeController, UserNavigationEntry } from './types';
 export declare class InternalNavigator extends DestroyableClass {
     protected settings: ReaderSettingsManager;
     protected context: Context;
     protected userNavigation$: Observable<UserNavigationEntry>;
-    protected controlledNavigationController: ControlledNavigationController;
-    protected scrollNavigationController: ScrollNavigationController;
+    protected getActiveNavigationModeController: () => NavigationModeController;
+    protected navigationModeLayout$: Observable<unknown>;
     protected navigationResolver: ReturnType<typeof createNavigationResolver>;
     protected spine: Spine;
-    protected isRestorationLocked$: Observable<boolean>;
+    protected viewport: Viewport;
+    protected isUserInteractionLocked$: Observable<boolean>;
     navigationSubject: BehaviorSubject<InternalNavigationEntry>;
-    navigated$: Observable<{
-        position: SpinePosition | UnboundSpinePosition;
-        id: symbol;
-        meta: {
-            triggeredBy: `user` | `restoration` | `pagination`;
-        };
-        type: `api` | `scroll`;
-        animation?: boolean | `turn` | `snap`;
-        url?: string | URL;
-        spineItem?: string | number;
-        cfi?: string;
-    } & NavigationConsolidation>;
-    navigation$: Observable<{
-        position: SpinePosition | UnboundSpinePosition;
-        id: symbol;
+    navigation$: Observable<Pick<InternalNavigationEntry, "id" | "position" | "requestedPosition" | "requestedVisibleArea"> & {
+        triggeredBy: InternalNavigationEntry["meta"]["triggeredBy"];
     }>;
     locker: Locker;
-    constructor(settings: ReaderSettingsManager, context: Context, userNavigation$: Observable<UserNavigationEntry>, controlledNavigationController: ControlledNavigationController, scrollNavigationController: ScrollNavigationController, navigationResolver: ReturnType<typeof createNavigationResolver>, spine: Spine, isRestorationLocked$: Observable<boolean>);
+    constructor(settings: ReaderSettingsManager, context: Context, userNavigation$: Observable<UserNavigationEntry>, getActiveNavigationModeController: () => NavigationModeController, navigationModeLayout$: Observable<unknown>, navigationResolver: ReturnType<typeof createNavigationResolver>, spine: Spine, viewport: Viewport, isUserInteractionLocked$: Observable<boolean>);
     get navigation(): InternalNavigationEntry;
 }

package/dist/navigation/Navigator.d.ts

@@ -7,8 +7,7 @@ import { Viewport } from '../viewport/Viewport';
 import { ControlledNavigationController } from './controllers/ControlledNavigationController';
 import { ScrollNavigationController } from './controllers/ScrollNavigationController';
 import { InternalNavigator } from './InternalNavigator';
-import { Locker } from './Locker';
-import { UserNavigationEntry, InternalNavigationEntry } from './types';
+import { UserNavigationEntry, InternalNavigationEntry, NavigationVisibleArea, SpineBoundary } from './types';
 import { Observable } from 'rxjs';
 import { SpinePosition, SpineItemPosition, SpineItem, UnboundSpinePosition } from '..';
 import { getNavigationForSpineItemPage } from './resolvers/getNavigationForSpineItemPage';
@@ -25,10 +24,10 @@ export declare const createNavigator: ({ spineItemsManager, context, hookManager
     internalNavigator: InternalNavigator;
     scrollNavigationController: ScrollNavigationController;
     controlledNavigationController: ControlledNavigationController;
-    locker: Locker;
     navigationState$: Observable<"free" | "busy">;
     navigate: (to: UserNavigationEntry) => void;
-    lock(): () => void;
+    lock: () => () => void;
+    isLocked$: Observable<boolean>;
     navigationResolver: {
         getNavigationForUrl: (url: string | URL) => {
             position: SpinePosition;
@@ -44,8 +43,8 @@ export declare const createNavigator: ({ spineItemsManager, context, hookManager
         getNavigationForSpineIndexOrId: (indexOrId: number | string | SpineItem) => SpinePosition;
         getNavigationForPosition: (viewportPosition: SpinePosition | UnboundSpinePosition) => SpinePosition;
         getMostPredominantNavigationForPosition: (viewportPosition: SpinePosition) => SpinePosition;
-        fromUnboundSpinePosition: (position: SpinePosition | UnboundSpinePosition) => SpinePosition;
-        fromOutOfBoundsSpinePosition: (position: SpinePosition | UnboundSpinePosition) => SpinePosition | UnboundSpinePosition;
+        clampPositionInSpine: (position: SpinePosition | UnboundSpinePosition, size: NavigationVisibleArea) => UnboundSpinePosition;
+        getBoundaryForPosition: (position: SpinePosition | UnboundSpinePosition, size?: NavigationVisibleArea) => SpineBoundary | undefined;
         isNavigationGoingForwardFrom: (to: SpinePosition, from: SpinePosition) => boolean;
         arePositionsDifferent: (a: {
             x: number;
@@ -54,16 +53,16 @@ export declare const createNavigator: ({ spineItemsManager, context, hookManager
             x: number;
             y: number;
         }) => boolean;
-        getAdjustedPositionForSpread: (position: SpinePosition | UnboundSpinePosition) => SpinePosition;
+        getAdjustedPositionForSpread: (position: SpinePosition | UnboundSpinePosition) => SpinePosition | UnboundSpinePosition;
         spineItemNavigator: {
             getNavigationForLastPage: (spineItem: SpineItem) => SpineItemPosition;
             getNavigationForPosition: (spineItem: SpineItem, position: SpineItemPosition) => SpineItemPosition;
             getNavigationFromNode: (spineItem: SpineItem, node: Node, offset: number) => SpineItemPosition;
         };
     };
-    navigation$: Observable<{
-        position: SpinePosition | UnboundSpinePosition;
-        id: symbol;
+    navigation$: Observable<Pick< InternalNavigationEntry, "id" | "position" | "requestedPosition" | "requestedVisibleArea"> & {
+        triggeredBy: InternalNavigationEntry["meta"]["triggeredBy"];
     }>;
+    position$: Observable< SpinePosition | UnboundSpinePosition>;
 };
 export type Navigator = ReturnType<typeof createNavigator>;

package/dist/navigation/consolidation/consolidateWithPagination.d.ts

@@ -1,14 +1,16 @@
 import { Observable } from 'rxjs';
 import { Context } from '../../context/Context';
 import { Spine } from '../../spine/Spine';
-import { InternalNavigationEntry } from '../types';
+import { InternalNavigationEntry, NavigationVisibleArea } from '../types';
 import { SpinePosition, UnboundSpinePosition, SpineItemPosition, UnboundSpineItemPagePosition } from '../..';
 export declare const consolidateWithPagination: (context: Context, navigation$: Observable<InternalNavigationEntry>, spine: Spine) => Observable<{
     meta: {
         triggeredBy: "pagination";
     };
+    requestedPosition: SpinePosition | UnboundSpinePosition;
     position: SpinePosition | UnboundSpinePosition;
     id: symbol;
+    requestedVisibleArea?: NavigationVisibleArea;
     type: `api` | `scroll`;
     animation?: boolean | `turn` | `snap`;
     url?: string | URL;

package/dist/navigation/consolidation/mapUserNavigationToInternal.d.ts

@@ -1,8 +1,9 @@
 import { Observable } from 'rxjs';
 import { NavigationResolver } from '../resolvers/NavigationResolver';
-import { InternalNavigationEntry, InternalNavigationInput, UserNavigationEntry } from '../types';
-export declare const mapUserNavigationToInternal: ({ navigationResolver }: {
+import { InternalNavigationEntry, InternalNavigationInput, NavigationVisibleArea, UserNavigationEntry } from '../types';
+export declare const mapUserNavigationToInternal: ({ navigationResolver, getNavigationVisibleArea, }: {
     navigationResolver: NavigationResolver;
+    getNavigationVisibleArea: () => NavigationVisibleArea;
 }) => (stream: Observable<[UserNavigationEntry, InternalNavigationEntry]>) => Observable<{
     navigation: InternalNavigationInput;
     previousNavigation: InternalNavigationEntry;

package/dist/navigation/consolidation/withFallbackPosition.d.ts

@@ -1,12 +1,14 @@
 import { Observable } from 'rxjs';
 import { ReaderSettingsManager } from '../../settings/ReaderSettingsManager';
 import { SpineItemsManager } from '../../spine/SpineItemsManager';
+import { Viewport } from '../../viewport/Viewport';
 import { NavigationResolver } from '../resolvers/NavigationResolver';
 import { InternalNavigationEntry, InternalNavigationInput } from '../types';
-export declare const withFallbackPosition: ({ spineItemsManager, navigationResolver, settings, }: {
+export declare const withFallbackPosition: ({ spineItemsManager, navigationResolver, settings, viewport, }: {
     spineItemsManager: SpineItemsManager;
     navigationResolver: NavigationResolver;
     settings: ReaderSettingsManager;
+    viewport: Viewport;
 }) => <Navigation extends {
     navigation: InternalNavigationInput;
     previousNavigation: InternalNavigationEntry;

package/dist/navigation/controllers/ControlledNavigationController.d.ts

@@ -6,22 +6,23 @@ import { Spine } from '../../spine/Spine';
 import { SpinePosition } from '../../spine/types';
 import { DestroyableClass } from '../../utils/DestroyableClass';
 import { Viewport } from '../../viewport/Viewport';
-export type ViewportNavigationEntry = {
-    position: SpinePosition;
-    animation?: boolean | "turn" | "snap";
-};
-export declare class ControlledNavigationController extends DestroyableClass {
+import { NavigationModeController, NavigationModeControllerNavigationEntry } from '../types';
+import { AbsoluteViewport } from '../../viewport/types';
+export type ControlledNavigationEntry = NavigationModeControllerNavigationEntry;
+export declare class ControlledNavigationController extends DestroyableClass implements NavigationModeController {
     protected settings: ReaderSettingsManager;
     protected hookManager: HookManager;
     protected context: Context;
     protected spine: Spine;
     protected viewport: Viewport;
-    protected navigateSubject: Subject<ViewportNavigationEntry>;
+    protected navigateSubject: Subject<NavigationModeControllerNavigationEntry>;
     readonly element$: BehaviorSubject<HTMLElement>;
     isNavigating$: Observable<boolean>;
     layout$: Observable<unknown>;
     constructor(settings: ReaderSettingsManager, hookManager: HookManager, context: Context, spine: Spine, viewport: Viewport);
-    protected setViewportPosition(position: SpinePosition): void;
-    navigate(navigation: ViewportNavigationEntry): void;
+    protected applyNavigationPosition(position: ControlledNavigationEntry["position"]): void;
+    navigate(navigation: NavigationModeControllerNavigationEntry): void;
+    isActive: () => boolean;
+    getNavigationVisibleArea: () => AbsoluteViewport;
     get viewportPosition(): SpinePosition;
 }

package/dist/navigation/controllers/ControlledNavigationController.test.d.ts

@@ -0,0 +1 @@
+export {};

package/dist/navigation/controllers/ScrollNavigationController.d.ts

@@ -7,33 +7,34 @@ import { SpinePosition, UnboundSpinePosition } from '../../spine/types';
 import { AbstractPosition } from '../../types';
 import { ReactiveEntity } from '../../utils/ReactiveEntity';
 import { Viewport } from '../../viewport/Viewport';
+import { NavigationModeController, NavigationModeControllerNavigationEntry } from '../types';
+import { RelativeViewport } from '../../viewport/types';
 export declare class ScrollPosition extends AbstractPosition {
 }
 export declare class UnboundScrollPosition extends AbstractPosition {
     readonly __symbol: symbol;
 }
-export type ScrollNavigationViewportNavigationEntry = {
-    position: UnboundSpinePosition | SpinePosition;
-};
+export type ScrollNavigationEntry = NavigationModeControllerNavigationEntry;
 export declare class ScrollNavigationController extends ReactiveEntity<{
     element: HTMLElement | undefined;
-}> {
+}> implements NavigationModeController {
     protected viewport: Viewport;
     protected settings: ReaderSettingsManager;
     protected hookManager: HookManager;
     protected spine: Spine;
     protected context: Context;
-    protected navigateSubject: Subject<ScrollNavigationViewportNavigationEntry>;
+    protected navigateSubject: Subject<NavigationModeControllerNavigationEntry>;
     protected scrollingSubject: BehaviorSubject<boolean>;
-    isScrolling$: Observable<boolean>;
     isNavigating$: Observable<boolean>;
     userScroll$: Observable<Event>;
     constructor(viewport: Viewport, settings: ReaderSettingsManager, hookManager: HookManager, spine: Spine, context: Context);
-    protected setViewportPosition: ({ position, }: ScrollNavigationViewportNavigationEntry) => void;
+    protected applyNavigationPosition: ({ position }: ScrollNavigationEntry) => void;
     update(value: Partial<{
         element: HTMLElement | undefined;
     }>): void;
-    navigate(navigation: ScrollNavigationViewportNavigationEntry): void;
+    navigate(navigation: NavigationModeControllerNavigationEntry): void;
+    isActive: () => boolean;
+    getNavigationVisibleArea: () => RelativeViewport;
     fromScrollPosition(position: UnboundScrollPosition | ScrollPosition): UnboundSpinePosition;
     fromSpinePosition(position: UnboundSpinePosition | SpinePosition): ScrollPosition;
     get scrollPosition(): ScrollPosition;

package/dist/navigation/controllers/positions.d.ts

@@ -1,5 +1,9 @@
 import { SpinePosition } from '../../spine/types';
-export declare const spinePositionToTranslation: (position: SpinePosition) => {
+type SpinePositionLike = {
+    x: number;
+    y: number;
+};
+export declare const spinePositionToTranslation: (position: SpinePositionLike) => {
     x: number;
     y: number;
 };
@@ -7,3 +11,4 @@ export declare const translationToSpinePosition: (translation: {
     x: number;
     y: number;
 } | DOMMatrix) => SpinePosition;
+export {};

package/dist/navigation/operators.d.ts

@@ -0,0 +1,11 @@
+import { MonoTypeOperatorFunction, Observable } from 'rxjs';
+import { Navigation } from './types';
+export type NavigationState = "busy" | "free";
+export type NavigationSignals = {
+    navigation$: Observable<Navigation>;
+    navigationState$: Observable<NavigationState>;
+};
+export declare const waitForNavigationSettled: <T>(navigationState$: Observable<NavigationState>) => MonoTypeOperatorFunction<T>;
+export declare const observeSettledNavigation: ({ navigation$, navigationState$, }: NavigationSignals) => Observable<Navigation>;
+export declare const observeNextSettledNavigation: (signals: NavigationSignals) => Observable<Navigation>;
+export declare const takeUntilNextNavigationSettled: <T>(signals: NavigationSignals) => MonoTypeOperatorFunction<T>;

package/dist/navigation/resolvers/NavigationResolver.d.ts

@@ -7,6 +7,7 @@ import { SpinePosition, UnboundSpinePosition } from '../../spine/types';
 import { SpineItem } from '../../spineItem/SpineItem';
 import { SpineItemPosition } from '../../spineItem/types';
 import { Viewport } from '../../viewport/Viewport';
+import { NavigationVisibleArea, SpineBoundary } from '../types';
 import { getNavigationForSpineItemPage } from './getNavigationForSpineItemPage';
 export declare const NAMESPACE = "spineNavigator";
 export type NavigationResolver = ReturnType<typeof createNavigationResolver>;
@@ -32,8 +33,8 @@ export declare const createNavigationResolver: ({ context, spineItemsManager, lo
     getNavigationForSpineIndexOrId: (indexOrId: number | string | SpineItem) => SpinePosition;
     getNavigationForPosition: (viewportPosition: SpinePosition | UnboundSpinePosition) => SpinePosition;
     getMostPredominantNavigationForPosition: (viewportPosition: SpinePosition) => SpinePosition;
-    fromUnboundSpinePosition: (position: SpinePosition | UnboundSpinePosition) => SpinePosition;
-    fromOutOfBoundsSpinePosition: (position: SpinePosition | UnboundSpinePosition) => SpinePosition | UnboundSpinePosition;
+    clampPositionInSpine: (position: SpinePosition | UnboundSpinePosition, size: NavigationVisibleArea) => UnboundSpinePosition;
+    getBoundaryForPosition: (position: SpinePosition | UnboundSpinePosition, size?: NavigationVisibleArea) => SpineBoundary | undefined;
     isNavigationGoingForwardFrom: (to: SpinePosition, from: SpinePosition) => boolean;
     arePositionsDifferent: (a: {
         x: number;
@@ -42,7 +43,7 @@ export declare const createNavigationResolver: ({ context, spineItemsManager, lo
         x: number;
         y: number;
     }) => boolean;
-    getAdjustedPositionForSpread: (position: SpinePosition | UnboundSpinePosition) => SpinePosition;
+    getAdjustedPositionForSpread: (position: SpinePosition | UnboundSpinePosition) => SpinePosition | UnboundSpinePosition;
     spineItemNavigator: {
         getNavigationForLastPage: (spineItem: SpineItem) => SpineItemPosition;
         getNavigationForPosition: (spineItem: SpineItem, position: SpineItemPosition) => SpineItemPosition;

package/dist/navigation/resolvers/clampRectInSpine.d.ts

@@ -0,0 +1,13 @@
+import { Spine } from '../../spine/Spine';
+import { SpineItemsManager } from '../../spine/SpineItemsManager';
+import { SpinePosition, UnboundSpinePosition } from '../../spine/types';
+import { NavigationVisibleArea, SpineBoundary } from '../types';
+export type ClampRectInSpineParams = {
+    position: SpinePosition | UnboundSpinePosition;
+    size: NavigationVisibleArea;
+    isRTL: boolean;
+    spineItemsManager: SpineItemsManager;
+    spine: Spine;
+};
+export declare const clampRectInSpine: ({ position, size, isRTL, spineItemsManager, spine, }: ClampRectInSpineParams) => UnboundSpinePosition;
+export declare const getBoundaryForRectInSpine: ({ position, size, isRTL, spineItemsManager, spine, }: ClampRectInSpineParams) => SpineBoundary | undefined;

package/dist/navigation/resolvers/clampRectInSpine.test.d.ts

@@ -0,0 +1 @@
+export {};

package/dist/navigation/resolvers/getAdjustedPositionForSpread.d.ts

@@ -1,6 +1,8 @@
 import { SpinePosition, UnboundSpinePosition } from '../../spine/types';
-export declare const getAdjustedPositionForSpread: ({ position: { x, y }, pageSizeWidth, visibleAreaRectWidth, }: {
-    position: SpinePosition | UnboundSpinePosition;
+type Args<P extends SpinePosition | UnboundSpinePosition> = {
+    position: P;
     pageSizeWidth: number;
     visibleAreaRectWidth: number;
-}) => SpinePosition;
+};
+export declare const getAdjustedPositionForSpread: <P extends SpinePosition | UnboundSpinePosition>({ position, pageSizeWidth, visibleAreaRectWidth, }: Args<P>) => P;
+export {};

package/dist/navigation/types.d.ts

@@ -1,5 +1,11 @@
+import { Observable } from 'rxjs';
 import { SpinePosition, UnboundSpinePosition } from '../spine/types';
 import { SpineItemPosition, UnboundSpineItemPagePosition } from '../spineItem/types';
+export type SpineBoundary = "start" | "end";
+export type NavigationVisibleArea = {
+    width: number;
+    height: number;
+};
 export type UserNavigationEntry = {
     position?: SpinePosition | UnboundSpinePosition;
     spineItem?: number | string;
@@ -9,6 +15,10 @@ export type UserNavigationEntry = {
     type?: "api" | "scroll";
     direction?: "left" | "right" | "top" | "bottom";
 };
+export type NavigationModeControllerNavigationEntry = {
+    position: SpinePosition | UnboundSpinePosition;
+    animation?: boolean | "turn" | "snap";
+};
 export type NavigationConsolidation = {
     spineItemHeight?: number;
     spineItemWidth?: number;
@@ -26,13 +36,27 @@ export type InternalNavigationEntry = {
     meta: {
         triggeredBy: `user` | `restoration` | `pagination`;
     };
+    requestedPosition?: SpinePosition | UnboundSpinePosition;
+    requestedVisibleArea?: NavigationVisibleArea;
     type: `api` | `scroll`;
     animation?: boolean | `turn` | `snap`;
     url?: string | URL;
     spineItem?: string | number;
     cfi?: string;
 } & NavigationConsolidation;
+export type NavigationSurface = {
+    getNavigationVisibleArea: () => NavigationVisibleArea;
+};
+export type NavigationModeController = NavigationSurface & {
+    isActive: () => boolean;
+    isNavigating$: Observable<boolean>;
+    layout$?: Observable<unknown>;
+    navigate: (navigation: NavigationModeControllerNavigationEntry) => void;
+    destroy: () => void;
+};
 export type InternalNavigationInput = Omit<InternalNavigationEntry, "position"> & {
     position?: SpinePosition | UnboundSpinePosition;
 };
-export type Navigation = Pick<InternalNavigationEntry, "position" | "id">;
+export type Navigation = Pick<InternalNavigationEntry, "position" | "id" | "requestedPosition" | "requestedVisibleArea"> & {
+    triggeredBy: InternalNavigationEntry["meta"]["triggeredBy"];
+};

package/dist/pagination/PaginationController.d.ts

@@ -1,3 +1,4 @@
+import { Observable } from 'rxjs';
 import { Context } from '../context/Context';
 import { Spine } from '../spine/Spine';
 import { SpineItemsManager } from '../spine/SpineItemsManager';
@@ -10,5 +11,6 @@ export declare class PaginationController extends DestroyableClass {
     protected spineItemsManager: SpineItemsManager;
     protected spine: Spine;
     protected spineItemLocator: ReturnType<typeof createSpineItemLocator>;
-    constructor(context: Context, pagination: Pagination, spineItemsManager: SpineItemsManager, spine: Spine, spineItemLocator: ReturnType<typeof createSpineItemLocator>);
+    protected isNavigationLocked$: Observable<boolean>;
+    constructor(context: Context, pagination: Pagination, spineItemsManager: SpineItemsManager, spine: Spine, spineItemLocator: ReturnType<typeof createSpineItemLocator>, isNavigationLocked$: Observable<boolean>);
 }

package/dist/reader.d.ts

@@ -13,7 +13,7 @@ import { Viewport } from './viewport/Viewport';
 import { CoreHook } from './hooks';
 import { Manifest } from '@prose-reader/shared';
 import { ProseParsedCfi } from './cfi';
-import { PageEntry, SpineItem, InternalNavigationEntry, InternalNavigator, ScrollNavigationController, ControlledNavigationController, Locker, UserNavigationEntry, SpinePosition, SpineItemPosition, UnboundSpinePosition, SpineItemsObserver, CoreOutputSettings } from '.';
+import { PageEntry, SpineItem, InternalNavigationEntry, InternalNavigator, ScrollNavigationController, ControlledNavigationController, UserNavigationEntry, SpinePosition, SpineItemPosition, UnboundSpinePosition, NavigationVisibleArea, SpineBoundary, SpineItemsObserver, CoreOutputSettings } from '.';
 import { getNavigationForSpineItemPage } from './navigation/resolvers/getNavigationForSpineItemPage';
 import { PaginationInfo } from './pagination';
 export type CreateReaderOptions = Partial<CoreInputSettings>;
@@ -49,10 +49,10 @@ export declare const createReader: (inputSettings: CreateReaderOptions) => {
         internalNavigator: InternalNavigator;
         scrollNavigationController: ScrollNavigationController;
         controlledNavigationController: ControlledNavigationController;
-        locker: Locker;
         navigationState$: Observable<"free" | "busy">;
         navigate: (to: UserNavigationEntry) => void;
-        lock(): () => void;
+        lock: () => () => void;
+        isLocked$: Observable<boolean>;
         navigationResolver: {
             getNavigationForUrl: (url: string | URL) => {
                 position: SpinePosition;
@@ -68,8 +68,8 @@ export declare const createReader: (inputSettings: CreateReaderOptions) => {
             getNavigationForSpineIndexOrId: (indexOrId: number | string | SpineItem) => SpinePosition;
             getNavigationForPosition: (viewportPosition: SpinePosition | UnboundSpinePosition) => SpinePosition;
             getMostPredominantNavigationForPosition: (viewportPosition: SpinePosition) => SpinePosition;
-            fromUnboundSpinePosition: (position: SpinePosition | UnboundSpinePosition) => SpinePosition;
-            fromOutOfBoundsSpinePosition: (position: SpinePosition | UnboundSpinePosition) => SpinePosition | UnboundSpinePosition;
+            clampPositionInSpine: (position: SpinePosition | UnboundSpinePosition, size: NavigationVisibleArea) => UnboundSpinePosition;
+            getBoundaryForPosition: (position: SpinePosition | UnboundSpinePosition, size?: NavigationVisibleArea) => SpineBoundary | undefined;
             isNavigationGoingForwardFrom: (to: SpinePosition, from: SpinePosition) => boolean;
             arePositionsDifferent: (a: {
                 x: number;
@@ -78,17 +78,17 @@ export declare const createReader: (inputSettings: CreateReaderOptions) => {
                 x: number;
                 y: number;
             }) => boolean;
-            getAdjustedPositionForSpread: (position: SpinePosition | UnboundSpinePosition) => SpinePosition;
+            getAdjustedPositionForSpread: (position: SpinePosition | UnboundSpinePosition) => SpinePosition | UnboundSpinePosition;
             spineItemNavigator: {
                 getNavigationForLastPage: (spineItem: SpineItem) => SpineItemPosition;
                 getNavigationForPosition: (spineItem: SpineItem, position: SpineItemPosition) => SpineItemPosition;
                 getNavigationFromNode: (spineItem: SpineItem, node: Node, offset: number) => SpineItemPosition;
             };
         };
-        navigation$: Observable<{
-            position: SpinePosition | UnboundSpinePosition;
-            id: symbol;
+        navigation$: Observable<Pick< InternalNavigationEntry, "id" | "position" | "requestedPosition" | "requestedVisibleArea"> & {
+            triggeredBy: InternalNavigationEntry["meta"]["triggeredBy"];
         }>;
+        position$: Observable< SpinePosition | UnboundSpinePosition>;
     };
     spineItemsObserver: SpineItemsObserver;
     spineItemsManager: SpineItemsManager;

package/dist/spine/loader/SpineItemsLoader.d.ts

@@ -2,6 +2,7 @@ import { Context } from '../../context/Context';
 import { ReaderSettingsManager } from '../../settings/ReaderSettingsManager';
 import { SpineItem } from '../../spineItem/SpineItem';
 import { DestroyableClass } from '../../utils/DestroyableClass';
+import { Viewport } from '../../viewport/Viewport';
 import { SpineLocator } from '../locator/SpineLocator';
 import { SpineItemsManager } from '../SpineItemsManager';
 import { SpineLayout } from '../SpineLayout';
@@ -11,8 +12,9 @@ export declare class SpineItemsLoader extends DestroyableClass {
     protected spineLocator: SpineLocator;
     protected settings: ReaderSettingsManager;
     protected spineLayout: SpineLayout;
+    protected viewport: Viewport;
     private forcedOpenSubject;
-    constructor(context: Context, spineItemsManager: SpineItemsManager, spineLocator: SpineLocator, settings: ReaderSettingsManager, spineLayout: SpineLayout);
+    constructor(context: Context, spineItemsManager: SpineItemsManager, spineLocator: SpineLocator, settings: ReaderSettingsManager, spineLayout: SpineLayout, viewport: Viewport);
     forceOpen(spineItems: (number | SpineItem)[]): () => void;
     destroy(): void;
 }

package/dist/spine/loader/SpineItemsLoader.test.d.ts

@@ -0,0 +1 @@
+export {};

package/dist/utilities.d.ts

@@ -0,0 +1,4 @@
+export type { BookBoundaryReachedEvent, BookBoundaryReachedOptions, } from './enhancers/navigation/bookBoundary';
+export { observeBookBoundaryReached } from './enhancers/navigation/bookBoundary';
+export * from './navigation/operators';
+export { isHtmlElement, isHtmlTagElement } from './utils/dom';

package/dist/viewport/Viewport.d.ts

@@ -2,6 +2,7 @@ import { Context } from '../context/Context';
 import { ReaderSettingsManager } from '../settings/ReaderSettingsManager';
 import { ReactiveEntity } from '../utils/ReactiveEntity';
 import { AbsoluteViewport, RelativeViewport } from './types';
+import { Observable } from 'rxjs';
 type State = {
     element: HTMLElement;
     pageSize: {
@@ -14,6 +15,8 @@ type State = {
 export declare class Viewport extends ReactiveEntity<State> {
     protected context: Context;
     protected settingsManager: ReaderSettingsManager;
+    private layoutSubject;
+    readonly layout$: Observable<void>;
     constructor(context: Context, settingsManager: ReaderSettingsManager);
     protected calculatePageSize(layout: {
         width: number;
@@ -30,5 +33,6 @@ export declare class Viewport extends ReactiveEntity<State> {
     };
     get scaleFactor(): number;
     get relativeViewport(): RelativeViewport;
+    destroy(): void;
 }
 export {};

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@prose-reader/core",
-  "version": "1.289.0",
+  "version": "1.291.0",
   "type": "module",
   "main": "./dist/index.umd.cjs",
   "module": "./dist/index.js",
@@ -23,8 +23,8 @@
     "tsc": "tsc"
   },
   "dependencies": {
-    "@prose-reader/cfi": "^1.289.0",
-    "@prose-reader/shared": "^1.289.0"
+    "@prose-reader/cfi": "^1.291.0",
+    "@prose-reader/shared": "^1.291.0"
   },
   "peerDependencies": {
     "rxjs": "*"
@@ -40,5 +40,5 @@
       }
     }
   },
-  "gitHead": "bad187a76f540ffe0c6dee9496c3a8e3090327dd"
+  "gitHead": "95d3d207700bd99e75fdc6a169c7102f90cc7781"
 }

package/dist/navigation/resolvers/fromOutOfBoundsSpinePosition.d.ts

@@ -1,20 +0,0 @@
-import { Spine } from '../../spine/Spine';
-import { SpineItemsManager } from '../../spine/SpineItemsManager';
-import { SpinePosition, UnboundSpinePosition } from '../../spine/types';
-export declare const NAMESPACE = "spineNavigator";
-type SharedParams = {
-    isRTL: boolean;
-    spineItemsManager: SpineItemsManager;
-    spine: Spine;
-    viewportWidth: number;
-};
-export declare function fromOutOfBoundsSpinePosition(params: SharedParams & {
-    position: SpinePosition;
-}): SpinePosition;
-export declare function fromOutOfBoundsSpinePosition(params: SharedParams & {
-    position: UnboundSpinePosition;
-}): UnboundSpinePosition;
-export declare function fromOutOfBoundsSpinePosition(params: SharedParams & {
-    position: UnboundSpinePosition | SpinePosition;
-}): UnboundSpinePosition | SpinePosition;
-export {};

package/dist/navigation/resolvers/fromUnboundSpinePosition.d.ts

@@ -1,12 +0,0 @@
-import { Spine } from '../../spine/Spine';
-import { SpineItemsManager } from '../../spine/SpineItemsManager';
-import { SpinePosition, UnboundSpinePosition } from '../../spine/types';
-export declare const NAMESPACE = "spineNavigator";
-export declare const fromUnboundSpinePosition: ({ position, isRTL, pageSizeHeight, spineItemsManager, visibleAreaRectWidth, spine, }: {
-    position: SpinePosition | UnboundSpinePosition;
-    isRTL: boolean;
-    pageSizeHeight: number;
-    spineItemsManager: SpineItemsManager;
-    visibleAreaRectWidth: number;
-    spine: Spine;
-}) => SpinePosition;