@readium/navigator 2.5.0-beta.2 → 2.5.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@readium/navigator",
-  "version": "2.5.0-beta.2",
+  "version": "2.5.0",
   "type": "module",
   "description": "Next generation SDK for publications in Web Apps",
   "author": "readium",
@@ -50,7 +50,7 @@
     "generate:css-selector": "node scripts/generate-css-selector.js"
   },
   "devDependencies": {
-    "@readium/css": "^2.0.1",
+    "@readium/css": "^2.0.2",
     "@readium/navigator-html-injectables": "workspace:*",
     "@readium/shared": "workspace:*",
     "@types/path-browserify": "^1.0.3",

package/src/epub/EpubNavigator.ts

@@ -19,7 +19,7 @@ import { IInjectableRule, IInjectablesConfig } from "../injection/Injectable.ts"
 import { IContentProtectionConfig, IKeyboardPeripheralsConfig } from "../Navigator.ts";
 import { NavigatorProtector, NAVIGATOR_SUSPICIOUS_ACTIVITY_EVENT } from "../protection/NavigatorProtector.ts";
 import { KeyboardPeripherals, NAVIGATOR_KEYBOARD_PERIPHERAL_EVENT } from "../peripherals/KeyboardPeripherals.ts";
-import { getScriptMode } from "./helpers/scriptMode.ts";
+import { getScriptMode } from "../helpers/scriptMode.ts";
 
 export type ManagerEventKey = "zoom";
 

package/src/epub/css/ReadiumCSS.ts

@@ -1,5 +1,5 @@
 import { LineLengths } from "../../helpers/index.ts";
-import { getContentWidth } from "../../helpers/dimensions.ts";
+import { getContentWidth, getContentHeight } from "../../helpers/dimensions.ts";
 import { EpubSettings } from "../preferences/EpubSettings.ts";
 import { IUserProperties, RSProperties, UserProperties } from "./Properties.ts";
 
@@ -138,8 +138,7 @@ export class ReadiumCSS {
     // (width) must not be constrained by line-length at all — use the full
     // parent width minus the known constraint.
     if (this.isCJKVertical) {
-      const w = Math.round(getContentWidth(this.containerParent) - this.constraint);
-      return { colCount: undefined, effectiveContainerWidth: w, effectiveLineLength: w };
+      return this.computeCJKVerticalLength(scale, ignoreCompensation);
     }
 
     const isScroll = scroll ?? this.userProperties.view === "scroll";
@@ -246,6 +245,16 @@ export class ReadiumCSS {
     };
   }
 
+  private computeCJKVerticalLength(scale: number | null, ignoreCompensation: boolean | null) {
+    const w = Math.round(getContentWidth(this.containerParent) - this.constraint);
+    const h = Math.round(getContentHeight(this.containerParent));
+    const metrics = this.getCompensatedMetrics(scale, ignoreCompensation);
+    const effectiveLineLength = metrics.maximal !== null
+      ? Math.min(Math.round(metrics.maximal * metrics.zoomCompensation), h)
+      : h;
+    return { colCount: undefined, effectiveContainerWidth: w, effectiveLineLength };
+  }
+
   // This behaves as paginate where colCount = 1
   private computeScrollLength(scale: number | null, ignoreCompensation: boolean | null) {
     const constrainedWidth = Math.round(getContentWidth(this.containerParent) - (this.constraint));

package/src/epub/frame/FrameBlobBuilder.ts

@@ -1,6 +1,6 @@
 import { Link, MediaType, Publication, ReadingProgression } from "@readium/shared";
 import { Injector } from "../../injection/Injector.ts";
-import { getScriptMode } from "../helpers/scriptMode.ts";
+import { getScriptMode } from "../../helpers/scriptMode.ts";
 
 const csp = (domains: string[]) => {
     const d = domains.join(" ");

package/src/epub/index.ts

@@ -3,4 +3,3 @@ export * from "./frame/index.ts";
 export * from "./fxl/index.ts";
 export * from "./preferences/index.ts";
 export * from "./css/index.ts";
-export { getScriptMode, type ScriptMode } from "./helpers/scriptMode.ts";

package/src/helpers/dimensions.ts

@@ -11,3 +11,10 @@ export function getContentWidth(el: Element) {
   return el.clientWidth - paddingLeft - paddingRight;
 }
 
+export function getContentHeight(el: Element) {
+  const cStyle = getComputedStyle(el);
+  const paddingTop = parseFloat(cStyle.paddingTop || "0");
+  const paddingBottom = parseFloat(cStyle.paddingBottom || "0");
+  return el.clientHeight - paddingTop - paddingBottom;
+}
+

package/src/helpers/index.ts

@@ -1,2 +1,3 @@
 export * from "./lineLength.ts";
 export * from './sML.ts';
+export * from './scriptMode.ts';

package/src/injection/epubInjectables.ts

@@ -1,7 +1,7 @@
 import { IInjectableRule, IInjectable } from "../injection/Injectable.ts";
 import { stripJS, stripCSS } from "../helpers/minify.ts";
 import { Metadata, Layout, Link } from "@readium/shared";
-import { getScriptMode } from "../epub/helpers/scriptMode.ts";
+import { getScriptMode } from "../helpers/scriptMode.ts";
 
 import cssSelectorGeneratorContent from "../dom/_readium_cssSelectorGenerator.js?raw";
 import executionPreventionContent from "../dom/_readium_executionPrevention.js?raw";

package/src/webpub/WebPubNavigator.ts

@@ -7,7 +7,7 @@ import * as path from "path-browserify";
 import { WebPubFrameManager } from "./WebPubFrameManager.ts";
 
 import { ManagerEventKey } from "../epub/EpubNavigator.ts";
-import { getScriptMode } from "../epub/helpers/scriptMode.ts";
+import { getScriptMode } from "../helpers/scriptMode.ts";
 import { WebPubCSS } from "./css/WebPubCSS.ts";
 import { WebUserProperties, WebRSProperties } from "./css/Properties.ts";
 import { IWebPubPreferences, WebPubPreferences } from "./preferences/WebPubPreferences.ts";

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

@@ -24,6 +24,7 @@ export declare class ReadiumCSS {
     private updateLayout;
     private getCompensatedMetrics;
     private paginate;
+    private computeCJKVerticalLength;
     private computeScrollLength;
     setContainerWidth(): void;
     resizeHandler(): void;

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

@@ -3,4 +3,3 @@ export * from "./frame/index.ts";
 export * from "./fxl/index.ts";
 export * from "./preferences/index.ts";
 export * from "./css/index.ts";
-export { getScriptMode, type ScriptMode } from "./helpers/scriptMode.ts";

package/types/src/helpers/dimensions.d.ts

@@ -5,3 +5,4 @@
  * @param el - The element to measure.
  */
 export declare function getContentWidth(el: Element): number;
+export declare function getContentHeight(el: Element): number;

package/types/src/helpers/index.d.ts

@@ -1,2 +1,3 @@
 export * from "./lineLength.ts";
 export * from './sML.ts';
+export * from './scriptMode.ts';