@prose-reader/core 1.199.0 → 1.201.0

package/dist/navigation/InternalNavigator.d.ts

@@ -7,8 +7,9 @@ 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 { ViewportNavigator, ViewportPosition } from './viewport/ViewportNavigator';
 export type NavigationConsolidation = {
     spineItemHeight?: number;
     spineItemWidth?: number;
@@ -21,7 +22,7 @@ export type NavigationConsolidation = {
     directionFromLastNavigation?: "forward" | "backward" | "anchor";
 };
 export type InternalNavigationEntry = {
-    position: SpinePosition | ViewportPosition;
+    position: SpinePosition | DeprecatedViewportPosition;
     id: symbol;
     meta: {
         triggeredBy: `user` | `restoration` | `pagination`;
@@ -32,20 +33,22 @@ export type InternalNavigationEntry = {
     spineItem?: string | number;
     cfi?: string;
 } & NavigationConsolidation;
-export type InternalNavigationInput = Omit<InternalNavigationEntry, "position"> & Partial<InternalNavigationEntry>;
+export type InternalNavigationInput = Omit<InternalNavigationEntry, "position"> & {
+    position?: SpinePosition | DeprecatedViewportPosition;
+};
 export type Navigation = Pick<InternalNavigationEntry, "position" | "id">;
 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<{
-        position: SpinePosition | ViewportPosition;
+        position: SpinePosition | DeprecatedViewportPosition;
         id: symbol;
         meta: {
             triggeredBy: `user` | `restoration` | `pagination`;
@@ -57,10 +60,10 @@ export declare class InternalNavigator extends DestroyableClass {
         cfi?: string;
     } & NavigationConsolidation>;
     navigation$: Observable<{
-        position: SpinePosition | ViewportPosition;
+        position: SpinePosition;
         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,49 +1,46 @@
 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 { ControlledNavigationController } from './controllers/ControlledNavigationController';
+import { ScrollNavigationController } from './controllers/ScrollNavigationController';
+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>;
+    scrollNavigationController: ScrollNavigationController;
+    controlledNavigationController: ControlledNavigationController;
     isLocked$: import('rxjs').Observable<boolean>;
     viewportState$: import('rxjs').Observable<"free" | "busy">;
     navigate: (to: import('./UserNavigator').UserNavigationEntry) => void;
     lock(): () => void;
     navigationResolver: {
         getNavigationForUrl: (url: string | URL) => {
-            position: import('./viewport/ViewportNavigator').ViewportPosition;
+            position: import('./controllers/ControlledNavigationController').DeprecatedViewportPosition;
             spineItemId: string;
         } | undefined;
-        getNavigationForSpineItemPage: (params: Omit<Parameters<typeof import('./resolvers/getNavigationForSpineItemPage').getNavigationForSpineItemPage>[0], "context" | "spineItemsManager" | "spineItemNavigationResolver" | "spineLocator">) => import('./viewport/ViewportNavigator').ViewportPosition;
+        getNavigationForSpineItemPage: (params: Omit<Parameters<typeof import('./resolvers/getNavigationForSpineItemPage').getNavigationForSpineItemPage>[0], "context" | "spineItemsManager" | "spineItemNavigationResolver" | "spineLocator">) => import('../spine/types').SpinePosition;
         getNavigationFromSpineItemPosition: (params: {
             spineItemPosition: import('../spineItem/types').SpineItemPosition;
             spineItem: import('..').SpineItem;
-        }) => import('./viewport/ViewportNavigator').ViewportPosition;
-        getNavigationForCfi: (cfi: string) => import('./viewport/ViewportNavigator').ViewportPosition | undefined;
-        getNavigationForLastPage: (spineItem: import('..').SpineItem) => import('./viewport/ViewportNavigator').ViewportPosition;
-        getNavigationForSpineIndexOrId: (indexOrId: number | string | import('..').SpineItem) => import('./viewport/ViewportNavigator').ViewportPosition;
-        getNavigationForPosition: (viewportPosition: import('./viewport/ViewportNavigator').ViewportPosition | import('../spine/types').SpinePosition) => import('./viewport/ViewportNavigator').ViewportPosition;
-        getMostPredominantNavigationForPosition: (viewportPosition: import('./viewport/ViewportNavigator').ViewportPosition) => import('./viewport/ViewportNavigator').ViewportPosition;
-        getAdjustedPositionWithSafeEdge: (position: import('./viewport/ViewportNavigator').ViewportPosition | import('../spine/types').SpinePosition) => {
-            x: number;
-            y: number;
-        };
-        isNavigationGoingForwardFrom: (to: import('./viewport/ViewportNavigator').ViewportPosition, from: import('./viewport/ViewportNavigator').ViewportPosition) => boolean;
-        areNavigationDifferent: (a: import('./viewport/ViewportNavigator').ViewportPosition, b: import('./viewport/ViewportNavigator').ViewportPosition) => boolean;
+        }) => import('../spine/types').SpinePosition;
+        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;
@@ -51,7 +48,7 @@ export declare const createNavigator: ({ spineItemsManager, context, parentEleme
             x: number;
             y: number;
         }) => boolean;
-        getAdjustedPositionForSpread: (position: import('./viewport/ViewportNavigator').ViewportPosition | import('../spine/types').SpinePosition) => import('./viewport/ViewportNavigator').ViewportPosition;
+        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;
@@ -59,9 +56,8 @@ export declare const createNavigator: ({ spineItemsManager, context, parentEleme
         };
     };
     navigation$: import('rxjs').Observable<{
-        position: import('../spine/types').SpinePosition | import('./viewport/ViewportNavigator').ViewportPosition;
+        position: import('../spine/types').SpinePosition;
         id: symbol;
     }>;
-    getElement: () => HTMLElement;
 };
 export type Navigator = ReturnType<typeof createNavigator>;

package/dist/navigation/UserNavigator.d.ts

@@ -1,12 +1,13 @@
 import { Observable, Subject } from 'rxjs';
-import { ReaderSettingsManager } from '../settings/ReaderSettingsManager';
-import { ViewportPosition } from './viewport/ViewportNavigator';
 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 { Locker } from './Locker';
-import { Spine } from '../spine/Spine';
+import { DeprecatedViewportPosition } from './controllers/ControlledNavigationController';
 export type UserNavigationEntry = {
-    position?: ViewportPosition;
+    position?: DeprecatedViewportPosition | SpinePosition;
     spineItem?: number | string;
     url?: string | URL;
     cfi?: string;
@@ -16,13 +17,13 @@ export type UserNavigationEntry = {
 };
 export declare class UserNavigator extends DestroyableClass {
     protected settings: ReaderSettingsManager;
-    protected element$: Observable<HTMLElement>;
+    protected scrollNavigatorElement$: Observable<HTMLElement | undefined>;
     protected context: Context;
     protected scrollHappeningFromBrowser$: Observable<unknown>;
     protected spine: Spine;
     protected navigationSubject: Subject<UserNavigationEntry>;
     locker: Locker;
     navigation$: Observable<UserNavigationEntry>;
-    constructor(settings: ReaderSettingsManager, element$: Observable<HTMLElement>, context: Context, scrollHappeningFromBrowser$: Observable<unknown>, spine: Spine);
+    constructor(settings: ReaderSettingsManager, scrollNavigatorElement$: Observable<HTMLElement | undefined>, context: Context, scrollHappeningFromBrowser$: Observable<unknown>, spine: Spine);
     navigate(to: UserNavigationEntry): void;
 }

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').ViewportPosition;
+    position: import('../../spine/types').SpinePosition | import('../controllers/ControlledNavigationController').DeprecatedViewportPosition;
     id: symbol;
     type: `api` | `scroll`;
     animation?: boolean | `turn` | `snap`;

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

@@ -1,6 +1,6 @@
 import { Observable } from 'rxjs';
-import { InternalNavigationEntry, InternalNavigationInput } from '../InternalNavigator';
 import { SpineItemsManager } from '../../spine/SpineItemsManager';
+import { InternalNavigationEntry, InternalNavigationInput } from '../InternalNavigator';
 import { NavigationResolver } from '../resolvers/NavigationResolver';
 export declare const withFallbackPosition: ({ spineItemsManager, navigationResolver, }: {
     spineItemsManager: SpineItemsManager;

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

@@ -1,10 +1,10 @@
 import { Observable } from 'rxjs';
-import { InternalNavigationInput } from '../InternalNavigator';
 import { Context } from '../../context/Context';
 import { ReaderSettingsManager } from '../../settings/ReaderSettingsManager';
 import { SpineItemsManager } from '../../spine/SpineItemsManager';
-import { NavigationResolver } from '../resolvers/NavigationResolver';
 import { SpineLocator } from '../../spine/locator/SpineLocator';
+import { InternalNavigationInput } from '../InternalNavigator';
+import { NavigationResolver } from '../resolvers/NavigationResolver';
 type Navigation = {
     navigation: InternalNavigationInput;
 };

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

@@ -5,32 +5,24 @@ import { ReaderSettingsManager } from '../../settings/ReaderSettingsManager';
 import { Spine } from '../../spine/Spine';
 import { SpinePosition } from '../../spine/types';
 import { DestroyableClass } from '../../utils/DestroyableClass';
-export type ViewportPosition = {
-    x: number;
-    y: number;
-    __symbol?: `ViewportPosition`;
-    spineItem?: false;
-};
+import { Viewport } from '../../viewport/Viewport';
+export type DeprecatedViewportPosition = SpinePosition;
 export type ViewportNavigationEntry = {
-    position: ViewportPosition | SpinePosition;
+    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);
-    protected setViewportPosition({ x, y }: ViewportPosition | SpinePosition): void;
+    constructor(settings: ReaderSettingsManager, hookManager: HookManager, context: Context, spine: Spine, viewport: Viewport);
+    protected setViewportPosition(position: SpinePosition): void;
     navigate(navigation: ViewportNavigationEntry): void;
-    get viewportPosition(): {
-        x: number;
-        y: number;
-    };
+    get viewportPosition(): SpinePosition;
 }

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

@@ -0,0 +1,26 @@
+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>;
+    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/controllers/getScaledDownPosition.d.ts

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

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

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

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 { ViewportPosition } from '../viewport/ViewportNavigator';
+import { DeprecatedViewportPosition } from '../controllers/ControlledNavigationController';
 import { getNavigationForSpineItemPage } from './getNavigationForSpineItemPage';
 export declare const NAMESPACE = "spineNavigator";
 export type NavigationResolver = ReturnType<typeof createNavigationResolver>;
@@ -18,25 +18,21 @@ export declare const createNavigationResolver: ({ context, spineItemsManager, lo
     spineLayout: SpineLayout;
 }) => {
     getNavigationForUrl: (url: string | URL) => {
-        position: ViewportPosition;
+        position: DeprecatedViewportPosition;
         spineItemId: string;
     } | undefined;
-    getNavigationForSpineItemPage: (params: Omit<Parameters<typeof getNavigationForSpineItemPage>[0], "context" | "spineItemsManager" | "spineItemNavigationResolver" | "spineLocator">) => ViewportPosition;
+    getNavigationForSpineItemPage: (params: Omit<Parameters<typeof getNavigationForSpineItemPage>[0], "context" | "spineItemsManager" | "spineItemNavigationResolver" | "spineLocator">) => SpinePosition;
     getNavigationFromSpineItemPosition: (params: {
         spineItemPosition: SpineItemPosition;
         spineItem: SpineItem;
-    }) => ViewportPosition;
-    getNavigationForCfi: (cfi: string) => ViewportPosition | undefined;
-    getNavigationForLastPage: (spineItem: SpineItem) => ViewportPosition;
-    getNavigationForSpineIndexOrId: (indexOrId: number | string | SpineItem) => ViewportPosition;
-    getNavigationForPosition: (viewportPosition: ViewportPosition | SpinePosition) => ViewportPosition;
-    getMostPredominantNavigationForPosition: (viewportPosition: ViewportPosition) => ViewportPosition;
-    getAdjustedPositionWithSafeEdge: (position: ViewportPosition | SpinePosition) => {
-        x: number;
-        y: number;
-    };
-    isNavigationGoingForwardFrom: (to: ViewportPosition, from: ViewportPosition) => boolean;
-    areNavigationDifferent: (a: ViewportPosition, b: ViewportPosition) => boolean;
+    }) => SpinePosition;
+    getNavigationForCfi: (cfi: string) => DeprecatedViewportPosition | undefined;
+    getNavigationForLastPage: (spineItem: SpineItem) => DeprecatedViewportPosition;
+    getNavigationForSpineIndexOrId: (indexOrId: number | string | SpineItem) => DeprecatedViewportPosition;
+    getNavigationForPosition: (viewportPosition: DeprecatedViewportPosition | SpinePosition) => SpinePosition;
+    getMostPredominantNavigationForPosition: (viewportPosition: DeprecatedViewportPosition) => DeprecatedViewportPosition;
+    getAdjustedPositionWithSafeEdge: (position: DeprecatedViewportPosition | SpinePosition) => SpinePosition;
+    isNavigationGoingForwardFrom: (to: DeprecatedViewportPosition, from: DeprecatedViewportPosition) => boolean;
     arePositionsDifferent: (a: {
         x: number;
         y: number;
@@ -44,7 +40,7 @@ export declare const createNavigationResolver: ({ context, spineItemsManager, lo
         x: number;
         y: number;
     }) => boolean;
-    getAdjustedPositionForSpread: (position: ViewportPosition | SpinePosition) => ViewportPosition;
+    getAdjustedPositionForSpread: (position: DeprecatedViewportPosition | SpinePosition) => SpinePosition;
     spineItemNavigator: {
         getNavigationForLastPage: (spineItem: SpineItem) => SpineItemPosition;
         getNavigationForPosition: (spineItem: SpineItem, position: SpineItemPosition) => SpineItemPosition;

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

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

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

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

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

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

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 { ViewportPosition } from '../viewport/ViewportNavigator';
+import { DeprecatedViewportPosition } from '../controllers/ControlledNavigationController';
 export declare const getNavigationForSpineItemPage: ({ pageIndex, spineItemsManager, spineItemId, context, spineLocator, spineItemNavigationResolver, }: {
     pageIndex: number;
     spineItemId: SpineItem | number | string;
@@ -11,4 +11,4 @@ export declare const getNavigationForSpineItemPage: ({ pageIndex, spineItemsMana
     spineItemNavigationResolver: SpineItemNavigationResolver;
     spineLocator: SpineLocator;
     context: Context;
-}) => ViewportPosition;
+}) => DeprecatedViewportPosition;

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 { ViewportPosition } from '../viewport/ViewportNavigator';
+import { DeprecatedViewportPosition } from '../controllers/ControlledNavigationController';
 export declare const getNavigationForUrl: ({ context, spineItemsManager, spineLocator, url, pageSizeWidth, visibleAreaRectWidth, }: {
     url: string | URL;
     spineItemsManager: SpineItemsManager;
@@ -10,6 +10,6 @@ export declare const getNavigationForUrl: ({ context, spineItemsManager, spineLo
     pageSizeWidth: number;
     visibleAreaRectWidth: number;
 }) => {
-    position: ViewportPosition;
+    position: DeprecatedViewportPosition;
     spineItemId: string;
 } | undefined;

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

@@ -9,4 +9,4 @@ export declare const getNavigationFromSpineItemPosition: ({ spineItem, spineItem
     spineLocator: SpineLocator;
     spineItemLocator: SpineItemLocator;
     context: Context;
-}) => import('../viewport/ViewportNavigator').ViewportPosition;
+}) => import('../../spine/types').SpinePosition;

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

@@ -1,6 +1,8 @@
+import { Observable } from 'rxjs';
 import { SpineItemsManager } from '../../spine/SpineItemsManager';
 import { SpineLayout } from '../../spine/SpineLayout';
 import { SpineLocator } from '../../spine/locator/SpineLocator';
+import { SpinePosition } from '../../spine/types';
 import { InternalNavigationEntry } from '../InternalNavigator';
 import { NavigationResolver } from '../resolvers/NavigationResolver';
 export declare const restoreNavigationForControlledPageTurnMode: ({ spineLocator, navigation, navigationResolver, spineItemsManager, spineLayout, }: {
@@ -9,7 +11,4 @@ export declare const restoreNavigationForControlledPageTurnMode: ({ spineLocator
     navigationResolver: NavigationResolver;
     spineItemsManager: SpineItemsManager;
     spineLayout: SpineLayout;
-}) => import('rxjs').Observable<{
-    x: number;
-    y: number;
-}>;
+}) => Observable<SpinePosition>;

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 { ViewportPosition } from '../viewport/ViewportNavigator';
 export declare const restorePosition: ({ navigation, spineItemsManager, settings, spineLocator, navigationResolver, spineLayout, }: {
     spineLocator: SpineLocator;
     settings: ReaderSettingsManager;
@@ -18,4 +18,4 @@ export declare const restorePosition: ({ navigation, spineItemsManager, settings
     spineItemLocator: SpineItemLocator;
     context: Context;
     spineLayout: SpineLayout;
-}) => Observable<ViewportPosition | SpinePosition>;
+}) => Observable<DeprecatedViewportPosition | SpinePosition>;

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,36 +48,32 @@ export declare const createReader: (inputSettings: CreateReaderOptions) => {
         } | undefined;
     };
     navigation: {
-        viewportBusy$: import('rxjs').Observable<"busy">;
-        getViewportPosition: () => {
-            x: number;
-            y: number;
-        };
+        destroy: () => void;
         getNavigation: () => import('./navigation/InternalNavigator').InternalNavigationEntry;
-        getElement: () => HTMLElement;
+        internalNavigator: import('./navigation/InternalNavigator').InternalNavigator;
+        scrollNavigationController: import('./navigation/controllers/ScrollNavigationController').ScrollNavigationController;
+        controlledNavigationController: import('./navigation/controllers/ControlledNavigationController').ControlledNavigationController;
+        isLocked$: import('rxjs').Observable<boolean>;
+        viewportState$: import('rxjs').Observable<"free" | "busy">;
         navigate: (to: import('./navigation/UserNavigator').UserNavigationEntry) => void;
-        lock: () => () => void;
+        lock(): () => void;
         navigationResolver: {
             getNavigationForUrl: (url: string | URL) => {
-                position: import('./navigation/viewport/ViewportNavigator').ViewportPosition;
+                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('./navigation/viewport/ViewportNavigator').ViewportPosition;
+            getNavigationForSpineItemPage: (params: Omit<Parameters<typeof import('./navigation/resolvers/getNavigationForSpineItemPage').getNavigationForSpineItemPage>[0], "context" | "spineItemsManager" | "spineItemNavigationResolver" | "spineLocator">) => import('./spine/types').SpinePosition;
             getNavigationFromSpineItemPosition: (params: {
                 spineItemPosition: import('./spineItem/types').SpineItemPosition;
                 spineItem: SpineItem;
-            }) => import('./navigation/viewport/ViewportNavigator').ViewportPosition;
-            getNavigationForCfi: (cfi: string) => import('./navigation/viewport/ViewportNavigator').ViewportPosition | undefined;
-            getNavigationForLastPage: (spineItem: SpineItem) => import('./navigation/viewport/ViewportNavigator').ViewportPosition;
-            getNavigationForSpineIndexOrId: (indexOrId: number | string | SpineItem) => import('./navigation/viewport/ViewportNavigator').ViewportPosition;
-            getNavigationForPosition: (viewportPosition: import('./navigation/viewport/ViewportNavigator').ViewportPosition | import('./spine/types').SpinePosition) => import('./navigation/viewport/ViewportNavigator').ViewportPosition;
-            getMostPredominantNavigationForPosition: (viewportPosition: import('./navigation/viewport/ViewportNavigator').ViewportPosition) => import('./navigation/viewport/ViewportNavigator').ViewportPosition;
-            getAdjustedPositionWithSafeEdge: (position: import('./navigation/viewport/ViewportNavigator').ViewportPosition | import('./spine/types').SpinePosition) => {
-                x: number;
-                y: number;
-            };
-            isNavigationGoingForwardFrom: (to: import('./navigation/viewport/ViewportNavigator').ViewportPosition, from: import('./navigation/viewport/ViewportNavigator').ViewportPosition) => boolean;
-            areNavigationDifferent: (a: import('./navigation/viewport/ViewportNavigator').ViewportPosition, b: import('./navigation/viewport/ViewportNavigator').ViewportPosition) => boolean;
+            }) => import('./spine/types').SpinePosition;
+            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;
@@ -84,13 +81,17 @@ export declare const createReader: (inputSettings: CreateReaderOptions) => {
                 x: number;
                 y: number;
             }) => boolean;
-            getAdjustedPositionForSpread: (position: import('./navigation/viewport/ViewportNavigator').ViewportPosition | import('./spine/types').SpinePosition) => import('./navigation/viewport/ViewportNavigator').ViewportPosition;
+            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;
@@ -102,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">;