@readium/navigator 2.0.0 → 2.1.1

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@readium/navigator",
-  "version": "2.0.0",
+  "version": "2.1.1",
   "type": "module",
   "description": "Next generation SDK for publications in Web Apps",
   "author": "readium",
@@ -31,9 +31,9 @@
   "types": "./types/src/index.d.ts",
   "exports": {
     ".": {
+      "types": "./types/src/index.d.ts",
       "import": "./dist/index.js",
-      "require": "./dist/index.umd.cjs",
-      "types": "./types/src/index.d.ts"
+      "require": "./dist/index.umd.cjs"
     }
   },
   "files": [
@@ -48,17 +48,17 @@
     "build": "tsc && vite build"
   },
   "devDependencies": {
-    "@laynezh/vite-plugin-lib-assets": "^0.5.25",
-    "@readium/css": ">=2.0.0-beta.18",
+    "@laynezh/vite-plugin-lib-assets": "^2.1.0",
+    "@readium/css": "2.0.0-beta.19",
     "@readium/navigator-html-injectables": "workspace:*",
     "@readium/shared": "workspace:*",
     "@types/path-browserify": "^1.0.3",
     "css-selector-generator": "^3.6.9",
     "path-browserify": "^1.0.1",
     "tslib": "^2.8.1",
-    "typescript": "^5.6.3",
-    "typescript-plugin-css-modules": "^5.1.0",
+    "typescript": "^5.9.2",
+    "typescript-plugin-css-modules": "^5.2.0",
     "user-agent-data-types": "^0.4.2",
-    "vite": "^4.5.5"
+    "vite": "^7.1.5"
   }
 }

package/src/epub/css/Properties.ts

@@ -1,4 +1,4 @@
-import { TextAlignment, Theme } from "../../preferences/Types";
+import { TextAlignment } from "../../preferences/Types";
 
 export type BodyHyphens = "auto" | "none";
 export type BoxSizing = "content-box" | "border-box";
