@prose-reader/core 1.200.0 → 1.202.0

package/dist/navigation/InternalNavigator.d.ts

@@ -6,9 +6,10 @@ import { SpinePosition } from '../spine/types';
 import { SpineItemPosition } from '../spineItem/types';
 import { DestroyableClass } from '../utils/DestroyableClass';
 import { Locker } from './Locker';
-import { UserNavigationEntry } from './UserNavigator';
+import { ControlledNavigationController, DeprecatedViewportPosition } from './controllers/ControlledNavigationController';
+import { ScrollNavigationController } from './controllers/ScrollNavigationController';
 import { createNavigationResolver } from './resolvers/NavigationResolver';
-import { DeprecatedViewportPosition, ViewportNavigator } from './viewport/ViewportNavigator';
+import { UserNavigationEntry } from './types';
 export type NavigationConsolidation = {
     spineItemHeight?: number;
     spineItemWidth?: number;
@@ -40,10 +41,10 @@ export declare class InternalNavigator extends DestroyableClass {
     protected settings: ReaderSettingsManager;
     protected context: Context;
     protected userNavigation$: Observable<UserNavigationEntry>;
-    protected viewportController: ViewportNavigator;
+    protected viewportController: ControlledNavigationController;
+    protected scrollNavigationController: ScrollNavigationController;
     protected navigationResolver: ReturnType<typeof createNavigationResolver>;
     protected spine: Spine;
-    protected element$: Observable<HTMLElement>;
     protected isUserLocked$: Observable<boolean>;
     navigationSubject: BehaviorSubject<InternalNavigationEntry>;
     navigated$: Observable<{
@@ -63,6 +64,6 @@ export declare class InternalNavigator extends DestroyableClass {
         id: symbol;
     }>;
     locker: Locker;
-    constructor(settings: ReaderSettingsManager, context: Context, userNavigation$: Observable<UserNavigationEntry>, viewportController: ViewportNavigator, navigationResolver: ReturnType<typeof createNavigationResolver>, spine: Spine, element$: Observable<HTMLElement>, isUserLocked$: Observable<boolean>);
+    constructor(settings: ReaderSettingsManager, context: Context, userNavigation$: Observable<UserNavigationEntry>, viewportController: ControlledNavigationController, scrollNavigationController: ScrollNavigationController, navigationResolver: ReturnType<typeof createNavigationResolver>, spine: Spine, isUserLocked$: Observable<boolean>);
     get navigation(): InternalNavigationEntry;
 }

package/dist/navigation/Navigator.d.ts

@@ -1,31 +1,34 @@
 import { Context } from '../context/Context';
-import { SpineItemsManager } from '../spine/SpineItemsManager';
-import { BehaviorSubject } from 'rxjs';
-import { Spine } from '../spine/Spine';
-import { ReaderSettingsManager } from '../settings/ReaderSettingsManager';
 import { HookManager } from '../hooks/HookManager';
-import { ViewportNavigator } from './viewport/ViewportNavigator';
+import { ReaderSettingsManager } from '../settings/ReaderSettingsManager';
+import { Spine } from '../spine/Spine';
+import { SpineItemsManager } from '../spine/SpineItemsManager';
+import { Viewport } from '../viewport/Viewport';
 import { InternalNavigator } from './InternalNavigator';
-export declare const createNavigator: ({ spineItemsManager, context, parentElement$, hookManager, spine, settings, }: {
+import { Locker } from './Locker';
+import { ControlledNavigationController } from './controllers/ControlledNavigationController';
+import { ScrollNavigationController } from './controllers/ScrollNavigationController';
+import { UserNavigationEntry } from './types';
+export declare const createNavigator: ({ spineItemsManager, context, hookManager, spine, settings, viewport, }: {
     spineItemsManager: SpineItemsManager;
     context: Context;
-    parentElement$: BehaviorSubject<HTMLElement | undefined>;
     hookManager: HookManager;
     spine: Spine;
     settings: ReaderSettingsManager;
+    viewport: Viewport;
 }) => {
     destroy: () => void;
     getNavigation: () => import('./InternalNavigator').InternalNavigationEntry;
     internalNavigator: InternalNavigator;
-    viewportNavigator: ViewportNavigator;
-    element$: BehaviorSubject<HTMLElement>;
-    isLocked$: import('rxjs').Observable<boolean>;
+    scrollNavigationController: ScrollNavigationController;
+    controlledNavigationController: ControlledNavigationController;
+    locker: Locker;
     viewportState$: import('rxjs').Observable<"free" | "busy">;
-    navigate: (to: import('./UserNavigator').UserNavigationEntry) => void;
+    navigate: (to: UserNavigationEntry) => void;
     lock(): () => void;
     navigationResolver: {
         getNavigationForUrl: (url: string | URL) => {
-            position: import('./viewport/ViewportNavigator').DeprecatedViewportPosition;
+            position: import('./controllers/ControlledNavigationController').DeprecatedViewportPosition;
             spineItemId: string;
         } | undefined;
         getNavigationForSpineItemPage: (params: Omit<Parameters<typeof import('./resolvers/getNavigationForSpineItemPage').getNavigationForSpineItemPage>[0], "context" | "spineItemsManager" | "spineItemNavigationResolver" | "spineLocator">) => import('../spine/types').SpinePosition;
@@ -33,13 +36,13 @@ export declare const createNavigator: ({ spineItemsManager, context, parentEleme
             spineItemPosition: import('../spineItem/types').SpineItemPosition;
             spineItem: import('..').SpineItem;
         }) => import('../spine/types').SpinePosition;
-        getNavigationForCfi: (cfi: string) => import('./viewport/ViewportNavigator').DeprecatedViewportPosition | undefined;
-        getNavigationForLastPage: (spineItem: import('..').SpineItem) => import('./viewport/ViewportNavigator').DeprecatedViewportPosition;
-        getNavigationForSpineIndexOrId: (indexOrId: number | string | import('..').SpineItem) => import('./viewport/ViewportNavigator').DeprecatedViewportPosition;
-        getNavigationForPosition: (viewportPosition: import('./viewport/ViewportNavigator').DeprecatedViewportPosition | import('../spine/types').SpinePosition) => import('../spine/types').SpinePosition;
-        getMostPredominantNavigationForPosition: (viewportPosition: import('./viewport/ViewportNavigator').DeprecatedViewportPosition) => import('./viewport/ViewportNavigator').DeprecatedViewportPosition;
-        getAdjustedPositionWithSafeEdge: (position: import('./viewport/ViewportNavigator').DeprecatedViewportPosition | import('../spine/types').SpinePosition) => import('../spine/types').SpinePosition;
-        isNavigationGoingForwardFrom: (to: import('./viewport/ViewportNavigator').DeprecatedViewportPosition, from: import('./viewport/ViewportNavigator').DeprecatedViewportPosition) => boolean;
+        getNavigationForCfi: (cfi: string) => import('./controllers/ControlledNavigationController').DeprecatedViewportPosition | undefined;
+        getNavigationForLastPage: (spineItem: import('..').SpineItem) => import('./controllers/ControlledNavigationController').DeprecatedViewportPosition;
+        getNavigationForSpineIndexOrId: (indexOrId: number | string | import('..').SpineItem) => import('./controllers/ControlledNavigationController').DeprecatedViewportPosition;
+        getNavigationForPosition: (viewportPosition: import('./controllers/ControlledNavigationController').DeprecatedViewportPosition | import('../spine/types').SpinePosition) => import('../spine/types').SpinePosition;
+        getMostPredominantNavigationForPosition: (viewportPosition: import('./controllers/ControlledNavigationController').DeprecatedViewportPosition) => import('./controllers/ControlledNavigationController').DeprecatedViewportPosition;
+        getAdjustedPositionWithSafeEdge: (position: import('./controllers/ControlledNavigationController').DeprecatedViewportPosition | import('../spine/types').SpinePosition) => import('../spine/types').SpinePosition;
+        isNavigationGoingForwardFrom: (to: import('./controllers/ControlledNavigationController').DeprecatedViewportPosition, from: import('./controllers/ControlledNavigationController').DeprecatedViewportPosition) => boolean;
         arePositionsDifferent: (a: {
             x: number;
             y: number;
@@ -47,7 +50,7 @@ export declare const createNavigator: ({ spineItemsManager, context, parentEleme
             x: number;
             y: number;
         }) => boolean;
-        getAdjustedPositionForSpread: (position: import('./viewport/ViewportNavigator').DeprecatedViewportPosition | import('../spine/types').SpinePosition) => import('../spine/types').SpinePosition;
+        getAdjustedPositionForSpread: (position: import('./controllers/ControlledNavigationController').DeprecatedViewportPosition | import('../spine/types').SpinePosition) => import('../spine/types').SpinePosition;
         spineItemNavigator: {
             getNavigationForLastPage: (spineItem: import('..').SpineItem) => import('../spineItem/types').SpineItemPosition;
             getNavigationForPosition: (spineItem: import('..').SpineItem, position: import('../spineItem/types').SpineItemPosition) => import('../spineItem/types').SpineItemPosition;
@@ -58,6 +61,5 @@ export declare const createNavigator: ({ spineItemsManager, context, parentEleme
         position: import('../spine/types').SpinePosition;
         id: symbol;
     }>;
-    getElement: () => HTMLElement;
 };
 export type Navigator = ReturnType<typeof createNavigator>;

package/dist/navigation/UserScrollNavigation.d.ts

@@ -0,0 +1,18 @@
+import { Subject } from 'rxjs';
+import { Context } from '../context/Context';
+import { ReaderSettingsManager } from '../settings/ReaderSettingsManager';
+import { Spine } from '../spine/Spine';
+import { DestroyableClass } from '../utils/DestroyableClass';
+import { Locker } from './Locker';
+import { ScrollNavigationController } from './controllers/ScrollNavigationController';
+import { UserNavigationEntry } from './types';
+export declare class UserScrollNavigation extends DestroyableClass {
+    protected settings: ReaderSettingsManager;
+    protected context: Context;
+    protected spine: Spine;
+    protected scrollNavigationController: ScrollNavigationController;
+    protected locker: Locker;
+    protected navigationSubject: Subject<UserNavigationEntry>;
+    navigation$: import('rxjs').Observable<UserNavigationEntry>;
+    constructor(settings: ReaderSettingsManager, context: Context, spine: Spine, scrollNavigationController: ScrollNavigationController, locker: Locker);
+}

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

@@ -6,7 +6,7 @@ export declare const consolidateWithPagination: (context: Context, navigation$:
     meta: {
         triggeredBy: "pagination";
     };
-    position: import('../../spine/types').SpinePosition | import('../viewport/ViewportNavigator').DeprecatedViewportPosition;
+    position: import('../../spine/types').SpinePosition | import('../controllers/ControlledNavigationController').DeprecatedViewportPosition;
     id: symbol;
     type: `api` | `scroll`;
     animation?: boolean | `turn` | `snap`;

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

@@ -1,6 +1,6 @@
 import { Observable } from 'rxjs';
-import { UserNavigationEntry } from '../UserNavigator';
 import { InternalNavigationEntry, InternalNavigationInput } from '../InternalNavigator';
+import { UserNavigationEntry } from '../types';
 export declare const mapUserNavigationToInternal: (stream: Observable<[UserNavigationEntry, InternalNavigationEntry]>) => Observable<{
     navigation: InternalNavigationInput;
     previousNavigation: InternalNavigationEntry;

package/dist/navigation/{viewport/ViewportNavigator.d.ts → controllers/ControlledNavigationController.d.ts}

@@ -5,23 +5,23 @@ import { ReaderSettingsManager } from '../../settings/ReaderSettingsManager';
 import { Spine } from '../../spine/Spine';
 import { SpinePosition } from '../../spine/types';
 import { DestroyableClass } from '../../utils/DestroyableClass';
+import { Viewport } from '../../viewport/Viewport';
 export type DeprecatedViewportPosition = SpinePosition;
 export type ViewportNavigationEntry = {
     position: SpinePosition;
     animation?: boolean | "turn" | "snap";
 };
-export declare class ViewportNavigator extends DestroyableClass {
+export declare class ControlledNavigationController extends DestroyableClass {
     protected settings: ReaderSettingsManager;
-    protected viewportElement$: BehaviorSubject<HTMLElement>;
     protected hookManager: HookManager;
     protected context: Context;
     protected spine: Spine;
+    protected viewport: Viewport;
     protected navigateSubject: Subject<ViewportNavigationEntry>;
-    protected scrollingSubject: BehaviorSubject<boolean>;
+    readonly element$: BehaviorSubject<HTMLElement>;
     isNavigating$: Observable<boolean>;
-    isScrolling$: Observable<boolean>;
     layout$: Observable<unknown>;
-    constructor(settings: ReaderSettingsManager, viewportElement$: BehaviorSubject<HTMLElement>, hookManager: HookManager, context: Context, spine: Spine);
+    constructor(settings: ReaderSettingsManager, hookManager: HookManager, context: Context, spine: Spine, viewport: Viewport);
     protected setViewportPosition(position: SpinePosition): void;
     navigate(navigation: ViewportNavigationEntry): void;
     get viewportPosition(): SpinePosition;

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

@@ -0,0 +1,27 @@
+import { BehaviorSubject, Observable, Subject } from 'rxjs';
+import { Context } from '../../context/Context';
+import { HookManager } from '../../hooks/HookManager';
+import { ReaderSettingsManager } from '../../settings/ReaderSettingsManager';
+import { Spine } from '../../spine/Spine';
+import { SpinePosition } from '../../spine/types';
+import { ReactiveEntity } from '../../utils/ReactiveEntity';
+import { Viewport } from '../../viewport/Viewport';
+import { ViewportNavigationEntry } from './ControlledNavigationController';
+export declare class ScrollNavigationController extends ReactiveEntity<{
+    element: HTMLElement | undefined;
+}> {
+    protected viewport: Viewport;
+    protected settings: ReaderSettingsManager;
+    protected hookManager: HookManager;
+    protected spine: Spine;
+    protected context: Context;
+    protected navigateSubject: Subject<ViewportNavigationEntry>;
+    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 }: ViewportNavigationEntry) => void;
+    navigate(navigation: ViewportNavigationEntry): void;
+    get viewportPosition(): SpinePosition;
+}

package/dist/navigation/{viewport → controllers}/getScaledDownPosition.d.ts

@@ -1,5 +1,5 @@
 import { SpinePosition } from '../../spine/types';
-import { DeprecatedViewportPosition } from './ViewportNavigator';
+import { DeprecatedViewportPosition } from './ControlledNavigationController';
 export declare const getScaledDownPosition: ({ position: { x, y }, spineElement, element, }: {
     position: DeprecatedViewportPosition;
     spineElement: HTMLElement;

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

@@ -6,7 +6,7 @@ import { SpineLocator } from '../../spine/locator/SpineLocator';
 import { SpinePosition } from '../../spine/types';
 import { SpineItem } from '../../spineItem/SpineItem';
 import { SpineItemPosition } from '../../spineItem/types';
-import { DeprecatedViewportPosition } from '../viewport/ViewportNavigator';
+import { DeprecatedViewportPosition } from '../controllers/ControlledNavigationController';
 import { getNavigationForSpineItemPage } from './getNavigationForSpineItemPage';
 export declare const NAMESPACE = "spineNavigator";
 export type NavigationResolver = ReturnType<typeof createNavigationResolver>;

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

@@ -1,5 +1,5 @@
 import { SpinePosition } from '../../spine/types';
-import { DeprecatedViewportPosition } from '../viewport/ViewportNavigator';
+import { DeprecatedViewportPosition } from '../controllers/ControlledNavigationController';
 export declare const getAdjustedPositionForSpread: ({ position: { x, y }, pageSizeWidth, visibleAreaRectWidth, }: {
     position: DeprecatedViewportPosition | SpinePosition;
     pageSizeWidth: number;

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

@@ -1,7 +1,7 @@
 import { SpineItemsManager } from '../../spine/SpineItemsManager';
 import { SpineLayout } from '../../spine/SpineLayout';
 import { SpinePosition } from '../../spine/types';
-import { DeprecatedViewportPosition } from '../viewport/ViewportNavigator';
+import { DeprecatedViewportPosition } from '../controllers/ControlledNavigationController';
 export declare const NAMESPACE = "spineNavigator";
 export declare const getAdjustedPositionWithSafeEdge: ({ position, isRTL, pageSizeHeight, spineItemsManager, visibleAreaRectWidth, spineLayout, }: {
     position: DeprecatedViewportPosition | SpinePosition;

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

@@ -2,7 +2,7 @@ import { Context } from '../../context/Context';
 import { SpineLocator } from '../../spine/locator/SpineLocator';
 import { SpinePosition } from '../../spine/types';
 import { SpineItemNavigationResolver } from '../../spineItem/navigationResolver';
-import { DeprecatedViewportPosition } from '../viewport/ViewportNavigator';
+import { DeprecatedViewportPosition } from '../controllers/ControlledNavigationController';
 export declare const getNavigationForPosition: ({ viewportPosition, spineLocator, context, spineItemNavigationResolver, }: {
     viewportPosition: DeprecatedViewportPosition | SpinePosition;
     spineLocator: SpineLocator;

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

@@ -3,7 +3,7 @@ import { SpineItemsManager } from '../../spine/SpineItemsManager';
 import { SpineLocator } from '../../spine/locator/SpineLocator';
 import { SpineItem } from '../../spineItem/SpineItem';
 import { SpineItemNavigationResolver } from '../../spineItem/navigationResolver';
-import { DeprecatedViewportPosition } from '../viewport/ViewportNavigator';
+import { DeprecatedViewportPosition } from '../controllers/ControlledNavigationController';
 export declare const getNavigationForSpineItemPage: ({ pageIndex, spineItemsManager, spineItemId, context, spineLocator, spineItemNavigationResolver, }: {
     pageIndex: number;
     spineItemId: SpineItem | number | string;

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

@@ -1,7 +1,7 @@
 import { Context } from '../../context/Context';
 import { SpineItemsManager } from '../../spine/SpineItemsManager';
 import { SpineLocator } from '../../spine/locator/SpineLocator';
-import { DeprecatedViewportPosition } from '../viewport/ViewportNavigator';
+import { DeprecatedViewportPosition } from '../controllers/ControlledNavigationController';
 export declare const getNavigationForUrl: ({ context, spineItemsManager, spineLocator, url, pageSizeWidth, visibleAreaRectWidth, }: {
     url: string | URL;
     spineItemsManager: SpineItemsManager;

package/dist/navigation/restoration/restorePosition.d.ts

@@ -7,8 +7,8 @@ import { SpineLocator } from '../../spine/locator/SpineLocator';
 import { SpinePosition } from '../../spine/types';
 import { SpineItemLocator } from '../../spineItem/locationResolver';
 import { InternalNavigationEntry } from '../InternalNavigator';
+import { DeprecatedViewportPosition } from '../controllers/ControlledNavigationController';
 import { NavigationResolver } from '../resolvers/NavigationResolver';
-import { DeprecatedViewportPosition } from '../viewport/ViewportNavigator';
 export declare const restorePosition: ({ navigation, spineItemsManager, settings, spineLocator, navigationResolver, spineLayout, }: {
     spineLocator: SpineLocator;
     settings: ReaderSettingsManager;

package/dist/navigation/tests/utils.d.ts

@@ -4,15 +4,4 @@ import { HookManager } from '../../hooks/HookManager';
 import { ReaderSettingsManager } from '../../settings/ReaderSettingsManager';
 import { Spine } from '../../spine/Spine';
 import { SpineItemsManager } from '../../spine/SpineItemsManager';
-import { InternalNavigator } from '../InternalNavigator';
-import { UserNavigator } from '../UserNavigator';
 export declare const generateItems: (size: number, number: number, context: Context, settings: ReaderSettingsManager, hookManager: HookManager, spine: Spine, spineItemsManager: SpineItemsManager) => SpineItem[];
-export declare const createNavigator: () => {
-    internalNavigator: InternalNavigator;
-    userNavigator: UserNavigator;
-    context: Context;
-    spineItemsManagerMock: SpineItemsManager;
-    spine: Spine;
-    settings: ReaderSettingsManager;
-    hookManager: HookManager<import('../../hooks/types').CoreHook>;
-};

package/dist/navigation/types.d.ts

@@ -0,0 +1,11 @@
+import { SpinePosition } from '../spine/types';
+import { DeprecatedViewportPosition } from './controllers/ControlledNavigationController';
+export type UserNavigationEntry = {
+    position?: DeprecatedViewportPosition | SpinePosition;
+    spineItem?: number | string;
+    url?: string | URL;
+    cfi?: string;
+    animation?: boolean | "turn" | "snap";
+    type?: "api" | "scroll";
+    direction?: "left" | "right" | "top" | "bottom";
+};

package/dist/reader.d.ts

@@ -7,6 +7,7 @@ import { CoreInputSettings } from './settings/types';
 import { Spine } from './spine/Spine';
 import { SpineItemsManager } from './spine/SpineItemsManager';
 import { SpineItem } from './spineItem/SpineItem';
+import { Viewport } from './viewport/Viewport';
 export type CreateReaderOptions = Partial<CoreInputSettings>;
 export type CreateReaderParameters = CreateReaderOptions;
 export type ContextSettings = Partial<CoreInputSettings>;
@@ -47,15 +48,18 @@ export declare const createReader: (inputSettings: CreateReaderOptions) => {
         } | undefined;
     };
     navigation: {
-        viewportBusy$: import('rxjs').Observable<"busy">;
-        getViewportPosition: () => import('./spine/types').SpinePosition;
+        destroy: () => void;
         getNavigation: () => import('./navigation/InternalNavigator').InternalNavigationEntry;
-        getElement: () => HTMLElement;
-        navigate: (to: import('./navigation/UserNavigator').UserNavigationEntry) => void;
-        lock: () => () => void;
+        internalNavigator: import('./navigation/InternalNavigator').InternalNavigator;
+        scrollNavigationController: import('./navigation/controllers/ScrollNavigationController').ScrollNavigationController;
+        controlledNavigationController: import('./navigation/controllers/ControlledNavigationController').ControlledNavigationController;
+        locker: import('./navigation/Locker').Locker;
+        viewportState$: import('rxjs').Observable<"free" | "busy">;
+        navigate: (to: import('./navigation/types').UserNavigationEntry) => void;
+        lock(): () => void;
         navigationResolver: {
             getNavigationForUrl: (url: string | URL) => {
-                position: import('./navigation/viewport/ViewportNavigator').DeprecatedViewportPosition;
+                position: import('./navigation/controllers/ControlledNavigationController').DeprecatedViewportPosition;
                 spineItemId: string;
             } | undefined;
             getNavigationForSpineItemPage: (params: Omit<Parameters<typeof import('./navigation/resolvers/getNavigationForSpineItemPage').getNavigationForSpineItemPage>[0], "context" | "spineItemsManager" | "spineItemNavigationResolver" | "spineLocator">) => import('./spine/types').SpinePosition;
@@ -63,13 +67,13 @@ export declare const createReader: (inputSettings: CreateReaderOptions) => {
                 spineItemPosition: import('./spineItem/types').SpineItemPosition;
                 spineItem: SpineItem;
             }) => import('./spine/types').SpinePosition;
-            getNavigationForCfi: (cfi: string) => import('./navigation/viewport/ViewportNavigator').DeprecatedViewportPosition | undefined;
-            getNavigationForLastPage: (spineItem: SpineItem) => import('./navigation/viewport/ViewportNavigator').DeprecatedViewportPosition;
-            getNavigationForSpineIndexOrId: (indexOrId: number | string | SpineItem) => import('./navigation/viewport/ViewportNavigator').DeprecatedViewportPosition;
-            getNavigationForPosition: (viewportPosition: import('./navigation/viewport/ViewportNavigator').DeprecatedViewportPosition | import('./spine/types').SpinePosition) => import('./spine/types').SpinePosition;
-            getMostPredominantNavigationForPosition: (viewportPosition: import('./navigation/viewport/ViewportNavigator').DeprecatedViewportPosition) => import('./navigation/viewport/ViewportNavigator').DeprecatedViewportPosition;
-            getAdjustedPositionWithSafeEdge: (position: import('./navigation/viewport/ViewportNavigator').DeprecatedViewportPosition | import('./spine/types').SpinePosition) => import('./spine/types').SpinePosition;
-            isNavigationGoingForwardFrom: (to: import('./navigation/viewport/ViewportNavigator').DeprecatedViewportPosition, from: import('./navigation/viewport/ViewportNavigator').DeprecatedViewportPosition) => boolean;
+            getNavigationForCfi: (cfi: string) => import('./navigation/controllers/ControlledNavigationController').DeprecatedViewportPosition | undefined;
+            getNavigationForLastPage: (spineItem: SpineItem) => import('./navigation/controllers/ControlledNavigationController').DeprecatedViewportPosition;
+            getNavigationForSpineIndexOrId: (indexOrId: number | string | SpineItem) => import('./navigation/controllers/ControlledNavigationController').DeprecatedViewportPosition;
+            getNavigationForPosition: (viewportPosition: import('./navigation/controllers/ControlledNavigationController').DeprecatedViewportPosition | import('./spine/types').SpinePosition) => import('./spine/types').SpinePosition;
+            getMostPredominantNavigationForPosition: (viewportPosition: import('./navigation/controllers/ControlledNavigationController').DeprecatedViewportPosition) => import('./navigation/controllers/ControlledNavigationController').DeprecatedViewportPosition;
+            getAdjustedPositionWithSafeEdge: (position: import('./navigation/controllers/ControlledNavigationController').DeprecatedViewportPosition | import('./spine/types').SpinePosition) => import('./spine/types').SpinePosition;
+            isNavigationGoingForwardFrom: (to: import('./navigation/controllers/ControlledNavigationController').DeprecatedViewportPosition, from: import('./navigation/controllers/ControlledNavigationController').DeprecatedViewportPosition) => boolean;
             arePositionsDifferent: (a: {
                 x: number;
                 y: number;
@@ -77,13 +81,17 @@ export declare const createReader: (inputSettings: CreateReaderOptions) => {
                 x: number;
                 y: number;
             }) => boolean;
-            getAdjustedPositionForSpread: (position: import('./navigation/viewport/ViewportNavigator').DeprecatedViewportPosition | import('./spine/types').SpinePosition) => import('./spine/types').SpinePosition;
+            getAdjustedPositionForSpread: (position: import('./navigation/controllers/ControlledNavigationController').DeprecatedViewportPosition | import('./spine/types').SpinePosition) => import('./spine/types').SpinePosition;
             spineItemNavigator: {
                 getNavigationForLastPage: (spineItem: SpineItem) => import('./spineItem/types').SpineItemPosition;
                 getNavigationForPosition: (spineItem: SpineItem, position: import('./spineItem/types').SpineItemPosition) => import('./spineItem/types').SpineItemPosition;
                 getNavigationFromNode: (spineItem: SpineItem, node: Node, offset: number) => import('./spineItem/types').SpineItemPosition;
             };
         };
+        navigation$: import('rxjs').Observable<{
+            position: import('./spine/types').SpinePosition;
+            id: symbol;
+        }>;
     };
     spineItemsObserver: import('./spine/SpineItemsObserver').SpineItemsObserver;
     spineItemsManager: SpineItemsManager;
@@ -95,6 +103,7 @@ export declare const createReader: (inputSettings: CreateReaderOptions) => {
         state$: import('rxjs').Observable<import('./pagination/Pagination').PaginationInfo>;
     };
     settings: SettingsInterface<NonNullable<CoreInputSettings>, NonNullable<import('./settings/types').CoreOutputSettings | undefined>>;
+    viewport: Viewport;
     element$: import('rxjs').Observable<HTMLElement>;
     viewportState$: import('rxjs').Observable<"free" | "busy">;
     viewportFree$: import('rxjs').Observable<"free">;

package/dist/settings/SettingsManagerOverload.d.ts

@@ -18,6 +18,7 @@ export declare abstract class SettingsManagerOverload<InputSettings, OutputSetti
     };
     update(settings: Partial<InputSettings & ParentInputSettings>): void;
     get values(): ParentOutputSettings & OutputSettings;
+    watch<K extends keyof ObservedValueOf<typeof this.values$>>(key: K): Observable<(ParentOutputSettings & OutputSettings)[K]>;
     watch<K extends keyof ObservedValueOf<typeof this.values$>>(keys: K[]): Observable<Pick<ParentOutputSettings & OutputSettings, K>>;
     destroy(): void;
 }

package/dist/spine/Spine.d.ts

@@ -1,15 +1,16 @@
 import { BehaviorSubject, Observable } from 'rxjs';
 import { Context } from '../context/Context';
+import { HookManager } from '../hooks/HookManager';
 import { Pagination } from '../pagination/Pagination';
-import { SpineItemsManager } from './SpineItemsManager';
-import { SpineLocator } from './locator/SpineLocator';
-import { createSpineItemLocator as createSpineItemLocationResolver } from '../spineItem/locationResolver';
 import { ReaderSettingsManager } from '../settings/ReaderSettingsManager';
-import { HookManager } from '../hooks/HookManager';
-import { SpineItemsLoader } from './loader/SpineItemsLoader';
+import { createSpineItemLocator as createSpineItemLocationResolver } from '../spineItem/locationResolver';
 import { DestroyableClass } from '../utils/DestroyableClass';
+import { Viewport } from '../viewport/Viewport';
+import { SpineItemsManager } from './SpineItemsManager';
 import { SpineItemsObserver } from './SpineItemsObserver';
 import { SpineLayout } from './SpineLayout';
+import { SpineItemsLoader } from './loader/SpineItemsLoader';
+import { SpineLocator } from './locator/SpineLocator';
 export declare class Spine extends DestroyableClass {
     protected parentElement$: Observable<HTMLElement>;
     protected context: Context;
@@ -18,13 +19,14 @@ export declare class Spine extends DestroyableClass {
     spineItemLocator: ReturnType<typeof createSpineItemLocationResolver>;
     protected settings: ReaderSettingsManager;
     protected hookManager: HookManager;
+    protected viewport: Viewport;
     protected elementSubject: BehaviorSubject<HTMLElement>;
     readonly spineItemsLoader: SpineItemsLoader;
     locator: SpineLocator;
     spineItemsObserver: SpineItemsObserver;
     spineLayout: SpineLayout;
     element$: Observable<HTMLElement>;
-    constructor(parentElement$: Observable<HTMLElement>, context: Context, pagination: Pagination, spineItemsManager: SpineItemsManager, spineItemLocator: ReturnType<typeof createSpineItemLocationResolver>, settings: ReaderSettingsManager, hookManager: HookManager);
+    constructor(parentElement$: Observable<HTMLElement>, context: Context, pagination: Pagination, spineItemsManager: SpineItemsManager, spineItemLocator: ReturnType<typeof createSpineItemLocationResolver>, settings: ReaderSettingsManager, hookManager: HookManager, viewport: Viewport);
     get element(): HTMLElement;
     layout(): void;
     destroy(): void;

package/dist/spine/SpineLayout.d.ts

@@ -3,6 +3,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 { SpineItemsManager } from './SpineItemsManager';
 import { SpineItemSpineLayout } from './types';
 export type PageLayoutInformation = {
@@ -17,10 +18,11 @@ export declare class SpineLayout extends DestroyableClass {
     protected spineItemsManager: SpineItemsManager;
     protected context: Context;
     protected settings: ReaderSettingsManager;
+    protected viewport: Viewport;
     protected layoutSubject: Subject<unknown>;
     protected spineItemsRelativeLayouts: SpineItemSpineLayout[];
     readonly layout$: Observable<unknown>;
-    constructor(spineItemsManager: SpineItemsManager, context: Context, settings: ReaderSettingsManager);
+    constructor(spineItemsManager: SpineItemsManager, context: Context, settings: ReaderSettingsManager, viewport: Viewport);
     layout(): void;
     getSpineItemSpineLayoutInfo(spineItemOrIndex: SpineItem | number | string | undefined): SpineItemSpineLayout;
     get numberOfPages(): number;

package/dist/spine/layout/layoutItem.d.ts

@@ -2,9 +2,10 @@ import { Observable } from 'rxjs';
 import { SpineItem } from '../..';
 import { Context } from '../../context/Context';
 import { ReaderSettingsManager } from '../../settings/ReaderSettingsManager';
+import { Viewport } from '../../viewport/Viewport';
 import { SpineItemsManager } from '../SpineItemsManager';
 import { SpineItemSpineLayout } from '../types';
-export declare const layoutItem: ({ horizontalOffset, verticalOffset, context, spineItemsManager, isGloballyPrePaginated, settings, index, item, }: {
+export declare const layoutItem: ({ horizontalOffset, verticalOffset, context, spineItemsManager, isGloballyPrePaginated, settings, index, item, viewport, }: {
     horizontalOffset: number;
     verticalOffset: number;
     context: Context;
@@ -13,6 +14,7 @@ export declare const layoutItem: ({ horizontalOffset, verticalOffset, context, s
     settings: ReaderSettingsManager;
     item: SpineItem;
     index: number;
+    viewport: Viewport;
 }) => Observable<{
     horizontalOffset: number;
     verticalOffset: number;

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

@@ -1,3 +1,4 @@
+import { SpineItem } from '../..';
 import { Context } from '../../context/Context';
 import { ReaderSettingsManager } from '../../settings/ReaderSettingsManager';
 import { DestroyableClass } from '../../utils/DestroyableClass';
@@ -12,6 +13,6 @@ export declare class SpineItemsLoader extends DestroyableClass {
     protected spineLayout: SpineLayout;
     private forcedOpenSubject;
     constructor(context: Context, spineItemsManager: SpineItemsManager, spineLocator: SpineLocator, settings: ReaderSettingsManager, spineLayout: SpineLayout);
-    forceOpen(spineItems: number[]): () => void;
+    forceOpen(spineItems: (number | SpineItem)[]): () => void;
     destroy(): void;
 }

package/dist/spine/locator/SpineLocator.d.ts

@@ -3,6 +3,7 @@ import { ReaderSettingsManager } from '../../settings/ReaderSettingsManager';
 import { SpineItem } from '../../spineItem/SpineItem';
 import { createSpineItemLocator } from '../../spineItem/locationResolver';
 import { SpineItemPosition } from '../../spineItem/types';
+import { Viewport } from '../../viewport/Viewport';
 import { ViewportSlicePosition } from '../../viewport/types';
 import { SpineItemsManager } from '../SpineItemsManager';
 import { SpineLayout } from '../SpineLayout';
@@ -11,12 +12,13 @@ import { getAbsolutePageIndexFromPageIndex } from './getAbsolutePageIndexFromPag
 import { getSpineInfoFromAbsolutePageIndex } from './getSpineInfoFromAbsolutePageIndex';
 import { getVisibleSpineItemsFromPosition } from './getVisibleSpineItemsFromPosition';
 export type SpineLocator = ReturnType<typeof createSpineLocator>;
-export declare const createSpineLocator: ({ spineItemsManager, context, spineItemLocator, settings, spineLayout, }: {
+export declare const createSpineLocator: ({ spineItemsManager, context, spineItemLocator, settings, spineLayout, viewport, }: {
     spineItemsManager: SpineItemsManager;
     context: Context;
     spineItemLocator: ReturnType<typeof createSpineItemLocator>;
     settings: ReaderSettingsManager;
     spineLayout: SpineLayout;
+    viewport: Viewport;
 }) => {
     getSpinePositionFromSpineItemPosition: ({ spineItem, spineItemPosition, }: {
         spineItemPosition: SpineItemPosition;
@@ -34,19 +36,23 @@ export declare const createSpineLocator: ({ spineItemsManager, context, spineIte
     getSpineItemFromPosition: (position: SpinePosition) => SpineItem | undefined;
     getSpineItemFromIframe: (iframe: Element) => SpineItem | undefined;
     getSpineItemPageIndexFromNode: (node: Node, offset: number | undefined, spineItemOrIndex: SpineItem | number) => number | undefined;
-    getVisibleSpineItemsFromPosition: (params: Omit<Parameters<typeof getVisibleSpineItemsFromPosition>[0], "context" | "spineItemsManager" | "settings" | "spineLayout">) => {
+    getVisibleSpineItemsFromPosition: (params: Omit<Parameters<typeof getVisibleSpineItemsFromPosition>[0], "spineItemsManager" | "settings" | "spineLayout" | "viewport">) => {
         beginIndex: number;
         endIndex: number;
     } | undefined;
-    getVisiblePagesFromViewportPosition: ({ position, threshold, spineItem, restrictToScreen, useAbsoluteViewport, }: {
+    getVisiblePagesFromViewportPosition: (params: Omit<Parameters<({ position, threshold, spineItem, restrictToScreen, useAbsoluteViewport, viewport, }: {
         position: SpinePosition;
         threshold: number;
         spineItem: SpineItem;
         restrictToScreen?: boolean;
         useAbsoluteViewport?: boolean;
+        viewport: Viewport;
     }) => {
         beginPageIndex: number;
         endPageIndex: number;
+    } | undefined>[0], "viewport">) => {
+        beginPageIndex: number;
+        endPageIndex: number;
     } | undefined;
     isPositionWithinSpineItem: (position: ViewportSlicePosition | SpinePosition, spineItem: SpineItem) => boolean;
     spineItemLocator: {

package/dist/spine/locator/getSpineItemFromPosition.d.ts

@@ -1,4 +1,4 @@
-import { DeprecatedViewportPosition } from '../../navigation/viewport/ViewportNavigator';
+import { DeprecatedViewportPosition } from '../../navigation/controllers/ControlledNavigationController';
 import { ReaderSettingsManager } from '../../settings/ReaderSettingsManager';
 import { SpineItemsManager } from '../SpineItemsManager';
 import { SpineLayout } from '../SpineLayout';

package/dist/spine/locator/getVisibleSpineItemsFromPosition.d.ts

@@ -1,18 +1,18 @@
-import { Context } from '../../context/Context';
-import { DeprecatedViewportPosition } from '../../navigation/viewport/ViewportNavigator';
+import { DeprecatedViewportPosition } from '../../navigation/controllers/ControlledNavigationController';
 import { ReaderSettingsManager } from '../../settings/ReaderSettingsManager';
+import { Viewport } from '../../viewport/Viewport';
 import { SpineItemsManager } from '../SpineItemsManager';
 import { SpineLayout } from '../SpineLayout';
 import { SpinePosition } from '../types';
-export declare const getVisibleSpineItemsFromPosition: ({ position, threshold, restrictToScreen, spineItemsManager, context, settings, spineLayout, useAbsoluteViewport, }: {
+export declare const getVisibleSpineItemsFromPosition: ({ position, threshold, restrictToScreen, spineItemsManager, settings, spineLayout, useAbsoluteViewport, viewport, }: {
     position: DeprecatedViewportPosition | SpinePosition;
     threshold: number;
     restrictToScreen?: boolean;
     spineItemsManager: SpineItemsManager;
-    context: Context;
     settings: ReaderSettingsManager;
     spineLayout: SpineLayout;
     useAbsoluteViewport?: boolean;
+    viewport: Viewport;
 }) => {
     beginIndex: number;
     endIndex: number;