@readium/navigator 2.0.0-beta.8 → 2.0.0

package/src/epub/preferences/EpubPreferencesEditor.ts

@@ -1,10 +1,9 @@
-import { EPUBLayout, Metadata, ReadingProgression } from "@readium/shared";
+import { Layout, Metadata, ReadingProgression } from "@readium/shared";
 import { IPreferencesEditor } from "../../preferences/PreferencesEditor";
 import { EpubPreferences } from "./EpubPreferences";
 import { EpubSettings } from "./EpubSettings";
 import { BooleanPreference, EnumPreference, Preference, RangePreference } from "../../preferences/Preference";
 import { 
-  LayoutStrategy,
   TextAlignment, 
   Theme, 
   fontSizeRangeConfig, 
@@ -19,13 +18,13 @@ export class EpubPreferencesEditor implements IPreferencesEditor {
   preferences: EpubPreferences;
   private settings: EpubSettings;
   private metadata: Metadata | null;
-  private layout: EPUBLayout;
+  private layout: Layout;
 
   constructor(initialPreferences: EpubPreferences, settings: EpubSettings, metadata: Metadata) {
     this.preferences = initialPreferences;
     this.settings = settings;
     this.metadata = metadata;
-    this.layout = this.metadata?.getPresentation()?.layout || EPUBLayout.reflowable;
+    this.layout = this.metadata?.effectiveLayout || Layout.reflowable;
   }
 
   clear() {
@@ -61,7 +60,7 @@ export class EpubPreferencesEditor implements IPreferencesEditor {
     return new Preference<number>({
       initialValue: this.preferences.columnCount,
       effectiveValue: this.settings.columnCount || null,
-      isEffective: this.layout === EPUBLayout.reflowable && !this.settings.scroll,
+      isEffective: this.layout !== Layout.fixed && !this.settings.scroll,
       onChange: (newValue: number | null | undefined) => {
         this.updatePreference("columnCount", newValue || null);
       }
@@ -96,7 +95,7 @@ export class EpubPreferencesEditor implements IPreferencesEditor {
     return new BooleanPreference({
       initialValue: this.preferences.deprecatedFontSize,
       effectiveValue: CSS.supports("zoom", "1") ? this.settings.deprecatedFontSize || false : true,
-      isEffective: this.layout === EPUBLayout.reflowable,
+      isEffective: this.layout !== Layout.fixed,
       onChange: (newValue: boolean | null | undefined) => {
         this.updatePreference("deprecatedFontSize", newValue || null);
       }
@@ -107,7 +106,7 @@ export class EpubPreferencesEditor implements IPreferencesEditor {
     return new Preference<string>({
       initialValue: this.preferences.fontFamily,
       effectiveValue: this.settings.fontFamily || null,
-      isEffective: this.layout === EPUBLayout.reflowable,
+      isEffective: this.layout !== Layout.fixed,
       onChange: (newValue: string | null | undefined) => {
         this.updatePreference("fontFamily", newValue || null);
       }
@@ -118,7 +117,7 @@ export class EpubPreferencesEditor implements IPreferencesEditor {
     return new RangePreference<number>({
       initialValue: this.preferences.fontSize,
       effectiveValue: this.settings.fontSize || 1,
-      isEffective: this.layout === EPUBLayout.reflowable,
+      isEffective: this.layout !== Layout.fixed,
       onChange: (newValue: number | null | undefined) => {
         this.updatePreference("fontSize", newValue || null);
       },
@@ -131,7 +130,7 @@ export class EpubPreferencesEditor implements IPreferencesEditor {
     return new BooleanPreference({
       initialValue: this.preferences.fontSizeNormalize,
       effectiveValue: this.settings.fontSizeNormalize || false,
-      isEffective: this.layout === EPUBLayout.reflowable && this.preferences.fontSizeNormalize !== null,
+      isEffective: this.layout !== Layout.fixed && this.preferences.fontSizeNormalize !== null,
       onChange: (newValue: boolean | null | undefined) => {
         this.updatePreference("fontSizeNormalize", newValue || null);
       }
@@ -142,7 +141,7 @@ export class EpubPreferencesEditor implements IPreferencesEditor {
     return new BooleanPreference({
       initialValue: this.preferences.fontOpticalSizing,
       effectiveValue: this.settings.fontOpticalSizing || true,
-      isEffective: this.layout === EPUBLayout.reflowable && this.preferences.fontOpticalSizing !== null,
+      isEffective: this.layout !== Layout.fixed && this.preferences.fontOpticalSizing !== null,
       onChange: (newValue: boolean | null | undefined) => {
         this.updatePreference("fontOpticalSizing", newValue || null);
       }
@@ -153,7 +152,7 @@ export class EpubPreferencesEditor implements IPreferencesEditor {
     return new RangePreference<number>({
       initialValue: this.preferences.fontWeight,
       effectiveValue: this.settings.fontWeight || 400,
-      isEffective: this.layout === EPUBLayout.reflowable && this.preferences.fontWeight !== null,
+      isEffective: this.layout !== Layout.fixed && this.preferences.fontWeight !== null,
       onChange: (newValue: number | null | undefined) => {
         this.updatePreference("fontWeight", newValue || null);
       },
@@ -166,7 +165,7 @@ export class EpubPreferencesEditor implements IPreferencesEditor {
     return new RangePreference<number>({
       initialValue: this.preferences.fontWidth,
       effectiveValue: this.settings.fontWidth || 100,
-      isEffective: this.layout === EPUBLayout.reflowable && this.preferences.fontWidth !== null,
+      isEffective: this.layout !== Layout.fixed && this.preferences.fontWidth !== null,
       onChange: (newValue: number | null | undefined) => {
         this.updatePreference("fontWidth", newValue || null);
       },
@@ -179,7 +178,7 @@ export class EpubPreferencesEditor implements IPreferencesEditor {
     return new BooleanPreference({
       initialValue: this.preferences.hyphens,
       effectiveValue: this.settings.hyphens || false,
-      isEffective: this.layout === EPUBLayout.reflowable && this.metadata?.effectiveReadingProgression === ReadingProgression.ltr && this.preferences.hyphens !== null,
+      isEffective: this.layout !== Layout.fixed && this.metadata?.effectiveReadingProgression === ReadingProgression.ltr && this.preferences.hyphens !== null,
       onChange: (newValue: boolean | null | undefined) => {
         this.updatePreference("hyphens", newValue || null);
       }
@@ -212,34 +211,33 @@ export class EpubPreferencesEditor implements IPreferencesEditor {
     });
   }
 
+  get iOSPatch(): BooleanPreference {
+    return new BooleanPreference({
+      initialValue: this.preferences.iOSPatch,
+      effectiveValue: this.settings.iOSPatch || false,
+      isEffective: this.layout !== Layout.fixed,
+      onChange: (newValue: boolean | null | undefined) => {
+        this.updatePreference("iOSPatch", newValue || null);
+      }
+    });
+  }
+
   get iPadOSPatch(): BooleanPreference {
     return new BooleanPreference({
       initialValue: this.preferences.iPadOSPatch,
       effectiveValue: this.settings.iPadOSPatch || false,
-      isEffective: this.layout === EPUBLayout.reflowable,
+      isEffective: this.layout !== Layout.fixed,
       onChange: (newValue: boolean | null | undefined) => {
         this.updatePreference("iPadOSPatch", newValue || null);
       }
     });
   }
 
-  get layoutStrategy(): EnumPreference<LayoutStrategy> {
-    return new EnumPreference<LayoutStrategy>({
-      initialValue: this.preferences.layoutStrategy,
-      effectiveValue: this.settings.layoutStrategy,
-      isEffective: this.layout === EPUBLayout.reflowable,
-      onChange: (newValue: LayoutStrategy | null | undefined) => {
-        this.updatePreference("layoutStrategy", newValue || null);
-      },
-      supportedValues: Object.values(LayoutStrategy)
-    })
-  }
-
   get letterSpacing(): RangePreference<number> {
     return new RangePreference<number>({
       initialValue: this.preferences.letterSpacing,
       effectiveValue: this.settings.letterSpacing || 0,
-      isEffective: this.layout === EPUBLayout.reflowable && this.preferences.letterSpacing !== null,
+      isEffective: this.layout !== Layout.fixed && this.preferences.letterSpacing !== null,
       onChange: (newValue: number | null | undefined) => {
         this.updatePreference("letterSpacing", newValue || null);
       },
@@ -252,7 +250,7 @@ export class EpubPreferencesEditor implements IPreferencesEditor {
     return new BooleanPreference({
       initialValue: this.preferences.ligatures,
       effectiveValue: this.settings.ligatures || true,
-      isEffective: this.layout === EPUBLayout.reflowable
+      isEffective: this.layout !== Layout.fixed
         && this.metadata?.languages?.some(lang => lang === "ar" || lang === "fa")
         && this.preferences.ligatures !== null || false,
       onChange: (newValue: boolean | null | undefined) => {
@@ -265,7 +263,7 @@ export class EpubPreferencesEditor implements IPreferencesEditor {
     return new RangePreference<number>({
       initialValue: this.preferences.lineHeight,
       effectiveValue: this.settings.lineHeight,
-      isEffective: this.layout === EPUBLayout.reflowable && this.preferences.lineHeight !== null,
+      isEffective: this.layout !== Layout.fixed && this.preferences.lineHeight !== null,
       onChange: (newValue: number | null | undefined) => {
         this.updatePreference("lineHeight", newValue || null);
       },
@@ -278,7 +276,7 @@ export class EpubPreferencesEditor implements IPreferencesEditor {
     return new Preference<string>({
       initialValue: this.preferences.linkColor,
       effectiveValue: this.settings.linkColor || defaultColors.RS__linkColor,
-      isEffective: this.layout === EPUBLayout.reflowable && this.preferences.linkColor !== null,
+      isEffective: this.layout !== Layout.fixed && this.preferences.linkColor !== null,
       onChange: (newValue: string | null | undefined) => {
         this.updatePreference("linkColor", newValue || null);
       }
@@ -289,7 +287,7 @@ export class EpubPreferencesEditor implements IPreferencesEditor {
     return new RangePreference<number>({
       initialValue: this.preferences.maximalLineLength,
       effectiveValue: this.settings.maximalLineLength,
-      isEffective: this.layout === EPUBLayout.reflowable,
+      isEffective: this.layout !== Layout.fixed,
       onChange: (newValue: number | null | undefined) => {
         this.updatePreference("maximalLineLength", newValue);
       },
@@ -302,7 +300,7 @@ export class EpubPreferencesEditor implements IPreferencesEditor {
     return new RangePreference<number>({
       initialValue: this.preferences.minimalLineLength,
       effectiveValue: this.settings.minimalLineLength,
-      isEffective: this.layout === EPUBLayout.reflowable,
+      isEffective: this.layout !== Layout.fixed,
       onChange: (newValue: number | null | undefined) => {
         this.updatePreference("minimalLineLength", newValue);
       },
@@ -315,7 +313,7 @@ export class EpubPreferencesEditor implements IPreferencesEditor {
     return new BooleanPreference({
       initialValue: this.preferences.noRuby,
       effectiveValue: this.settings.noRuby || false,
-      isEffective: this.layout === EPUBLayout.reflowable && this.metadata?.languages?.includes("ja") || false,
+      isEffective: this.layout !== Layout.fixed && this.metadata?.languages?.includes("ja") || false,
       onChange: (newValue: boolean | null | undefined) => {
         this.updatePreference("noRuby", newValue || null);
       }
@@ -326,7 +324,7 @@ export class EpubPreferencesEditor implements IPreferencesEditor {
     return new RangePreference<number>({
       initialValue: this.preferences.optimalLineLength,
       effectiveValue: this.settings.optimalLineLength,
-      isEffective: this.layout === EPUBLayout.reflowable,
+      isEffective: this.layout !== Layout.fixed,
       onChange: (newValue: number | null | undefined) => {
         this.updatePreference("optimalLineLength", newValue as number);
       },
@@ -339,7 +337,7 @@ export class EpubPreferencesEditor implements IPreferencesEditor {
     return new Preference<number>({
       initialValue: this.preferences.pageGutter,
       effectiveValue: this.settings.pageGutter,
-      isEffective: this.layout === EPUBLayout.reflowable,
+      isEffective: this.layout !== Layout.fixed,
       onChange: (newValue: number | null | undefined) => {
         this.updatePreference("pageGutter", newValue || null);
       }
@@ -350,7 +348,7 @@ export class EpubPreferencesEditor implements IPreferencesEditor {
     return new RangePreference<number>({
       initialValue: this.preferences.paragraphIndent,
       effectiveValue: this.settings.paragraphIndent || 0,
-      isEffective: this.layout === EPUBLayout.reflowable && this.preferences.paragraphIndent !== null,
+      isEffective: this.layout !== Layout.fixed && this.preferences.paragraphIndent !== null,
       onChange: (newValue: number | null | undefined) => {
         this.updatePreference("paragraphIndent", newValue || null);
       },
@@ -363,7 +361,7 @@ export class EpubPreferencesEditor implements IPreferencesEditor {
     return new RangePreference<number>({
       initialValue: this.preferences.paragraphSpacing,
       effectiveValue: this.settings.paragraphSpacing || 0,
-      isEffective: this.layout === EPUBLayout.reflowable && this.preferences.paragraphSpacing !== null,
+      isEffective: this.layout !== Layout.fixed && this.preferences.paragraphSpacing !== null,
       onChange: (newValue: number | null | undefined) => {
         this.updatePreference("paragraphSpacing", newValue || null);
       },
@@ -376,7 +374,7 @@ export class EpubPreferencesEditor implements IPreferencesEditor {
     return new BooleanPreference({
       initialValue: this.preferences.scroll,
       effectiveValue: this.settings.scroll || false,
-      isEffective: this.layout === EPUBLayout.reflowable,
+      isEffective: this.layout !== Layout.fixed,
       onChange: (newValue: boolean | null | undefined) => {
         this.updatePreference("scroll", newValue || null);
       }
@@ -387,7 +385,7 @@ export class EpubPreferencesEditor implements IPreferencesEditor {
     return new Preference<number>({
       initialValue: this.preferences.scrollPaddingTop,
       effectiveValue: this.settings.scrollPaddingTop || 0,
-      isEffective: this.layout === EPUBLayout.reflowable && !!this.settings.scroll && this.preferences.scrollPaddingTop !== null,
+      isEffective: this.layout !== Layout.fixed && !!this.settings.scroll && this.preferences.scrollPaddingTop !== null,
       onChange: (newValue: number | null | undefined) => {
         this.updatePreference("scrollPaddingTop", newValue || null);
       }
@@ -398,7 +396,7 @@ export class EpubPreferencesEditor implements IPreferencesEditor {
     return new Preference<number>({
       initialValue: this.preferences.scrollPaddingBottom,
       effectiveValue: this.settings.scrollPaddingBottom || 0,
-      isEffective: this.layout === EPUBLayout.reflowable && !!this.settings.scroll && this.preferences.scrollPaddingBottom !== null,
+      isEffective: this.layout !== Layout.fixed && !!this.settings.scroll && this.preferences.scrollPaddingBottom !== null,
       onChange: (newValue: number | null | undefined) => {
         this.updatePreference("scrollPaddingBottom", newValue || null);
       }
@@ -410,7 +408,7 @@ export class EpubPreferencesEditor implements IPreferencesEditor {
     return new Preference<number>({
       initialValue: this.preferences.scrollPaddingLeft,
       effectiveValue: this.settings.scrollPaddingLeft || 0,
-      isEffective: this.layout === EPUBLayout.reflowable && !!this.settings.scroll && this.preferences.scrollPaddingLeft !== null,
+      isEffective: this.layout !== Layout.fixed && !!this.settings.scroll && this.preferences.scrollPaddingLeft !== null,
       onChange: (newValue: number | null | undefined) => {
         this.updatePreference("scrollPaddingLeft", newValue || null);
       }
@@ -421,7 +419,7 @@ export class EpubPreferencesEditor implements IPreferencesEditor {
     return new Preference<number>({
       initialValue: this.preferences.scrollPaddingRight,
       effectiveValue: this.settings.scrollPaddingRight || 0,
-      isEffective: this.layout === EPUBLayout.reflowable && !!this.settings.scroll && this.preferences.scrollPaddingRight !== null,
+      isEffective: this.layout !== Layout.fixed && !!this.settings.scroll && this.preferences.scrollPaddingRight !== null,
       onChange: (newValue: number | null | undefined) => {
         this.updatePreference("scrollPaddingRight", newValue || null);
       }
@@ -433,7 +431,7 @@ export class EpubPreferencesEditor implements IPreferencesEditor {
     return new Preference<string>({
       initialValue: this.preferences.selectionBackgroundColor,
       effectiveValue: this.settings.selectionBackgroundColor || defaultColors.RS__selectionBackgroundColor,
-      isEffective: this.layout === EPUBLayout.reflowable && this.preferences.selectionBackgroundColor !== null,
+      isEffective: this.layout !== Layout.fixed && this.preferences.selectionBackgroundColor !== null,
       onChange: (newValue: string | null | undefined) => {
         this.updatePreference("selectionBackgroundColor", newValue || null);
       }
@@ -444,7 +442,7 @@ export class EpubPreferencesEditor implements IPreferencesEditor {
     return new Preference<string>({
       initialValue: this.preferences.selectionTextColor,
       effectiveValue: this.settings.selectionTextColor || defaultColors.RS__selectionTextColor,
-      isEffective: this.layout === EPUBLayout.reflowable && this.preferences.selectionTextColor !== null,
+      isEffective: this.layout !== Layout.fixed && this.preferences.selectionTextColor !== null,
       onChange: (newValue: string | null | undefined) => {
         this.updatePreference("selectionTextColor", newValue || null);
       }
@@ -455,7 +453,7 @@ export class EpubPreferencesEditor implements IPreferencesEditor {
     return new EnumPreference<TextAlignment>({
       initialValue: this.preferences.textAlign,
       effectiveValue: this.settings.textAlign || TextAlignment.start,
-      isEffective: this.layout === EPUBLayout.reflowable && this.preferences.textAlign !== null,
+      isEffective: this.layout !== Layout.fixed && this.preferences.textAlign !== null,
       onChange: (newValue: TextAlignment | null | undefined) => {
         this.updatePreference("textAlign", newValue || null);
       },
@@ -467,7 +465,7 @@ export class EpubPreferencesEditor implements IPreferencesEditor {
     return new Preference<string>({
       initialValue: this.preferences.textColor,
       effectiveValue: this.settings.textColor || defaultColors.RS__textColor,
-      isEffective: this.layout === EPUBLayout.reflowable && this.preferences.textColor !== null,
+      isEffective: this.layout !== Layout.fixed && this.preferences.textColor !== null,
       onChange: (newValue: string | null | undefined) => {
         this.updatePreference("textColor", newValue || null);
       }
@@ -478,7 +476,7 @@ export class EpubPreferencesEditor implements IPreferencesEditor {
     return new BooleanPreference({
       initialValue: this.preferences.textNormalization,
       effectiveValue: this.settings.textNormalization || false,
-      isEffective: this.layout === EPUBLayout.reflowable,
+      isEffective: this.layout !== Layout.fixed,
       onChange: (newValue: boolean | null | undefined) => {
         this.updatePreference("textNormalization", newValue || null);
       }
@@ -489,7 +487,7 @@ export class EpubPreferencesEditor implements IPreferencesEditor {
     return new EnumPreference<Theme>({
       initialValue: this.preferences.theme,
       effectiveValue: this.settings.theme || null,
-      isEffective: this.layout === EPUBLayout.reflowable,
+      isEffective: this.layout !== Layout.fixed,
       onChange: (newValue: Theme | null | undefined) => {
         this.updatePreference("theme", newValue || null);
       },
@@ -501,7 +499,7 @@ export class EpubPreferencesEditor implements IPreferencesEditor {
     return new Preference<string>({
       initialValue: this.preferences.visitedColor,
       effectiveValue: this.settings.visitedColor || defaultColors.RS__visitedColor,
-      isEffective: this.layout === EPUBLayout.reflowable && this.preferences.visitedColor !== null,
+      isEffective: this.layout !== Layout.fixed && this.preferences.visitedColor !== null,
       onChange: (newValue: string | null | undefined) => {
         this.updatePreference("visitedColor", newValue || null);
       }
@@ -512,7 +510,7 @@ export class EpubPreferencesEditor implements IPreferencesEditor {
     return new RangePreference<number>({
       initialValue: this.preferences.wordSpacing,
       effectiveValue: this.settings.wordSpacing || 0,
-      isEffective: this.layout === EPUBLayout.reflowable && this.preferences.wordSpacing !== null,
+      isEffective: this.layout !== Layout.fixed && this.preferences.wordSpacing !== null,
       onChange: (newValue: number | null | undefined) => {
         this.updatePreference("wordSpacing", newValue || null);
       },

package/src/epub/preferences/EpubSettings.ts

@@ -1,5 +1,5 @@
 import { ConfigurableSettings } from "../../preferences/Configurable";
-import { LayoutStrategy, TextAlignment, Theme } from "../../preferences/Types";
+import { TextAlignment, Theme } from "../../preferences/Types";
 import { EpubDefaults } from "./EpubDefaults";
 import { EpubPreferences } from "./EpubPreferences";
 
@@ -21,8 +21,8 @@ export interface IEpubSettings {
   hyphens?: boolean | null,
   invertFilter?: boolean | number | null,
   invertGaijiFilter: boolean | number | null,
+  iOSPatch?: boolean | null,
   iPadOSPatch?: boolean | null,
-  layoutStrategy?: LayoutStrategy | null,
   letterSpacing?: number | null,
   ligatures?: boolean | null,
   lineHeight?: number | null,
@@ -65,8 +65,8 @@ export class EpubSettings implements ConfigurableSettings {
   hyphens: boolean | null;
   invertFilter: boolean | number | null;
   invertGaijiFilter: boolean | number | null;
+  iOSPatch: boolean;
   iPadOSPatch: boolean;
-  layoutStrategy: LayoutStrategy | null;
   letterSpacing: number | null;
   ligatures: boolean | null;
   lineHeight: number | null;
@@ -140,6 +140,13 @@ export class EpubSettings implements ConfigurableSettings {
     this.invertGaijiFilter = typeof preferences.invertGaijiFilter === "boolean" 
       ? preferences.invertGaijiFilter 
       : defaults.invertGaijiFilter ?? null;
+    this.iOSPatch = this.deprecatedFontSize 
+      ? false 
+      : preferences.iOSPatch === false 
+        ? false 
+        : preferences.iOSPatch === true 
+          ? ((sMLWithRequest.OS.iOS || sMLWithRequest.OS.iPadOS) && sMLWithRequest.iOSRequest === "mobile")
+          : defaults.iOSPatch;
     this.iPadOSPatch = this.deprecatedFontSize 
       ? false 
       : preferences.iPadOSPatch === false 
@@ -147,7 +154,6 @@ export class EpubSettings implements ConfigurableSettings {
         : preferences.iPadOSPatch === true 
           ? (sMLWithRequest.OS.iPadOS && sMLWithRequest.iOSRequest === "desktop") 
           : defaults.iPadOSPatch;
-    this.layoutStrategy = preferences.layoutStrategy || defaults.layoutStrategy || null;
     this.letterSpacing = preferences.letterSpacing !== undefined 
       ? preferences.letterSpacing 
       : defaults.letterSpacing !== undefined 

package/src/preferences/Types.ts

@@ -11,12 +11,6 @@ export enum Theme {
   custom = "custom"
 }
 
-export enum LayoutStrategy {
-  margin = "margin",
-  lineLength = "lineLength",
-  columns = "columns"
-}
-
 export type RangeConfig = {
   range: [number, number],
   step: number

package/types/src/Navigator.d.ts

@@ -1,5 +1,14 @@
 import { Link, Locator, Publication, ReadingProgression } from "@readium/shared";
 type cbb = (ok: boolean) => void;
+export interface ProgressionRange {
+    start: number;
+    end: number;
+}
+export interface VisualNavigatorViewport {
+    readingOrder: string[];
+    progressions: Map<string, ProgressionRange>;
+    positions: number[] | null;
+}
 export declare abstract class Navigator {
     abstract get publication(): Publication;
     abstract get currentLocator(): Locator;

package/types/src/epub/EpubNavigator.d.ts

@@ -1,5 +1,5 @@
-import { EPUBLayout, Link, Locator, Publication, ReadingProgression } from "@readium/shared";
-import { Configurable, ConfigurablePreferences, ConfigurableSettings, VisualNavigator } from "../";
+import { Layout, Link, Locator, Publication, ReadingProgression } from "@readium/shared";
+import { Configurable, ConfigurablePreferences, ConfigurableSettings, VisualNavigator, VisualNavigatorViewport } from "../";
 import { FramePoolManager } from "./frame/FramePoolManager";
 import { FXLFramePoolManager } from "./fxl/FXLFramePoolManager";
 import { CommsEventKey } from "@readium/navigator-html-injectables";
@@ -22,6 +22,7 @@ export interface EpubNavigatorListeners {
     click: (e: FrameClickEvent) => boolean;
     zoom: (scale: number) => void;
     miscPointer: (amount: number) => void;
+    scroll: (delta: number) => void;
     customEvent: (key: string, data: unknown) => void;
     handleLocator: (locator: Locator) => boolean;
     textSelected: (selection: BasicTextSelection) => void;
@@ -35,15 +36,16 @@ export declare class EpubNavigator extends VisualNavigator implements Configurab
     private currentLocation;
     private lastLocationInView;
     private currentProgression;
-    readonly layout: EPUBLayout;
+    private _layout;
     private _preferences;
     private _defaults;
     private _settings;
     private _css;
     private _preferencesEditor;
     private resizeObserver;
+    private reflowViewport;
     constructor(container: HTMLElement, pub: Publication, listeners: EpubNavigatorListeners, positions?: Locator[], initialPosition?: Locator | undefined, configuration?: EpubNavigatorConfiguration);
-    static determineLayout(pub: Publication): EPUBLayout;
+    static determineLayout(pub: Publication, scroll?: boolean): Layout;
     load(): Promise<void>;
     get settings(): Readonly<EpubSettings>;
     get preferencesEditor(): EpubPreferencesEditor;
@@ -54,6 +56,7 @@ export declare class EpubNavigator extends VisualNavigator implements Configurab
     private compileCSSProperties;
     private commitCSS;
     resizeHandler(): Promise<void>;
+    get layout(): Layout;
     get ownerWindow(): Window & typeof globalThis;
     /**
      * Exposed to the public to compensate for lack of implemented readium conveniences
@@ -78,13 +81,18 @@ export declare class EpubNavigator extends VisualNavigator implements Configurab
     private changeResource;
     private findLastPositionInProgressionRange;
     private findNearestPositions;
+    private updateViewport;
     private syncLocation;
     goBackward(_: boolean, cb: (ok: boolean) => void): void;
     goForward(_: boolean, cb: (ok: boolean) => void): void;
     get currentLocator(): Locator;
-    get currentPositionNumbers(): number[];
+    get viewport(): VisualNavigatorViewport;
+    get isScrollStart(): boolean;
+    get isScrollEnd(): boolean;
+    get canGoBackward(): boolean;
+    get canGoForward(): boolean;
     get readingProgression(): ReadingProgression;
-    setReadingProgression(newProgression: ReadingProgression): Promise<void>;
+    private setLayout;
     get publication(): Publication;
     private loadLocator;
     go(locator: Locator, _: boolean, cb: (ok: boolean) => void): void;

package/types/src/epub/css/Properties.d.ts

@@ -37,6 +37,7 @@ export interface IUserProperties {
     fontWidth?: FontWidth | null;
     invertFilter?: boolean | number | null;
     invertGaijiFilter?: boolean | number | null;
+    iOSPatch?: boolean | null;
     iPadOSPatch?: boolean | null;
     letterSpacing?: number | null;
     ligatures?: Ligatures | null;
@@ -71,6 +72,7 @@ export declare class UserProperties extends Properties {
     fontWidth: FontWidth | null;
     invertFilter: boolean | number | null;
     invertGaijiFilter: boolean | number | null;
+    iOSPatch: boolean | null;
     iPadOSPatch: boolean | null;
     letterSpacing: number | null;
     ligatures: Ligatures | null;

package/types/src/epub/css/ReadiumCSS.d.ts

@@ -1,5 +1,4 @@
 import { LineLengths } from "../../helpers";
-import { LayoutStrategy } from "../../preferences";
 import { EpubSettings } from "../preferences/EpubSettings";
 import { RSProperties, UserProperties } from "./Properties";
 export interface IReadiumCSS {
@@ -8,7 +7,6 @@ export interface IReadiumCSS {
     lineLengths: LineLengths;
     container: HTMLElement;
     constraint: number;
-    layoutStrategy?: LayoutStrategy | null;
 }
 export declare class ReadiumCSS {
     rsProperties: RSProperties;
@@ -17,7 +15,6 @@ export declare class ReadiumCSS {
     container: HTMLElement;
     containerParent: HTMLElement;
     constraint: number;
-    layoutStrategy: LayoutStrategy;
     private cachedColCount;
     private effectiveContainerWidth;
     constructor(props: IReadiumCSS);

package/types/src/epub/fxl/FXLFramePoolManager.d.ts

@@ -3,6 +3,7 @@ import { Locator, Publication, Page, Link } from "@readium/shared";
 import { FrameCommsListener } from "../frame";
 import { FXLFrameManager } from "./FXLFrameManager";
 import { FXLPeripherals } from "./FXLPeripherals";
+import { VisualNavigatorViewport } from "../../Navigator";
 export declare class FXLFramePoolManager {
     private readonly container;
     private readonly positions;
@@ -86,6 +87,7 @@ export declare class FXLFramePoolManager {
     update(pub: Publication, locator: Locator, modules: ModuleName[], _force?: boolean): Promise<void>;
     get currentFrames(): (FXLFrameManager | undefined)[];
     get currentBounds(): DOMRect;
-    get currentNumbers(): number[];
+    get viewport(): VisualNavigatorViewport;
+    private getCurrentNumbers;
     deselect(): void;
 }

package/types/src/epub/fxl/FXLSpreader.d.ts

@@ -1,4 +1,15 @@
 import { Link, Publication } from "@readium/shared";
+export declare enum Orientation {
+    auto = "auto",
+    landscape = "landscape",
+    portrait = "portrait"
+}
+export declare enum Spread {
+    auto = "auto",
+    both = "both",
+    none = "none",
+    landscape = "landscape"
+}
 export declare class FXLSpreader {
     shift: boolean;
     private spreads;

package/types/src/epub/preferences/EpubDefaults.d.ts

@@ -1,4 +1,4 @@
-import { LayoutStrategy, TextAlignment, Theme } from "../../preferences/Types";
+import { TextAlignment, Theme } from "../../preferences/Types";
 export interface IEpubDefaults {
     backgroundColor?: string | null;
     blendFilter?: boolean | null;
@@ -15,8 +15,8 @@ export interface IEpubDefaults {
     hyphens?: boolean | null;
     invertFilter?: boolean | number | null;
     invertGaijiFilter?: boolean | number | null;
+    iOSPatch?: boolean | null;
     iPadOSPatch?: boolean | null;
-    layoutStrategy?: LayoutStrategy | null;
     letterSpacing?: number | null;
     ligatures?: boolean | null;
     lineHeight?: number | null;
@@ -56,8 +56,8 @@ export declare class EpubDefaults {
     hyphens: boolean | null;
     invertFilter: boolean | number | null;
     invertGaijiFilter: boolean | number | null;
+    iOSPatch: boolean;
     iPadOSPatch: boolean;
-    layoutStrategy: LayoutStrategy | null;
     letterSpacing: number | null;
     ligatures: boolean | null;
     lineHeight: number | null;

package/types/src/epub/preferences/EpubPreferences.d.ts

@@ -1,5 +1,5 @@
 import { ConfigurablePreferences } from "../../preferences/Configurable";
-import { LayoutStrategy, TextAlignment, Theme } from "../../preferences/Types";
+import { TextAlignment, Theme } from "../../preferences/Types";
 export interface IEpubPreferences {
     backgroundColor?: string | null;
     blendFilter?: boolean | null;
@@ -16,8 +16,8 @@ export interface IEpubPreferences {
     hyphens?: boolean | null;
     invertFilter?: boolean | number | null;
     invertGaijiFilter?: boolean | number | null;
+    iOSPatch?: boolean | null;
     iPadOSPatch?: boolean | null;
-    layoutStrategy?: LayoutStrategy | null;
     letterSpacing?: number | null;
     ligatures?: boolean | null;
     lineHeight?: number | null;
@@ -57,8 +57,8 @@ export declare class EpubPreferences implements ConfigurablePreferences {
     hyphens?: boolean | null;
     invertFilter?: boolean | number | null;
     invertGaijiFilter?: boolean | number | null;
+    iOSPatch?: boolean | null;
     iPadOSPatch?: boolean | null;
-    layoutStrategy?: LayoutStrategy | null;
     letterSpacing?: number | null;
     ligatures?: boolean | null;
     lineHeight?: number | null;

package/types/src/epub/preferences/EpubPreferencesEditor.d.ts

@@ -3,7 +3,7 @@ import { IPreferencesEditor } from "../../preferences/PreferencesEditor";
 import { EpubPreferences } from "./EpubPreferences";
 import { EpubSettings } from "./EpubSettings";
 import { BooleanPreference, EnumPreference, Preference, RangePreference } from "../../preferences/Preference";
-import { LayoutStrategy, TextAlignment, Theme } from "../../preferences/Types";
+import { TextAlignment, Theme } from "../../preferences/Types";
 export declare class EpubPreferencesEditor implements IPreferencesEditor {
     preferences: EpubPreferences;
     private settings;
@@ -27,8 +27,8 @@ export declare class EpubPreferencesEditor implements IPreferencesEditor {
     get hyphens(): BooleanPreference;
     get invertFilter(): RangePreference<number>;
     get invertGaijiFilter(): RangePreference<number>;
+    get iOSPatch(): BooleanPreference;
     get iPadOSPatch(): BooleanPreference;
-    get layoutStrategy(): EnumPreference<LayoutStrategy>;
     get letterSpacing(): RangePreference<number>;
     get ligatures(): BooleanPreference;
     get lineHeight(): RangePreference<number>;