@@ -51,7 +51,6 @@ abstract class Properties {
 export interface IUserProperties {
   advancedSettings?: boolean | null;
   a11yNormalize?: boolean | null;
-  appearance?: Theme | null;
   backgroundColor?: string | null;
   blendFilter?: boolean | null;
   bodyHyphens?: BodyHyphens | null;
@@ -87,7 +86,6 @@ export interface IUserProperties {
 
 export class UserProperties extends Properties {
   a11yNormalize: boolean | null;
-  appearance: Theme | null;
   backgroundColor: string | null;
   blendFilter: boolean | null;
   bodyHyphens: BodyHyphens | null;
@@ -123,7 +121,6 @@ export class UserProperties extends Properties {
   constructor(props: IUserProperties) {
     super();
     this.a11yNormalize = props.a11yNormalize ?? null;
-    this.appearance = props.appearance ?? null;
     this.backgroundColor = props.backgroundColor ?? null;
     this.blendFilter = props.blendFilter ?? null;
     this.bodyHyphens = props.bodyHyphens ?? null;
@@ -161,7 +158,6 @@ export class UserProperties extends Properties {
     const cssProperties: { [key: string]: string } = {};
 
     if (this.a11yNormalize) cssProperties["--USER__a11yNormalize"] = this.toFlag("a11y");
-    if (this.appearance) cssProperties["--USER__appearance"] = this.toFlag(this.appearance);
     if (this.backgroundColor) cssProperties["--USER__backgroundColor"] = this.backgroundColor;
     if (this.blendFilter) cssProperties["--USER__blendFilter"] = this.toFlag("blend");
     if (this.bodyHyphens) cssProperties["--USER__bodyHyphens"] = this.bodyHyphens;

package/src/epub/css/ReadiumCSS.ts

@@ -73,7 +73,6 @@ export class ReadiumCSS {
     
     const updated: IUserProperties = {
       a11yNormalize: settings.textNormalization,
-      appearance: settings.theme,
       backgroundColor: settings.backgroundColor,
       blendFilter: settings.blendFilter,
       bodyHyphens: typeof settings.hyphens !== "boolean" 
@@ -161,12 +160,17 @@ export class ReadiumCSS {
   // TODO: As scroll shows, the effective line-length
   // should be the same as uncompensated when scale >= 1
   private paginate(scale: number | null, ignoreCompensation: boolean | null, colCount?: number | null) {
-    const constrainedWidth = Math.round(getContentWidth(this.containerParent) - (this.constraint));
+    const constrainedWidth = Math.round(getContentWidth(this.containerParent) - this.constraint);
     const metrics = this.getCompensatedMetrics(scale, ignoreCompensation);
-    const zoomCompensation = metrics.zoomCompensation;
-    const optimal = metrics.optimal;
-    const minimal = metrics.minimal;
-    const maximal = metrics.maximal;
+    const { zoomCompensation, optimal, minimal, maximal } = metrics;
+
+    // Helper function for single column width calculation
+    const getSingleColWidth = (): number => {
+      if (constrainedWidth >= optimal && maximal !== null) {
+        return Math.min(Math.round(maximal * zoomCompensation), constrainedWidth);
+      }
+      return constrainedWidth;
+    };
 
     let RCSSColCount = 1;
     let effectiveContainerWidth = constrainedWidth;
@@ -180,13 +184,12 @@ export class ReadiumCSS {
     }
     
     if (colCount === null) {
-      if (constrainedWidth < optimal || maximal === null) {
-        RCSSColCount = 1;
-        effectiveContainerWidth = constrainedWidth;
-      } else {
+      if (constrainedWidth >= optimal && maximal !== null) {
         RCSSColCount = Math.floor(constrainedWidth / optimal);
         const requiredWidth = Math.round(RCSSColCount * (maximal * zoomCompensation));
         effectiveContainerWidth = Math.min(requiredWidth, constrainedWidth);
+      } else {
+        effectiveContainerWidth = getSingleColWidth();
       }
     } else if (colCount > 1) {
       const minRequiredWidth = Math.round(colCount * (minimal !== null ? minimal : optimal));
@@ -202,25 +205,22 @@ export class ReadiumCSS {
       } else {
         if (minimal !== null && constrainedWidth < Math.round(colCount * minimal)) {
           RCSSColCount = Math.floor(constrainedWidth / minimal);
+          if (RCSSColCount <= 1) {
+            RCSSColCount = 1;
+            effectiveContainerWidth = getSingleColWidth();
+          } else {
+            const requiredWidth = Math.round(RCSSColCount * (optimal * zoomCompensation));
+            effectiveContainerWidth = Math.min(requiredWidth, constrainedWidth);
+          }
         } else {
           RCSSColCount = colCount;
+          const requiredWidth = Math.round(RCSSColCount * (optimal * zoomCompensation));
+          effectiveContainerWidth = Math.min(requiredWidth, constrainedWidth);
         }
-        const requiredWidth = Math.round((RCSSColCount * (optimal * zoomCompensation)));
-        effectiveContainerWidth = Math.min(requiredWidth, constrainedWidth);
       }
     } else {
       RCSSColCount = 1;
-      
-      if (constrainedWidth >= optimal) {
-        if (maximal === null) {
-          effectiveContainerWidth = constrainedWidth
-        } else {
-          const requiredWidth = Math.round(maximal * zoomCompensation);
-          effectiveContainerWidth = Math.min(requiredWidth, constrainedWidth);
-        }
-      } else {
-        effectiveContainerWidth = constrainedWidth 
-      }
+      effectiveContainerWidth = getSingleColWidth();
     }
 
     return { 

package/src/epub/preferences/EpubDefaults.ts

@@ -2,8 +2,7 @@ import {
   fontSizeRangeConfig, 
   fontWeightRangeConfig, 
   fontWidthRangeConfig, 
-  TextAlignment, 
-  Theme 
+  TextAlignment
 } from "../../preferences/Types";
 
 import { 
@@ -59,7 +58,6 @@ export interface IEpubDefaults {
   textAlign?: TextAlignment | null,
   textColor?: string | null,
   textNormalization?: boolean | null,
-  theme?: Theme | null,
   visitedColor?: string | null,
   wordSpacing?: number | null
 }
@@ -103,7 +101,6 @@ export class EpubDefaults {
   textAlign: TextAlignment | null;
   textColor: string | null;
   textNormalization: boolean | null;
-  theme: Theme | null;
   visitedColor: string | null;
   wordSpacing: number | null;
 
@@ -150,7 +147,6 @@ export class EpubDefaults {
     this.textAlign = ensureEnumValue<TextAlignment>(defaults.textAlign, TextAlignment) || null;
     this.textColor = ensureString(defaults.textColor) || null;
     this.textNormalization = ensureBoolean(defaults.textNormalization) ?? false;
-    this.theme = ensureEnumValue<Theme>(defaults.theme, Theme) || null;
     this.visitedColor = ensureString(defaults.visitedColor) || null;
     this.wordSpacing = ensureNonNegative(defaults.wordSpacing) || null;
 

package/src/epub/preferences/EpubPreferences.ts

@@ -2,7 +2,6 @@ import { ConfigurablePreferences } from "../../preferences/Configurable";
 
 import { 
   TextAlignment, 
-  Theme, 
   fontSizeRangeConfig, 
   fontWeightRangeConfig, 
   fontWidthRangeConfig 
@@ -56,7 +55,6 @@ export interface IEpubPreferences {
   textAlign?: TextAlignment | null,
   textColor?: string | null,
   textNormalization?: boolean | null,
-  theme?: Theme | null,
   visitedColor?: string | null,
   wordSpacing?: number | null
 }
@@ -100,7 +98,6 @@ export class EpubPreferences implements ConfigurablePreferences {
   textAlign?: TextAlignment | null;
   textColor?: string | null;
   textNormalization?: boolean | null;
-  theme?: Theme | null;
   visitedColor?: string | null;
   wordSpacing?: number | null;
 
@@ -140,7 +137,6 @@ export class EpubPreferences implements ConfigurablePreferences {
     this.textAlign = ensureEnumValue<TextAlignment>(preferences.textAlign, TextAlignment);
     this.textColor = ensureString(preferences.textColor);
     this.textNormalization = ensureBoolean(preferences.textNormalization);
-    this.theme = ensureEnumValue<Theme>(preferences.theme, Theme);
     this.visitedColor = ensureString(preferences.visitedColor);
     this.wordSpacing = ensureNonNegative(preferences.wordSpacing);
 

package/src/epub/preferences/EpubPreferencesEditor.ts

@@ -5,13 +5,12 @@ import { EpubSettings } from "./EpubSettings";
 import { BooleanPreference, EnumPreference, Preference, RangePreference } from "../../preferences/Preference";
 import { 
   TextAlignment, 
-  Theme, 
   fontSizeRangeConfig, 
   fontWeightRangeConfig, 
   fontWidthRangeConfig 
 } from "../../preferences/Types";
 
-import defaultColors from "@readium/css/css/vars/day.json";
+import defaultColors from "@readium/css/css/vars/colors.json";
 
 // WIP: will change cos’ of all the missing pieces
 export class EpubPreferencesEditor implements IPreferencesEditor {
@@ -483,18 +482,6 @@ export class EpubPreferencesEditor implements IPreferencesEditor {
     });
   }
 
-  get theme(): EnumPreference<Theme> {
-    return new EnumPreference<Theme>({
-      initialValue: this.preferences.theme,
-      effectiveValue: this.settings.theme || null,
-      isEffective: this.layout !== Layout.fixed,
-      onChange: (newValue: Theme | null | undefined) => {
-        this.updatePreference("theme", newValue || null);
-      },
-      supportedValues: Object.values(Theme)
-    });
-  }
-
   get visitedColor(): Preference<string> {
     return new Preference<string>({
       initialValue: this.preferences.visitedColor,

package/src/epub/preferences/EpubSettings.ts

@@ -1,5 +1,5 @@
 import { ConfigurableSettings } from "../../preferences/Configurable";
-import { TextAlignment, Theme } from "../../preferences/Types";
+import { TextAlignment } from "../../preferences/Types";
 import { EpubDefaults } from "./EpubDefaults";
 import { EpubPreferences } from "./EpubPreferences";
 
@@ -44,7 +44,6 @@ export interface IEpubSettings {
   textAlign?: TextAlignment | null,
   textColor?: string | null,
   textNormalization?: boolean | null,
-  theme?: Theme | null,
   visitedColor?: string | null,
   wordSpacing?: number | null
 }
@@ -88,7 +87,6 @@ export class EpubSettings implements ConfigurableSettings {
   textAlign: TextAlignment | null;
   textColor: string | null;
   textNormalization: boolean | null;
-  theme: Theme | null;
   visitedColor: string | null;
   wordSpacing: number | null;
 
@@ -225,7 +223,6 @@ export class EpubSettings implements ConfigurableSettings {
     this.textNormalization = typeof preferences.textNormalization === "boolean" 
       ? preferences.textNormalization 
       : defaults.textNormalization ?? null;
-    this.theme = preferences.theme || defaults.theme || null;
     this.visitedColor = preferences.visitedColor || defaults.visitedColor || null;
     this.wordSpacing = preferences.wordSpacing !== undefined 
       ? preferences.wordSpacing 

package/src/preferences/Types.ts

@@ -5,12 +5,6 @@ export enum TextAlignment {
   justify = "justify"
 };
 
-export enum Theme {
-  sepia = "sepia",
-  night = "night",
-  custom = "custom"
-}
-
 export type RangeConfig = {
   range: [number, number],
   step: number

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

@@ -1,4 +1,4 @@
-import { TextAlignment, Theme } from "../../preferences/Types";
+import { TextAlignment } from "../../preferences/Types";
 export type BodyHyphens = "auto" | "none";
 export type BoxSizing = "content-box" | "border-box";
 export type FontOpticalSizing = "auto" | "none";
@@ -22,7 +22,6 @@ declare abstract class Properties {
 export interface IUserProperties {
     advancedSettings?: boolean | null;
     a11yNormalize?: boolean | null;
-    appearance?: Theme | null;
     backgroundColor?: string | null;
     blendFilter?: boolean | null;
     bodyHyphens?: BodyHyphens | null;
@@ -57,7 +56,6 @@ export interface IUserProperties {
 }
 export declare class UserProperties extends Properties {
     a11yNormalize: boolean | null;
-    appearance: Theme | null;
     backgroundColor: string | null;
     blendFilter: boolean | null;
     bodyHyphens: BodyHyphens | null;

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

@@ -1,4 +1,4 @@
-import { TextAlignment, Theme } from "../../preferences/Types";
+import { TextAlignment } from "../../preferences/Types";
 export interface IEpubDefaults {
     backgroundColor?: string | null;
     blendFilter?: boolean | null;
@@ -36,7 +36,6 @@ export interface IEpubDefaults {
     textAlign?: TextAlignment | null;
     textColor?: string | null;
     textNormalization?: boolean | null;
-    theme?: Theme | null;
     visitedColor?: string | null;
     wordSpacing?: number | null;
 }
@@ -77,7 +76,6 @@ export declare class EpubDefaults {
     textAlign: TextAlignment | null;
     textColor: string | null;
     textNormalization: boolean | null;
-    theme: Theme | null;
     visitedColor: string | null;
     wordSpacing: number | null;
     constructor(defaults: IEpubDefaults);

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

@@ -1,5 +1,5 @@
 import { ConfigurablePreferences } from "../../preferences/Configurable";
-import { TextAlignment, Theme } from "../../preferences/Types";
+import { TextAlignment } from "../../preferences/Types";
 export interface IEpubPreferences {
     backgroundColor?: string | null;
     blendFilter?: boolean | null;
@@ -37,7 +37,6 @@ export interface IEpubPreferences {
     textAlign?: TextAlignment | null;
     textColor?: string | null;
     textNormalization?: boolean | null;
-    theme?: Theme | null;
     visitedColor?: string | null;
     wordSpacing?: number | null;
 }
@@ -78,7 +77,6 @@ export declare class EpubPreferences implements ConfigurablePreferences {
     textAlign?: TextAlignment | null;
     textColor?: string | null;
     textNormalization?: boolean | null;
-    theme?: Theme | null;
     visitedColor?: string | null;
     wordSpacing?: number | null;
     constructor(preferences?: IEpubPreferences);

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 { TextAlignment, Theme } from "../../preferences/Types";
+import { TextAlignment } from "../../preferences/Types";
 export declare class EpubPreferencesEditor implements IPreferencesEditor {
     preferences: EpubPreferences;
     private settings;
@@ -48,7 +48,6 @@ export declare class EpubPreferencesEditor implements IPreferencesEditor {
     get textAlign(): EnumPreference<TextAlignment>;
     get textColor(): Preference<string>;
     get textNormalization(): BooleanPreference;
-    get theme(): EnumPreference<Theme>;
     get visitedColor(): Preference<string>;
     get wordSpacing(): RangePreference<number>;
 }

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

@@ -1,5 +1,5 @@
 import { ConfigurableSettings } from "../../preferences/Configurable";
-import { TextAlignment, Theme } from "../../preferences/Types";
+import { TextAlignment } from "../../preferences/Types";
 import { EpubDefaults } from "./EpubDefaults";
 import { EpubPreferences } from "./EpubPreferences";
 export interface IEpubSettings {
@@ -39,7 +39,6 @@ export interface IEpubSettings {
     textAlign?: TextAlignment | null;
     textColor?: string | null;
     textNormalization?: boolean | null;
-    theme?: Theme | null;
     visitedColor?: string | null;
     wordSpacing?: number | null;
 }
@@ -80,7 +79,6 @@ export declare class EpubSettings implements ConfigurableSettings {
     textAlign: TextAlignment | null;
     textColor: string | null;
     textNormalization: boolean | null;
-    theme: Theme | null;
     visitedColor: string | null;
     wordSpacing: number | null;
     constructor(preferences: EpubPreferences, defaults: EpubDefaults);

package/types/src/preferences/Types.d.ts

@@ -4,11 +4,6 @@ export declare enum TextAlignment {
     right = "right",
     justify = "justify"
 }
-export declare enum Theme {
-    sepia = "sepia",
-    night = "night",
-    custom = "custom"
-}
 export type RangeConfig = {
     range: [number, number];
     step: number;