@readium/navigator 2.1.0 → 2.2.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@readium/navigator",
-  "version": "2.1.0",
+  "version": "2.2.0",
   "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" 

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/index.ts

@@ -1,4 +1,5 @@
 export * from './Navigator';
+export * from './webpub';
 export * from './epub';
 export * from './audio';
 export * from './helpers';

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/src/webpub/WebPubBlobBuilder.ts

@@ -0,0 +1,145 @@
+import { Link, Publication } from "@readium/shared";
+
+// Utilities (matching FrameBlobBuilder pattern)
+const blobify = (source: string, type: string) => URL.createObjectURL(new Blob([source], { type }));
+const stripJS = (source: string) => source.replace(/\/\/.*/g, "").replace(/\/\*[\s\S]*?\*\//g, "").replace(/\n/g, "").replace(/\s+/g, " ");
+const scriptify = (doc: Document, source: string) => {
+    const s = doc.createElement("script");
+    s.dataset.readium = "true";
+    s.src = source.startsWith("blob:") ? source : blobify(source, "text/javascript");
+    return s;
+}
+
+type CacheFunction = () => string;
+const resourceBlobCache = new Map<string, string>();
+const cached = (key: string, cacher: CacheFunction) => {
+    if (resourceBlobCache.has(key)) return resourceBlobCache.get(key)!;
+    const value = cacher();
+    resourceBlobCache.set(key, value);
+    return value;
+};
+
+const cssSelectorGenerator = (doc: Document) => scriptify(doc, cached("css-selector-generator", () => blobify(
+    "!function(t,e){\"object\"==typeof exports&&\"object\"==typeof module?module.exports=e():\"function\"==typeof define&&define.amd?define([],e):\"object\"==typeof exports?exports._readium_cssSelectorGenerator=e():t._readium_cssSelectorGenerator=e()}(self,(()=>(()=>{\"use strict\";var t,e,n={d:(t,e)=>{for(var o in e)n.o(e,o)&&!n.o(t,o)&&Object.defineProperty(t,o,{enumerable:!0,get:e[o]})},o:(t,e)=>Object.prototype.hasOwnProperty.call(t,e),r:t=>{\"undefined\"!=typeof Symbol&&Symbol.toStringTag&&Object.defineProperty(t,Symbol.toStringTag,{value:\"Module\"}),Object.defineProperty(t,\"__esModule\",{value:!0})}},o={};function r(t){return t&&t instanceof Element}function i(t=\"unknown problem\",...e){console.warn(`CssSelectorGenerator: ${t}`,...e)}n.r(o),n.d(o,{default:()=>z,getCssSelector:()=>U}),function(t){t.NONE=\"none\",t.DESCENDANT=\"descendant\",t.CHILD=\"child\"}(t||(t={})),function(t){t.id=\"id\",t.class=\"class\",t.tag=\"tag\",t.attribute=\"attribute\",t.nthchild=\"nthchild\",t.nthoftype=\"nthoftype\"}(e||(e={}));const c={selectors:[e.id,e.class,e.tag,e.attribute],includeTag:!1,whitelist:[],blacklist:[],combineWithinSelector:!0,combineBetweenSelectors:!0,root:null,maxCombinations:Number.POSITIVE_INFINITY,maxCandidates:Number.POSITIVE_INFINITY};function u(t){return t instanceof RegExp}function s(t){return[\"string\",\"function\"].includes(typeof t)||u(t)}function l(t){return Array.isArray(t)?t.filter(s):[]}function a(t){const e=[Node.DOCUMENT_NODE,Node.DOCUMENT_FRAGMENT_NODE,Node.ELEMENT_NODE];return function(t){return t instanceof Node}(t)&&e.includes(t.nodeType)}function f(t,e){if(a(t))return t.contains(e)||i(\"element root mismatch\",\"Provided root does not contain the element. This will most likely result in producing a fallback selector using element\'s real root node. If you plan to use the selector using provided root (e.g. `root.querySelector`), it will nto work as intended.\"),t;const n=e.getRootNode({composed:!1});return a(n)?(n!==document&&i(\"shadow root inferred\",\"You did not provide a root and the element is a child of Shadow DOM. This will produce a selector using ShadowRoot as a root. If you plan to use the selector using document as a root (e.g. `document.querySelector`), it will not work as intended.\"),n):e.ownerDocument.querySelector(\":root\")}function d(t){return\"number\"==typeof t?t:Number.POSITIVE_INFINITY}function m(t=[]){const[e=[],...n]=t;return 0===n.length?e:n.reduce(((t,e)=>t.filter((t=>e.includes(t)))),e)}function p(t){return[].concat(...t)}function h(t){const e=t.map((t=>{if(u(t))return e=>t.test(e);if(\"function\"==typeof t)return e=>{const n=t(e);return\"boolean\"!=typeof n?(i(\"pattern matcher function invalid\",\"Provided pattern matching function does not return boolean. It\'s result will be ignored.\",t),!1):n};if(\"string\"==typeof t){const e=new RegExp(\"^\"+t.replace(\/[|\\\\{}()[\\]^$+?.]\/g,\"\\\\$&\").replace(\/\\*\/g,\".+\")+\"$\");return t=>e.test(t)}return i(\"pattern matcher invalid\",\"Pattern matching only accepts strings, regular expressions and\/or functions. This item is invalid and will be ignored.\",t),()=>!1}));return t=>e.some((e=>e(t)))}function g(t,e,n){const o=Array.from(f(n,t[0]).querySelectorAll(e));return o.length===t.length&&t.every((t=>o.includes(t)))}function y(t,e){e=null!=e?e:function(t){return t.ownerDocument.querySelector(\":root\")}(t);const n=[];let o=t;for(;r(o)&&o!==e;)n.push(o),o=o.parentElement;return n}function b(t,e){return m(t.map((t=>y(t,e))))}const N={[t.NONE]:{type:t.NONE,value:\"\"},[t.DESCENDANT]:{type:t.DESCENDANT,value:\" > \"},[t.CHILD]:{type:t.CHILD,value:\" \"}},S=new RegExp([\"^$\",\"\\\\s\"].join(\"|\")),E=new RegExp([\"^$\"].join(\"|\")),w=[e.nthoftype,e.tag,e.id,e.class,e.attribute,e.nthchild],v=h([\"class\",\"id\",\"ng-*\"]);function C({nodeName:t}){return`[${t}]`}function O({nodeName:t,nodeValue:e}){return`[${t}=\'${L(e)}\']`}function T(t){const e=Array.from(t.attributes).filter((e=>function({nodeName:t},e){const n=e.tagName.toLowerCase();return!([\"input\",\"option\"].includes(n)&&\"value\"===t||v(t))}(e,t)));return[...e.map(C),...e.map(O)]}function I(t){return(t.getAttribute(\"class\")||\"\").trim().split(\/\\s+\/).filter((t=>!E.test(t))).map((t=>`.${L(t)}`))}function x(t){const e=t.getAttribute(\"id\")||\"\",n=`#${L(e)}`,o=t.getRootNode({composed:!1});return!S.test(e)&&g([t],n,o)?[n]:[]}function j(t){const e=t.parentNode;if(e){const n=Array.from(e.childNodes).filter(r).indexOf(t);if(n>-1)return[`:nth-child(${n+1})`]}return[]}function A(t){return[L(t.tagName.toLowerCase())]}function D(t){const e=[...new Set(p(t.map(A)))];return 0===e.length||e.length>1?[]:[e[0]]}function $(t){const e=D([t])[0],n=t.parentElement;if(n){const o=Array.from(n.children).filter((t=>t.tagName.toLowerCase()===e)),r=o.indexOf(t);if(r>-1)return[`${e}:nth-of-type(${r+1})`]}return[]}function R(t=[],{maxResults:e=Number.POSITIVE_INFINITY}={}){const n=[];let o=0,r=k(1);for(;r.length<=t.length&&o<e;)o+=1,n.push(r.map((e=>t[e]))),r=P(r,t.length-1);return n}function P(t=[],e=0){const n=t.length;if(0===n)return[];const o=[...t];o[n-1]+=1;for(let t=n-1;t>=0;t--)if(o[t]>e){if(0===t)return k(n+1);o[t-1]++,o[t]=o[t-1]+1}return o[n-1]>e?k(n+1):o}function k(t=1){return Array.from(Array(t).keys())}const _=\":\".charCodeAt(0).toString(16).toUpperCase(),M=\/[ !\"#$%&\'()\\[\\]{|}<>*+,.\/;=?@^`~\\\\]\/;function L(t=\"\"){var e,n;return null!==(n=null===(e=null===CSS||void 0===CSS?void 0:CSS.escape)||void 0===e?void 0:e.call(CSS,t))&&void 0!==n?n:function(t=\"\"){return t.split(\"\").map((t=>\":\"===t?`\\\\${_} `:M.test(t)?`\\\\${t}`:escape(t).replace(\/%\/g,\"\\\\\"))).join(\"\")}(t)}const q={tag:D,id:function(t){return 0===t.length||t.length>1?[]:x(t[0])},class:function(t){return m(t.map(I))},attribute:function(t){return m(t.map(T))},nthchild:function(t){return m(t.map(j))},nthoftype:function(t){return m(t.map($))}},F={tag:A,id:x,class:I,attribute:T,nthchild:j,nthoftype:$};function V(t){return t.includes(e.tag)||t.includes(e.nthoftype)?[...t]:[...t,e.tag]}function Y(t={}){const n=[...w];return t[e.tag]&&t[e.nthoftype]&&n.splice(n.indexOf(e.tag),1),n.map((e=>{return(o=t)[n=e]?o[n].join(\"\"):\"\";var n,o})).join(\"\")}function B(t,e,n=\"\",o){const r=function(t,e){return\"\"===e?t:function(t,e){return[...t.map((t=>e+\" \"+t)),...t.map((t=>e+\" > \"+t))]}(t,e)}(function(t,e,n){const o=function(t,e){const{blacklist:n,whitelist:o,combineWithinSelector:r,maxCombinations:i}=e,c=h(n),u=h(o);return function(t){const{selectors:e,includeTag:n}=t,o=[].concat(e);return n&&!o.includes(\"tag\")&&o.push(\"tag\"),o}(e).reduce(((e,n)=>{const o=function(t,e){var n;return(null!==(n=q[e])&&void 0!==n?n:()=>[])(t)}(t,n),s=function(t=[],e,n){return t.filter((t=>n(t)||!e(t)))}(o,c,u),l=function(t=[],e){return t.sort(((t,n)=>{const o=e(t),r=e(n);return o&&!r?-1:!o&&r?1:0}))}(s,u);return e[n]=r?R(l,{maxResults:i}):l.map((t=>[t])),e}),{})}(t,n),r=function(t,e){return function(t){const{selectors:e,combineBetweenSelectors:n,includeTag:o,maxCandidates:r}=t,i=n?R(e,{maxResults:r}):e.map((t=>[t]));return o?i.map(V):i}(e).map((e=>function(t,e){const n={};return t.forEach((t=>{const o=e[t];o.length>0&&(n[t]=o)})),function(t={}){let e=[];return Object.entries(t).forEach((([t,n])=>{e=n.flatMap((n=>0===e.length?[{[t]:n}]:e.map((e=>Object.assign(Object.assign({},e),{[t]:n})))))})),e}(n).map(Y)}(e,t))).filter((t=>t.length>0))}(o,n),i=p(r);return[...new Set(i)]}(t,o.root,o),n);for(const e of r)if(g(t,e,o.root))return e;return null}function G(t){return{value:t,include:!1}}function W({selectors:t,operator:n}){let o=[...w];t[e.tag]&&t[e.nthoftype]&&(o=o.filter((t=>t!==e.tag)));let r=\"\";return o.forEach((e=>{(t[e]||[]).forEach((({value:t,include:e})=>{e&&(r+=t)}))})),n.value+r}function H(n){return[\":root\",...y(n).reverse().map((n=>{const o=function(e,n,o=t.NONE){const r={};return n.forEach((t=>{Reflect.set(r,t,function(t,e){return F[e](t)}(e,t).map(G))})),{element:e,operator:N[o],selectors:r}}(n,[e.nthchild],t.DESCENDANT);return o.selectors.nthchild.forEach((t=>{t.include=!0})),o})).map(W)].join(\"\")}function U(t,n={}){const o=function(t){const e=(Array.isArray(t)?t:[t]).filter(r);return[...new Set(e)]}(t),i=function(t,n={}){const o=Object.assign(Object.assign({},c),n);return{selectors:(r=o.selectors,Array.isArray(r)?r.filter((t=>{return n=e,o=t,Object.values(n).includes(o);var n,o})):[]),whitelist:l(o.whitelist),blacklist:l(o.blacklist),root:f(o.root,t),combineWithinSelector:!!o.combineWithinSelector,combineBetweenSelectors:!!o.combineBetweenSelectors,includeTag:!!o.includeTag,maxCombinations:d(o.maxCombinations),maxCandidates:d(o.maxCandidates)};var r}(o[0],n);let u=\"\",s=i.root;function a(){return function(t,e,n=\"\",o){if(0===t.length)return null;const r=[t.length>1?t:[],...b(t,e).map((t=>[t]))];for(const t of r){const e=B(t,0,n,o);if(e)return{foundElements:t,selector:e}}return null}(o,s,u,i)}let m=a();for(;m;){const{foundElements:t,selector:e}=m;if(g(o,e,i.root))return e;s=t[0],u=e,m=a()}return o.length>1?o.map((t=>U(t,i))).join(\", \"):function(t){return t.map(H).join(\", \")}(o)}const z=U;return o})()));",
+    "text/javascript"
+)));
+
+const readiumPropertiesScript = `
+window._readium_blockedEvents = [];
+window._readium_blockEvents = false; // WebPub doesn't need event blocking
+window._readium_eventBlocker = null;
+`;
+
+const rBefore = (doc: Document) => scriptify(doc, cached("webpub-js-before", () => blobify(stripJS(readiumPropertiesScript), "text/javascript")));
+const rAfter = (doc: Document) => scriptify(doc, cached("webpub-js-after", () => blobify(stripJS(`
+if(window.onload) window.onload = new Proxy(window.onload, {
+    apply: function(target, receiver, args) {
+        if(!window._readium_blockEvents) {
+            Reflect.apply(target, receiver, args);
+            return;
+        }
+        _readium_blockedEvents.push([0, target, receiver, args]);
+    }
+});`), "text/javascript")));
+
+export class WebPubBlobBuilder {
+    private readonly item: Link;
+    private readonly burl: string;
+    private readonly pub: Publication;
+
+    constructor(pub: Publication, baseURL: string, item: Link) {
+        this.pub = pub;
+        this.item = item;
+        this.burl = item.toURL(baseURL) || "";
+    }
+
+    public async build(): Promise<string> {
+        if (!this.item.mediaType.isHTML) {
+            throw new Error(`Unsupported media type for WebPub: ${this.item.mediaType.string}`);
+        }
+
+        return await this.buildHtmlFrame();
+    }
+
+    private async buildHtmlFrame(): Promise<string> {
+        // Load the HTML resource
+        const txt = await this.pub.get(this.item).readAsString();
+        if(!txt) throw new Error(`Failed reading item ${this.item.href}`);
+        const doc = new DOMParser().parseFromString(
+            txt,
+            this.item.mediaType.string as DOMParserSupportedType
+        );
+        const perror = doc.querySelector("parsererror");
+        if(perror) {
+            const details = perror.querySelector("div");
+            throw new Error(`Failed parsing item ${this.item.href}: ${details?.textContent || perror.textContent}`);
+        }
+        return this.finalizeDOM(doc, this.burl, this.item.mediaType, txt);
+    }
+
+    private hasExecutable(doc: Document): boolean {
+        return (
+            !!doc.querySelector("script") ||
+            !!doc.querySelector("body[onload]:not(body[onload=''])")
+        );
+    }
+
+    private finalizeDOM(doc: Document, base: string | undefined, mediaType: any, txt?: string): string {
+        if(!doc) return "";
+
+        doc.body.querySelectorAll("img").forEach((img) => {
+            img.setAttribute("fetchpriority", "high");
+        });
+
+        if(base !== undefined) {
+            const b = doc.createElement("base");
+            b.href = base;
+            b.dataset.readium = "true";
+            doc.head.firstChild!.before(b);
+        }
+
+
+        const hasExecutable = this.hasExecutable(doc);
+        if(hasExecutable) doc.head.firstChild!.before(rBefore(doc));
+        doc.head.firstChild!.before(cssSelectorGenerator(doc));
+        if(hasExecutable) doc.head.appendChild(rAfter(doc));
+
+        // Serialize properly based on content type
+        let serializedContent: string;
+
+        if (mediaType.string === "application/xhtml+xml") {
+            // XHTML: Use XMLSerializer for proper XML formatting
+            serializedContent = new XMLSerializer().serializeToString(doc);
+        } else {
+            // HTML: Use custom HTML serialization to preserve HTML formatting
+            serializedContent = this.serializeAsHTML(doc, txt || "");
+        }
+
+        // Make blob from doc
+        return URL.createObjectURL(
+            new Blob([serializedContent], {
+              type: mediaType.isHTML
+                ? mediaType.string
+                : "application/xhtml+xml",
+            })
+        );
+    }
+
+    private serializeAsHTML(doc: Document, txt: string): string {
+        // For HTML content, try to preserve the original HTML structure
+        // while injecting our scripts
+
+        // Extract the original DOCTYPE if present
+        const doctypeMatch = txt.match(/<!DOCTYPE[^>]*>/i);
+        const doctype = doctypeMatch ? doctypeMatch[0] + "\n" : "";
+
+        // Get the HTML element and serialize it as HTML
+        const htmlElement = doc.documentElement;
+        let htmlContent = htmlElement.outerHTML;
+
+        // Try to preserve the original HTML structure
+        // This is a best-effort approach since there's no perfect HTML serializer
+
+        return doctype + htmlContent;
+    }
+}

package/src/webpub/WebPubFrameManager.ts

@@ -0,0 +1,140 @@
+import { Loader, ModuleName } from "@readium/navigator-html-injectables";
+import { FrameComms } from "../epub/frame/FrameComms";
+import { ReadiumWindow } from "../../../navigator-html-injectables/types/src/helpers/dom";
+import { sML } from "../helpers";
+
+export class WebPubFrameManager {
+    private frame: HTMLIFrameElement;
+    private loader: Loader | undefined;
+    public readonly source: string;
+    private comms: FrameComms | undefined;
+    private destroyed: boolean = false;
+
+    private currModules: ModuleName[] = [];
+
+    constructor(source: string) {
+        this.frame = document.createElement("iframe");
+        this.frame.classList.add("readium-navigator-iframe");
+        this.frame.style.visibility = "hidden";
+        this.frame.style.setProperty("aria-hidden", "true");
+        this.frame.style.opacity = "0";
+        this.frame.style.position = "absolute";
+        this.frame.style.pointerEvents = "none";
+        this.frame.style.transition = "visibility 0s, opacity 0.1s linear";
+        // Protect against background color bleeding
+        this.frame.style.backgroundColor = "#FFFFFF";
+        this.source = source;
+    }
+
+    async load(modules: ModuleName[] = []): Promise<Window> {
+        return new Promise((res, rej) => {
+            if(this.loader) {
+                const wnd = this.frame.contentWindow!;
+                // Check if currently loaded modules are equal
+                if([...this.currModules].sort().join("|") === [...modules].sort().join("|")) {
+                    try { res(wnd); } catch (error) {};
+                    return;
+                }
+                this.comms?.halt();
+                this.loader.destroy();
+                this.loader = new Loader(wnd as ReadiumWindow, modules);
+                this.currModules = modules;
+                this.comms = undefined;
+                try { res(wnd); } catch (error) {}
+                return;
+            }
+            this.frame.onload = () => {
+                const wnd = this.frame.contentWindow!;
+                this.loader = new Loader(wnd as ReadiumWindow, modules);
+                this.currModules = modules;
+                try { res(wnd); } catch (error) {}
+            };
+            this.frame.onerror = (err) => {
+                try { rej(err); } catch (error) {}
+            }
+            this.frame.contentWindow!.location.replace(this.source);
+        });
+    }
+
+    async destroy() {
+        await this.hide();
+        this.loader?.destroy();
+        this.frame.remove();
+        this.destroyed = true;
+    }
+
+    async hide(): Promise<void> {
+        if(this.destroyed) return;
+        this.frame.style.visibility = "hidden";
+        this.frame.style.setProperty("aria-hidden", "true");
+        this.frame.style.opacity = "0";
+        this.frame.style.pointerEvents = "none";
+
+        if(this.frame.parentElement) {
+            if(this.comms === undefined || !this.comms.ready) return;
+            return new Promise((res, _) => {
+                this.comms?.send("unfocus", undefined, (_: boolean) => {
+                    this.comms?.halt();
+                    res();
+                });
+            });
+        } else {
+            this.comms?.halt();
+        }
+    }
+
+    async show(atProgress?: number): Promise<void> {
+        if (this.destroyed) throw Error("Trying to show frame when it doesn't exist");
+        if (!this.frame.parentElement) throw Error("Trying to show frame that is not attached to the DOM");
+        if (this.comms) this.comms.resume();
+        else this.comms = new FrameComms(this.frame.contentWindow!, this.source);
+
+        return new Promise((res, _) => {
+            this.comms?.send("activate", undefined, () => {
+                this.comms?.send("focus", undefined, () => {
+                    const remove = () => {
+                        this.frame.style.removeProperty("visibility");
+                        this.frame.style.removeProperty("aria-hidden");
+                        this.frame.style.removeProperty("opacity");
+                        this.frame.style.removeProperty("pointer-events");
+
+                        if (sML.UA.WebKit) {
+                            this.comms?.send("force_webkit_recalc", undefined);
+                        }
+
+                        res();
+                    }
+
+                    if (atProgress !== undefined) {
+                        this.comms?.send("go_progression", atProgress, remove);
+                    } else {
+                        remove();
+                    }
+                });
+            });
+        });
+    }
+
+    get iframe() {
+        if(this.destroyed) throw Error("Trying to use frame when it doesn't exist");
+        return this.frame;
+    }
+
+    get realSize() {
+        if(this.destroyed) throw Error("Trying to use frame client rect when it doesn't exist");
+        return this.frame.getBoundingClientRect();
+    }
+
+    get window() {
+        if(this.destroyed || !this.frame.contentWindow) throw Error("Trying to use frame window when it doesn't exist");
+        return this.frame.contentWindow;
+    }
+
+    get msg() {
+        return this.comms;
+    }
+
+    get ldr() {
+        return this.loader;
+    }
+}