@prose-reader/core 1.270.0 → 1.271.0

package/dist/index.js

@@ -1,9 +1,9 @@
-import { switchMap as w, of as v, fromEvent as q, take as Tt, map as S, from as A, takeUntil as $, Observable as se, defer as Ft, Subject as R, combineLatest as O, merge as P, EMPTY as _, NEVER as he, tap as x, share as j, BehaviorSubject as Y, distinctUntilChanged as k, filter as M, mergeMap as ge, first as V, endWith as ye, catchError as Ue, finalize as pe, lastValueFrom as rn, scheduled as an, animationFrameScheduler as ce, exhaustMap as ze, debounceTime as be, withLatestFrom as z, throttleTime as cn, startWith as ne, shareReplay as J, switchScan as un, defaultIfEmpty as ln, forkJoin as dn, delay as Pe, timer as Te, skip as Lt, ReplaySubject as ot, identity as xe, reduce as pn, concatMap as st } from "rxjs";
-import { Report as gn, isShallowEqual as U, shallowMergeIfDefined as $e, getParentPath as hn, parseContentType as mn, detectMimeTypeFromName as Me, arrayEqual as fn } from "@prose-reader/shared";
-import { isShallowEqual as nr } from "@prose-reader/shared";
-import { switchMap as X, first as Mt, map as ie, distinctUntilChanged as fe, startWith as yn, shareReplay as Ze, tap as N, pairwise as Sn, take as In, takeUntil as K, filter as ae, debounceTime as bn, skip as Ct, mergeMap as vn, catchError as rt } from "rxjs/operators";
-import { generate as We, parse as Et, isIndirectionOnly as wn, isParsedCfiRange as Pn, resolve as xn } from "@prose-reader/cfi";
-const $n = "@prose-reader/core", D = gn.namespace($n, void 0, {
+import { switchMap as w, of as v, fromEvent as X, take as $t, map as S, from as k, takeUntil as T, Observable as ce, defer as Tt, Subject as R, combineLatest as j, merge as P, EMPTY as _, NEVER as ge, tap as $, share as D, BehaviorSubject as q, distinctUntilChanged as N, filter as C, mergeMap as pe, first as U, endWith as fe, catchError as ze, finalize as me, lastValueFrom as nn, scheduled as on, animationFrameScheduler as re, exhaustMap as sn, debounceTime as Ie, withLatestFrom as z, throttleTime as rn, startWith as ne, shareReplay as J, switchScan as an, defaultIfEmpty as cn, forkJoin as un, delay as Pe, timer as Te, skip as Ft, ReplaySubject as ot, identity as xe, concatMap as ln } from "rxjs";
+import { Report as dn, isShallowEqual as O, shallowMergeIfDefined as $e, getParentPath as pn, parseContentType as gn, detectMimeTypeFromName as Me, arrayEqual as hn } from "@prose-reader/shared";
+import { isShallowEqual as tr } from "@prose-reader/shared";
+import { switchMap as Y, first as mn, map as ie, distinctUntilChanged as be, startWith as fn, shareReplay as Ge, tap as V, pairwise as yn, take as Sn, takeUntil as K, filter as de, debounceTime as In, skip as Lt, mergeMap as bn, catchError as st, share as vn } from "rxjs/operators";
+import { generate as We, parse as Mt, isIndirectionOnly as wn, isParsedCfiRange as Pn, resolve as xn } from "@prose-reader/cfi";
+const $n = "@prose-reader/core", A = dn.namespace($n, void 0, {
   color: "#98cde7"
 }), Tn = [
   "pointercancel",
@@ -25,17 +25,19 @@ function Fn(n, e, t) {
     return n.caretRangeFromPoint(e, t);
 }
 const Ln = (n, e) => {
-  const t = "body" in n ? _e(n.body, e) : _e(n, e), i = "createRange" in n ? n : n.ownerDocument;
-  if (t) {
+  const t = "createRange" in n ? n : n.ownerDocument;
+  if (!t) return;
+  const i = "body" in n ? _e(n.body, e) : _e(n, e);
+  if (i) {
     let o, s = 0;
-    const r = i.createRange();
-    return Array.from(t.childNodes).some((a) => {
+    const r = t.createRange();
+    return Array.from(i.childNodes).some((a) => {
       r.selectNodeContents(a);
       const c = r.getClientRects(), u = Mn(c, e);
       if (u) {
         o = r.cloneRange();
         const l = Fn(
-          i,
+          t,
           Math.ceil(u.left),
           Math.ceil(u.top)
         );
@@ -45,10 +47,10 @@ const Ln = (n, e) => {
     }), o ? {
       node: o.startContainer,
       offset: s
-    } : { node: t, offset: 0 };
+    } : { node: i, offset: 0 };
   }
 }, _e = (n, e) => {
-  const t = n.getBoundingClientRect(), i = Dt(
+  const t = n.getBoundingClientRect(), i = Ct(
     t,
     e
   );
@@ -61,12 +63,12 @@ const Ln = (n, e) => {
   }
   return o;
 };
-function Dt(n, { left: e, right: t }) {
+function Ct(n, { left: e, right: t }) {
   return n.left <= e && n.right <= e ? "before" : n.left <= e && n.right > e && n.right <= t ? "partially-before" : n.left <= t && n.right > t ? "partially-after" : n.left > t ? "after" : "within";
 }
 function Mn(n, e) {
   return Array.from(n).find((t) => {
-    const i = Dt(t, e);
+    const i = Ct(t, e);
     return i !== "before" && i !== "after";
   });
 }
@@ -77,11 +79,11 @@ const Cn = (n, e) => {
     try {
       e <= (t?.endOffset || 0) && t?.setStart(n, e || 0);
     } catch (i) {
-      D.error(i);
+      A.error(i);
     }
     return t;
   }
-}, Je = (n) => {
+}, Ze = (n) => {
   if (n?.target && n?.target?.ownerDocument?.defaultView) {
     const e = n?.target?.ownerDocument?.defaultView;
     if (e.PointerEvent && n instanceof e.PointerEvent)
@@ -94,7 +96,7 @@ const Cn = (n, e) => {
   }
   return !!Tn.includes(n.type);
 }, En = (n) => {
-  if (Je(n)) return !1;
+  if (Ze(n)) return !1;
   if (n?.target && n?.target?.ownerDocument?.defaultView) {
     const e = n?.target?.ownerDocument?.defaultView;
     if (e.MouseEvent)
@@ -118,7 +120,7 @@ const Cn = (n, e) => {
       return n instanceof e.TouchEvent;
   }
   return !1;
-}, Rn = () => document.createElement("div"), Rt = (n) => {
+}, An = () => document.createElement("div"), Et = (n) => {
   const e = [
     "img",
     // Images
@@ -134,8 +136,8 @@ const Cn = (n, e) => {
     // JavaScript files
   ].join(",");
   return Array.from(n?.querySelectorAll(e) || []);
-}, An = (n) => {
-  if (Rt(n).forEach((t) => {
+}, Rn = (n) => {
+  if (Et(n).forEach((t) => {
     const i = t.getAttribute("src") || t.getAttribute("href");
     i?.startsWith("blob:") && n?.defaultView?.URL.revokeObjectURL(i);
   }), n) {
@@ -152,7 +154,7 @@ const Cn = (n, e) => {
     }
   }
 };
-function At(n, e, t = []) {
+function Dt(n, e, t = []) {
   if (typeof n != "object" || n === null) return !1;
   for (const i of e)
     if (!(i in n)) return !1;
@@ -161,8 +163,8 @@ function At(n, e, t = []) {
       return !1;
   return !0;
 }
-function Nt(n) {
-  return At(
+function At(n) {
+  return Dt(
     n,
     ["nodeType"],
     []
@@ -170,10 +172,10 @@ function Nt(n) {
   ) && n.nodeType === Node.ELEMENT_NODE;
 }
 function Nn(n, e) {
-  return Nt(n) && n.tagName.toLowerCase() === e.toLowerCase();
+  return At(n) && n.tagName.toLowerCase() === e.toLowerCase();
 }
 function On(n) {
-  return At(
+  return Dt(
     n,
     [
       "startContainer",
@@ -196,12 +198,12 @@ const Ce = (n, e, t, i) => {
     const t = n.getElementById(e);
     t && t.remove();
   }
-}, at = (n, e) => {
+}, rt = (n, e) => {
   const t = new RegExp(`${e}\\s*=\\s*([0-9.]+)`, "i"), i = n.match(t) || [], o = i[1] || "0";
   return i && Number.parseFloat(o) || 0;
 }, Vn = (n, e, t, i) => {
   n?.contentDocument?.head && Ce(n.contentDocument, e, t, i);
-}, _s = (n, e) => {
+}, Ws = (n, e) => {
   n?.contentDocument && Ee(n.contentDocument, e);
 }, oe = (n, e, t, i) => {
   if (!n) return;
@@ -213,13 +215,13 @@ const Ce = (n, e, t, i) => {
     return;
   }
   Vn(n, e, t, i);
-}, Ke = (n) => {
+}, Je = (n) => {
   if (n?.contentDocument) {
     const t = n.contentDocument.querySelector("meta[name='viewport']");
     if (t) {
       const i = t.getAttribute("content");
       if (i) {
-        const o = at(i, "width"), s = at(i, "height");
+        const o = rt(i, "width"), s = rt(i, "height");
         return o > 0 && s > 0 ? {
           hasViewport: !0,
           width: o,
@@ -230,14 +232,14 @@ const Ce = (n, e, t, i) => {
   }
   return { hasViewport: !1 };
 }, jn = (n) => n.pipe(
-  w((e) => e.src === "about:blank" && e.contentDocument?.readyState === "complete" && e.contentDocument.body ? v(e) : q(e, "load").pipe(
-    Tt(1),
+  w((e) => e.src === "about:blank" && e.contentDocument?.readyState === "complete" && e.contentDocument.body ? v(e) : X(e, "load").pipe(
+    $t(1),
     S(() => e)
   ))
 ), kn = (n) => n.pipe(
   w((e) => {
     const t = e?.contentDocument?.fonts.ready;
-    return t ? A(t).pipe(S(() => e)) : v(void 0);
+    return t ? k(t).pipe(S(() => e)) : v(void 0);
   })
 ), Un = (n) => (e) => {
   const t = n(e), i = new IntersectionObserver((o) => {
@@ -276,7 +278,7 @@ const Ce = (n, e, t, i) => {
   };
 }, zn = (n) => (e) => {
   const t = n(e);
-  return t.context.watch("rootElement").pipe($(t.context.destroy$)).subscribe((i) => {
+  return t.context.watch("rootElement").pipe(T(t.context.destroy$)).subscribe((i) => {
     if (!i) return;
     const o = () => {
       t.settings.values.computedPageTurnMode === "controlled" && i.scrollTo(0, 0);
@@ -286,7 +288,7 @@ const Ce = (n, e, t, i) => {
     const s = t.spineItemsManager.get(i)?.renderer.getDocumentFrame();
     s && s.contentDocument?.body.setAttribute("tabindex", "-1");
   }), t;
-}, Ae = ({
+}, Re = ({
   position: n,
   frameElement: e
 }) => {
@@ -300,8 +302,8 @@ const Ce = (n, e, t, i) => {
   if (!e || !o) return n;
   const s = t.getSpineItemFromIframe(o), r = o, { height: a, width: c } = i.pageSize;
   if (!s || !(r instanceof HTMLIFrameElement)) return n;
-  if (Je(n)) {
-    const { clientX: u, clientY: l } = Ae({
+  if (Ze(n)) {
+    const { clientX: u, clientY: l } = Re({
       position: n,
       frameElement: r
     }), d = new PointerEvent(n.type, {
@@ -316,7 +318,7 @@ const Ce = (n, e, t, i) => {
     }), d;
   }
   if (En(n)) {
-    const { clientX: u, clientY: l } = Ae({
+    const { clientX: u, clientY: l } = Re({
       position: n,
       frameElement: r
     }), d = new MouseEvent(n.type, {
@@ -331,7 +333,7 @@ const Ce = (n, e, t, i) => {
   }
   if (Dn(n)) {
     const u = Array.from(n.touches).map((d) => {
-      const { clientX: p, clientY: g } = Ae({
+      const { clientX: p, clientY: g } = Re({
         position: d,
         frameElement: r
       });
@@ -374,7 +376,7 @@ const Ce = (n, e, t, i) => {
       const a = Hn.map((c) => {
         const u = (l) => {
           let d = l;
-          if (Je(l) && (d = new PointerEvent(l.type, l)), d !== l) {
+          if (Ze(l) && (d = new PointerEvent(l.type, l)), d !== l) {
             const p = Wn(
               d,
               l,
@@ -395,15 +397,15 @@ const Ce = (n, e, t, i) => {
       });
     }
   ), t;
-}, Ot = (n) => ie((e) => Object.entries(e).reduce(
+}, Rt = (n) => ie((e) => Object.entries(e).reduce(
   (t, [i, o]) => n.includes(i) ? {
     ...t,
     [i]: o
   } : t,
   {}
-)), Qe = (n) => (e) => e.pipe(Ot(n), fe(U));
-function et(n) {
-  return new se((e) => {
+)), Ke = (n) => (e) => e.pipe(Rt(n), be(O));
+function Qe(n) {
+  return new ce((e) => {
     const t = new ResizeObserver((i) => {
       e.next(i);
     });
@@ -413,9 +415,9 @@ function et(n) {
   });
 }
 const De = (n) => (e) => e.pipe(
-  X(
+  Y(
     (t) => n.pipe(
-      Mt(),
+      mn(),
       ie(() => t)
     )
   )
@@ -426,8 +428,8 @@ const De = (n) => (e) => e.pipe(
   });
   return () => (t.unsubscribe(), e ? v(e.result) : n);
 };
-function Vt() {
-  return new se((n) => {
+function et() {
+  return new ce((n) => {
     if (window.requestIdleCallback) {
       const t = window.requestIdleCallback(() => {
         n.next(), n.complete();
@@ -440,17 +442,17 @@ function Vt() {
     return () => clearTimeout(e);
   });
 }
-function ct(n) {
-  return Ft(() => Vt().pipe(X(n)));
+function at(n) {
+  return Tt(() => et().pipe(Y(n)));
 }
-const ut = (n, e) => new se((t) => {
+const ct = (n, e) => new ce((t) => {
   const i = new MutationObserver((o) => {
     t.next(o);
   });
   return i.observe(n, e), () => i.disconnect();
 });
-function Hs(n, e) {
-  return new se((t) => {
+function _s(n, e) {
+  return new ce((t) => {
     const i = new IntersectionObserver((o) => {
       t.next(o);
     }, e);
@@ -459,7 +461,7 @@ function Hs(n, e) {
     };
   });
 }
-class jt {
+class Nt {
   constructor(e, t) {
     this.settingsManager = t;
     const i = $e(
@@ -469,12 +471,12 @@ class jt {
     this.outputSettings = this.computeOutputSettings(i), this.inputSettings = $e(
       this.getDefaultSettings(),
       e
-    ), this.outputSettingsUpdateSubject = new R(), this.values$ = O([
+    ), this.outputSettingsUpdateSubject = new R(), this.values$ = j([
       this.settingsManager.values$,
-      this.outputSettingsUpdateSubject.pipe(yn(this.outputSettings))
+      this.outputSettingsUpdateSubject.pipe(fn(this.outputSettings))
     ]).pipe(
       ie(([o, s]) => ({ ...o, ...s })),
-      Ze(1)
+      Ge(1)
     ), this.values$.subscribe();
   }
   _prepareUpdate(e) {
@@ -498,16 +500,16 @@ class jt {
     };
   }
   watch(e) {
-    return Array.isArray(e) ? this.values$.pipe(Qe(e)) : this.values$.pipe(
+    return Array.isArray(e) ? this.values$.pipe(Ke(e)) : this.values$.pipe(
       ie((t) => t[e]),
-      fe(U)
+      be(O)
     );
   }
   destroy() {
     this.outputSettingsUpdateSubject.complete();
   }
 }
-const Bs = (n) => {
+const Hs = (n) => {
   const e = new FileReader();
   return new Promise((t) => {
     e.addEventListener(
@@ -519,12 +521,12 @@ const Bs = (n) => {
     ), e.readAsDataURL(n);
   });
 };
-let Yn = class extends jt {
+let Yn = class extends Nt {
   computeOutputSettings(e) {
     return e;
   }
   hasSettingsChanged(e) {
-    return !U(this.outputSettings, e);
+    return !O(this.outputSettings, e);
   }
   getCleanedParentInputSettings(e) {
     const {
@@ -578,13 +580,13 @@ const qn = (n) => (e) => {
     }
   });
   const d = (p) => p.pipe(
-    Sn(),
+    yn(),
     S(([g, h]) => h.fontScale !== g.fontScale || h.lineHeight !== g.lineHeight)
   );
   return c.values$.pipe(
     d,
-    N(l),
-    $(a.$.destroy$)
+    V(l),
+    T(a.$.destroy$)
   ).subscribe(), {
     ...a,
     destroy: () => {
@@ -593,7 +595,7 @@ const qn = (n) => (e) => {
     settings: c
   };
 }, Gn = (n) => (e) => {
-  const t = n(e), i = (o) => q(o, "keyup").pipe(
+  const t = n(e), i = (o) => X(o, "keyup").pipe(
     S((s) => {
       const { pageTurnDirection: r, computedPageTurnMode: a } = t.settings.values;
       if (a === "scrollable")
@@ -613,7 +615,7 @@ const qn = (n) => (e) => {
       return s;
     })
   );
-  return i(document).pipe($(t.$.destroy$)).subscribe(), t.spineItemsManager.items$.pipe(
+  return i(document).pipe(T(t.$.destroy$)).subscribe(), t.spineItemsManager.items$.pipe(
     w(
       (o) => P(
         ...o.map(
@@ -626,7 +628,7 @@ const qn = (n) => (e) => {
         )
       )
     ),
-    $(t.$.destroy$)
+    T(t.$.destroy$)
   ).subscribe(), t;
 }, Zn = (n) => n.spine.spineItemsManager.items$.pipe(
   w(
@@ -634,25 +636,25 @@ const qn = (n) => (e) => {
       ...e.map((t) => t.watch("isLoaded").pipe(
         w(() => {
           const i = t.renderer.getDocumentFrame();
-          if (!i || !i?.contentDocument) return he;
+          if (!i || !i?.contentDocument) return ge;
           const s = Array.from(
             i.contentDocument.querySelectorAll("a")
           ).map(
-            (r) => q(r, "click")
+            (r) => X(r, "click")
           );
           return P(...s);
         })
       ))
     )
   ),
-  x((e) => {
+  $((e) => {
     e.preventDefault();
   }),
-  j()
+  D()
 );
-class Q extends se {
+class Q extends ce {
   constructor(e) {
-    super((t) => this.stateSubject.pipe($(this._destroy$)).subscribe(t)), this._destroy$ = new R(), this.destroy$ = this._destroy$.asObservable(), this.stateSubject = new Y(e);
+    super((t) => this.stateSubject.pipe(T(this._destroy$)).subscribe(t)), this._destroy$ = new R(), this.destroy$ = this._destroy$.asObservable(), this.stateSubject = new q(e);
   }
   next(e) {
     this.stateSubject.next(e);
@@ -662,12 +664,12 @@ class Q extends se {
    */
   mergeCompare(e) {
     const t = { ...this.value, ...e };
-    U(this.value, t) || this.stateSubject.next(t);
+    O(this.value, t) || this.stateSubject.next(t);
   }
   watch(e) {
-    return Array.isArray(e) ? this.stateSubject.pipe(Qe(e)) : this.stateSubject.pipe(
+    return Array.isArray(e) ? this.stateSubject.pipe(Ke(e)) : this.stateSubject.pipe(
       S((t) => t[e]),
-      k(U)
+      N(O)
     );
   }
   get value() {
@@ -684,50 +686,49 @@ const Le = class Le extends Q {
       error: void 0
     }), this.triggerSubject = new R(), this.context = e.context, this.settings = e.settings, this.hookManager = e.hookManager, this.item = e.item, this.containerElement = e.containerElement, this.resourcesHandler = e.resourcesHandler, this.viewport = e.viewport;
     const t = this.triggerSubject.pipe(
-      M((s) => s.type === "unload")
+      C((o) => o.type === "unload")
     ), i = this.triggerSubject.pipe(
-      M((s) => s.type === "load")
+      C((o) => o.type === "load")
     );
     this.loaded$ = i.pipe(
-      ge(() => this.value.state === "loaded" || this.value.state === "loading" ? _ : (this.next({ state: "loading", error: void 0 }), this.onCreateDocument().pipe(V()).pipe(
-        ge((a) => (this.hookManager.execute("item.onDocumentCreated", this.item.id, {
+      pe(() => this.value.state === "loaded" || this.value.state === "loading" ? _ : (this.next({ state: "loading", error: void 0 }), this.onCreateDocument().pipe(U()).pipe(
+        pe((r) => (this.hookManager.execute("item.onDocumentCreated", this.item.id, {
           itemId: this.item.id,
-          documentContainer: a
+          documentContainer: r
         }), this.onLoadDocument().pipe(
-          ye(null),
-          V()
+          fe(null),
+          U()
         ).pipe(
           De(this.context.bridgeEvent.viewportFree$),
           w(() => {
-            const u = this.hookManager.execute("item.onDocumentLoad", this.item.id, {
+            const c = this.hookManager.execute("item.onDocumentLoad", this.item.id, {
               itemId: this.item.id,
-              documentContainer: a
+              documentContainer: r
             }).filter(
-              (l) => l instanceof se
+              (u) => u instanceof ce
             );
-            return O([v(null), ...u]).pipe(V());
+            return j([v(null), ...c]).pipe(U());
           })
         ))),
         S(() => {
           this.next({ state: "loaded", error: void 0 });
         }),
-        $(t)
+        T(t)
       ))),
-      j()
-    );
-    const o = t.pipe(
-      ge(() => this.value.state === "unloading" || this.value.state === "idle" ? _ : (this.next({ state: "unloading", error: void 0 }), this.context.bridgeEvent.viewportFree$.pipe(
-        V(),
-        w(() => (this.hookManager.destroy("item.onDocumentLoad", this.item.id), this.onUnload().pipe(ye(null), V()))),
-        x(() => {
+      D()
+    ), this.unloaded$ = t.pipe(
+      pe(() => this.value.state === "unloading" || this.value.state === "idle" ? _ : (this.next({ state: "unloading", error: void 0 }), this.context.bridgeEvent.viewportFree$.pipe(
+        U(),
+        w(() => (this.hookManager.destroy("item.onDocumentLoad", this.item.id), this.onUnload().pipe(fe(null), U()))),
+        S(() => {
           this.next({ state: "idle", error: void 0 });
         }),
-        $(i)
-      )))
-    );
-    P(this.loaded$, o).pipe(
-      Ue((s) => (this.next({ state: "error", error: s }), _)),
-      $(this.destroy$)
+        T(i)
+      ))),
+      D()
+    ), P(this.loaded$, this.unloaded$).pipe(
+      ze((o) => (this.next({ state: "error", error: o }), _)),
+      T(this.destroy$)
     ).subscribe();
   }
   setDocumentContainer(e) {
@@ -758,9 +759,9 @@ const Le = class Le extends Q {
    */
   renderHeadless() {
     const e = new R();
-    return Ft(() => this.onRenderHeadless({ release: e })).pipe(
-      ye(void 0),
-      V(),
+    return Tt(() => this.onRenderHeadless({ release: e })).pipe(
+      fe(void 0),
+      U(),
       S((t) => {
         if (t)
           return {
@@ -770,10 +771,10 @@ const Le = class Le extends Q {
             }
           };
       }),
-      pe(() => {
+      me(() => {
         e.complete();
       }),
-      Ue((t) => (D.error(t), v(void 0)))
+      ze((t) => (A.error(t), v(void 0)))
     );
   }
   layout(e) {
@@ -794,21 +795,21 @@ const Le = class Le extends Q {
     if (e) return e;
     const t = this.getDocumentFrame();
     if (t) {
-      const { hasViewport: i } = Ke(t);
+      const { hasViewport: i } = Je(t);
       if (i) return "pre-paginated";
     }
     return this.context.manifest?.renditionLayout ?? "reflowable";
   }
 };
 Le.DOCUMENT_CONTAINER_CLASS_NAME = "prose-reader-document-container";
-let Se = Le;
+let ye = Le;
 const Jn = (n) => new URL(n.href);
 class tt {
   constructor(e, t) {
     this.item = e, this.settings = t;
   }
   async getResource() {
-    return await rn(
+    return await nn(
       this.settings.values.getResource?.(this.item) ?? v(void 0)
     ) ?? Jn(this.item);
   }
@@ -817,7 +818,7 @@ class tt {
     return e instanceof Response ? e : e instanceof URL ? fetch(e) : e;
   }
 }
-const kt = (n, e) => {
+const Ot = (n, e) => {
   const t = n.startsWith("file://"), i = t ? n.replace("file://", "http://") : n, o = new URL(e, i).toString();
   return t ? o.replace("http://", "file://") : o;
 }, Kn = async (n, e, t, i, o) => {
@@ -837,7 +838,7 @@ const kt = (n, e) => {
                   return h;
                 const m = h.match(/url\(['"]?([^'"]+)['"]?\)/);
                 if (!m) return h;
-                const y = m[1] ?? "", f = i.manifest?.items.find(({ href: I }) => `${kt(t, y).toLowerCase()}`.endsWith(
+                const y = m[1] ?? "", f = i.manifest?.items.find(({ href: I }) => `${Ot(t, y).toLowerCase()}`.endsWith(
                   `${I.toLowerCase()}`
                 ));
                 if (f) {
@@ -845,10 +846,10 @@ const kt = (n, e) => {
                   try {
                     const b = await I.getResource();
                     if (b instanceof Response) {
-                      const F = await b.blob(), T = n.defaultView?.URL.createObjectURL(F);
+                      const F = await b.blob(), x = n.defaultView?.URL.createObjectURL(F);
                       return h.replace(
                         m[0],
-                        `url("${T}")`
+                        `url("${x}")`
                       );
                     }
                   } catch (b) {
@@ -871,23 +872,23 @@ const kt = (n, e) => {
 }, Qn = (n, e, t, i, o) => {
   const s = e.getAttribute("src") || e.getAttribute("href");
   if (!s) return v(null);
-  const r = i.manifest?.items.find(({ href: c }) => `${kt(t, s).toLowerCase()}`.endsWith(
+  const r = i.manifest?.items.find(({ href: c }) => `${Ot(t, s).toLowerCase()}`.endsWith(
     `${c.toLowerCase()}`
   ));
   if (!r) return v(null);
   const a = new tt(r, o);
-  return A(a.getResource()).pipe(
-    ge(
-      (c) => c instanceof Response ? A(c.blob()) : v(void 0)
+  return k(a.getResource()).pipe(
+    pe(
+      (c) => c instanceof Response ? k(c.blob()) : v(void 0)
     ),
-    ge((c) => {
+    pe((c) => {
       if (!c)
         return v(null);
       const u = n?.defaultView?.URL.createObjectURL(c) ?? "";
       if (e.hasAttribute("src"))
         e.setAttribute("src", u);
       else if (e.hasAttribute("href") && (e.setAttribute("href", u), n?.defaultView && e instanceof n.defaultView.HTMLLinkElement))
-        return new se((l) => {
+        return new ce((l) => {
           e.onload = async () => {
             try {
               e.sheet && await Kn(
@@ -911,9 +912,9 @@ const kt = (n, e) => {
   context: t
 }) => (i) => i.pipe(
   w((o) => {
-    const s = Rt(
+    const s = Et(
       o.contentDocument
-    ), r = hn(e.href), a = s.map(
+    ), r = pn(e.href), a = s.map(
       (c) => Qn(
         o.contentDocument,
         c,
@@ -922,13 +923,13 @@ const kt = (n, e) => {
         n
       )
     );
-    return O(a).pipe(S(() => o));
+    return j(a).pipe(S(() => o));
   })
 ), ti = (n) => {
-  An(n?.contentDocument);
-}, Ys = "@prose-reader/core", qs = 0, Gs = 200, ni = [".xhtml", ".html", ".htm"], W = "prose-reader", Ut = `${W}-style`, ii = `data-${W}-id`, oi = `${W}-viewport`, si = `${W}-scroll-navigator`, ri = async (n, e) => {
+  Rn(n?.contentDocument);
+}, Xs = "@prose-reader/core", Ys = 0, qs = 200, ni = [".xhtml", ".html", ".htm"], W = "prose-reader", Vt = `${W}-style`, ii = `data-${W}-id`, oi = `${W}-viewport`, si = `${W}-scroll-navigator`, ri = async (n, e) => {
   if (typeof n == "string") return n;
-  const t = mn(n.headers.get("Content-Type") || "") || Me(e.href);
+  const t = gn(n.headers.get("Content-Type") || "") || Me(e.href);
   if (["image/jpg", "image/jpeg", "image/png", "image/webp"].some(
     (o) => o === t
   )) {
@@ -970,7 +971,7 @@ const kt = (n, e) => {
 }) => {
   const t = (i) => ri(i, n);
   return (i) => i.pipe(
-    w((o) => A(e.getResource()).pipe(
+    w((o) => k(e.getResource()).pipe(
       w((s) => s instanceof URL && n.href.startsWith(window.location.origin) && // we have an encoding and it's a valid html
       (n.mediaType && [
         "application/xhtml+xml",
@@ -980,23 +981,23 @@ const kt = (n, e) => {
       ].includes(n.mediaType) || // no encoding ? then try to detect html
       !n.mediaType && ni.some(
         (a) => n.href.endsWith(a)
-      )) ? (o?.setAttribute("src", n.href), v(o)) : (s instanceof URL ? A(e.fetchResource()) : v(s)).pipe(
+      )) ? (o?.setAttribute("src", n.href), v(o)) : (s instanceof URL ? k(e.fetchResource()) : v(s)).pipe(
         w((a) => {
           if (!(a instanceof Response))
             throw new Error("Invalid resource");
-          return A(t(a));
+          return k(t(a));
         }),
-        x((a) => {
+        $((a) => {
           if (a) {
             const c = new Blob([a], { type: "text/html" }), u = URL.createObjectURL(c);
             o?.setAttribute("src", u);
           }
         }),
         S(() => o),
-        Ue((a) => (D.error(
+        ze((a) => (A.error(
           `Error while trying to fetch or load resource for item ${n.id}`,
           s
-        ), D.error(a), v(o)))
+        ), A.error(a), v(o)))
       ))
     ))
   );
@@ -1015,12 +1016,12 @@ const kt = (n, e) => {
   border: 0px none transparent;
   padding: 0px;
 `, n.setAttribute("role", "main"), n;
-}, ui = "body{margin:0}html,body{height:100%;width:100%}html[data-prose-reader-html-renderer-has-viewport-dimensions=false] body{display:flex}html[data-prose-reader-html-renderer-has-viewport-dimensions=false][data-prose-reader-html-renderer-spread-position=left] body{justify-content:flex-end}html[data-prose-reader-html-renderer-has-viewport-dimensions=false][data-prose-reader-html-renderer-spread-position=right] body{justify-content:flex-start}html[data-prose-reader-html-renderer-has-viewport-dimensions=false][data-prose-reader-html-renderer-spread-position=none] body{justify-content:center}:not(html.prose-reader-html-renderer-touch-enabled),:not(html.prose-reader-html-renderer-touch-enabled) body{touch-action:none}img{-webkit-user-select:none;user-select:none;-webkit-user-drag:none;-khtml-user-drag:none;-moz-user-drag:none;-o-user-drag:none;display:flex}html[data-prose-reader-html-renderer-has-viewport-dimensions=false] img{max-width:100%;height:100%;object-fit:contain}", zt = ({
+}, ui = "body{margin:0}html,body{height:100%;width:100%}html[data-prose-reader-html-renderer-has-viewport-dimensions=false] body{display:flex}html[data-prose-reader-html-renderer-has-viewport-dimensions=false][data-prose-reader-html-renderer-spread-position=left] body{justify-content:flex-end}html[data-prose-reader-html-renderer-has-viewport-dimensions=false][data-prose-reader-html-renderer-spread-position=right] body{justify-content:flex-start}html[data-prose-reader-html-renderer-has-viewport-dimensions=false][data-prose-reader-html-renderer-spread-position=none] body{justify-content:center}:not(html.prose-reader-html-renderer-touch-enabled),:not(html.prose-reader-html-renderer-touch-enabled) body{touch-action:none}img{-webkit-user-select:none;user-select:none;-webkit-user-drag:none;-khtml-user-drag:none;-moz-user-drag:none;-o-user-drag:none;display:flex}html[data-prose-reader-html-renderer-has-viewport-dimensions=false] img{max-width:100%;height:100%;object-fit:contain}", jt = ({
   pageHeight: n,
   pageWidth: e,
   frameElement: t
 }) => {
-  const i = Ke(t);
+  const i = Je(t);
   if (t?.contentDocument && t.contentWindow && i) {
     const o = e / (i.width ?? 1);
     return { computedScale: Math.min(
@@ -1028,7 +1029,7 @@ const kt = (n, e) => {
       n / (i.height ?? 1)
     ), computedWidthScale: o, viewportDimensions: i };
   }
-}, lt = (n, e) => {
+}, ut = (n, e) => {
   n.style.width = `${e.width}px`, n.style.height = `${e.height}px`;
 }, li = ({
   minPageSpread: n,
@@ -1041,14 +1042,14 @@ const kt = (n, e) => {
 }) => {
   const a = n * o;
   if (s?.contentDocument && s?.contentWindow) {
-    const { viewportDimensions: c, computedScale: u = 1 } = zt({ frameElement: s, pageHeight: i, pageWidth: o }) ?? {}, l = !!c, d = o, p = i;
+    const { viewportDimensions: c, computedScale: u = 1 } = jt({ frameElement: s, pageHeight: i, pageWidth: o }) ?? {}, l = !!c, d = o, p = i;
     if (s.contentDocument?.documentElement && s.contentDocument?.documentElement.setAttribute(
       "data-prose-reader-html-renderer-has-viewport-dimensions",
       l.toString()
-    ), c ? lt(s, {
+    ), c ? ut(s, {
       width: c.width ?? 1,
       height: c.height ?? 1
-    }) : lt(s, {
+    }) : ut(s, {
       width: d,
       height: p
     }), c) {
@@ -1209,7 +1210,7 @@ const kt = (n, e) => {
 }) => {
   const l = o * e, d = i?.renditionLayout === "reflowable" && i?.renditionFlow === "scrolled-continuous", p = d ? Math.min(400, n) : n;
   t?.style.setProperty("width", `${e}px`), d ? t?.style.removeProperty("height") : t?.style.setProperty("height", `${p}px`);
-  const { viewportDimensions: g, computedScale: h = 1 } = zt({
+  const { viewportDimensions: g, computedScale: h = 1 } = jt({
     frameElement: t,
     pageHeight: p,
     pageWidth: e
@@ -1268,7 +1269,7 @@ const kt = (n, e) => {
     return y % l === 0 ? t?.style.setProperty("margin-left", "0px") : (y = y + e, s && !u && t?.style.setProperty("margin-left", `${e}px`)), { width: y, height: f };
   }
 };
-class fi extends Se {
+class fi extends ye {
   constructor() {
     super(...arguments), this.isPrePaginated = () => this.item.renditionLayout === "pre-paginated" || !this.item.renditionLayout && this.context.manifest?.renditionLayout === "pre-paginated", this.isImageType = () => !!(this.item.mediaType ?? Me(this.item.href))?.startsWith("image/");
   }
@@ -1286,11 +1287,11 @@ class fi extends Se {
         settings: this.settings
       }),
       De(this.context.bridgeEvent.viewportFree$),
-      x(() => {
+      $(() => {
         this.attach();
       }),
       jn,
-      x((t) => {
+      $((t) => {
         this.isPrePaginated() ? oe(t, "prose-reader-css", ui) : this.isImageType();
       }),
       ei({
@@ -1351,7 +1352,7 @@ class fi extends Se {
     return v(u);
   }
   onRenderHeadless() {
-    return A(this.resourcesHandler.fetchResource()).pipe(
+    return k(this.resourcesHandler.fetchResource()).pipe(
       w((e) => {
         if (e instanceof Response) {
           const t = e.headers.get("content-type") ?? "";
@@ -1361,7 +1362,7 @@ class fi extends Se {
             "text/html",
             "text/xml"
           ].includes(t))
-            return A(e.text()).pipe(
+            return k(e.text()).pipe(
               S((o) => new DOMParser().parseFromString(
                 o,
                 t
@@ -1411,7 +1412,7 @@ const yi = (n) => (e) => {
       return e.getRenderer?.(o) ?? ((r) => new fi(r));
     }
   }), i = Zn(t);
-  return i.pipe($(t.$.destroy$)).subscribe(), {
+  return i.pipe(T(t.$.destroy$)).subscribe(), {
     ...t,
     links$: i
   };
@@ -1424,7 +1425,7 @@ class nt {
     this.left = e.left, this.right = e.right, this.top = e.top, this.bottom = e.bottom, this.width = e.width, this.height = e.height, this.x = e.x, this.y = e.y;
   }
 }
-class C {
+class E {
   constructor(e) {
     this.__symbol = /* @__PURE__ */ Symbol("SpineItemPosition"), this.x = e.x, this.y = e.y;
   }
@@ -1439,7 +1440,7 @@ class Si extends nt {
     super(...arguments), this.__symbol = "SpineItemPageLayout";
   }
 }
-class He extends nt {
+class Oe extends nt {
   constructor() {
     super(...arguments), this.__symbol = "SpineItemSpineLayout";
   }
@@ -1449,25 +1450,25 @@ class Ii extends nt {
     super(...arguments), this.__symbol = "SpineItemPageSpineLayout";
   }
 }
-class Wt {
+class kt {
   constructor(e) {
     this.x = e.x, this.y = e.y;
   }
 }
-class L extends Wt {
+class M extends kt {
   constructor() {
     super(...arguments), this.__symbol = "SpinePosition";
   }
   static from(e) {
-    return new L(e);
+    return new M(e);
   }
 }
-class ue extends Wt {
+class ae extends kt {
   constructor() {
     super(...arguments), this.__symbol = "UnboundSpinePosition";
   }
   static from(e) {
-    return new ue(e);
+    return new ae(e);
   }
 }
 const bi = (n, e) => {
@@ -1476,14 +1477,14 @@ const bi = (n, e) => {
     x: u / a,
     y: l / c
   };
-}, vi = (n, e) => new ue(
+}, vi = (n, e) => new ae(
   bi(n, e)
 ), wi = (n) => ({
   getSpinePositionFromClientPosition: (e) => n.spine.element ? vi(e, n.spine.element) : void 0
 }), Pi = (n) => {
   let e;
   const t = n.context.watch("rootElement").pipe(
-    X((c) => c ? new se(() => (e = c.ownerDocument.createElement("div"), e.style.cssText = `
+    Y((c) => c ? new ce(() => (e = c.ownerDocument.createElement("div"), e.style.cssText = `
         position: absolute;
         left: 0;
         top: 0;
@@ -1492,40 +1493,40 @@ const bi = (n, e) => {
         visibility: hidden;
       `, c.appendChild(e), () => {
       e?.remove(), e = void 0;
-    })) : he)
-  ), i = (c) => an(c, ce).pipe(
-    N(() => {
+    })) : ge)
+  ), i = (c) => on(c, re).pipe(
+    V(() => {
       e?.style.setProperty(
         "visibility",
         "hidden"
       );
     })
   ), o = n.context.bridgeEvent.viewportBusy$.pipe(
-    N(() => {
+    V(() => {
       e?.style.setProperty(
         "visibility",
         "visible"
       );
     })
   ), s = i(n.viewportFree$).pipe(
-    In(1)
+    Sn(1)
   ), a = n.settings.values$.pipe(
     ie(() => n.settings.values.computedPageTurnMode),
-    fe()
+    be()
   ).pipe(
-    X(
-      (c) => c === "controlled" ? o.pipe(X(() => s)) : i(v(void 0))
+    Y(
+      (c) => c === "controlled" ? o.pipe(Y(() => s)) : i(v(void 0))
     ),
     K(n.$.destroy$)
   );
   return P(t, a);
-}, xi = `${W}-enhancer-loading`, _t = `${xi}-container`, $i = ({
+}, xi = `${W}-enhancer-loading`, Ut = `${xi}-container`, $i = ({
   container: n,
   item: e,
   viewport: t
 }) => {
   const i = n.ownerDocument.createElement("div");
-  i.classList.add(_t), i.style.cssText = `
+  i.classList.add(Ut), i.style.cssText = `
       height: 100%;
       width: 100%;
       max-width: ${t.absoluteViewport.width}px;
@@ -1555,12 +1556,12 @@ const bi = (n, e) => {
       width: 80%;
     `, i.appendChild(o), i.appendChild(s), i;
 }, Ti = (n) => n.spineItemsManager.items$.pipe(
-  X(
+  Y(
     (e) => P(
       ...e.map((t) => {
         t.containerElement.style.zIndex = "0";
         const i = t.containerElement.querySelector(
-          `.${_t}`
+          `.${Ut}`
         ), o = i instanceof HTMLElement ? i : $i({
           container: t.containerElement,
           item: t.item,
@@ -1568,7 +1569,7 @@ const bi = (n, e) => {
         });
         return t.containerElement.appendChild(o), P(
           t.pipe(
-            N((s) => {
+            V((s) => {
               if (o.style.setProperty(
                 "visibility",
                 s.isReady ? "hidden" : "visible"
@@ -1583,8 +1584,8 @@ const bi = (n, e) => {
               }
             })
           ),
-          O([n.spine.layout$, n.theme.$.theme$]).pipe(
-            N(([, s]) => {
+          j([n.spine.layout$, n.theme.$.theme$]).pipe(
+            V(([, s]) => {
               const r = n.viewport.absoluteViewport.width;
               o.style.setProperty(
                 "max-width",
@@ -1610,7 +1611,7 @@ const bi = (n, e) => {
       const o = n.spineItemsManager.get(e.id), s = o?.renderer.getDocumentFrame();
       if (o?.renditionLayout !== "reflowable" || !(s instanceof HTMLIFrameElement))
         return;
-      const { hasViewport: r } = Ke(s), { width: a } = n.viewport.pageSize, c = o?.renderer.getDocumentFrame();
+      const { hasViewport: r } = Je(s), { width: a } = n.viewport.pageSize, c = o?.renderer.getDocumentFrame();
       if (r) {
         const u = a < i;
         t === "none" && u && c instanceof HTMLIFrameElement && c?.style.setProperty(
@@ -1620,25 +1621,17 @@ const bi = (n, e) => {
       }
     }
   );
-}, Mi = (n) => n.spineItemsManager.items$.pipe(
-  w(
-    (e) => P(
-      ...e.map(
-        (t) => t.pipe(
-          x((i) => {
-            t.containerElement.dataset.isDirty = i.iDirty.toString(), t.containerElement.dataset.isReady = i.isReady.toString();
-          })
-        )
-      )
-    )
-  )
+}, Mi = (n) => n.spineItemsObserver.states$.pipe(
+  $(({ item: e, isReady: t, isDirty: i }) => {
+    e.containerElement.dataset.isDirty = i.toString(), e.containerElement.dataset.isReady = t.toString();
+  })
 );
-let Ci = class extends jt {
+let Ci = class extends Nt {
   computeOutputSettings(e) {
     return e;
   }
   hasSettingsChanged(e) {
-    return !U(this.outputSettings, e);
+    return !O(this.outputSettings, e);
   }
   getCleanedParentInputSettings(e) {
     const {
@@ -1659,11 +1652,11 @@ let Ci = class extends jt {
     };
   }
 };
-const Ei = (n) => O([
+const Ei = (n) => j([
   n.viewport.watch(["width", "height"]),
   n.context.watch("manifest")
 ]).pipe(
-  x(([{ width: e, height: t }, i]) => {
+  $(([{ width: e, height: t }, i]) => {
     const o = e > t;
     return !o && i?.renditionSpread === "portrait" ? n.settings.update({ spreadMode: !0 }) : o && (i?.renditionSpread === void 0 || i?.renditionSpread === "auto" || i?.renditionSpread === "landscape" || i?.renditionSpread === "both") ? n.settings.update({ spreadMode: !0 }) : n.settings.update({ spreadMode: !1 });
   })
@@ -1689,33 +1682,33 @@ const Ei = (n) => O([
       !m && f && (f.getBoundingClientRect().left, m = !0);
     });
   }), r.hookManager.register("item.onBeforeLayout", ({ item: m }) => {
-    const y = r.spineItemsManager.get(m.id), I = !!(m.mediaType ?? Me(m.href))?.startsWith("image/"), { pageHorizontalMargin: b = 0, pageVerticalMargin: F = 0 } = a.values, T = r.viewport.pageSize;
+    const y = r.spineItemsManager.get(m.id), I = !!(m.mediaType ?? Me(m.href))?.startsWith("image/"), { pageHorizontalMargin: b = 0, pageVerticalMargin: F = 0 } = a.values, x = r.viewport.pageSize;
     if (y?.renditionLayout === "reflowable" && !I) {
-      let E = T.width - b * 2;
-      const H = T.height - F * 2;
-      let B = T.width - b * 2, re = b * 2;
-      y.isUsingVerticalWriting() && (B = T.width - b * 2, E = H, re = F * 2);
-      const le = y?.renderer.getDocumentFrame();
-      le && oe(
-        le,
+      let L = x.width - b * 2;
+      const H = x.height - F * 2;
+      let B = x.width - b * 2, se = b * 2;
+      y.isUsingVerticalWriting() && (B = x.width - b * 2, L = H, se = F * 2);
+      const ue = y?.renderer.getDocumentFrame();
+      ue && oe(
+        ue,
         "prose-layout-enhancer-css",
         `
               body {
                 width: ${B}px !important;
                 margin: ${F}px ${b}px !important;
-                column-gap: ${re}px !important;
-                column-width: ${E}px !important;
+                column-gap: ${se}px !important;
+                column-width: ${L}px !important;
                 height: ${H}px !important;
               }
               img, video, audio, object, svg {
-                -max-width: ${E}px !important;
+                -max-width: ${L}px !important;
                 -max-height: ${H}px !important;
               }
               table {
-                max-width: ${E}px !important;
+                max-width: ${L}px !important;
               }
               td {
-                max-width: ${E}px;
+                max-width: ${L}px;
               }
             `
       );
@@ -1729,32 +1722,32 @@ const Ei = (n) => O([
     const f = r.spineItemsManager.get(m.id)?.renderer.documentContainer;
     r.settings.values.computedPageTurnMode !== "scrollable" && f?.setAttribute("tab-index", "0");
   });
-  const c = r.spineItemsObserver.itemIsReady$.pipe(
-    ae(({ isReady: m }) => m),
-    N(({ item: m }) => {
+  const c = r.spineItemsObserver.states$.pipe(
+    de(({ isReady: m }) => m),
+    V(({ item: m }) => {
       const y = m.renderer.documentContainer;
       y && (y.style.opacity = "1");
     })
   ), u = a.values$.pipe(
-    ae(({ layoutAutoResize: m }) => m === "container"),
-    X(() => r.context.watch("rootElement")),
-    ae(Z),
-    X((m) => et(m)),
-    bn(100),
-    ae(Z),
-    N(() => {
+    de(({ layoutAutoResize: m }) => m === "container"),
+    Y(() => r.context.watch("rootElement")),
+    de(Z),
+    Y((m) => Qe(m)),
+    In(100),
+    de(Z),
+    V(() => {
       r?.layout();
     })
   ), l = Pi(r);
   a.watch(["pageHorizontalMargin", "pageVerticalMargin"]).pipe(
-    Ct(1),
-    N(() => {
+    Lt(1),
+    V(() => {
       r.layout();
     }),
     K(r.$.destroy$)
   ).subscribe();
   const d = r.spine.pages.pipe(
-    Ze({ refCount: !0, bufferSize: 1 })
+    Ge({ refCount: !0, bufferSize: 1 })
   ), p = Mi(r), g = Ei(r), h = Ti(r);
   return P(
     c,
@@ -1775,7 +1768,7 @@ const Ei = (n) => O([
     coordinates: wi(r)
   };
 };
-class Ri extends Se {
+class Ai extends ye {
   getImageElement() {
     const e = this.documentContainer;
     if (e instanceof HTMLImageElement)
@@ -1783,12 +1776,12 @@ class Ri extends Se {
   }
   onCreateDocument() {
     const e = this.containerElement.ownerDocument.createElement("img");
-    return A(this.resourcesHandler.getResource()).pipe(
+    return k(this.resourcesHandler.getResource()).pipe(
       w((t) => {
         if (this.setDocumentContainer(e), e.style.objectFit = "contain", e.style.userSelect = "none", t instanceof URL)
           return v(t.href);
         if (t instanceof Response)
-          return A(t.blob()).pipe(
+          return k(t.blob()).pipe(
             S((i) => URL.createObjectURL(i))
           );
         throw new Error("Invalid resource");
@@ -1802,7 +1795,7 @@ class Ri extends Se {
   onLoadDocument() {
     const e = this.getImageElement();
     if (!e) throw new Error("invalid element");
-    return this.attach(), q(e, "load");
+    return this.attach(), X(e, "load");
   }
   onUnload() {
     const e = this.getImageElement();
@@ -1827,12 +1820,12 @@ class Ri extends Se {
   getDocumentFrame() {
   }
 }
-const Ai = (n) => (e) => {
+const Ri = (n) => (e) => {
   const t = n({
     ...e,
     getRenderer(r) {
       const a = e.getRenderer?.(r), u = !!(r.mediaType ?? Me(r.href))?.startsWith("image/");
-      return !a && u ? (l) => new Ri(l) : a;
+      return !a && u ? (l) => new Ai(l) : a;
     }
   }), i = new IntersectionObserver(
     (r) => {
@@ -1883,32 +1876,32 @@ const Ai = (n) => (e) => {
     }
   };
 }, Ni = (n, e) => n.links$.pipe(
-  x((t) => {
+  $((t) => {
     if (!Nn(t.target, "a") || t.type !== "click") return;
     const i = new URL(t.target.href), o = `${i.origin}${i.pathname}`;
     n.context.manifest?.spineItems.some(
       (r) => r.href === o
     ) && e.goToUrl(i);
   })
-), ee = D.namespace("navigation"), Oi = ({
+), ee = A.namespace("navigation"), Oi = ({
   position: n,
   spineItem: e,
   pageHeight: t,
   pageWidth: i,
   spineItemLocator: o
 }) => {
-  let s = new C({
+  let s = new E({
     x: n.x - i,
     y: n.y
   });
-  return e.isUsingVerticalWriting() && (s = new C({
+  return e.isUsingVerticalWriting() && (s = new E({
     x: n.x,
     y: n.y + t
   })), o.getSpineItemClosestPositionFromUnsafePosition(
     s,
     e
   );
-}, dt = ({
+}, lt = ({
   position: n,
   navigationResolver: e,
   computedPageTurnDirection: t,
@@ -1936,10 +1929,10 @@ const Ai = (n) => (e) => {
     spineItemPosition: l,
     spineItem: a
   }) : e.fromUnboundSpinePosition(
-    r === "horizontal" ? new L({
+    r === "horizontal" ? new M({
       x: n.x - s.pageSize.width,
       y: 0
-    }) : new L({
+    }) : new M({
       y: n.y - s.pageSize.height,
       x: 0
     })
@@ -1955,7 +1948,7 @@ const Ai = (n) => (e) => {
   viewport: a,
   settings: c
 }) => {
-  const u = dt({
+  const u = lt({
     position: n,
     viewport: a,
     navigationResolver: i,
@@ -1977,7 +1970,7 @@ const Ai = (n) => (e) => {
       );
     if (r === "vertical" && n.y !== u.y)
       return i.getAdjustedPositionForSpread(u);
-    const l = dt({
+    const l = lt({
       position: u,
       viewport: a,
       navigationResolver: i,
@@ -1995,18 +1988,18 @@ const Ai = (n) => (e) => {
   pageWidth: i,
   spineItemLocator: o
 }) => {
-  let s = new C({
+  let s = new E({
     x: n.x + i,
     y: n.y
   });
-  return e.isUsingVerticalWriting() && (s = new C({
+  return e.isUsingVerticalWriting() && (s = new E({
     x: n.x,
     y: n.y - t
   })), o.getSpineItemClosestPositionFromUnsafePosition(
     s,
     e
   );
-}, pt = ({
+}, dt = ({
   position: n,
   navigationResolver: e,
   computedPageTurnDirection: t,
@@ -2034,10 +2027,10 @@ const Ai = (n) => (e) => {
     spineItemPosition: l,
     spineItem: a
   }) : e.fromUnboundSpinePosition(
-    r === "horizontal" ? new ue({
+    r === "horizontal" ? new ae({
       x: n.x + s.pageSize.width,
       y: 0
-    }) : new ue({
+    }) : new ae({
       y: n.y + s.pageSize.height,
       x: 0
     })
@@ -2053,7 +2046,7 @@ const Ai = (n) => (e) => {
   viewport: a,
   settings: c
 }) => {
-  const u = pt({
+  const u = dt({
     position: n,
     viewport: a,
     navigationResolver: i,
@@ -2078,7 +2071,7 @@ const Ai = (n) => (e) => {
       );
     if (r === "vertical" && n.y !== u.y)
       return i.getAdjustedPositionForSpread(u);
-    const l = pt({
+    const l = dt({
       position: u,
       viewport: a,
       navigationResolver: i,
@@ -2092,7 +2085,7 @@ const Ai = (n) => (e) => {
 };
 class Ui {
   constructor(e) {
-    this.reader = e, this.movingLastDelta = { x: 0, y: 0 }, this.movingLastPosition = new L({ x: 0, y: 0 }), this.unlock = void 0;
+    this.reader = e, this.movingLastDelta = { x: 0, y: 0 }, this.movingLastPosition = new M({ x: 0, y: 0 }), this.unlock = void 0;
   }
   turnRight() {
     return this.turnRightOrBottom();
@@ -2273,8 +2266,8 @@ class zi extends Q {
   constructor(e) {
     super({
       lastDelta: { x: 0, y: 0 },
-      lastPosition: new L({ x: 0, y: 0 }),
-      lastStartPosition: new L({ x: 0, y: 0 }),
+      lastPosition: new M({ x: 0, y: 0 }),
+      lastStartPosition: new M({ x: 0, y: 0 }),
       isStarted: !1
     }), this.reader = e, this.unlock = void 0;
   }
@@ -2310,7 +2303,7 @@ class zi extends Q {
       ), c = Math.floor(
         t === "horizontal" ? 0 : this.value.lastPosition.y - r / o
       );
-      i = new L({
+      i = new M({
         x: a,
         y: c
       }), this.mergeCompare({
@@ -2339,18 +2332,18 @@ class _i extends G {
   constructor(e, t) {
     super(), this.scrollNavigationController = e, this.locker = t, this.navigationSubject = new R(), this.navigation$ = this.navigationSubject.asObservable();
     const i = this.scrollNavigationController.userScroll$.pipe(
-      ze((o) => {
+      sn((o) => {
         const s = this.locker.lock();
         return P(
           this.scrollNavigationController.userScroll$,
           v(o)
         ).pipe(
-          be(
+          Ie(
             Wi,
-            ce
+            re
           ),
-          V(),
-          x(() => {
+          U(),
+          $(() => {
             const r = this.scrollNavigationController.fromScrollPosition(
               this.scrollNavigationController.scrollPosition
             );
@@ -2360,13 +2353,13 @@ class _i extends G {
               position: r
             });
           }),
-          pe(() => {
+          me(() => {
             s();
           })
         );
       })
     );
-    P(i).pipe($(this.destroy$)).subscribe();
+    P(i).pipe(T(this.destroy$)).subscribe();
   }
 }
 const Hi = (n) => n.pagination.state$.pipe(
@@ -2388,33 +2381,33 @@ const Hi = (n) => n.pagination.state$.pipe(
       };
     }
   ),
-  k(U)
+  N(O)
 ), Bi = ({ reader: n, duration: e }) => (t) => {
   let i;
   const o = () => {
     i?.(), i = void 0;
   };
   return t.pipe(
-    x(() => {
+    $(() => {
       i || (i = n?.navigation.lock());
     }),
-    cn(e, ce, {
+    rn(e, re, {
       trailing: !0,
       leading: !0
     }),
-    x(o),
-    pe(o)
+    $(o),
+    me(o)
   );
 }, Xi = (n) => (e) => {
   const t = n(e), i = Hi(t), o = new Ui(t), s = new zi(t), r = new _i(
     t.navigation.scrollNavigationController,
     t.navigation.locker
   ), a = Ni(t, o), c = r.navigation$.pipe(
-    x((d) => {
+    $((d) => {
       t.navigation.navigate(d);
     })
   );
-  return P(a, c).pipe($(t.$.destroy$)).subscribe(), {
+  return P(a, c).pipe(T(t.$.destroy$)).subscribe(), {
     ...t,
     load: (d) => {
       const { cfi: p, ...g } = d;
@@ -2449,7 +2442,7 @@ const Hi = (n) => n.pagination.state$.pipe(
       goToAbsolutePageIndex: o.goToAbsolutePageIndex.bind(o)
     }
   };
-}, Ht = (n, e, t) => {
+}, zt = (n, e, t) => {
   const i = t.spineItems.findIndex(
     (o) => o.href === n
   );
@@ -2466,7 +2459,7 @@ const Hi = (n) => n.pagination.state$.pipe(
       const m = {
         title: s.title,
         path: s.path
-      }, y = Ht(n, s.contents, t);
+      }, y = zt(n, s.contents, t);
       return y ? {
         ...m,
         subChapter: y
@@ -2476,7 +2469,7 @@ const Hi = (n) => n.pagination.state$.pipe(
   }, void 0);
 }, Yi = (n, e) => {
   const { href: t } = e;
-  return Ht(t, n.nav?.toc ?? [], n);
+  return zt(t, n.nav?.toc ?? [], n);
 }, qi = (n) => {
   const e = n.context.manifest, t = n.spineItemsManager.items;
   return e ? t.reduce(
@@ -2487,7 +2480,7 @@ const Hi = (n) => n.pagination.state$.pipe(
   ne([]),
   S(() => qi(n))
 ), Zi = (n, e, t) => n + e * t, Ji = (n, e, t) => {
-  const { height: i, width: o } = t.layout.layoutInfo, { top: s, left: r } = n.spine.getSpineItemSpineLayoutInfo(t);
+  const { height: i, width: o } = t.layoutInfo, { top: s, left: r } = n.spine.getSpineItemSpineLayoutInfo(t);
   return n.settings.values.computedPageTurnDirection === "vertical" ? Math.max(
     0,
     Math.min(
@@ -2502,7 +2495,7 @@ const Hi = (n) => n.pagination.state$.pipe(
     )
   );
 }, Ki = (n, e, t, i, o) => o.isReady$.pipe(
-  V(),
+  U(),
   z(n.layoutInfo$),
   S(([s, r]) => {
     const a = n.context, c = a.manifest?.renditionLayout === "pre-paginated", u = a.manifest?.spineItems.length || 0, l = a.manifest?.spineItems.slice(0, e).reduce((f, I) => f + (I.progressionWeight ?? 0), 0) || 0, d = n.spineItemsManager.getSpineItemIndex(o) ?? 0, p = n.context.manifest?.spineItems.length ?? 0, g = r.pages.filter((f) => f.itemIndex === d).length ?? 0, h = a.manifest?.spineItems[e]?.progressionWeight ?? // if no progressionWeight is defined we "assume" the document weight to be
@@ -2522,7 +2515,7 @@ const Hi = (n) => n.pagination.state$.pipe(
     )), e === u - 1 && t === g - 1 && y > 0.99 ? 1 : y;
   })
 ), Qi = (n) => n.spine.layout$.pipe(
-  be(10, ce),
+  Ie(10, re),
   z(n.pagination.state$),
   S(() => ({
     numberOfPagesPerItems: n.spineItemsManager.items.reduce(
@@ -2534,7 +2527,7 @@ const Hi = (n) => n.pagination.state$.pipe(
      */
     numberOfTotalPages: n.spine.pages.value.pages.length
   })),
-  k(U),
+  N(O),
   ne({
     numberOfPagesPerItems: [],
     numberOfTotalPages: 0
@@ -2570,7 +2563,7 @@ const Hi = (n) => n.pagination.state$.pipe(
     // hasPreviousChapter: (reader.spine.spineItemIndex || 0) < (manifest.readingOrder.length - 1),
     // numberOfSpineItems: context.manifest?.readingOrder.length,
   });
-}, to = (n) => O([
+}, to = (n) => j([
   n.pagination.state$,
   // Usually pagination change if layout changes (number of pages) however it is especially
   // useful for like webtoon where you still have one page but only the layout will give you the final size
@@ -2588,7 +2581,7 @@ const Hi = (n) => n.pagination.state$.pipe(
     ) : v(0);
   })
 ), no = (n) => {
-  const e = Gi(n), t = Qi(n), i = new Y({
+  const e = Gi(n), t = Qi(n), i = new q({
     ...n.pagination.state,
     beginChapterInfo: void 0,
     beginCfi: void 0,
@@ -2603,7 +2596,7 @@ const Hi = (n) => n.pagination.state$.pipe(
     endChapterInfo: void 0,
     endSpineItemReadingDirection: void 0,
     percentageEstimateOfBook: 0
-  }), o = O([
+  }), o = j([
     n.pagination.state$,
     e,
     to(n)
@@ -2621,9 +2614,9 @@ const Hi = (n) => n.pagination.state$.pipe(
         }))
       )
     ),
-    k(U)
+    N(O)
   );
-  return { paginationInfo$: O([
+  return { paginationInfo$: j([
     o,
     t
   ]).pipe(
@@ -2639,21 +2632,21 @@ const Hi = (n) => n.pagination.state$.pipe(
         r.endPageIndexInSpineItem ?? 0
       )
     })),
-    x((r) => {
+    $((r) => {
       i.next(r);
     }),
     J(1)
   ), getPaginationInfo: () => i.value };
-}, me = (n) => We({
+}, he = (n) => We({
   spineIndex: n.index,
   spineId: n.id
-}), Bt = ({
+}), Wt = ({
   nodeOrRange: n,
   offset: e,
   item: t
 }) => {
   const i = "ownerDocument" in n ? n.ownerDocument : n.startContainer.ownerDocument;
-  return !i || !i?.documentElement || n === i ? me(t) : On(n) ? We({
+  return !i || !i?.documentElement || n === i ? he(t) : On(n) ? We({
     start: {
       node: n.startContainer,
       offset: n.startOffset,
@@ -2672,7 +2665,7 @@ const Hi = (n) => n.pagination.state$.pipe(
     spineIndex: t.index,
     spineId: t.id
   });
-}, Be = ({
+}, He = ({
   pageIndex: n,
   spineItem: e,
   spine: t
@@ -2680,25 +2673,25 @@ const Hi = (n) => n.pagination.state$.pipe(
   const o = t.pages.value.pages.find(
     (r) => r.itemIndex === e.index && r.pageIndex === n
   )?.firstVisibleNode, s = e.renderer.getDocumentFrame();
-  return o && s instanceof HTMLIFrameElement && s.contentWindow?.document ? Bt({
+  return o && s instanceof HTMLIFrameElement && s.contentWindow?.document ? Wt({
     nodeOrRange: o.node,
     offset: o.offset,
     item: e.item
-  }).trim() : me(e.item);
-}, io = (n, e) => Bt({
+  }).trim() : he(e.item);
+}, io = (n, e) => Wt({
   nodeOrRange: n,
   item: e
-}), Js = (n) => n.index.toString(), gt = (n) => n[0]?.index === 6 && n.length > 1, Xe = (n) => {
-  const e = Et(n);
+}), Zs = (n) => n.index.toString(), pt = (n) => n[0]?.index === 6 && n.length > 1, Be = (n) => {
+  const e = Mt(n);
   return wn(e);
-}, oo = (n) => Array.isArray(n) ? n[0] && gt(n[0]) ? n[0] : void 0 : n.parent[0] && gt(n.parent[0]) ? n.parent[0] : void 0, it = (n) => {
-  const e = Et(n), s = ((oo(e) ?? [])[1]?.index ?? 2) / 2 - 1, r = Pn(e), a = r ? e.end.at(-1)?.at(-1)?.offset : e.at(-1)?.at(-1)?.offset;
+}, oo = (n) => Array.isArray(n) ? n[0] && pt(n[0]) ? n[0] : void 0 : n.parent[0] && pt(n.parent[0]) ? n.parent[0] : void 0, it = (n) => {
+  const e = Mt(n), s = ((oo(e) ?? [])[1]?.index ?? 2) / 2 - 1, r = Pn(e), a = r ? e.end.at(-1)?.at(-1)?.offset : e.at(-1)?.at(-1)?.offset;
   return {
     isCfiRange: r,
     itemIndex: s,
     offset: a ?? 0
   };
-}, Xt = ({
+}, _t = ({
   cfi: n,
   spineItemsManager: e
 }) => {
@@ -2727,7 +2720,7 @@ const Hi = (n) => n.pagination.state$.pipe(
           spineItem: o
         };
       } catch (a) {
-        return D.warn(`Error resolving cfi: ${n}.`), D.warn(a), {
+        return A.warn(`Error resolving cfi: ${n}.`), A.warn(a), {
           ...i,
           spineItem: o,
           itemIndex: t,
@@ -2754,17 +2747,17 @@ const Hi = (n) => n.pagination.state$.pipe(
   const t = n.spineItemsManager.get(e);
   if (!t)
     throw new Error("Spine item not found");
-  const i = me(t.item);
+  const i = he(t.item);
   return {
     ...n.cfi.parseCfi(i),
-    cfi: me(t.item),
+    cfi: he(t.item),
     itemIndex: t.index,
     node: null
   };
 }, ro = (n, e) => {
   let t = n?.itemPageIndex;
   const { itemIndex: i, ...o } = e.cfi.parseCfi(n.cfi), s = e.spineItemsManager.get(i);
-  return s ? Vt().pipe(
+  return s ? et().pipe(
     z(s.isReady$),
     S(([, r]) => {
       const {
@@ -2804,12 +2797,12 @@ class ao {
         resource: t,
         meta: so(this.reader, t)
       };
-      return ct(() => {
+      return at(() => {
         const s = this.reader.spineItemsManager.get(
           o.meta.itemIndex ?? 0
         ), r = s?.renditionLayout === "reflowable", a = i.mode === "shallow" || !r || !s ? () => {
         } : this.reader.spine.spineItemsLoader.forceOpen([s.index]), c = "cfi" in t ? t.cfi : void 0, u = c ? this.locatorsByKey.get(c) : void 0, l = (p) => p.pipe(
-          pe(() => {
+          me(() => {
             c && this.deregisterMemoizedStream(c), setTimeout(() => {
               a();
             }, 1e3);
@@ -2825,9 +2818,9 @@ class ao {
             )
           );
         const d = this.reader.spine.layout$.pipe(
-          be(10),
+          Ie(10),
           ne(o),
-          un((p) => ro(p.meta, this.reader).pipe(
+          an((p) => ro(p.meta, this.reader).pipe(
             S((g) => ({
               ...p,
               meta: g
@@ -2843,16 +2836,16 @@ class ao {
     };
   }
   locateResource(e, t) {
-    return Array.isArray(e) ? ct(
-      () => O(
+    return Array.isArray(e) ? at(
+      () => j(
         e.map((i) => this.locate(i, t ?? {}))
-      ).pipe(ln([]))
+      ).pipe(cn([]))
     ) : this.locate(e, t ?? {});
   }
 }
 const co = (n) => (e) => {
   const t = n(e), { paginationInfo$: i, getPaginationInfo: o } = no(t);
-  i.pipe($(t.$.destroy$)).subscribe();
+  i.pipe(T(t.$.destroy$)).subscribe();
   const s = new ao(t);
   return {
     ...t,
@@ -2919,7 +2912,7 @@ const co = (n) => (e) => {
       a(d);
     };
   })
-}), Oe = async (n) => new Promise((e, t) => {
+}), Ve = async (n) => new Promise((e, t) => {
   const i = window.indexedDB.open(n);
   i.onerror = (o) => {
     t(o);
@@ -2939,7 +2932,7 @@ const co = (n) => (e) => {
   }, o = async (c, u) => {
     const l = i(c);
     if (!l) return new Response("Item not found", { status: 404 });
-    const p = await (await Oe("prose-reader")).get(`${e}_${l.id}`);
+    const p = await (await Ve("prose-reader")).get(`${e}_${l.id}`);
     if (p)
       return new Response(p, { status: 200 });
     const g = u && await u(l) || await fetch(l.href);
@@ -2948,36 +2941,36 @@ const co = (n) => (e) => {
     t.next({ id: c, data: u });
   };
   t.asObservable().pipe(
-    vn(({ id: c, data: u }) => {
+    bn(({ id: c, data: u }) => {
       const l = i(c);
-      return l ? A(
-        dn([Oe("prose-reader"), A(u.blob())])
+      return l ? k(
+        un([Ve("prose-reader"), k(u.blob())])
       ).pipe(
-        X(([d, p]) => A(d.put(`${e}_${l.id}`, p))),
-        rt((d) => (D.error(d), _))
+        Y(([d, p]) => k(d.put(`${e}_${l.id}`, p))),
+        st((d) => (A.error(d), _))
       ) : _;
     }),
     K(n.destroy$)
   ).subscribe();
   const r = n.manifest$.pipe(
-    N(() => {
+    V(() => {
       e = Date.now().toString();
     })
   );
   return P(r).pipe(
-    X(() => (D.debug("Cleanup up old cache..."), A(Oe("prose-reader")).pipe(
-      X(
-        (c) => A(c.keys()).pipe(
+    Y(() => (A.debug("Cleanup up old cache..."), k(Ve("prose-reader")).pipe(
+      Y(
+        (c) => k(c.keys()).pipe(
           ie(
             (u) => u.filter((l) => !l.toString().startsWith(e))
           ),
-          X((u) => {
+          Y((u) => {
             const l = u.map((d) => c.remove(d));
-            return A(Promise.all(l));
+            return k(Promise.all(l));
           })
         )
       ),
-      rt((c) => (D.error(c), _))
+      st((c) => (A.error(c), _))
     ))),
     K(n.destroy$)
   ).subscribe(), {
@@ -3012,7 +3005,7 @@ const co = (n) => (e) => {
         t.setStart(n.node, o), t.setEnd(n.node, s);
       }
     } catch (o) {
-      D.warn("Failed to create range from selection", o, {
+      A.warn("Failed to create range from selection", o, {
         anchor: n,
         focus: e
       });
@@ -3031,7 +3024,7 @@ const co = (n) => (e) => {
         { node: o, offset: s }
       );
     } catch (r) {
-      D.warn("Failed to create range from selection", r, {
+      A.warn("Failed to create range from selection", r, {
         selection: n,
         spineItem: e
       });
@@ -3043,39 +3036,39 @@ class mo extends G {
     super();
     const t = e.contentDocument || e.contentWindow?.document;
     if (!t)
-      this.selectionChange$ = he, this.selectionOver$ = he;
+      this.selectionChange$ = ge, this.selectionOver$ = ge;
     else {
-      const i = ut(t.body, {
+      const i = ct(t.body, {
         childList: !0,
         subtree: !0
       }).pipe(
-        M(
+        C(
           (s) => !!s.find((r) => r.type === "childList" && r.removedNodes.length)
         )
-      ), o = e.parentElement ? ut(e.parentElement, {
+      ), o = e.parentElement ? ct(e.parentElement, {
         childList: !0
       }).pipe(
-        M(
+        C(
           (s) => !!s.find(
             (r) => Array.from(r.removedNodes).includes(e)
           )
         )
       ) : v(null);
       this.selectionChange$ = P(
-        q(t, "selectionchange"),
+        X(t, "selectionchange"),
         i
       ).pipe(
         S(() => t.getSelection()),
-        $(P(o, this.destroy$)),
-        ye(null)
-      ), this.selectionOver$ = q(t, "pointerdown").pipe(
+        T(P(o, this.destroy$)),
+        fe(null)
+      ), this.selectionOver$ = X(t, "pointerdown").pipe(
         w(
           () => P(
-            q(t, "pointerup"),
-            q(t, "pointercancel"),
-            q(t, "contextmenu")
+            X(t, "pointerup"),
+            X(t, "pointercancel"),
+            X(t, "contextmenu")
           ).pipe(
-            V(),
+            U(),
             /**
              * The selection is still valid during the event even if it will
              * be discarded. The timeout make sure to detect this edge case.
@@ -3085,10 +3078,10 @@ class mo extends G {
               const r = t.getSelection();
               return r && !r.isCollapsed ? [s, r] : void 0;
             }),
-            M(Z)
+            C(Z)
           )
         ),
-        $(P(o, this.destroy$))
+        T(P(o, this.destroy$))
       );
     }
   }
@@ -3096,7 +3089,7 @@ class mo extends G {
 const fo = (n) => n.watch("isLoaded").pipe(
   w(() => {
     const e = n.renderer.getDocumentFrame(), t = e?.contentDocument || e?.contentWindow?.document;
-    if (!e || !t) return he;
+    if (!e || !t) return ge;
     const i = new mo(e);
     return P(
       i.selectionChange$.pipe(
@@ -3116,14 +3109,14 @@ const fo = (n) => n.watch("isLoaded").pipe(
         }))
       )
     ).pipe(
-      $(n.unloaded$),
-      ye(void 0),
-      pe(() => {
+      T(n.unloaded$),
+      fe(void 0),
+      me(() => {
         i.destroy();
       })
     );
   }),
-  k()
+  N()
 ), yo = (n) => (e) => {
   const t = n(e);
   let i;
@@ -3144,33 +3137,33 @@ const fo = (n) => n.watch("isLoaded").pipe(
       return P(...d);
     }),
     ne(void 0),
-    k(),
-    x((l) => {
+    N(),
+    $((l) => {
       i = l;
     }),
     J({ refCount: !0, bufferSize: 1 })
   ), s = o, r = o.pipe(
     S((l) => !!l),
-    k(),
-    M((l) => l),
-    j()
+    N(),
+    C((l) => l),
+    D()
   ), a = r.pipe(
     w(() => s),
-    k(),
-    M((l) => !l),
-    j()
+    N(),
+    C((l) => !l),
+    D()
   ), c = o.pipe(
-    M((l) => l?.type === "over"),
-    j()
+    C((l) => l?.type === "over"),
+    D()
   ), u = t.context.watch("rootElement").pipe(
-    M(Z),
-    w((l) => q(l, "pointerdown")),
+    C(Z),
+    w((l) => X(l, "pointerdown")),
     z(s),
     S(([, l]) => l),
     ne(void 0),
     J({ refCount: !0, bufferSize: 1 })
   );
-  return P(s, u).pipe($(t.$.destroy$)).subscribe(), {
+  return P(s, u).pipe(T(t.$.destroy$)).subscribe(), {
     ...t,
     selection: {
       selection$: s,
@@ -3182,7 +3175,7 @@ const fo = (n) => n.watch("isLoaded").pipe(
       createOrderedRangeFromSelection: ho
     }
   };
-}, ht = [
+}, gt = [
   {
     name: "bright",
     backgroundColor: "white"
@@ -3198,10 +3191,10 @@ const fo = (n) => n.watch("isLoaded").pipe(
     foregroundColor: "#f1ebeb"
   }
 ], So = (n) => (e) => {
-  const t = n(e), i = new Y(
+  const t = n(e), i = new q(
     e.theme ?? "bright"
   ), o = () => {
-    const a = ht.find(
+    const a = gt.find(
       (c) => c.name === i.value
     );
     return `
@@ -3218,7 +3211,7 @@ const fo = (n) => n.watch("isLoaded").pipe(
   }, s = ({
     container: a
   }) => {
-    const c = ht.find(
+    const c = gt.find(
       (u) => u.name === i.value
     );
     return c && a.style.setProperty(
@@ -3239,14 +3232,14 @@ const fo = (n) => n.watch("isLoaded").pipe(
       u && oe(u, "prose-reader-theme", o());
     }
   }), t.spineItemsManager.items$.pipe(
-    N(
+    V(
       (a) => a.map(
         ({ element: c }) => s({ container: c })
       )
     ),
     K(t.$.destroy$)
   ).subscribe(), i.pipe(
-    N(() => {
+    V(() => {
       r();
     }),
     K(t.$.destroy$)
@@ -3267,7 +3260,7 @@ const fo = (n) => n.watch("isLoaded").pipe(
   return {
     ...t,
     utils: {
-      isOrIsWithinValidLink: (s) => !!(Nt(s) && (s.nodeName === "a" ? s : s.closest("a"))?.getAttribute("href")),
+      isOrIsWithinValidLink: (s) => !!(At(s) && (s.nodeName === "a" ? s : s.closest("a"))?.getAttribute("href")),
       injectScopedCSS: (s, r, a) => {
         const c = a.replace("${id}", t.id);
         return Ce(s, `${r}-${t.id}`, c);
@@ -3276,7 +3269,7 @@ const fo = (n) => n.watch("isLoaded").pipe(
   };
 };
 navigator.userAgent.indexOf("") > -1 && navigator.userAgent.indexOf("Chrome") <= -1;
-const bo = (n) => (e) => n(e), vo = "[data-prose-reader-scroll-navigator][data-prose-reader-zooming=true]{overflow:scroll}[data-prose-reader-scroll-navigator][data-prose-reader-zooming=true][data-prose-reader-zooming-direction=down]{overflow-x:auto}", mt = (n, e, t) => {
+const bo = (n) => (e) => n(e), vo = "[data-prose-reader-scroll-navigator][data-prose-reader-zooming=true]{overflow:scroll}[data-prose-reader-scroll-navigator][data-prose-reader-zooming=true][data-prose-reader-zooming-direction=down]{overflow-x:auto}", ht = (n, e, t) => {
   const { clientWidth: i, clientHeight: o } = t.value.element, s = {
     maxX: 0,
     minX: i * (1 - e),
@@ -3298,14 +3291,14 @@ const bo = (n) => (e) => n(e), vo = "[data-prose-reader-scroll-navigator][data-p
     y: i.y + c * (1 - o)
   };
 };
-class Yt {
+class Ht {
   constructor(e) {
     this.x = e.x, this.y = e.y;
   }
 }
-class ft extends Yt {
+class mt extends Ht {
 }
-class xo extends Yt {
+class xo extends Ht {
   constructor() {
     super(...arguments), this.__symbol = /* @__PURE__ */ Symbol("UnboundScrollPosition");
   }
@@ -3314,7 +3307,7 @@ class $o extends Q {
   constructor(e, t, i, o, s) {
     super({
       element: void 0
-    }), this.viewport = e, this.settings = t, this.hookManager = i, this.spine = o, this.context = s, this.navigateSubject = new R(), this.scrollingSubject = new Y(!1), this.isScrolling$ = this.scrollingSubject.asObservable(), this.setViewportPosition = ({
+    }), this.viewport = e, this.settings = t, this.hookManager = i, this.spine = o, this.context = s, this.navigateSubject = new R(), this.scrollingSubject = new q(!1), this.isScrolling$ = this.scrollingSubject.asObservable(), this.setViewportPosition = ({
       position: d
     }) => {
       const p = this.value.element;
@@ -3325,27 +3318,27 @@ class $o extends Q {
         top: g.y,
         behavior: "instant"
       }), Te(1).pipe(
-        x(() => {
+        $(() => {
           this.scrollingSubject.next(!1);
         }),
-        $(P(this.scrollingSubject.pipe(Lt(1)), this.destroy$))
+        T(P(this.scrollingSubject.pipe(Ft(1)), this.destroy$))
       ).subscribe(), this.hookManager.execute("onViewportOffsetAdjust", void 0, {});
     };
     const r = this.context.pipe(
-      Qe(["rootElement"]),
-      x(({ rootElement: d }) => {
+      Ke(["rootElement"]),
+      $(({ rootElement: d }) => {
         if (!d) return;
         const p = document.createElement("div");
         p.setAttribute(`data-${si}`, ""), p.appendChild(this.viewport.value.element), d.appendChild(p), this.update({ element: p });
       })
-    ), a = O([
+    ), a = j([
       t.watch(["computedPageTurnMode"]),
       this.watch("element")
     ]).pipe(
-      x(([{ computedPageTurnMode: d }, p]) => {
+      $(([{ computedPageTurnMode: d }, p]) => {
         p && (d === "scrollable" ? p.style.display = "block" : p.style.display = "contents");
       })
-    ), c = this.navigateSubject.pipe(x(this.setViewportPosition));
+    ), c = this.navigateSubject.pipe($(this.setViewportPosition));
     this.isNavigating$ = this.navigateSubject.pipe(
       ne(!1),
       w(() => P(v(!0), v(!1))),
@@ -3353,12 +3346,12 @@ class $o extends Q {
     );
     const u = P(
       o.element$.pipe(
-        M(Z),
-        w((d) => et(d))
+        C(Z),
+        w((d) => Qe(d))
       ),
       o.element$.pipe(
-        M(Z),
-        w((d) => q(d, "scroll"))
+        C(Z),
+        w((d) => X(d, "scroll"))
       ),
       o.spineItemsObserver.itemResize$
     ).pipe(
@@ -3368,9 +3361,9 @@ class $o extends Q {
           ne(!0)
         )
       ),
-      k(),
+      N(),
       ne(!1)
-    ), l = O([
+    ), l = j([
       u,
       this.isScrolling$
     ]).pipe(
@@ -3380,13 +3373,13 @@ class $o extends Q {
       J(1)
     );
     this.userScroll$ = this.watch("element").pipe(
-      M(Z),
+      C(Z),
       w(
         (d) => t.watch(["computedPageTurnMode"]).pipe(
           w(
-            ({ computedPageTurnMode: p }) => p === "controlled" ? he : q(d, "scroll").pipe(
+            ({ computedPageTurnMode: p }) => p === "controlled" ? ge : X(d, "scroll").pipe(
               z(l),
-              M(
+              C(
                 ([, g]) => !g
               ),
               S(([g]) => g)
@@ -3394,8 +3387,8 @@ class $o extends Q {
           )
         )
       ),
-      j()
-    ), P(r, a, c).pipe($(this.destroy$)).subscribe();
+      D()
+    ), P(r, a, c).pipe(T(this.destroy$)).subscribe();
   }
   update(e) {
     this.mergeCompare(e);
@@ -3405,21 +3398,21 @@ class $o extends Q {
   }
   fromScrollPosition(e) {
     const t = this.viewport.scaleFactor;
-    return new ue({
+    return new ae({
       x: e.x / t,
       y: e.y / t
     });
   }
   fromSpinePosition(e) {
     const t = this.viewport.scaleFactor;
-    return new ft({
+    return new mt({
       x: e.x * t,
       y: e.y * t
     });
   }
   get scrollPosition() {
     const e = this.value.element;
-    return new ft({
+    return new mt({
       x: e?.scrollLeft ?? 0,
       y: e?.scrollTop ?? 0
     });
@@ -3433,7 +3426,7 @@ const To = (n, e, t, i, o) => {
   });
 }, Fo = (n, e) => {
   const t = e.viewport, i = e.navigation.scrollNavigationController, o = t.value.element, s = i.value.element, r = i.value.element, a = Math.round(t.scaleFactor * 100) / 100, c = o.offsetLeft, u = o.offsetTop, l = To(
-    s ?? Rn(),
+    s ?? An(),
     a,
     n,
     c,
@@ -3471,7 +3464,7 @@ class Lo extends Q {
           currentScale: 1,
           currentPosition: { x: 0, y: 0 }
         }), this.updateZoom(s), s !== 1 && this.isControlled ? Te(o?.animate ? we : 0).pipe(
-          x(() => {
+          $(() => {
             this.reader.layout();
           })
         ) : _;
@@ -3490,15 +3483,15 @@ class Lo extends Q {
         ), o?.animate && this.isControlled && (s.style.transition = `transform ${we}ms`), this.updateZoom(1, { x: 0, y: 0 }), s.style.transform = "", this.mergeCompare({
           isZooming: !1
         }), Te(o?.animate ? we : 0).pipe(
-          x(() => {
+          $(() => {
             const r = this.reader.viewport.value.element;
             r.style.transformOrigin = "", r.style.transition = "", this.isControlled && this.reader.layout();
           }),
-          $(this.enterSubject)
+          T(this.enterSubject)
         );
       })
     );
-    P(t, i).pipe($(this.destroy$)).subscribe();
+    P(t, i).pipe(T(this.destroy$)).subscribe();
   }
   enter(e) {
     this.enterSubject.next(e);
@@ -3508,14 +3501,14 @@ class Lo extends Q {
   }
   move(e, t) {
     this.isControlled && (this.viewport.element.style.transition = "", this.updateZoom(this.value.currentScale, e, {
-      constraints: t?.constrain === "within-viewport" ? (...i) => mt(...i, this.reader.viewport) : void 0
+      constraints: t?.constrain === "within-viewport" ? (...i) => ht(...i, this.reader.viewport) : void 0
     }));
   }
   scaleAt(e, t) {
     this.viewport.element.style.transition = "";
     const o = Math.ceil(e * 100) / 100;
     this.updateZoom(o, void 0, {
-      constraints: t?.constrain === "within-viewport" ? (...s) => mt(...s, this.reader.viewport) : void 0
+      constraints: t?.constrain === "within-viewport" ? (...s) => ht(...s, this.reader.viewport) : void 0
     });
   }
   updateZoom(e, t, i) {
@@ -3552,11 +3545,11 @@ class Lo extends Q {
     return this.reader.viewport.value;
   }
 }
-const yt = `${Ut}-enhancer-zoom`, Mo = (n) => (e) => {
+const ft = `${Vt}-enhancer-zoom`, Mo = (n) => (e) => {
   const t = n(e), i = new Lo(t);
-  Ce(document, yt, vo);
+  Ce(document, ft, vo);
   const o = () => {
-    Ee(document, yt), i.destroy(), t.destroy();
+    Ee(document, ft), i.destroy(), t.destroy();
   }, s = i;
   return {
     ...t,
@@ -3572,16 +3565,16 @@ const yt = `${Ut}-enhancer-zoom`, Mo = (n) => (e) => {
       }
     }
   };
-}, qt = (n) => n?.renditionLayout === "pre-paginated" || n?.spineItems.every((e) => e.renditionLayout === "pre-paginated");
+}, Bt = (n) => n?.renditionLayout === "pre-paginated" || n?.spineItems.every((e) => e.renditionLayout === "pre-paginated");
 class Co {
   constructor() {
-    this.navigationSubject = new ot(1), this.viewportStateSubject = new Y("free"), this.paginationSubject = new ot(), this.navigationIsLockedSubject = new Y(!1), this.pagination$ = this.paginationSubject.asObservable(), this.navigationUnlocked$ = this.navigationIsLockedSubject.pipe(
-      k(),
-      M((e) => !e)
+    this.navigationSubject = new ot(1), this.viewportStateSubject = new q("free"), this.paginationSubject = new ot(), this.navigationIsLockedSubject = new q(!1), this.pagination$ = this.paginationSubject.asObservable(), this.navigationUnlocked$ = this.navigationIsLockedSubject.pipe(
+      N(),
+      C((e) => !e)
     ), this.viewportState$ = this.viewportStateSubject.asObservable(), this.viewportFree$ = this.viewportState$.pipe(
-      M((e) => e === "free")
+      C((e) => e === "free")
     ), this.viewportBusy$ = this.viewportState$.pipe(
-      M((e) => e === "busy")
+      C((e) => e === "busy")
     ), this.navigation$ = this.navigationSubject.asObservable();
   }
 }
@@ -3591,8 +3584,8 @@ class Eo extends Q {
       assumedRenditionLayout: "reflowable"
     }), this.bridgeEvent = new Co(), this.manifest$ = this.pipe(
       ie((e) => e.manifest),
-      ae(Z),
-      fe()
+      de(Z),
+      be()
     ), this.isRTL = () => this.value.manifest?.readingDirection === "rtl";
   }
   update(e) {
@@ -3600,7 +3593,7 @@ class Eo extends Q {
       ...t,
       ...e,
       ...e.manifest && {
-        isFullyPrePaginated: qt(i),
+        isFullyPrePaginated: Bt(i),
         assumedRenditionLayout: i?.renditionLayout ?? "reflowable"
       }
     };
@@ -3620,7 +3613,7 @@ class Do extends Q {
       supportedPageTurnMode: ["controlled", "scrollable"],
       supportedPageTurnDirection: ["horizontal", "vertical"],
       supportedComputedPageTurnDirection: ["horizontal", "vertical"]
-    }), O([
+    }), j([
       e.watch(["manifest", "hasVerticalWriting"]),
       t.watch(["computedPageTurnMode"])
     ]).pipe(
@@ -3630,7 +3623,7 @@ class Do extends Q {
         renditionLayout: i?.renditionLayout,
         computedPageTurnMode: s
       })),
-      k(U),
+      N(O),
       S(
         ({
           hasVerticalWriting: i,
@@ -3644,11 +3637,11 @@ class Do extends Q {
           supportedPageTurnDirection: r === "scrollable" ? ["vertical"] : s === "reflowable" ? ["horizontal"] : ["horizontal", "vertical"]
         })
       ),
-      $(this.destroy$)
+      T(this.destroy$)
     ).subscribe(this.next.bind(this));
   }
 }
-class Ro {
+class Ao {
   constructor() {
     this._hooks = [], this._hookExecutions = [];
   }
@@ -3707,28 +3700,28 @@ class Ro {
       (r) => !o.includes(r)
     );
     const s = o.map(({ destroyFn: r }) => r());
-    return O(s);
+    return j(s);
   }
 }
-const Ao = "[data-prose-reader-scroll-navigator]{height:100%;width:100%;position:relative;overflow-y:scroll;overflow-x:hidden}[data-prose-reader-viewport]{background-color:#fff;position:relative;height:100%;width:100%}", No = (n) => ({
+const Ro = "[data-prose-reader-scroll-navigator]{height:100%;width:100%;position:relative;overflow-y:scroll;overflow-x:hidden}[data-prose-reader-viewport]{background-color:#fff;position:relative;height:100%;width:100%}", No = (n) => ({
   x: -n.x,
   y: -n.y
-}), Oo = (n) => n instanceof DOMMatrix ? new L({
+}), Oo = (n) => n instanceof DOMMatrix ? new M({
   x: -n.e,
   y: -n.f
-}) : new L({
+}) : new M({
   x: -n.x,
   y: -n.y
-}), Vo = "navigation/ViewportNavigator", St = D.namespace(Vo);
+}), Vo = "navigation/ViewportNavigator", yt = A.namespace(Vo);
 class jo extends G {
   constructor(e, t, i, o, s) {
-    super(), this.settings = e, this.hookManager = t, this.context = i, this.spine = o, this.viewport = s, this.navigateSubject = new R(), this.element$ = new Y(
+    super(), this.settings = e, this.hookManager = t, this.context = i, this.spine = o, this.viewport = s, this.navigateSubject = new R(), this.element$ = new q(
       document.createElement("div")
     );
     const r = this.spine.element$.pipe(
-      M(Z),
+      C(Z),
       z(this.element$),
-      x(([l, d]) => {
+      $(([l, d]) => {
         d.style.cssText = `
           height: 100%;
           width: 100%;
@@ -3739,23 +3732,23 @@ class jo extends G {
       "computedPageTurnDirection",
       "computedPageTurnMode",
       "numberOfAdjacentSpineItemToPreLoad"
-    ]), c = O([
+    ]), c = j([
       a,
       this.element$
     ]).pipe(
-      x(([, l]) => {
+      $(([, l]) => {
         e.values.computedPageTurnMode === "scrollable" ? l.style.display = "contents" : l.style.display = "block";
       })
     );
     this.layout$ = c.pipe(
-      x(() => {
-        St.info("layout", e.values);
+      $(() => {
+        yt.info("layout", e.values);
       }),
-      j()
+      D()
     );
     const u = this.navigateSubject.pipe(
-      x((l) => {
-        St.info("Navigation requested", l);
+      $((l) => {
+        yt.info("Navigation requested", l);
       })
     );
     this.isNavigating$ = u.pipe(
@@ -3770,7 +3763,7 @@ class jo extends G {
         return d.style.setProperty("transition", "none"), d.style.setProperty("opacity", "1"), P(
           v(!0),
           v(null).pipe(
-            ge(() => {
+            pe(() => {
               if (l?.type !== "manualAdjust") return v(!1);
               const p = l.animation === "snap" ? e.values.snapAnimationDuration : e.values.computedPageTurnAnimationDuration, g = l.animation === "snap" ? "slide" : e.values.computedPageTurnAnimation;
               return v(l).pipe(
@@ -3782,8 +3775,8 @@ class jo extends G {
                  * anything for x ms while we effectively adjust. We want it to be immediate.
                  * However when user is repeatedly turning page, we can improve smoothness by delaying a bit the adjustment
                  */
-                l.shouldAnimate ? Pe(1, ce) : xe,
-                x((h) => {
+                l.shouldAnimate ? Pe(1, re) : xe,
+                $((h) => {
                   const m = this.element$.getValue();
                   h.shouldAnimate ? g === "fade" ? (m.style.setProperty(
                     "transition",
@@ -3801,16 +3794,16 @@ class jo extends G {
                  * need to adjust to anchor to the payload position. This is because we use viewport computed position,
                  * not the value set by `setProperty`
                  */
-                x((h) => {
+                $((h) => {
                   g !== "fade" && this.setViewportPosition(h.position);
                 }),
-                l.shouldAnimate ? Pe(p / 2, ce) : xe,
-                x((h) => {
+                l.shouldAnimate ? Pe(p / 2, re) : xe,
+                $((h) => {
                   const m = this.element$.getValue();
                   g === "fade" && (this.setViewportPosition(h.position), m.style.setProperty("opacity", "1"));
                 }),
-                l.shouldAnimate ? Pe(p / 2, ce) : xe,
-                x((h) => {
+                l.shouldAnimate ? Pe(p / 2, re) : xe,
+                $((h) => {
                   g === "fade" && this.setViewportPosition(h.position);
                 })
               );
@@ -3821,7 +3814,7 @@ class jo extends G {
       }),
       ne(!1),
       J(1)
-    ), P(r, this.isNavigating$, this.layout$).pipe($(this.destroy$)).subscribe();
+    ), P(r, this.isNavigating$, this.layout$).pipe(T(this.destroy$)).subscribe();
   }
   /**
    * Programmatically set the viewport position.
@@ -3845,7 +3838,7 @@ class jo extends G {
   get viewportPosition() {
     const e = this.element$.getValue(), t = window.getComputedStyle(e), i = t.transform || t.webkitTransform;
     if (!i || i === "none")
-      return new L({ x: 0, y: 0 });
+      return new M({ x: 0, y: 0 });
     const o = new DOMMatrix(i);
     return Oo(o);
   }
@@ -3860,7 +3853,7 @@ const ko = () => (n) => n.pipe(
   }))
 ), Uo = (n, e, t) => n.bridgeEvent.pagination$.pipe(
   z(e),
-  M(
+  C(
     ([i, o]) => i.navigationId === o.id
   ),
   /**
@@ -3868,15 +3861,15 @@ const ko = () => (n) => n.pipe(
    * Otherwise we might save something incomplete and thus restore
    * the user to an invalid location.
    */
-  w(([i, o]) => (t.spineItemsManager.get(o.spineItem)?.isReady$.pipe(V()) ?? v(!1)).pipe(
-    M((r) => r),
+  w(([i, o]) => (t.spineItemsManager.get(o.spineItem)?.isReady$.pipe(U()) ?? v(!1)).pipe(
+    C((r) => r),
     S(() => ({
       pagination: i,
       navigation: o
     }))
   )),
   ko(),
-  k(
+  N(
     (i, o) => i.navigation.paginationBeginCfi === o.navigation.paginationBeginCfi
   ),
   S(
@@ -3995,7 +3988,7 @@ const ko = () => (n) => n.pipe(
         },
         ...s
       };
-    const a = e.getNavigationForSpineIndexOrId(r), c = t.values.computedPageTurnMode === "scrollable" ? new ue({
+    const a = e.getNavigationForSpineIndexOrId(r), c = t.values.computedPageTurnMode === "scrollable" ? new ae({
       x: a.x + s.previousNavigation.position.x,
       y: a.y
     }) : e.fromUnboundSpinePosition(a);
@@ -4007,7 +4000,7 @@ const ko = () => (n) => n.pipe(
       ...s
     };
   })
-), It = ({
+), St = ({
   settings: n,
   spineItemsManager: e,
   navigationResolver: t,
@@ -4045,12 +4038,12 @@ const ko = () => (n) => n.pipe(
       }) ?? {}, b = (l === "forward" || l === "anchor" ? f : I) ?? 0, F = t.getNavigationForSpineItemPage({
         pageIndex: b,
         spineItemId: y
-      }), T = i.getVisibleSpineItemsFromPosition({
+      }), x = i.getVisibleSpineItemsFromPosition({
         position: F,
         threshold: d,
         restrictToScreen: !1
-      }), E = l === "forward" || l === "anchor" ? T?.beginIndex : T?.endIndex;
-      return e.get(E);
+      }), L = l === "forward" || l === "anchor" ? x?.beginIndex : x?.endIndex;
+      return e.get(L);
     }
     return a && p === "scrollable" ? i.getSpineItemFromPosition(a) : e.get(0);
   };
@@ -4066,13 +4059,13 @@ const ko = () => (n) => n.pipe(
       };
     })
   );
-}, bt = ({ spine: n }) => (e) => e.pipe(
+}, It = ({ spine: n }) => (e) => e.pipe(
   w(({ navigation: t, ...i }) => {
     const o = n.getSpineItemSpineLayoutInfo(
       t.spineItem
     ), s = n.spineItemsManager.get(t.spineItem);
     return (s?.isReady$ ?? v(!1)).pipe(
-      V(),
+      U(),
       S(
         (r) => ({
           navigation: {
@@ -4089,7 +4082,7 @@ const ko = () => (n) => n.pipe(
       )
     );
   })
-), Ve = ({
+), je = ({
   settings: n,
   spineItemsManager: e,
   spineLocator: t,
@@ -4152,11 +4145,11 @@ const ko = () => (n) => n.pipe(
     return t;
   })
 );
-class Gt {
+class Xt {
   constructor() {
-    this.isLockedSubject = new Y(0), this.isLocked$ = this.isLockedSubject.pipe(
+    this.isLockedSubject = new q(0), this.isLocked$ = this.isLockedSubject.pipe(
       S((e) => !!e),
-      k()
+      N()
     );
   }
   lock() {
@@ -4175,7 +4168,7 @@ const Yo = ({
 }) => {
   const s = i.get(e.spineItem);
   return s ? s.isReady$.pipe(
-    V(),
+    U(),
     S((r) => {
       const a = o.getSpineItemSpineLayoutInfo(s), c = n.isPositionWithinSpineItem(
         e.position,
@@ -4191,7 +4184,7 @@ const Yo = ({
           return g.position;
       }
       const p = e.cfi ?? e.paginationBeginCfi;
-      if (p !== void 0 && !Xe(p) && (u || l || // when spine item is ready dimensions may have not changed but the position
+      if (p !== void 0 && !Be(p) && (u || l || // when spine item is ready dimensions may have not changed but the position
       // of dom elements may have!
       r && !e.spineItemIsReady)) {
         const g = t.getNavigationForCfi(p);
@@ -4199,7 +4192,7 @@ const Yo = ({
           return g;
       }
       if (c && d && e.directionFromLastNavigation === "backward") {
-        const g = new C({
+        const g = new E({
           x: (e.positionInSpineItem?.x ?? 0) + u,
           y: (e.positionInSpineItem?.y ?? 0) + l
         });
@@ -4222,7 +4215,7 @@ const Yo = ({
       }
       return c ? t.getNavigationForPosition(e.position) : t.getNavigationForSpineIndexOrId(s);
     })
-  ) : v(new L({ x: 0, y: 0 }));
+  ) : v(new M({ x: 0, y: 0 }));
 }, qo = ({
   navigation: n,
   spineLocator: e,
@@ -4232,11 +4225,11 @@ const Yo = ({
   spine: s
 }) => {
   const { spineItem: r } = n, a = t.get(r);
-  if (!a) return new L({ x: 0, y: 0 });
+  if (!a) return new M({ x: 0, y: 0 });
   const { height: c, top: u } = s.getSpineItemSpineLayoutInfo(a), l = e.isPositionWithinSpineItem(
     n.position,
     a
-  ), d = n.positionInSpineItem ?? new C({
+  ), d = n.positionInSpineItem ?? new E({
     y: 0,
     x: 0
   });
@@ -4247,7 +4240,7 @@ const Yo = ({
       return o.getNavigationForSpineIndexOrId(a);
     if (u !== n.spineItemTop) {
       const p = e.getSafeSpineItemPositionFromUnsafeSpineItemPosition(
-        n.positionInSpineItem ?? new C({
+        n.positionInSpineItem ?? new E({
           x: 0,
           y: 0
         }),
@@ -4259,7 +4252,7 @@ const Yo = ({
       });
     }
     if (u === n.spineItemTop && c !== n.spineItemHeight) {
-      const p = (n.spineItemHeight ?? d.y) - d.y, g = new C({
+      const p = (n.spineItemHeight ?? d.y) - d.y, g = new E({
         y: n.directionFromLastNavigation === "backward" ? c - p : d.y,
         x: n.position.x
       });
@@ -4275,7 +4268,7 @@ const Yo = ({
       }
       if (!l) {
         if (!(n.position.y < u)) {
-          const m = new C({
+          const m = new E({
             y: c - p,
             x: n.position.x
           });
@@ -4314,7 +4307,7 @@ const Yo = ({
   navigationResolver: o,
   spineItemsManager: e,
   spine: s
-}), vt = ({
+}), bt = ({
   settings: n,
   navigationResolver: e,
   context: t,
@@ -4337,28 +4330,28 @@ const Yo = ({
       }
     }))
   ))
-), Zo = "navigation/InternalNavigator", Jo = D.namespace(Zo);
+), Zo = "navigation/InternalNavigator", Jo = A.namespace(Zo);
 class Ko extends G {
   constructor(e, t, i, o, s, r, a, c) {
-    super(), this.settings = e, this.context = t, this.userNavigation$ = i, this.controlledNavigationController = o, this.scrollNavigationController = s, this.navigationResolver = r, this.spine = a, this.isRestorationLocked$ = c, this.navigationSubject = new Y({
+    super(), this.settings = e, this.context = t, this.userNavigation$ = i, this.controlledNavigationController = o, this.scrollNavigationController = s, this.navigationResolver = r, this.spine = a, this.isRestorationLocked$ = c, this.navigationSubject = new q({
       animation: !1,
-      position: new L({ x: 0, y: 0 }),
+      position: new M({ x: 0, y: 0 }),
       meta: {
         triggeredBy: "user"
       },
       spineItemIsReady: !1,
       type: "api",
       id: /* @__PURE__ */ Symbol()
-    }), this.navigated$ = this.navigationSubject.pipe(Lt(1)), this.navigation$ = this.navigationSubject.pipe(
+    }), this.navigated$ = this.navigationSubject.pipe(Ft(1)), this.navigation$ = this.navigationSubject.pipe(
       S(({ position: f, id: I }) => ({
         position: f,
         id: I
       })),
-      k(
-        ({ position: f, ...I }, { position: b, ...F }) => U(I, F) && U(f, b)
+      N(
+        ({ position: f, ...I }, { position: b, ...F }) => O(I, F) && O(f, b)
       ),
       J(1)
-    ), this.locker = new Gt();
+    ), this.locker = new Xt();
     const u = i.pipe(
       z(this.navigationSubject),
       zo({
@@ -4379,19 +4372,19 @@ class Ko extends G {
         navigationResolver: r
       }),
       Ho({ context: t, settings: e }),
-      It({
+      St({
         navigationResolver: r,
         settings: e,
         spineItemsManager: a.spineItemsManager,
         spineLocator: a.locator
       }),
-      Ve({
+      je({
         navigationResolver: r,
         settings: e,
         spineItemsManager: a.spineItemsManager,
         spineLocator: a.locator
       }),
-      bt({
+      It({
         spine: a
       })
     ).pipe(
@@ -4404,7 +4397,7 @@ class Ko extends G {
       w(([f, I]) => {
         const b = f.navigation.cfi || f.navigation.url || e.values.computedPageTurnMode === "scrollable" || I;
         return v(f).pipe(
-          b ? xe : vt({
+          b ? xe : bt({
             navigationResolver: r,
             settings: e,
             spine: a,
@@ -4412,35 +4405,35 @@ class Ko extends G {
           })
         );
       }),
-      Ve({
+      je({
         spineItemsManager: a.spineItemsManager,
         spineLocator: a.locator,
         settings: e,
         navigationResolver: r
       }),
       S((f) => f.navigation),
-      j()
+      D()
     ), l = u.pipe(
       z(c),
-      M(([, f]) => f),
+      C(([, f]) => f),
       w(([f]) => {
         const I = this.locker.lock();
         return c.pipe(
-          M((b) => !b),
-          V(),
+          C((b) => !b),
+          U(),
           S(
             () => ({
               ...f,
               animation: "snap"
             })
           ),
-          pe(() => {
+          me(() => {
             I();
           }),
-          $(u)
+          T(u)
         );
       }),
-      j()
+      D()
     ), d = P(
       o.layout$,
       a.layout$
@@ -4448,8 +4441,8 @@ class Ko extends G {
       w(() => v(null).pipe(
         w(
           () => c.pipe(
-            M((f) => !f),
-            V()
+            C((f) => !f),
+            U()
           )
         ),
         S(
@@ -4463,7 +4456,7 @@ class Ko extends G {
          * another navigation. Whether it's user or internal, it means
          * it has been controlled outside.
          */
-        $(
+        T(
           P(l, u)
         )
       ))
@@ -4472,7 +4465,7 @@ class Ko extends G {
       l
     ).pipe(
       S((f) => ({ navigation: f })),
-      vt({
+      bt({
         navigationResolver: r,
         settings: e,
         context: t,
@@ -4495,23 +4488,23 @@ class Ko extends G {
        * eg: after the reader load and the user has never navigated
        * yet.
        */
-      It({
+      St({
         navigationResolver: r,
         settings: e,
         spineItemsManager: a.spineItemsManager,
         spineLocator: a.locator
       }),
-      bt({
+      It({
         spine: a
       }),
-      Ve({
+      je({
         spineItemsManager: a.spineItemsManager,
         spineLocator: a.locator,
         settings: e,
         navigationResolver: r
       }),
       S(({ navigation: f }) => f),
-      j()
+      D()
     ), g = Uo(
       t,
       this.navigationSubject,
@@ -4521,7 +4514,7 @@ class Ko extends G {
       u,
       g
     ), m = (f) => f.pipe(
-      x(([I, b]) => {
+      $(([I, b]) => {
         Jo.info(
           `navigation updated from ${I.meta.triggeredBy} of type ${I.type}`,
           {
@@ -4531,12 +4524,12 @@ class Ko extends G {
         ), this.navigationSubject.next(I);
       })
     ), y = (f) => f.pipe(
-      x(([I, b]) => {
-        const F = I.type === "scroll", T = I.meta.triggeredBy === "pagination", E = I.meta.triggeredBy === "restoration", H = U(
+      $(([I, b]) => {
+        const F = I.type === "scroll", x = I.meta.triggeredBy === "pagination", L = I.meta.triggeredBy === "restoration", H = O(
           b.position,
           I.position
         );
-        if (F && !E || T || H)
+        if (F && !L || x || H)
           return;
         const B = {
           position: I.position,
@@ -4549,7 +4542,7 @@ class Ko extends G {
            * Explicitly trust the unbound position to be valid at this point.
            * Thanks to consolidation and restoration.
            */
-          position: L.from(B.position)
+          position: M.from(B.position)
         });
       })
     );
@@ -4564,7 +4557,7 @@ class Ko extends G {
        */
       y,
       m,
-      $(this.destroy$)
+      T(this.destroy$)
     ).subscribe();
   }
   get navigation() {
@@ -4574,20 +4567,20 @@ class Ko extends G {
 const Fe = (n, e, t) => {
   const i = t - n, o = t * (e * n) / (t || 1);
   return Math.max(0, Math.min(i, o));
-}, Ye = (n, e) => (e || 0) === 0 || (n || 0) === 0 ? 1 : Math.floor(Math.max(1, n / e)), je = (n, e, t) => {
-  const i = Ye(t, e), o = [...Array(i)].map((s, r) => r * e);
+}, Xe = (n, e) => (e || 0) === 0 || (n || 0) === 0 ? 1 : Math.floor(Math.max(1, n / e)), ke = (n, e, t) => {
+  const i = Xe(t, e), o = [...Array(i)].map((s, r) => r * e);
   return n >= i * e ? o[o.length - 1] || 0 : o.find((s) => n < s + e) || 0;
-}, wt = (n, e, t) => {
+}, vt = (n, e, t) => {
   const i = [...Array(t)].map((o, s) => s * e);
   return n <= 0 || t === 0 ? 0 : n >= t * e ? t - 1 : i.findIndex((o) => n < o + e) ?? 0;
 }, Qo = ({
   itemWidth: n,
   itemHeight: e,
   spineItemPosition: t
-}) => new C({
+}) => new E({
   x: Math.min(n, Math.max(0, t.x)),
   y: Math.min(e, Math.max(0, t.y))
-}), Zt = ({
+}), Yt = ({
   itemHeight: n,
   itemWidth: e,
   isUsingVerticalWriting: t,
@@ -4595,7 +4588,7 @@ const Fe = (n, e, t) => {
   pageHeight: o,
   pageTurnDirection: s,
   pageTurnMode: r
-}) => s === "vertical" && r === "scrollable" ? 1 : t || s === "vertical" ? Ye(n, o) : Ye(e, i), Pt = ({
+}) => s === "vertical" && r === "scrollable" ? 1 : t || s === "vertical" ? Xe(n, o) : Xe(e, i), wt = ({
   itemWidth: n,
   itemHeight: e,
   position: t,
@@ -4610,7 +4603,7 @@ const Fe = (n, e, t) => {
     spineItemPosition: t,
     itemHeight: e,
     itemWidth: n
-  }).x, d = Zt({
+  }).x, d = Yt({
     isUsingVerticalWriting: i,
     itemHeight: e,
     itemWidth: n,
@@ -4620,8 +4613,8 @@ const Fe = (n, e, t) => {
     pageTurnMode: a
   });
   if (i)
-    return wt(t.y, s, d);
-  const p = wt(l, o, d);
+    return vt(t.y, s, d);
+  const p = vt(l, o, d);
   return c ? d - 1 - p : p;
 }, es = ({
   pageIndex: n,
@@ -4636,7 +4629,7 @@ const Fe = (n, e, t) => {
       n,
       e.height
     );
-    return new C({
+    return new E({
       x: 0,
       y: r
     });
@@ -4646,14 +4639,14 @@ const Fe = (n, e, t) => {
     n,
     e.width
   );
-  return t.isRTL() ? new C({
+  return t.isRTL() ? new E({
     x: e.width - s - o.pageSize.width,
     y: 0
-  }) : new C({
+  }) : new E({
     x: s,
     y: 0
   });
-}, Jt = ({
+}, qt = ({
   context: n,
   settings: e,
   viewport: t
@@ -4661,14 +4654,14 @@ const Fe = (n, e, t) => {
   const i = (a, c, u) => {
     let l;
     a?.nodeName === "img" || a?.textContent === "" && a.nodeType === Node.ELEMENT_NODE ? l = a.getBoundingClientRect().x : a && (l = (a ? Cn(a, c) : void 0)?.getBoundingClientRect().x || l);
-    const d = u.layout.layoutInfo?.width || 0, p = t.pageSize.width;
+    const d = u.layoutInfo?.width || 0, p = t.pageSize.width;
     if (l !== void 0) {
-      const g = je(
+      const g = ke(
         l,
         p,
         d
       );
-      return new C({ x: g, y: 0 });
+      return new E({ x: g, y: 0 });
     }
   };
   return {
@@ -4679,11 +4672,11 @@ const Fe = (n, e, t) => {
     }) => es({
       context: n,
       isUsingVerticalWriting: !!c.isUsingVerticalWriting(),
-      itemLayout: c.layout.layoutInfo,
+      itemLayout: c.layoutInfo,
       pageIndex: a,
       viewport: t
     }),
-    getSpineItemPageIndexFromPosition: (a) => Pt({
+    getSpineItemPageIndexFromPosition: (a) => wt({
       ...a,
       isRTL: n.isRTL(),
       pageWidth: t.pageSize.width,
@@ -4692,8 +4685,8 @@ const Fe = (n, e, t) => {
       pageTurnMode: e.values.pageTurnMode
     }),
     getSpineItemPageIndexFromNode: (a, c, u) => {
-      const l = i(a, c, u), { height: d, width: p } = u.layout.layoutInfo;
-      return l ? Pt({
+      const l = i(a, c, u), { height: d, width: p } = u.layoutInfo;
+      return l ? wt({
         isUsingVerticalWriting: !!u.isUsingVerticalWriting(),
         position: l,
         itemHeight: d,
@@ -4706,14 +4699,14 @@ const Fe = (n, e, t) => {
       }) : void 0;
     },
     getSpineItemClosestPositionFromUnsafePosition: (a, c) => {
-      const { width: u, height: l } = c.layout.layoutInfo;
-      return new C({
-        x: je(
+      const { width: u, height: l } = c.layoutInfo;
+      return new E({
+        x: ke(
           a.x,
           t.pageSize.width,
           u
         ),
-        y: je(
+        y: ke(
           a.y,
           t.pageSize.height,
           l
@@ -4721,7 +4714,7 @@ const Fe = (n, e, t) => {
       });
     },
     getSpineItemPagePositionFromSpineItemPosition: (a, c, u) => {
-      const { width: l, height: d } = u.layout.layoutInfo, p = t.pageSize.width, g = t.pageSize.height;
+      const { width: l, height: d } = u.layoutInfo, p = t.pageSize.width, g = t.pageSize.height;
       if (!!u.isUsingVerticalWriting()) {
         const y = Fe(
           g,
@@ -4752,7 +4745,7 @@ const Fe = (n, e, t) => {
   settings: e,
   viewport: t
 }) => {
-  const i = Jt({
+  const i = qt({
     context: n,
     settings: e,
     viewport: t
@@ -4773,10 +4766,10 @@ const Fe = (n, e, t) => {
       c,
       u,
       a
-    ) || new C({ x: 0, y: 0 })
+    ) || new E({ x: 0, y: 0 })
   };
 };
-function Kt({
+function Gt({
   position: n,
   isRTL: e,
   spineItemsManager: t,
@@ -4790,18 +4783,18 @@ function Kt({
   ), a = r.bottom - 1, c = Math.max(0, n.y), u = Math.min(c, a);
   if (e) {
     const g = Math.min(o, n.x), h = Math.max(g, r.left);
-    return new L({
+    return new M({
       x: h,
       y: u
     });
   }
   const l = r.right - 1, d = Math.max(0, n.x), p = Math.min(d, l);
-  return new L({
+  return new M({
     x: p,
     y: u
   });
 }
-const xt = ({
+const Pt = ({
   position: n,
   isRTL: e,
   pageSizeHeight: t,
@@ -4809,7 +4802,7 @@ const xt = ({
   visibleAreaRectWidth: o,
   spine: s
 }) => {
-  const r = Kt({
+  const r = Gt({
     position: n,
     isRTL: e,
     spineItemsManager: i,
@@ -4820,13 +4813,13 @@ const xt = ({
   ), c = s.getSpineItemSpineLayoutInfo(a), u = c.bottom - t, l = Math.min(r.y, u);
   if (e) {
     const p = Math.min(0, r.x);
-    return new L({
+    return new M({
       x: p,
       y: l
     });
   }
   const d = c.right - o;
-  return new L({
+  return new M({
     x: Math.min(r.x, d),
     y: l
   });
@@ -4836,8 +4829,8 @@ const xt = ({
   visibleAreaRectWidth: i
 }) => {
   const s = n % i !== 0 ? n - t : n;
-  return new L({ x: s, y: e });
-}, qe = ({
+  return new M({ x: s, y: e });
+}, Ye = ({
   viewportPosition: n,
   spineLocator: e,
   spineItemNavigationResolver: t,
@@ -4861,7 +4854,7 @@ const xt = ({
       visibleAreaRectWidth: i.absoluteViewport.width
     });
   }
-  return new L({ x: 0, y: 0 });
+  return new M({ x: 0, y: 0 });
 }, ns = ({
   pageIndex: n,
   spineItemsManager: e,
@@ -4873,8 +4866,8 @@ const xt = ({
   const r = e.get(t);
   if (!r) {
     const u = n * s.pageSize.width;
-    return qe({
-      viewportPosition: new L({ x: u, y: 0 }),
+    return Ye({
+      viewportPosition: new M({ x: u, y: 0 }),
       spineItemNavigationResolver: o,
       spineLocator: i,
       viewport: s
@@ -4919,7 +4912,7 @@ const xt = ({
     spine: i
   });
   return t.getSpinePositionFromSpineItemPosition({
-    spineItemPosition: new C({ x: o, y: 0 }),
+    spineItemPosition: new E({ x: o, y: 0 }),
     spineItem: e
   });
 }, rs = ({
@@ -5036,15 +5029,15 @@ const xt = ({
       viewport: s
     }),
     getNavigationForCfi: (g) => {
-      const h = e.getSpineItemFromCfi(g), { node: m, offset: y = 0 } = Xt({
+      const h = e.getSpineItemFromCfi(g), { node: m, offset: y = 0 } = _t({
         cfi: g,
         spineItemsManager: e
       });
       if (!h) {
-        D.warn(us, `unable to detect item id from cfi ${g}`);
+        A.warn(us, `unable to detect item id from cfi ${g}`);
         return;
       }
-      const f = m ? r.getNavigationFromNode(h, m, y) : new C({ x: 0, y: 0 }), I = t.getSpinePositionFromSpineItemPosition({
+      const f = m ? r.getNavigationFromNode(h, m, y) : new E({ x: 0, y: 0 }), I = t.getSpinePositionFromSpineItemPosition({
         spineItemPosition: f,
         spineItem: h
       });
@@ -5075,17 +5068,17 @@ const xt = ({
           visibleAreaRectWidth: s.absoluteViewport.width
         });
       }
-      return new L({ x: 0, y: 0 });
+      return new M({ x: 0, y: 0 });
     },
-    getNavigationForPosition: (g) => qe({
+    getNavigationForPosition: (g) => Ye({
       viewportPosition: g,
       spineItemNavigationResolver: r,
       spineLocator: t,
       viewport: s
     }),
     getMostPredominantNavigationForPosition: (g) => {
-      const h = i.values.computedPageTurnDirection, m = 0.5, y = h === "horizontal" ? g.x + s.absoluteViewport.width * m : 0, f = h === "horizontal" ? 0 : g.y + s.absoluteViewport.height * m, I = xt({
-        position: new L({
+      const h = i.values.computedPageTurnDirection, m = 0.5, y = h === "horizontal" ? g.x + s.absoluteViewport.width * m : 0, f = h === "horizontal" ? 0 : g.y + s.absoluteViewport.height * m, I = Pt({
+        position: new M({
           x: y,
           y: f
         }),
@@ -5095,14 +5088,14 @@ const xt = ({
         spineItemsManager: e,
         spine: o
       });
-      return qe({
+      return Ye({
         spineItemNavigationResolver: r,
         spineLocator: t,
         viewportPosition: I,
         viewport: s
       });
     },
-    fromUnboundSpinePosition: (g) => xt({
+    fromUnboundSpinePosition: (g) => Pt({
       position: g,
       isRTL: n.isRTL(),
       pageSizeHeight: s.pageSize.height,
@@ -5110,7 +5103,7 @@ const xt = ({
       spineItemsManager: e,
       spine: o
     }),
-    fromOutOfBoundsSpinePosition: (g) => Kt({
+    fromOutOfBoundsSpinePosition: (g) => Gt({
       position: g,
       isRTL: n.isRTL(),
       spineItemsManager: e,
@@ -5134,7 +5127,7 @@ const xt = ({
   settings: o,
   viewport: s
 }) => {
-  const r = new R(), a = r.asObservable(), c = new Gt(), u = ls({
+  const r = new R(), a = r.asObservable(), c = new Xt(), u = ls({
     context: e,
     settings: o,
     spineItemsManager: n,
@@ -5162,15 +5155,15 @@ const xt = ({
     u,
     i,
     c.isLocked$
-  ), g = O([
+  ), g = j([
     l.isNavigating$,
     d.isNavigating$,
     c.isLocked$,
     p.locker.isLocked$
   ]).pipe(
     ie((y) => y.some((f) => f) ? "busy" : "free"),
-    fe(),
-    Ze(1)
+    be(),
+    Ge(1)
   );
   return {
     destroy: () => {
@@ -5231,9 +5224,9 @@ class gs extends G {
           threshold: { type: "percentage", value: 0.5 }
         });
         return this.context.bridgeEvent.navigationUnlocked$.pipe(
-          Tt(1),
+          $t(1),
           z(this.context.bridgeEvent.navigation$),
-          x(([, u]) => {
+          $(([, u]) => {
             const { position: l } = u, d = this.pagination.value, {
               beginIndex: p,
               endIndex: g
@@ -5248,14 +5241,14 @@ class gs extends G {
             }) ?? {}, { endPageIndex: b = 0 } = c({
               spineItem: m,
               position: l
-            }) ?? {}, F = y === void 0 || Xe(y) || d.beginSpineItemIndex !== p, T = d.endSpineItemIndex !== g || f === void 0 || Xe(f), E = F ? me(h.item) : y, H = T ? me(m.item) : f, B = h.numberOfPages, re = m.numberOfPages;
+            }) ?? {}, F = y === void 0 || Be(y) || d.beginSpineItemIndex !== p, x = d.endSpineItemIndex !== g || f === void 0 || Be(f), L = F ? he(h.item) : y, H = x ? he(m.item) : f, B = h.numberOfPages, se = m.numberOfPages;
             this.pagination.update({
-              beginCfi: E,
+              beginCfi: L,
               beginNumberOfPagesInSpineItem: B,
               beginPageIndexInSpineItem: I,
               beginSpineItemIndex: p,
               endCfi: H,
-              endNumberOfPagesInSpineItem: re,
+              endNumberOfPagesInSpineItem: se,
               endPageIndexInSpineItem: b,
               endSpineItemIndex: g,
               navigationId: u.id
@@ -5265,7 +5258,7 @@ class gs extends G {
       })
     ), a = r.pipe(
       De(this.context.bridgeEvent.viewportFree$),
-      x(() => {
+      $(() => {
         const {
           beginSpineItemIndex: c,
           endSpineItemIndex: u,
@@ -5276,12 +5269,12 @@ class gs extends G {
           return;
         const p = this.spineItemsManager.get(c), g = this.spineItemsManager.get(u);
         p === void 0 || g === void 0 || this.pagination.update({
-          beginCfi: Be({
+          beginCfi: He({
             pageIndex: l,
             spineItem: p,
             spine: this.spine
           }),
-          endCfi: Be({
+          endCfi: He({
             pageIndex: d,
             spineItem: g,
             spine: this.spine
@@ -5289,7 +5282,7 @@ class gs extends G {
         });
       })
     );
-    P(r, a).pipe($(this.destroy$)).subscribe();
+    P(r, a).pipe(T(this.destroy$)).subscribe();
   }
 }
 const hs = ({
@@ -5306,7 +5299,7 @@ class ms extends G {
     this.inputSettings = t, this.outputSettingsUpdateSubject = new R(), this._settings$ = this.outputSettingsUpdateSubject.asObservable().pipe(J(1)), this._settings$.subscribe();
   }
   _prepareUpdate(e) {
-    const t = $e(this.inputSettings, e), i = this.getOutputSettings(t), o = !U(this.outputSettings, i);
+    const t = $e(this.inputSettings, e), i = this.getOutputSettings(t), o = !O(this.outputSettings, i);
     return {
       hasChanged: o,
       state: i,
@@ -5333,8 +5326,8 @@ class ms extends G {
   }
   watch(e) {
     return this.values$.pipe(
-      Ot(e),
-      k(U)
+      Rt(e),
+      N(O)
     );
   }
   destroy() {
@@ -5344,8 +5337,8 @@ class ms extends G {
 class fs extends ms {
   constructor(e, t) {
     super(e), this.context = t, t.watch(["manifest", "hasVerticalWriting"]).pipe(
-      x(() => this.update(this.values)),
-      $(this.destroy$)
+      $(() => this.update(this.values)),
+      T(this.destroy$)
     ).subscribe();
   }
   getComputedSettings(e) {
@@ -5359,7 +5352,7 @@ class fs extends ms {
         manifest: t
       })
     };
-    return t?.renditionFlow === "scrolled-continuous" && (o.computedPageTurnMode = "scrollable"), o.computedPageTurnMode === "scrollable" && (o.computedPageTurnDirection = "vertical"), i && o.computedPageTurnAnimation === "slide" && (D.warn(
+    return t?.renditionFlow === "scrolled-continuous" && (o.computedPageTurnMode = "scrollable"), o.computedPageTurnMode === "scrollable" && (o.computedPageTurnDirection = "vertical"), i && o.computedPageTurnAnimation === "slide" && (A.warn(
       `pageTurnAnimation ${o.computedPageTurnAnimation} incompatible with current book, switching back to default`
     ), o.computedPageTurnAnimation = "none"), o.computedPageTurnMode === "scrollable" ? (o.computedPageTurnAnimationDuration = 0, o.computedPageTurnAnimation = "none") : o.computedPageTurnAnimationDuration = e.pageTurnAnimationDuration !== void 0 ? e.pageTurnAnimationDuration : 300, o;
   }
@@ -5380,7 +5373,7 @@ class fs extends ms {
     };
   }
 }
-class ys extends Se {
+class ys extends ye {
   onUnload() {
     return _;
   }
@@ -5401,74 +5394,105 @@ class ys extends Se {
 }
 class Ss extends G {
   constructor(e, t, i, o, s, r, a) {
-    super(), this.item = e, this.containerElement = t, this.context = i, this.hookManager = o, this.renderer = s, this.settings = r, this.viewport = a, this.layoutTriggerSubject = new R(), this.lastLayout = null, this.applyDimsAfterLayout = ({
-      blankPagePosition: c,
-      minimumWidth: u
-    }) => (l) => l.pipe(
-      S((d) => {
-        const p = U(
+    super(), this.item = e, this.containerElement = t, this.context = i, this.hookManager = o, this.renderer = s, this.settings = r, this.viewport = a, this.layoutTriggerSubject = new R(), this.lastLayout = null, this.computeLayoutInformation = ({
+      isLastItem: u,
+      horizontalOffset: l
+    }) => {
+      let d = this.viewport.value.pageSize.width, p = "none";
+      const g = l % this.viewport.absoluteViewport.width === 0, h = this.context.manifest, m = Bt(h) ?? !1;
+      if (this.settings.values.computedSpreadMode) {
+        !m && this.renderer.renditionLayout === "reflowable" && !u && (d = this.viewport.value.pageSize.width * 2), !m && this.renderer.renditionLayout === "reflowable" && u && g && (d = this.viewport.value.pageSize.width * 2);
+        const y = g && u && m;
+        this.item.pageSpreadRight && g && !this.context.isRTL() ? (p = "before", d = this.viewport.value.pageSize.width * 2) : this.item.pageSpreadLeft && g && this.context.isRTL() ? (p = "before", d = this.viewport.value.pageSize.width * 2) : y && (this.context.isRTL() ? p = "before" : p = "after", d = this.viewport.value.pageSize.width * 2);
+      }
+      return {
+        minimumWidth: d,
+        blankPagePosition: p
+      };
+    }, this.adjustPositionOfElement = ({
+      right: u,
+      left: l,
+      top: d
+    }) => {
+      u !== void 0 ? this.containerElement.style.right = `${u}px` : this.containerElement.style.removeProperty("right"), l !== void 0 ? this.containerElement.style.left = `${l}px` : this.containerElement.style.removeProperty("left"), d !== void 0 ? this.containerElement.style.top = `${d}px` : this.containerElement.style.removeProperty("top");
+    }, this.updateContainerLayout = ({
+      minimumWidth: u,
+      edgeX: l,
+      edgeY: d
+    }) => (p) => p.pipe(
+      S((g) => {
+        const h = O(
           this.lastLayout?.pageSize,
           this.viewport.pageSize
-        ) ? this.lastLayout : void 0, { width: g, height: h } = p ?? {}, { width: m = g, height: y = h } = d ?? {}, { width: f, height: I } = this.viewport.pageSize, b = this.validateDimension(
-          m ?? f,
-          f,
+        ) ? this.lastLayout : void 0, { width: m, height: y } = h ?? {}, { width: f = m, height: I = y } = g ?? {}, { width: b, height: F } = this.viewport.pageSize, x = this.validateDimension(
+          f ?? b,
+          b,
           u
-        ), F = this.settings.values.computedPageTurnMode === "scrollable" ? y ?? I : this.validateDimension(
-          y ?? I,
-          I,
-          I
+        ), L = this.settings.values.computedPageTurnMode === "scrollable" ? I ?? F : this.validateDimension(
+          I ?? F,
+          F,
+          F
         );
         return this.lastLayout = {
-          width: b,
-          height: F,
+          width: x,
+          height: L,
           pageSize: this.viewport.pageSize
-        }, this.containerElement.style.width = `${b}px`, this.containerElement.style.height = `${F}px`, this.hookManager.execute("item.onAfterLayout", void 0, {
-          blankPagePosition: c,
-          item: this.item,
-          minimumWidth: u
-        }), { width: b, height: F };
+        }, this.containerElement.style.width = `${x}px`, this.containerElement.style.height = `${L}px`, this.settings.values.computedPageTurnDirection === "vertical" ? (this.adjustPositionOfElement({
+          top: d,
+          left: l
+        }), { width: x, height: L }) : (this.adjustPositionOfElement(
+          this.context.isRTL() ? { right: l, top: 0 } : { left: l, top: 0 }
+        ), { width: x, height: L });
       })
-    ), this.layout = (c) => {
-      const u = Xn(this.layout$.pipe(V()));
-      return this.layoutTriggerSubject.next(c), u();
-    }, this.adjustPositionOfElement = ({
-      right: c,
-      left: u,
-      top: l
-    }) => {
-      c !== void 0 ? this.containerElement.style.right = `${c}px` : this.containerElement.style.removeProperty("right"), u !== void 0 ? this.containerElement.style.left = `${u}px` : this.containerElement.style.removeProperty("left"), l !== void 0 ? this.containerElement.style.top = `${l}px` : this.containerElement.style.removeProperty("top");
-    }, this.layoutProcess$ = this.layoutTriggerSubject.pipe(
-      w((c) => {
-        const { blankPagePosition: u, minimumWidth: l, spreadPosition: d } = c;
-        this.hookManager.execute("item.onBeforeLayout", void 0, {
-          blankPagePosition: u,
-          item: this.item,
-          minimumWidth: l
-        });
-        const p = this.renderer.layout({
-          blankPagePosition: u,
-          minPageSpread: l / this.viewport.pageSize.width,
-          minimumWidth: l,
-          spreadPosition: d
-        });
-        return P(
-          v({ type: "start" }),
-          p.pipe(
-            this.applyDimsAfterLayout(c),
-            S(
-              (g) => ({
+    ), this.layout = (u) => {
+      const l = Xn(this.didLayout$.pipe(U()));
+      return this.layoutTriggerSubject.next(u), l();
+    };
+    const c = this.layoutTriggerSubject.pipe(
+      w(
+        ({ spreadPosition: u, horizontalOffset: l, isLastItem: d, edgeX: p, edgeY: g }) => {
+          const { blankPagePosition: h, minimumWidth: m } = this.computeLayoutInformation({ horizontalOffset: l, isLastItem: d });
+          this.hookManager.execute("item.onBeforeLayout", void 0, {
+            blankPagePosition: h,
+            item: this.item,
+            minimumWidth: m
+          });
+          const y = this.renderer.layout({
+            blankPagePosition: h,
+            minPageSpread: m / this.viewport.pageSize.width,
+            minimumWidth: m,
+            spreadPosition: u
+          });
+          return P(
+            v({ type: "start" }),
+            y.pipe(
+              /**
+               * Now that inner layout is done from the renderer, we adjust the dimensions
+               * of the outer container element
+               */
+              this.updateContainerLayout({
+                minimumWidth: m,
+                edgeX: p,
+                edgeY: g
+              }),
+              S((f) => (this.hookManager.execute("item.onAfterLayout", void 0, {
+                blankPagePosition: h,
+                item: this.item,
+                minimumWidth: m
+              }), {
                 type: "end",
-                data: g
-              })
+                data: f
+              }))
             )
-          )
-        );
-      }),
-      j()
-    ), this.layout$ = this.layoutProcess$.pipe(
-      M((c) => c.type === "end"),
-      S((c) => c.data),
-      j()
+          );
+        }
+      ),
+      D()
+    );
+    this.didLayout$ = c.pipe(
+      C((u) => u.type === "end"),
+      S((u) => u.data),
+      D()
     );
   }
   validateDimension(e, t, i) {
@@ -5484,12 +5508,12 @@ class Ss extends G {
     };
   }
 }
-class Qt extends Q {
+class Zt extends Q {
   constructor(e, t, i, o, s, r, a) {
     super({
       isLoaded: !1,
       isReady: !1,
-      iDirty: !1,
+      isDirty: !1,
       isError: !1,
       error: void 0
     }), this.item = e, this.parentElement = t, this.context = i, this.settings = o, this.hookManager = s, this.index = r, this.viewport = a, this.load = () => {
@@ -5498,11 +5522,11 @@ class Qt extends Q {
       this.renderer.unload();
     }, this.markDirty = () => {
       this.mergeCompare({
-        iDirty: !0
+        isDirty: !0
       });
     }, this.destroy = () => {
       super.destroy(), this.containerElement.remove(), this.renderer.destroy();
-    }, this.isUsingVerticalWriting = () => !!this.renderer.writingMode?.startsWith("vertical"), this.containerElement = Is(
+    }, this.isUsingVerticalWriting = () => !!this.renderer.writingMode?.startsWith("vertical"), this.layout = (d) => this._layout.layout(d), this.containerElement = Is(
       t,
       e,
       s
@@ -5518,7 +5542,7 @@ class Qt extends Q {
       resourcesHandler: this.resourcesHandler,
       viewport: this.viewport
     };
-    this.renderer = c ? c(u) : new ys(u), this.layout = new Ss(
+    this.renderer = c ? c(u) : new ys(u), this._layout = new Ss(
       e,
       this.containerElement,
       i,
@@ -5528,22 +5552,23 @@ class Qt extends Q {
       this.viewport
     );
     const l = this.renderer.state$.pipe(
-      N(({ state: p, error: g }) => {
+      V(({ state: d, error: p }) => {
         this.mergeCompare({
-          isLoaded: p === "loaded",
-          isError: p === "error",
-          error: p === "error" ? g : void 0
+          isLoaded: d === "loaded",
+          isError: d === "error",
+          error: d === "error" ? p : void 0
         });
       })
-    ), d = this.layout.layout$.pipe(
-      N(() => {
+    );
+    this.didLayout$ = this._layout.didLayout$.pipe(
+      V(() => {
         this.mergeCompare({
-          iDirty: !1,
+          isDirty: !1,
           isReady: this.renderer.state$.value.state === "loaded"
         });
-      })
-    );
-    this.needsLayout$ = P(this.unloaded$, this.loaded$), P(
+      }),
+      vn()
+    ), P(
       /**
        * @important
        * The order is important here. We want to ensure the state value
@@ -5551,8 +5576,7 @@ class Qt extends Q {
        * to layout changes may rely on the state value to be updated.
        */
       l,
-      d,
-      this.layout.layout$
+      this.didLayout$
     ).pipe(K(this.destroy$)).subscribe();
   }
   /**
@@ -5576,29 +5600,29 @@ class Qt extends Q {
   get readingDirection() {
     return this.renderer.readingDirection;
   }
+  /**
+   * Note that this is dispatched AFTER the state has been updated.
+   */
   get loaded$() {
     return this.renderer.loaded$;
   }
+  /**
+   * Note that this is dispatched AFTER the state has been updated.
+   */
   get unloaded$() {
-    return this.renderer.state$.pipe(
-      fe(),
-      ae(({ state: e }) => e !== "idle"),
-      X(
-        () => this.renderer.state$.pipe(
-          ae(({ state: e }) => e === "idle"),
-          Mt()
-        )
-      )
-    );
+    return this.renderer.unloaded$;
   }
   get renditionLayout() {
     return this.renderer.renditionLayout;
   }
+  get layoutInfo() {
+    return this._layout.layoutInfo;
+  }
   get numberOfPages() {
-    return Zt({
+    return Yt({
       isUsingVerticalWriting: !!this.isUsingVerticalWriting(),
-      itemHeight: this.layout.layoutInfo.height,
-      itemWidth: this.layout.layoutInfo.width,
+      itemHeight: this._layout.layoutInfo.height,
+      itemWidth: this._layout.layoutInfo.width,
       pageWidth: this.viewport.pageSize.width,
       pageHeight: this.viewport.pageSize.height,
       pageTurnDirection: this.settings.values.computedPageTurnDirection,
@@ -5615,12 +5639,12 @@ const Is = (n, e, t) => {
 };
 class bs extends G {
   constructor(e, t, i, o, s) {
-    super(), this.context = e, this.spineItemsManager = t, this.spineLocator = i, this.settings = o, this.spineLayout = s, this.forcedOpenSubject = new Y(
+    super(), this.context = e, this.spineItemsManager = t, this.spineLocator = i, this.settings = o, this.spineLayout = s, this.forcedOpenSubject = new q(
       /* @__PURE__ */ new Map()
     );
     const r = this.forcedOpenSubject.pipe(
       S((u) => Array.from(u.keys()).sort((l, d) => l - d)),
-      k(fn),
+      N(hn),
       J({ bufferSize: 1, refCount: !0 })
     );
     P(
@@ -5632,7 +5656,7 @@ class bs extends G {
       // this can be changed by whatever we want and SHOULD not break navigation.
       // Ideally loading faster is better but loading too close to user navigating can
       // be dangerous.
-      be(100, ce),
+      Ie(100, re),
       De(this.context.bridgeEvent.viewportFree$),
       z(this.context.bridgeEvent.navigation$, r),
       S(([, u, l]) => {
@@ -5648,7 +5672,7 @@ class bs extends G {
           f.includes(b) ? I.load() : I.unload();
         });
       })
-    ).pipe($(this.destroy$)).subscribe();
+    ).pipe(T(this.destroy$)).subscribe();
   }
   forceOpen(e) {
     const t = e.map(
@@ -5668,21 +5692,21 @@ class bs extends G {
     super.destroy(), this.forcedOpenSubject.complete();
   }
 }
-const en = (n, e, t) => {
+const Jt = (n, e, t) => {
   const i = (t.width - e.width) / 2, o = (t.height - e.height) / 2;
-  return new ue({
+  return new ae({
     x: n.x - i,
     y: n.y - o
   });
 };
-class Ie extends DOMRect {
+class Se extends DOMRect {
   constructor() {
     super(...arguments), this.__symbol = /* @__PURE__ */ Symbol("ViewportPosition");
   }
   static from(e, t) {
     if (t) {
       const o = e;
-      return new Ie(
+      return new Se(
         o.x,
         o.y,
         t.width,
@@ -5690,7 +5714,7 @@ class Ie extends DOMRect {
       );
     }
     const i = e;
-    return new Ie(i.x, i.y, i.width, i.height);
+    return new Se(i.x, i.y, i.width, i.height);
   }
 }
 class vs {
@@ -5742,7 +5766,7 @@ const Ps = ({
 }) => {
   const o = n / i.width, s = e / i.height;
   return t.type === "percentage" ? s >= t.value && o >= t.value : e >= t.value && n >= t.value;
-}, tn = ({
+}, Kt = ({
   itemPosition: {
     bottom: n,
     left: e,
@@ -5781,7 +5805,7 @@ const Ps = ({
       visibleWidthOfItem: g
     }) || y
   };
-}, Ge = ({
+}, qe = ({
   position: n,
   spineItemsManager: e,
   spineLayout: t
@@ -5791,10 +5815,10 @@ const Ps = ({
     return u && l;
   });
   return n.x === 0 && !i ? e.items[0] : i;
-}, ke = ({
+}, Ue = ({
   spineItemPosition: n,
   itemLayout: { left: e, top: t }
-}) => new L({
+}) => new M({
   x: e + n.x,
   y: t + n.y
 }), Ts = ({
@@ -5806,20 +5830,20 @@ const Ps = ({
   useAbsoluteViewport: s = !0,
   viewport: r
 }) => {
-  const a = Ge({
+  const a = qe({
     position: n,
     spineItemsManager: i,
     spineLayout: o
   }) || i.get(0), c = i.items.reduce(
     (g, h) => {
-      const m = o.getSpineItemSpineLayoutInfo(h), y = s ? r.absoluteViewport : r.relativeViewport, f = en(
+      const m = o.getSpineItemSpineLayoutInfo(h), y = s ? r.absoluteViewport : r.relativeViewport, f = Jt(
         n,
         r.absoluteViewport,
         y
-      ), I = Ie.from(
+      ), I = Se.from(
         f,
         y
-      ), { visible: b } = tn({
+      ), { visible: b } = Kt({
         itemPosition: m,
         threshold: e,
         viewportPosition: I,
@@ -5845,7 +5869,7 @@ const Ps = ({
 }) => {
   const r = (h, m) => {
     const { left: y, top: f } = o.getSpineItemSpineLayoutInfo(m);
-    return new C({
+    return new E({
       /**
        * when using spread the item could be on the right and therefore will be negative
        * @example
@@ -5856,8 +5880,8 @@ const Ps = ({
       x: Math.max(h.x - y, 0),
       y: Math.max(h.y - f, 0)
     });
-  }, a = (h) => ke({
-    spineItemPosition: new C({ x: 0, y: 0 }),
+  }, a = (h) => Ue({
+    spineItemPosition: new E({ x: 0, y: 0 }),
     itemLayout: o.getSpineItemSpineLayoutInfo(h)
   }), c = (h) => n.items.find((m) => m.renderer.getDocumentFrame() === h), u = (h, m, y) => {
     if (typeof y == "number") {
@@ -5881,44 +5905,44 @@ const Ps = ({
     useAbsoluteViewport: I = !0,
     viewport: b
   }) => {
-    const F = y.numberOfPages, E = Array.from(Array(F)).map((re, le) => {
-      const Re = t.getSpineItemPositionFromPageIndex({
-        pageIndex: le,
+    const F = y.numberOfPages, L = Array.from(Array(F)).map((se, ue) => {
+      const Ae = t.getSpineItemPositionFromPageIndex({
+        pageIndex: ue,
         spineItem: y
-      }), de = ke({
-        spineItemPosition: Re,
+      }), le = Ue({
+        spineItemPosition: Ae,
         itemLayout: o.getSpineItemSpineLayoutInfo(y)
       });
       return {
-        index: le,
+        index: ue,
         absolutePosition: {
           width: b.pageSize.width,
           height: b.pageSize.height,
-          left: de.x,
-          top: de.y,
-          bottom: de.y + b.pageSize.height,
-          right: de.x + b.pageSize.width
+          left: le.x,
+          top: le.y,
+          bottom: le.y + b.pageSize.height,
+          right: le.x + b.pageSize.width
         }
       };
     }).reduce(
-      (re, { absolutePosition: le, index: Re }) => {
-        const de = I ? b.absoluteViewport : b.relativeViewport, nn = en(
+      (se, { absolutePosition: ue, index: Ae }) => {
+        const le = I ? b.absoluteViewport : b.relativeViewport, Qt = Jt(
           h,
           b.absoluteViewport,
-          de
-        ), on = Ie.from(
-          nn,
-          de
-        ), { visible: sn } = tn({
-          viewportPosition: on,
+          le
+        ), en = Se.from(
+          Qt,
+          le
+        ), { visible: tn } = Kt({
+          viewportPosition: en,
           restrictToScreen: f,
           threshold: m,
-          itemPosition: le
+          itemPosition: ue
         });
-        return sn ? [...re, Re] : re;
+        return tn ? [...se, Ae] : se;
       },
       []
-    ), H = E[0], B = E[E.length - 1] ?? H;
+    ), H = L[0], B = L[L.length - 1] ?? H;
     if (!(H === void 0 || B === void 0))
       return {
         beginPageIndex: H,
@@ -5931,7 +5955,7 @@ const Ps = ({
       spineItemPosition: m
     }) => {
       const y = o.getSpineItemSpineLayoutInfo(h);
-      return ke({
+      return Ue({
         itemLayout: y,
         spineItemPosition: m
       });
@@ -5944,7 +5968,7 @@ const Ps = ({
       spineItemsManager: n
     }),
     getSpineItemPagePositionFromSpinePosition: (h) => {
-      const m = Ge({
+      const m = qe({
         position: h,
         spineItemsManager: n,
         spineLayout: o
@@ -5955,8 +5979,8 @@ const Ps = ({
         h,
         m
       ), f = t.getSpineItemPageIndexFromPosition({
-        itemWidth: m.layout.layoutInfo.width,
-        itemHeight: m.layout.layoutInfo.height,
+        itemWidth: m.layoutInfo.width,
+        itemHeight: m.layoutInfo.height,
         position: y,
         isUsingVerticalWriting: !!m.isUsingVerticalWriting()
       }), I = t.getSpineItemPagePositionFromSpineItemPosition(
@@ -5973,7 +5997,7 @@ const Ps = ({
     },
     getSpinePositionFromSpineItem: a,
     getSpineItemPositionFromSpinePosition: r,
-    getSpineItemFromPosition: (h) => Ge({
+    getSpineItemFromPosition: (h) => qe({
       position: h,
       spineItemsManager: n,
       spineLayout: o
@@ -5997,13 +6021,13 @@ const Ps = ({
     spineItemLocator: t,
     getSafeSpineItemPositionFromUnsafeSpineItemPosition: (h, m) => {
       const { height: y, width: f } = o.getSpineItemSpineLayoutInfo(m);
-      return new C({
+      return new E({
         x: Math.min(Math.max(0, h.x), f),
         y: Math.min(Math.max(0, h.y), y)
       });
     }
   };
-}, Ls = D.namespace("spine"), Ms = ({
+}, Ls = A.namespace("spine"), Ms = ({
   position: n,
   pageSize: e
 }) => new Ii({
@@ -6019,7 +6043,9 @@ class Cs extends Q {
   constructor(e, t, i, o, s, r) {
     super({ pages: [] }), this.spineLayout = e, this.spineItemsManager = t, this.spineItemLocator = i, this.context = o, this.locator = s, this.viewport = r, this.fromSpineItemPageIndex = (a, c) => this.value.pages.find(
       (u) => u.itemIndex === a.index && u.pageIndex === c
-    ), this.fromAbsolutePageIndex = (a) => this.value.pages.reduce((c, u) => c || (u.absolutePageIndex === a ? u : c), void 0), this.observeFromAbsolutePageIndex = (a) => this.pipe(S(() => this.fromAbsolutePageIndex(a))), this.layout$ = e.layout$.pipe(
+    ), this.fromAbsolutePageIndex = (a) => this.value.pages.find(
+      (c) => c.absolutePageIndex === a
+    ), this.observeFromAbsolutePageIndex = (a) => this.pipe(S(() => this.fromAbsolutePageIndex(a))), this.layout$ = e.layout$.pipe(
       z(r),
       w(([, { pageSize: a }]) => {
         const c = t.items.reduce(
@@ -6057,209 +6083,148 @@ class Cs extends Q {
           },
           []
         );
-        return O(
+        return j(
           c.map((l) => {
             const { spineItem: d, ...p } = l;
-            return new se((g) => {
-              const h = l.spineItem.renderer?.getDocumentFrame();
-              let m;
-              h && h?.contentWindow?.document && // very important because it is being used by next functions
-              h.contentWindow.document.body !== null && (m = Ln(
-                h.contentWindow.document,
-                l.layout
-              )), g.next({ ...p, firstVisibleNode: m });
-            });
+            if (l.spineItem.value.isLoaded) {
+              const g = l.spineItem.renderer?.getDocumentFrame();
+              if (g && g?.contentWindow?.document && g.contentWindow.document.body !== null) {
+                const h = g.contentWindow.document;
+                return et().pipe(
+                  S(() => {
+                    const m = Ln(
+                      h,
+                      l.layout
+                    );
+                    return {
+                      ...p,
+                      firstVisibleNode: m
+                    };
+                  })
+                );
+              }
+            }
+            return v({ ...p, firstVisibleNode: void 0 });
           })
         );
       }),
       S((a) => (Ls.info("Pages layout", a), { pages: a })),
-      j()
-    ), this.layout$.pipe($(this.destroy$)).subscribe(this.next.bind(this));
+      D()
+    ), this.layout$.pipe(T(this.destroy$)).subscribe(this.next.bind(this));
   }
 }
 class Es extends G {
-  constructor(e, t) {
-    super(), this.spineItemsManager = e, this.spineLocator = t, this.itemIsReady$ = this.spineItemsManager.items$.pipe(
-      w((i) => {
-        const o = i.map(
-          (s) => s.isReady$.pipe(S((r) => ({ item: s, isReady: r })))
-        );
-        return P(...o);
-      }),
-      j()
+  constructor(e) {
+    super(), this.spineItemsManager = e, this.states$ = this.spineItemsManager.items$.pipe(
+      w((t) => P(
+        ...t.map(
+          (i) => i.pipe(
+            S((o) => ({ item: i, ...o })),
+            N(O)
+          )
+        )
+      )),
+      D()
     ), this.itemResize$ = this.spineItemsManager.items$.pipe(
-      w((i) => {
-        const o = i.map(
-          (s) => et(s.element).pipe(
-            S((r) => ({ entries: r, item: s }))
+      w((t) => {
+        const i = t.map(
+          (o) => Qe(o.element).pipe(
+            S((s) => ({ entries: s, item: o }))
           )
         );
-        return P(...o);
+        return P(...i);
       }),
-      j()
+      D()
+    ), this.itemLoad$ = this.spineItemsManager.items$.pipe(
+      w((t) => P(...t.map((i) => i.loaded$.pipe(S(() => i))))),
+      D()
+    ), this.itemUnload$ = this.spineItemsManager.items$.pipe(
+      w((t) => P(
+        ...t.map((i) => i.unloaded$.pipe(S(() => i)))
+      )),
+      D()
     );
   }
 }
-const Ds = ({
-  horizontalOffset: n,
-  verticalOffset: e,
-  context: t,
-  spineItemsManager: i,
-  isGloballyPrePaginated: o,
-  settings: s,
-  index: r,
-  item: a,
-  viewport: c
-}) => {
-  let u = c.value.pageSize.width, l = "none";
-  const d = n % c.absoluteViewport.width === 0, p = r === i.items.length - 1;
-  if (s.values.computedSpreadMode) {
-    !o && a.renditionLayout === "reflowable" && !p && (u = c.value.pageSize.width * 2), !o && a.renditionLayout === "reflowable" && p && d && (u = c.value.pageSize.width * 2);
-    const h = d && p && o;
-    a.item.pageSpreadRight && d && !t.isRTL() || a.item.pageSpreadLeft && d && t.isRTL() ? (l = "before", u = c.value.pageSize.width * 2) : h && (t.isRTL() ? l = "before" : l = "after", u = c.value.pageSize.width * 2);
-  }
-  return a.layout.layout({
-    minimumWidth: u,
-    blankPagePosition: l,
-    spreadPosition: s.values.computedSpreadMode ? d ? t.isRTL() ? "right" : "left" : t.isRTL() ? "left" : "right" : "none"
-  }).pipe(
-    S(({ width: h, height: m }) => {
-      if (s.values.computedPageTurnDirection === "vertical") {
-        const I = d ? e : e - c.absoluteViewport.height, b = d ? 0 : n;
-        t.isRTL() ? a.layout.adjustPositionOfElement({
-          top: I,
-          left: b
-        }) : a.layout.adjustPositionOfElement({
-          top: I,
-          left: b
-        });
-        const F = h + b, T = m + I, E = new He({
-          left: b,
-          right: F,
-          top: I,
-          bottom: T,
-          height: m,
-          width: h,
-          x: b,
-          y: I
+class Ds extends G {
+  constructor(e, t, i, o, s) {
+    super(), this.spineItemsManager = e, this.spineItemsObserver = t, this.context = i, this.settings = o, this.viewport = s, this.externalLayoutTrigger = new R(), this.spineItemsRelativeLayouts = [];
+    const r = P(
+      t.itemLoad$,
+      t.itemUnload$
+    ), a = P(
+      this.externalLayoutTrigger,
+      r
+    );
+    this.layout$ = a.pipe(
+      $(() => {
+        this.spineItemsManager.items.forEach((c) => {
+          c.markDirty();
         });
-        return {
-          horizontalOffset: F,
-          verticalOffset: T,
-          layoutPosition: E
-        };
-      }
-      a.layout.adjustPositionOfElement(
-        t.isRTL() ? { right: n, top: 0 } : { left: n, top: 0 }
-      );
-      const y = t.isRTL() ? c.absoluteViewport.width - n - h : n, f = new He({
-        right: t.isRTL() ? c.absoluteViewport.width - n : n + h,
-        left: y,
-        x: y,
-        top: e,
-        bottom: m,
-        height: m,
-        width: h,
-        y: e
-      });
-      return {
-        horizontalOffset: n + h,
-        verticalOffset: 0,
-        layoutPosition: f
-      };
-    })
-  );
-};
-class Rs extends G {
-  constructor(e, t, i, o) {
-    super(), this.spineItemsManager = e, this.context = t, this.settings = i, this.viewport = o, this.layoutSubject = new R(), this.spineItemsRelativeLayouts = [], e.items$.pipe(
-      x(() => {
-        this.spineItemsRelativeLayouts = [];
       }),
-      w((r) => {
-        const a = r.map(
-          (u) => u.needsLayout$.pipe(
-            x(() => {
-              this.layout();
-            })
-          )
-        ), c = r.map(
-          (u) => u.loaded$.pipe(
-            x(() => {
-              u.isUsingVerticalWriting() ? this.context.update({
-                hasVerticalWriting: !0
-              }) : this.context.update({
-                hasVerticalWriting: !1
-              });
+      Ie(50),
+      w(
+        () => this.spineItemsManager.items.reduce(
+          (c, u, l) => c.pipe(
+            ln(({ horizontalOffset: d, verticalOffset: p }) => {
+              const g = d % s.absoluteViewport.width === 0, h = l === e.items.length - 1, m = o.values.computedPageTurnDirection === "vertical", y = i.isRTL(), f = this.getSpreadPosition(
+                g,
+                y
+              ), { edgeX: I, edgeY: b } = this.getStartEdges(
+                m,
+                g,
+                d,
+                p,
+                s.absoluteViewport.height
+              );
+              return u.layout({
+                spreadPosition: f,
+                horizontalOffset: d,
+                isLastItem: h,
+                edgeX: I,
+                edgeY: b
+              }).pipe(
+                S(({ width: F, height: x }) => {
+                  const L = this.createSpineItemLayout(
+                    m,
+                    y,
+                    I,
+                    b,
+                    F,
+                    x,
+                    s.absoluteViewport.width
+                  );
+                  return this.spineItemsRelativeLayouts[l] = L, {
+                    horizontalOffset: I + F,
+                    verticalOffset: m ? b + x : 0
+                  };
+                })
+              );
             })
-          )
-        );
-        return P(...a, ...c);
-      })
-    ).pipe($(this.destroy$)).subscribe();
-    const s = new Y(!1);
-    this.layout$ = this.layoutSubject.pipe(
-      x(() => {
-        this.spineItemsManager.items.forEach((r) => {
-          r.markDirty();
-        });
-      }),
-      be(50),
-      // queue layout until previous layout is done
-      ze(
-        () => s.pipe(
-          M((r) => !r),
-          V()
+          ),
+          v({ horizontalOffset: 0, verticalOffset: 0 })
         )
       ),
-      ze(() => {
-        s.next(!0);
-        const r = this.context.manifest, a = qt(r) ?? !1;
-        return A(this.spineItemsManager.items).pipe(
-          pn(
-            (u, l, d) => u.pipe(
-              st(
-                ({ horizontalOffset: p, verticalOffset: g }) => Ds({
-                  context: this.context,
-                  horizontalOffset: p,
-                  index: d,
-                  isGloballyPrePaginated: a,
-                  item: l,
-                  settings: this.settings,
-                  spineItemsManager: this.spineItemsManager,
-                  verticalOffset: g,
-                  viewport: o
-                }).pipe(
-                  S(
-                    ({
-                      horizontalOffset: h,
-                      verticalOffset: m,
-                      layoutPosition: y
-                    }) => (this.spineItemsRelativeLayouts[d] = y, {
-                      horizontalOffset: h,
-                      verticalOffset: m
-                    })
-                  )
-                )
-              )
-            ),
-            v({ horizontalOffset: 0, verticalOffset: 0 })
-          ),
-          st((u) => u),
-          pe(() => {
-            s.next(!1);
-          })
-        );
+      T(this.destroy$),
+      D()
+    ), this.layout$.subscribe(), this.watchForVerticalWritingUpdate();
+  }
+  watchForVerticalWritingUpdate() {
+    this.spineItemsObserver.itemLoad$.pipe(
+      $((e) => {
+        this.context.update({
+          hasVerticalWriting: e.isUsingVerticalWriting()
+        });
       }),
-      j()
-    ), P(this.layout$).pipe($(this.destroy$)).subscribe();
+      T(this.destroy$)
+    ).subscribe();
   }
   layout() {
-    this.layoutSubject.next(void 0);
+    this.externalLayoutTrigger.next(void 0);
   }
   getSpineItemSpineLayoutInfo(e) {
     const t = this.spineItemsManager.getSpineItemIndex(e) ?? 0;
-    return this.spineItemsRelativeLayouts[t] || new He({
+    return this.spineItemsRelativeLayouts[t] || new Oe({
       left: 0,
       right: 0,
       top: 0,
@@ -6274,15 +6239,54 @@ class Rs extends G {
     return this.spineItemsManager.items.reduce((e, t) => e + t.numberOfPages, 0);
   }
   destroy() {
-    super.destroy(), this.layoutSubject.complete();
+    super.destroy(), this.externalLayoutTrigger.complete();
+  }
+  getSpreadPosition(e, t) {
+    return this.settings.values.computedSpreadMode ? e ? t ? "right" : "left" : t ? "left" : "right" : "none";
+  }
+  getStartEdges(e, t, i, o, s) {
+    return e ? {
+      edgeX: t ? 0 : i,
+      edgeY: t ? o : o - s
+    } : {
+      edgeX: i,
+      edgeY: 0
+    };
+  }
+  createSpineItemLayout(e, t, i, o, s, r, a) {
+    if (e) {
+      const u = s + i, l = r + o;
+      return new Oe({
+        left: i,
+        right: u,
+        top: o,
+        bottom: l,
+        height: r,
+        width: s,
+        x: i,
+        y: o
+      });
+    }
+    const c = t ? a - i - s : i;
+    return new Oe({
+      right: t ? a - i : i + s,
+      left: c,
+      x: c,
+      top: o,
+      bottom: r,
+      height: r,
+      width: s,
+      y: o
+    });
   }
 }
 class As extends G {
   constructor(e, t, i, o, s, r, a) {
-    super(), this.context = e, this.pagination = t, this.spineItemsManager = i, this.spineItemLocator = o, this.settings = s, this.hookManager = r, this.viewport = a, this.elementSubject = new Y(
+    super(), this.context = e, this.pagination = t, this.spineItemsManager = i, this.spineItemLocator = o, this.settings = s, this.hookManager = r, this.viewport = a, this.elementSubject = new q(
       void 0
-    ), this.element$ = this.elementSubject.asObservable(), this.spineLayout = new Rs(
+    ), this.element$ = this.elementSubject.asObservable(), this.spineItemsObserver = new Es(i), this.spineLayout = new Ds(
       i,
+      this.spineItemsObserver,
       e,
       s,
       a
@@ -6299,9 +6303,6 @@ class As extends G {
       this.locator,
       s,
       this.spineLayout
-    ), this.spineItemsObserver = new Es(
-      i,
-      this.locator
     ), this.pages = new Cs(
       this.spineLayout,
       this.spineItemsManager,
@@ -6311,23 +6312,23 @@ class As extends G {
       this.viewport
     );
     const c = e.watch("rootElement").pipe(
-      ae(Z),
-      N((l) => {
+      de(Z),
+      V((l) => {
         const d = l.ownerDocument.createElement("div");
         d.style.cssText = `
           height: 100%;
           position: relative;
         `, d.className = `${W}-spine`, this.elementSubject.next(d);
       })
-    ), u = O([
+    ), u = j([
       this.context.manifest$,
       this.element$
     ]).pipe(
-      N(([l, d]) => {
+      V(([l, d]) => {
         if (!d) return;
         this.spineItemsManager.destroyItems();
         const p = l.spineItems.map(
-          (g, h) => new Qt(
+          (g, h) => new Zt(
             g,
             d,
             this.context,
@@ -6358,9 +6359,9 @@ class As extends G {
     super.destroy(), this.pages.destroy(), this.spineItemsLoader.destroy(), this.elementSubject.getValue()?.remove(), this.elementSubject.complete();
   }
 }
-class Ns extends G {
+class Rs extends G {
   constructor(e, t) {
-    super(), this.context = e, this.settings = t, this.orderedSpineItemsSubject = new Y([]), this.items$ = this.orderedSpineItemsSubject.asObservable();
+    super(), this.context = e, this.settings = t, this.orderedSpineItemsSubject = new q([]), this.items$ = this.orderedSpineItemsSubject.asObservable();
   }
   get(e) {
     return typeof e == "number" ? this.orderedSpineItemsSubject.value[e] : typeof e == "string" ? this.orderedSpineItemsSubject.value.find(
@@ -6372,7 +6373,7 @@ class Ns extends G {
     return i > o ? "after" : i === o ? "same" : "before";
   }
   getSpineItemIndex(e) {
-    const t = e instanceof Qt ? e : this.get(e);
+    const t = e instanceof Zt ? e : this.get(e);
     if (!t) return;
     const i = this.orderedSpineItemsSubject.value.indexOf(t);
     return i < 0 ? void 0 : i;
@@ -6401,7 +6402,7 @@ class Ns extends G {
     });
   }
 }
-class Os extends Q {
+class Ns extends Q {
   constructor(e, t) {
     const i = document.createElement("div");
     i.setAttribute(`data-${oi}`, ""), super({
@@ -6414,17 +6415,17 @@ class Os extends Q {
       height: 1
     }), this.context = e, this.settingsManager = t;
     const o = this.settingsManager.watch(["computedSpreadMode"]).pipe(
-      x(() => {
+      $(() => {
         this.mergeCompare({
           pageSize: this.calculatePageSize(this.value)
         });
       })
     ), s = this.context.watch("rootElement").pipe(
-      x(() => {
+      $(() => {
         this.layout();
       })
     );
-    P(o, s).pipe($(this.destroy$)).subscribe();
+    P(o, s).pipe(T(this.destroy$)).subscribe();
   }
   calculatePageSize(e) {
     const { computedSpreadMode: t } = this.settingsManager.values;
@@ -6478,8 +6479,8 @@ class Os extends Q {
     });
   }
 }
-const $t = `${Ut}-core`, Vs = (n) => {
-  const e = crypto.randomUUID(), t = new R(), i = new R(), o = new Ro(), s = new Eo(), r = new fs(n, s), a = new Do(s, r), c = new Ns(s, r), u = new Os(s, r), l = Jt({
+const xt = `${Vt}-core`, Os = (n) => {
+  const e = crypto.randomUUID(), t = new R(), i = new R(), o = new Ao(), s = new Eo(), r = new fs(n, s), a = new Do(s, r), c = new Rs(s, r), u = new Ns(s, r), l = qt({
     context: s,
     settings: r,
     viewport: u
@@ -6510,28 +6511,28 @@ const $t = `${Ut}-core`, Vs = (n) => {
   ), d.subscribe(s.bridgeEvent.paginationSubject);
   const m = () => {
     t.next();
-  }, y = (T) => {
-    const { containerElement: E, manifest: H } = T;
+  }, y = (x) => {
+    const { containerElement: L, manifest: H } = x;
     if (s.manifest) {
-      D.warn("loading a new book is not supported yet");
+      A.warn("loading a new book is not supported yet");
       return;
     }
-    D.log("load", { options: T });
-    const B = js(E, e);
+    A.log("load", { options: x });
+    const B = Vs(L, e);
     s.update({
       manifest: H,
       rootElement: B
     }), m();
-  }, f = r.watch(["computedSpreadMode"]).pipe(Ct(1), N(m)), I = t.pipe(
-    N(() => {
-      const T = s.value.rootElement;
-      T && (T.style.setProperty("overflow", "hidden"), u.layout(), p.layout());
+  }, f = r.watch(["computedSpreadMode"]).pipe(Lt(1), V(m)), I = t.pipe(
+    V(() => {
+      const x = s.value.rootElement;
+      x && (x.style.setProperty("overflow", "hidden"), u.layout(), p.layout());
     }),
     K(i)
   ), b = P(I, f).subscribe();
-  Ce(document, $t, Ao);
+  Ce(document, xt, Ro);
   const F = () => {
-    Ee(document, $t), b.unsubscribe(), c.destroy(), h.destroy(), r.destroy(), d.destroy(), s.destroy(), g.destroy(), p.destroy(), a.destroy(), i.next(), i.complete(), u.destroy();
+    Ee(document, xt), b.unsubscribe(), c.destroy(), h.destroy(), r.destroy(), d.destroy(), s.destroy(), g.destroy(), p.destroy(), a.destroy(), i.next(), i.complete(), u.destroy();
   };
   return {
     id: e,
@@ -6541,11 +6542,11 @@ const $t = `${Ut}-core`, Vs = (n) => {
     cfi: {
       generateCfiFromRange: io,
       parseCfi: it,
-      generateCfiForSpineItemPage: (T) => Be({
-        ...T,
+      generateCfiForSpineItemPage: (x) => He({
+        ...x,
         spine: p
       }),
-      resolveCfi: (T) => Xt({ ...T, spineItemsManager: c })
+      resolveCfi: (x) => _t({ ...x, spineItemsManager: c })
     },
     navigation: g,
     spineItemsObserver: p.spineItemsObserver,
@@ -6562,7 +6563,7 @@ const $t = `${Ut}-core`, Vs = (n) => {
       }
     },
     settings: r,
-    renderHeadless: (T) => c.get(T)?.renderer.renderHeadless() ?? v(void 0),
+    renderHeadless: (x) => c.get(x)?.renderer.renderHeadless() ?? v(void 0),
     viewport: u,
     viewportState$: s.bridgeEvent.viewportState$,
     viewportFree$: s.bridgeEvent.viewportFree$,
@@ -6573,18 +6574,18 @@ const $t = `${Ut}-core`, Vs = (n) => {
      * It can typically be used to hide a loading indicator.
      */
     state$: s.manifest$.pipe(
-      ie((T) => T ? "ready" : "idle")
+      ie((x) => x ? "ready" : "idle")
     ),
     features: a,
     $: {
       destroy$: i
     }
   };
-}, js = (n, e) => (n.style.cssText = `
+}, Vs = (n, e) => (n.style.cssText = `
     ${n.style.cssText}
     background-color: white;
     position: relative;
-  `, n.classList.add(`${W}-reader`), n.setAttribute(ii, e), n.setAttribute("data-prose-reader-container", e), n), Ks = (
+  `, n.classList.add(`${W}-reader`), n.setAttribute(ii, e), n.setAttribute("data-prose-reader-container", e), n), Js = (
   //__
   yo(
     Gn(
@@ -6596,14 +6597,14 @@ const $t = `${Ut}-core`, Vs = (n) => {
                 Mo(
                   Xi(
                     yi(
-                      Ai(
+                      Ri(
                         zn(
                           Bn(
                             co(
                               Di(
                                 So(
                                   // __
-                                  Vs
+                                  Os
                                 )
                               )
                             )
@@ -6620,26 +6621,26 @@ const $t = `${Ut}-core`, Vs = (n) => {
       )
     )
   )
-), Qs = (n) => (e) => n(e);
+), Ks = (n) => (e) => n(e);
 export {
-  Wt as AbstractSpinePosition,
+  kt as AbstractSpinePosition,
   Eo as Context,
   jo as ControlledNavigationController,
   G as DestroyableClass,
-  Se as DocumentRenderer,
+  ye as DocumentRenderer,
   Do as Features,
   ii as HTML_ATTRIBUTE_DATA_READER_ID,
   W as HTML_PREFIX,
   si as HTML_PREFIX_SCROLL_NAVIGATOR,
   oi as HTML_PREFIX_VIEWPORT,
-  Ut as HTML_STYLE_PREFIX,
-  Ro as HookManager,
+  Vt as HTML_STYLE_PREFIX,
+  Ao as HookManager,
   ni as ITEM_EXTENSION_VALID_FOR_FRAME_SRC,
   Ko as InternalNavigator,
   nt as LayoutEntry,
-  Gt as Locker,
-  Gs as PAGINATION_UPDATE_AFTER_VIEWPORT_ADJUSTMENT_DEBOUNCE,
-  Ys as PROSE_READER_NAMESPACE,
+  Xt as Locker,
+  qs as PAGINATION_UPDATE_AFTER_VIEWPORT_ADJUSTMENT_DEBOUNCE,
+  Xs as PROSE_READER_NAMESPACE,
   Cs as Pages,
   ps as Pagination,
   gs as PaginationController,
@@ -6647,56 +6648,56 @@ export {
   tt as ResourceHandler,
   ao as ResourcesLocator,
   $o as ScrollNavigationController,
-  ft as ScrollPosition,
+  mt as ScrollPosition,
   ms as SettingsManager,
   As as Spine,
-  Qt as SpineItem,
+  Zt as SpineItem,
   Si as SpineItemPageLayout,
   Ii as SpineItemPageSpineLayout,
-  C as SpineItemPosition,
-  He as SpineItemSpineLayout,
-  Ns as SpineItemsManager,
+  E as SpineItemPosition,
+  Oe as SpineItemSpineLayout,
+  Rs as SpineItemsManager,
   Es as SpineItemsObserver,
-  L as SpinePosition,
+  M as SpinePosition,
   xo as UnboundScrollPosition,
   Ne as UnboundSpineItemPagePosition,
-  ue as UnboundSpinePosition,
-  qs as VIEWPORT_ADJUSTMENT_THROTTLE,
-  Os as Viewport,
+  ae as UnboundSpinePosition,
+  Ys as VIEWPORT_ADJUSTMENT_THROTTLE,
+  Ns as Viewport,
   ro as consolidate,
-  Ks as createReader,
-  ct as deferIdle,
+  Js as createReader,
+  at as deferIdle,
   Xn as deferNextResult,
-  Be as generateCfiForSpineItemPage,
+  He as generateCfiForSpineItemPage,
   io as generateCfiFromRange,
-  me as generateRootCfi,
-  at as getAttributeValueFromString,
-  Bs as getBase64FromBlob,
-  Ke as getFrameViewportInfo,
-  Js as getItemAnchor,
+  he as generateRootCfi,
+  rt as getAttributeValueFromString,
+  Hs as getBase64FromBlob,
+  Je as getFrameViewportInfo,
+  Zs as getItemAnchor,
   yi as htmlEnhancer,
-  Vt as idle,
+  et as idle,
   Vn as injectCSSToFrame,
   Z as isDefined,
-  Nt as isHtmlElement,
+  At as isHtmlElement,
   Nn as isHtmlTagElement,
-  Xe as isRootCfi,
-  nr as isShallowEqual,
+  Be as isRootCfi,
+  tr as isShallowEqual,
   Di as layoutEnhancer,
-  Ot as mapKeysTo,
-  Hs as observeIntersection,
-  ut as observeMutation,
-  et as observeResize,
+  Rt as mapKeysTo,
+  _s as observeIntersection,
+  ct as observeMutation,
+  Qe as observeResize,
   co as paginationEnhancer,
   it as parseCfi,
-  _s as removeCSS,
-  Xt as resolveCfi,
-  Qs as rootEnhancer,
+  Ws as removeCSS,
+  _t as resolveCfi,
+  Ks as rootEnhancer,
   Ms as spinePositionToSpineItemSpineLayout,
   oe as upsertCSSToFrame,
   jn as waitForFrameLoad,
   kn as waitForFrameReady,
   De as waitForSwitch,
-  Qe as watchKeys
+  Ke as watchKeys
 };
 //# sourceMappingURL=index.js.map