@prose-reader/core 1.372.0 → 1.373.0

package/dist/index.js

@@ -538,7 +538,9 @@ var Tt = class {
 	})))).pipe(j(n.$.destroy$)).subscribe(), n;
 }, kt = (e) => E(...e.spine.spineItemsManager.items.map((e) => e.watch("isLoaded").pipe(A(() => {
 	let t = e.renderer.getDocumentFrame();
-	return t?.contentDocument ? E(...Array.from(t.contentDocument.querySelectorAll("a")).map((e) => w(e, "click"))) : d;
+	if (!t?.contentDocument) return d;
+	let n = Array.from(t.contentDocument.querySelectorAll("a")).map((e) => w(e, "click"));
+	return E(...n);
 })))).pipe(M((e) => {
 	e.preventDefault();
 }), O()), U = class extends f {
@@ -739,7 +741,9 @@ var Tt = class {
 	let a = t.getAttribute("src") || t.getAttribute("href");
 	if (!a) return D(null);
 	let o = r.manifest.items.find(({ href: e }) => `${Nt(n, a).toLowerCase()}`.endsWith(`${e.toLowerCase()}`));
-	return o ? C(new Mt(o, i).getResource()).pipe(ue((e) => e instanceof Response ? C(e.blob()) : D(void 0)), ue((a) => {
+	if (!o) return D(null);
+	let s = new Mt(o, i);
+	return C(s.getResource()).pipe(ue((e) => e instanceof Response ? C(e.blob()) : D(void 0)), ue((a) => {
 		if (!a) return D(null);
 		let o = e?.defaultView?.URL.createObjectURL(a) ?? "";
 		if (t.hasAttribute("src")) t.setAttribute("src", o);
@@ -753,7 +757,7 @@ var Tt = class {
 			}, t.onerror = a.error;
 		});
 		return D(null);
-	})) : D(null);
+	}));
 }, It = ({ settings: e, item: t, context: n }) => (r) => r.pipe(A((r) => {
 	let a = Je(r.contentDocument), o = i(t.href), s = a.map((t) => Ft(r.contentDocument, t, o, n, e));
 	return s.length === 0 ? D(r) : v(s).pipe(T(() => r));
@@ -1083,17 +1087,19 @@ var Tt = class {
 		let { width: r, height: i } = this.viewport.pageSize, a = this.getFrameElement();
 		if (!a) return D(void 0);
 		let o = this.settings.values.computedPageTurnMode === "scrollable";
-		if (a.contentDocument?.documentElement && (R(a.contentDocument.documentElement, "data-prose-reader-html-renderer-spread-position", n), o ? a.contentDocument?.documentElement.classList.add("prose-reader-html-renderer-touch-enabled") : a.contentDocument?.documentElement.classList.remove("prose-reader-html-renderer-touch-enabled")), this.isPrePaginated()) return D(Qt({
-			blankPagePosition: t,
-			frameElement: a,
-			isRTL: this.context.isRTL(),
-			minPageSpread: e,
-			pageHeight: i,
-			pageWidth: r,
-			spreadPosition: n
-		}));
-		let s = !!this.writingMode?.startsWith("vertical"), c = this.isImageType();
-		return D(an({
+		if (a.contentDocument?.documentElement && (R(a.contentDocument.documentElement, "data-prose-reader-html-renderer-spread-position", n), o ? a.contentDocument?.documentElement.classList.add("prose-reader-html-renderer-touch-enabled") : a.contentDocument?.documentElement.classList.remove("prose-reader-html-renderer-touch-enabled")), this.isPrePaginated()) {
+			let o = Qt({
+				blankPagePosition: t,
+				frameElement: a,
+				isRTL: this.context.isRTL(),
+				minPageSpread: e,
+				pageHeight: i,
+				pageWidth: r,
+				spreadPosition: n
+			});
+			return D(o);
+		}
+		let s = !!this.writingMode?.startsWith("vertical"), c = this.isImageType(), l = an({
 			pageHeight: i,
 			pageWidth: r,
 			frameElement: a,
@@ -1105,7 +1111,8 @@ var Tt = class {
 			minPageSpread: e,
 			isImageType: c,
 			enableTouch: this.settings.values.computedPageTurnMode === "scrollable"
-		}));
+		});
+		return D(l);
 	}
 	onRenderHeadless() {
 		return C(this.resourcesHandler.fetchResource()).pipe(A((e) => {
@@ -1225,8 +1232,8 @@ var cn = class {
 		t && z(t.style, "visibility", "hidden");
 	})), i = e.context.bridgeEvent.viewportBusy$.pipe(I(() => {
 		t && z(t.style, "visibility", "visible");
-	})), a = r(e.viewportFree$).pipe(ke(1));
-	return E(n, e.settings.values$.pipe(Ce(() => e.settings.values.computedPageTurnMode), be()).pipe(P((e) => e === "controlled" ? i.pipe(P(() => a)) : r(D(void 0))), F(e.$.destroy$)));
+	})), a = r(e.viewportFree$).pipe(ke(1)), o = e.settings.values$.pipe(Ce(() => e.settings.values.computedPageTurnMode), be()).pipe(P((e) => e === "controlled" ? i.pipe(P(() => a)) : r(D(void 0))), F(e.$.destroy$));
+	return E(n, o);
 }, vn = "@prose-reader/core", yn = 0, bn = 200, X = "prose-reader", xn = `${X}-style`, Sn = `data-${X}-id`, Cn = `${X}-viewport`, wn = `${X}-scroll-navigator`, Tn = `${X}-spine-item`, En = `--${X}-absolute-viewport-width`, Dn = `--${X}-absolute-viewport-height`, On = `${X}-enhancer-loading`, kn = `${On}-container`, An = `${On}-logo`, jn = `${On}-details`, Mn = ({ container: e, item: t }) => {
 	let n = e.ownerDocument.createElement("div");
 	n.classList.add(kn);
@@ -1238,7 +1245,7 @@ var cn = class {
 	z(e.style, "color", Nn(t));
 }, Fn = (e) => {
 	let t = /* @__PURE__ */ new WeakMap();
-	return e.hookManager.register("item.onBeforeContainerAttach", ({ element: n, item: r }) => {
+	e.hookManager.register("item.onBeforeContainerAttach", ({ element: n, item: r }) => {
 		z(n.style, "z-index", "0");
 		let i = Mn({
 			container: n,
@@ -1248,13 +1255,14 @@ var cn = class {
 			loadingElement: i,
 			theme: e.theme.get()
 		}), t.set(n, i), n.appendChild(i);
-	}), E(e.spineItemsObserver.itemStateChange$.pipe(I(({ item: e, isError: n, error: r }) => {
+	});
+	let n = e.spineItemsObserver.itemStateChange$.pipe(I(({ item: e, isError: n, error: r }) => {
 		if (!n) return;
 		let i = t.get(e.containerElement);
 		if (!i) return;
 		let a = i.querySelector("[data-details-element]");
 		Ze(a) && Le(a, "innerText", r?.toString() ?? "Unknown error");
-	})), e.theme.$.theme$.pipe(I((n) => {
+	})), r = e.theme.$.theme$.pipe(I((n) => {
 		for (let r of e.spineItemsManager.items) {
 			let e = t.get(r.containerElement);
 			e && Pn({
@@ -1262,7 +1270,8 @@ var cn = class {
 				theme: n
 			});
 		}
-	})));
+	}));
+	return E(n, r);
 }, In = (e) => {
 	e.hookManager.register("item.onDocumentLoad", async ({ itemId: t }) => {
 		let n = e.spineItemsManager.get(t)?.renderer.getDocumentFrame();
@@ -1367,8 +1376,8 @@ var cn = class {
 	let f = s.spine.pages.pipe(Ee({
 		refCount: !0,
 		bufferSize: 1
-	}));
-	return E(l, d, u, f, Rn(s), Wn(s), Fn(s)).pipe(F(s.$.destroy$)).subscribe(), {
+	})), p = Rn(s), m = Wn(s), h = Fn(s);
+	return E(l, d, u, f, p, m, h).pipe(F(s.$.destroy$)).subscribe(), {
 		...s,
 		destroy: () => {
 			c.destroy(), s.destroy();
@@ -1763,7 +1772,8 @@ var cn = class {
 	}
 }, sr = 500, cr = class extends Q {
 	constructor(e, t) {
-		super(), this.scrollNavigationController = e, this.lock = t, this.navigationSubject = new m(), this.navigation$ = this.navigationSubject.asObservable(), E(this.scrollNavigationController.userScroll$.pipe(oe((e) => {
+		super(), this.scrollNavigationController = e, this.lock = t, this.navigationSubject = new m(), this.navigation$ = this.navigationSubject.asObservable();
+		let n = this.scrollNavigationController.userScroll$.pipe(oe((e) => {
 			let t = this.lock();
 			return E(this.scrollNavigationController.userScroll$, D(e)).pipe(te(sr, h), S(), M(() => {
 				let e = this.scrollNavigationController.fromScrollPosition(this.scrollNavigationController.scrollPosition);
@@ -1775,7 +1785,8 @@ var cn = class {
 			}), se(() => {
 				t();
 			}));
-		}))).pipe(j(this.destroy$)).subscribe();
+		}));
+		E(n).pipe(j(this.destroy$)).subscribe();
 	}
 }, lr = (e) => e.pagination.state$.pipe(N(e.settings.values$), T(([t, { computedPageTurnDirection: n }]) => {
 	let { spineItems: r, readingDirection: i } = e.context.manifest, a = r.length ?? 0, o = t.begin.spineItemIndex === 0, s = t.end.spineItemIndex === Math.max(a - 1, 0), c = t.end.spineItemIndex === Math.max(a - 1, 0), l = t.begin.spineItemIndex === 0, u = t.begin.pageIndexInSpineItem === 0, d = t.end.pageIndexInSpineItem === t.end.numberOfPagesInSpineItem - 1;
@@ -1798,19 +1809,19 @@ var cn = class {
 		leading: !0
 	}), M(i), se(i));
 }, dr = (e) => (t) => {
-	let n = e(t), r = lr(n), i = Zn(n), a = new ar(n), o = new or(n), s = new cr(n.navigation.scrollNavigationController, n.navigation.lock);
-	E(Qn(n, a), s.navigation$.pipe(M((e) => {
+	let n = e(t), r = lr(n), i = Zn(n), a = new ar(n), o = new or(n), s = new cr(n.navigation.scrollNavigationController, n.navigation.lock), c = Qn(n, a), l = s.navigation$.pipe(M((e) => {
 		n.navigation.navigate(e);
-	}))).pipe(j(n.$.destroy$)).subscribe();
-	let c = (e) => {
+	}));
+	E(c, l).pipe(j(n.$.destroy$)).subscribe();
+	let u = (e) => {
 		n.mount(e), t.cfi && a.goToCfi(t.cfi, { animate: !1 });
-	}, l = () => {
+	}, d = () => {
 		s.destroy(), n.destroy();
 	};
 	return {
 		...n,
-		mount: c,
-		destroy: l,
+		mount: u,
+		destroy: d,
 		navigation: {
 			...n.navigation,
 			state$: r,
@@ -2215,8 +2226,8 @@ var cn = class {
 	let t = e.pagination.state$, n = e.spine.pages.layout$, r = Yr(e).pipe(k({
 		bufferSize: 1,
 		refCount: !0
-	})), i = v([
-		t.pipe(T(Zr), b(gr)),
+	})), i = t.pipe(T(Zr), b(gr)), a = v([
+		i,
 		r,
 		n
 	]).pipe(T(([t, n, r]) => {
@@ -2233,14 +2244,14 @@ var cn = class {
 	}), k({
 		bufferSize: 1,
 		refCount: !0
-	})), a = v([
+	})), s = e.settings.watch(["computedSpreadMode"]).pipe(T((e) => e.computedSpreadMode ?? !1), b()), c = n.pipe(T((t) => Kr({
+		items: e.spineItemsManager.items,
+		pagesState: t
+	})), b(qr)), l = v([
 		t,
-		e.settings.watch(["computedSpreadMode"]).pipe(T((e) => e.computedSpreadMode ?? !1), b()),
-		i,
-		n.pipe(T((t) => Kr({
-			items: e.spineItemsManager.items,
-			pagesState: t
-		})), b(qr))
+		s,
+		a,
+		c
 	]).pipe(T(([e, t, n, r]) => ({
 		...e,
 		begin: {
@@ -2253,17 +2264,17 @@ var cn = class {
 		},
 		isUsingSpread: t,
 		...r
-	}))), s = Jn(e.navigation).pipe(T(({ position: e }) => e), b(o));
-	return v([a, v([
+	}))), u = Jn(e.navigation).pipe(T(({ position: e }) => e), b(o)), d = v([
 		t,
 		e.layout$,
-		s
+		u
 	]).pipe(A(([t, n, r]) => Jr({
 		reader: e,
 		paginationInfo: t,
 		navigationPosition: r,
 		manifest: e.context.manifest
-	})), T((e) => ({ percentageEstimateOfBook: e })))]).pipe(T(([e, t]) => ({
+	})), T((e) => ({ percentageEstimateOfBook: e })));
+	return v([l, d]).pipe(T(([e, t]) => ({
 		...e,
 		...t
 	})), b(gr), g(5));
@@ -2317,7 +2328,7 @@ var cn = class {
 	}
 }, ti = ({ selection: e, spineItem: t }) => {
 	let { anchorNode: n, anchorOffset: r, focusNode: i, focusOffset: a } = e;
-	if (!(!n || !i)) try {
+	if (n && i) try {
 		return ei({
 			node: n,
 			offset: r
@@ -2499,7 +2510,7 @@ var ci = (e) => (t) => e(t), li = (e, t, n) => {
 			let t = this.value.element;
 			if (!t) return;
 			let n = this.fromSpinePosition(e);
-			Math.round(n.x) === t.scrollLeft && Math.round(n.y) === t.scrollTop || (this.scrollingSubject.next(!0), t.scrollTo({
+			(Math.round(n.x) !== t.scrollLeft || Math.round(n.y) !== t.scrollTop) && (this.scrollingSubject.next(!0), t.scrollTo({
 				left: n.x,
 				top: n.y,
 				behavior: "instant"
@@ -2515,8 +2526,8 @@ var ci = (e) => (t) => e(t), li = (e, t, n) => {
 			t && (e === "scrollable" ? z(t.style, "display", "block") : z(t.style, "display", "contents"));
 		})), s = this.navigateSubject.pipe(M(this.applyNavigationPosition));
 		this.isNavigating$ = this.scrollingSubject.asObservable();
-		let c = v([E(r.element$.pipe(x(K), A((e) => vt(e))), r.element$.pipe(x(K), A((e) => w(e, "scroll"))), r.spineItemsObserver.itemResize$).pipe(A(() => ve(10).pipe(T(() => !1), pe(!0))), b(), pe(!1)), this.isNavigating$]).pipe(T(([e, t]) => e || t), k(1));
-		this.userScroll$ = this.watch("element").pipe(x(K), A((e) => t.watch(["computedPageTurnMode"]).pipe(A(({ computedPageTurnMode: t }) => t === "controlled" ? d : w(e, "scroll").pipe(N(c), x(([, e]) => !e), T(([e]) => e))))), O()), E(a, o, s).pipe(j(this.destroy$)).subscribe();
+		let c = E(r.element$.pipe(x(K), A((e) => vt(e))), r.element$.pipe(x(K), A((e) => w(e, "scroll"))), r.spineItemsObserver.itemResize$).pipe(A(() => ve(10).pipe(T(() => !1), pe(!0))), b(), pe(!1)), u = v([c, this.isNavigating$]).pipe(T(([e, t]) => e || t), k(1));
+		this.userScroll$ = this.watch("element").pipe(x(K), A((e) => t.watch(["computedPageTurnMode"]).pipe(A(({ computedPageTurnMode: t }) => t === "controlled" ? d : w(e, "scroll").pipe(N(u), x(([, e]) => !e), T(([e]) => e))))), O()), E(a, o, s).pipe(j(this.destroy$)).subscribe();
 	}
 	update(e) {
 		this.mergeCompare(e);
@@ -2568,7 +2579,8 @@ var ci = (e) => (t) => e(t), li = (e, t, n) => {
 				x: 0,
 				y: 0
 			}
-		}), this.reader = e, this.enterSubject = new m(), this.exitSubject = new m(), E(this.enterSubject.pipe(A((e) => {
+		}), this.reader = e, this.enterSubject = new m(), this.exitSubject = new m();
+		let t = this.enterSubject.pipe(A((e) => {
 			let { scale: t = 1, animate: n = !1 } = e ?? {}, r = this.reader.viewport.value.element;
 			R(this.viewport.element, `data-${X}-zooming`, "true");
 			let i = this.scrollNavigationController.value.element;
@@ -2582,7 +2594,7 @@ var ci = (e) => (t) => e(t), li = (e, t, n) => {
 			}), this.updateZoom(t), t !== 1 && this.isControlled ? ve(e?.animate ? vi : 0).pipe(M(() => {
 				this.reader.layout();
 			})) : u;
-		})), this.exitSubject.pipe(A((e) => {
+		})), n = this.exitSubject.pipe(A((e) => {
 			let t = this.reader.viewport.value.element;
 			R(this.viewport.element, `data-${X}-zooming`, "false");
 			let n = this.scrollNavigationController.value.element;
@@ -2593,7 +2605,8 @@ var ci = (e) => (t) => e(t), li = (e, t, n) => {
 				let e = this.reader.viewport.value.element;
 				B(e.style, "transform-origin"), B(e.style, "transition"), this.isControlled && this.reader.layout();
 			}), j(this.enterSubject));
-		}))).pipe(j(this.destroy$)).subscribe();
+		}));
+		E(t, n).pipe(j(this.destroy$)).subscribe();
 	}
 	enter(e) {
 		this.enterSubject.next(e);
@@ -2681,7 +2694,10 @@ var ci = (e) => (t) => e(t), li = (e, t, n) => {
 }).trim(), wi = (e, t) => Si({
 	nodeOrRange: e,
 	item: t
-}), Ti = (e) => e.index.toString(), Ei = (e) => e[0]?.index === 6 && e.length > 1, Di = (e) => je(Ne(e)), Oi = (e) => Array.isArray(e) ? e[0] && Ei(e[0]) ? e[0] : void 0 : e.parent[0] && Ei(e.parent[0]) ? e.parent[0] : void 0, ki = (e) => {
+}), Ti = (e) => e.index.toString(), Ei = (e) => e[0]?.index === 6 && e.length > 1, Di = (e) => {
+	let t = Ne(e);
+	return je(t);
+}, Oi = (e) => Array.isArray(e) ? e[0] && Ei(e[0]) ? e[0] : void 0 : e.parent[0] && Ei(e.parent[0]) ? e.parent[0] : void 0, ki = (e) => {
 	let t = Ne(e), n = ((Oi(t) ?? [])[1]?.index ?? 2) / 2 - 1, r = Me(t);
 	return {
 		isCfiRange: r,
@@ -2886,7 +2902,9 @@ var ci = (e) => (t) => e(t), li = (e, t, n) => {
 	}
 	destroy(e, t, n) {
 		let r = this._hookExecutions.filter((r) => n && r.ref === n || e === r.name && (!t || t && t === r.id));
-		return this._hookExecutions = this._hookExecutions.filter((e) => !r.includes(e)), v(r.map(({ destroyFn: e }) => e()));
+		this._hookExecutions = this._hookExecutions.filter((e) => !r.includes(e));
+		let i = r.map(({ destroyFn: e }) => e());
+		return v(i);
 	}
 }, Li = "[data-prose-reader-spine-item][data-is-ready=false]{pointer-events:none;-webkit-user-select:none;user-select:none}.prose-reader-enhancer-loading-container{width:100%;height:100%;max-width:var(--prose-reader-absolute-viewport-width,100%);text-align:center;color:#cacaca;z-index:1;background-color:#fff;flex-direction:column;justify-content:center;align-items:center;display:flex;position:absolute;top:0;left:0}[data-prose-reader-spine-item][data-is-ready=true] .prose-reader-enhancer-loading-container{visibility:hidden;z-index:0}.prose-reader-enhancer-loading-logo{font-size:4em}.prose-reader-enhancer-loading-details{text-overflow:ellipsis;white-space:nowrap;width:80%;max-width:300px;font-size:1.2em;overflow:hidden}[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}[data-prose-reader-scroll-navigator]{width:100%;height:100%;position:relative;overflow:hidden scroll}[data-prose-reader-viewport]{background-color:#fff;width:100%;height:100%;position:relative}.prose-reader-reader{background-color:#fff;position:relative;overflow:hidden}", Ri = (e) => ({
 	x: -e.x,
@@ -2902,14 +2920,14 @@ var ci = (e) => (t) => e(t), li = (e, t, n) => {
 		super(), this.settings = e, this.hookManager = t, this.context = n, this.spine = r, this.viewport = i, this.navigateSubject = new m(), this.isActive = () => this.settings.values.computedPageTurnMode === "controlled", this.getNavigationVisibleArea = () => this.viewport.absoluteViewport, this.element$ = new l(n.document.createElement("div"));
 		let o = this.spine.element$.pipe(x(K), N(this.element$), M(([e, t]) => {
 			t.style.cssText = "\n          height: 100%;\n          width: 100%;\n          position: relative;\n        ", t.className = `${X}-controlled-navigator`, t.innerHTML = "", t.appendChild(e), this.viewport.value.element.appendChild(t), this.element$.next(t);
-		})), s = v([e.watch([
+		})), s = e.watch([
 			"computedPageTurnDirection",
 			"computedPageTurnMode",
 			"numberOfAdjacentSpineItemToPreLoad"
-		]), this.element$]).pipe(M(([, t]) => {
+		]), c = v([s, this.element$]).pipe(M(([, t]) => {
 			e.values.computedPageTurnMode === "scrollable" ? z(t.style, "display", "contents") : z(t.style, "display", "block");
 		}));
-		this.layout$ = s.pipe(M(() => {
+		this.layout$ = c.pipe(M(() => {
 			Bi.info("layout", e.values);
 		}), O()), this.isNavigating$ = this.navigateSubject.pipe(b((e, t) => a(e.position, t.position)), T(({ animation: t, position: n }) => (Bi.info("Navigation requested", {
 			animation: t,
@@ -3106,7 +3124,7 @@ var ci = (e) => (t) => e(t), li = (e, t, n) => {
 })), Zi = ({ settings: e, spineItemsManager: t, spineLocator: n, navigationResolver: r }) => (i) => {
 	let a = (i) => {
 		let { navigationSnapThreshold: a, computedPageTurnMode: o } = e.values, s = t.get(i.spineItem);
-		if (!(!s || !i.position)) {
+		if (s && i.position) {
 			if (o === "controlled") {
 				let { endPageIndex: e, beginPageIndex: t } = n.getVisiblePagesFromViewportPosition({
 					position: i.position,
@@ -3352,11 +3370,10 @@ var ci = (e) => (t) => e(t), li = (e, t, n) => {
 			} })), se(() => {
 				t();
 			}), j(d));
-		}), O());
-		E(E(E(i, o.layout$).pipe(A(() => D(null).pipe(A(() => u.pipe(x((e) => !e), S())), T(() => ({ navigation: {
+		}), O()), p = E(i, o.layout$).pipe(A(() => D(null).pipe(A(() => u.pipe(x((e) => !e), S())), T(() => ({ navigation: {
 			...this.navigationSubject.getValue(),
 			animation: !1
-		} })), j(E(f, d))))), f).pipe(ra({
+		} })), j(E(f, d))))), m = E(p, f).pipe(ra({
 			navigationResolver: a,
 			settings: e,
 			context: t,
@@ -3378,7 +3395,8 @@ var ci = (e) => (t) => e(t), li = (e, t, n) => {
 			spineLocator: o.locator,
 			settings: e,
 			navigationResolver: a
-		}), T(({ navigation: e }) => e), O()), d, Ui(t, this.navigationSubject, o)).pipe(N(this.navigationSubject), (e) => e.pipe(M(([e]) => {
+		}), T(({ navigation: e }) => e), O()), h = Ui(t, this.navigationSubject, o);
+		E(m, d, h).pipe(N(this.navigationSubject), (e) => e.pipe(M(([e]) => {
 			let t = e.type === "scroll", n = e.meta.triggeredBy === "pagination", r = e.meta.triggeredBy === "restoration";
 			if (t && !r || n) return;
 			let i = {
@@ -3874,8 +3892,8 @@ var ci = (e) => (t) => e(t), li = (e, t, n) => {
 }, Fa = class extends Q {
 	constructor(e, t, n, r, i, a) {
 		super(), this.context = e, this.pagination = t, this.spineItemsManager = n, this.spine = r, this.isNavigationLocked$ = i, this.cfi = a;
-		let o = E(this.context.bridgeEvent.navigation$, r.layout$).pipe(A(() => this.isNavigationLocked$.pipe(x((e) => !e), he(1), N(this.context.bridgeEvent.navigation$), T(([, e]) => this.resolveMetrics(e) ?? this.pagination.value))), O());
-		E(o, o.pipe(yt(this.context.bridgeEvent.viewportFree$), T((e) => this.resolvePositions(e)), x((e) => e !== void 0))).pipe(j(this.destroy$)).subscribe((e) => {
+		let o = E(this.context.bridgeEvent.navigation$, r.layout$).pipe(A(() => this.isNavigationLocked$.pipe(x((e) => !e), he(1), N(this.context.bridgeEvent.navigation$), T(([, e]) => this.resolveMetrics(e) ?? this.pagination.value))), O()), s = o.pipe(yt(this.context.bridgeEvent.viewportFree$), T((e) => this.resolvePositions(e)), x((e) => e !== void 0));
+		E(o, s).pipe(j(this.destroy$)).subscribe((e) => {
 			this.pagination.update(e);
 		});
 	}
@@ -3909,7 +3927,7 @@ var ci = (e) => (t) => e(t), li = (e, t, n) => {
 	}
 	resolvePositions(e) {
 		let t = this.resolveEdgePositions(e.begin), n = this.resolveEdgePositions(e.end);
-		if (!(!t || !n)) return {
+		if (t && n) return {
 			...e,
 			begin: t,
 			end: n
@@ -4194,7 +4212,7 @@ var ci = (e) => (t) => e(t), li = (e, t, n) => {
 			});
 			return u ? [...n, i] : n;
 		}, []), u = l[0], d = l[l.length - 1] ?? u;
-		if (!(u === void 0 || d === void 0)) return {
+		if (u !== void 0 && d !== void 0) return {
 			beginPageIndex: u,
 			endPageIndex: d
 		};
@@ -4384,12 +4402,12 @@ var ci = (e) => (t) => e(t), li = (e, t, n) => {
 		let o = e.watch("rootElement").pipe(xe(K), I(() => {
 			let e = this.context.document.createElement("div");
 			e.style.cssText = "\n          height: 100%;\n          position: relative;\n        ", e.className = `${X}-spine`, this.elementSubject.next(e);
-		}));
-		E(this.element$.pipe(xe(K), I((e) => {
+		})), s = this.element$.pipe(xe(K), I((e) => {
 			this.spineItemsManager.items.forEach((t) => {
 				t.attach(e);
 			});
-		})), o).pipe(F(this.destroy$)).subscribe();
+		}));
+		E(s, o).pipe(F(this.destroy$)).subscribe();
 	}
 	get element() {
 		return this.elementSubject.getValue();
@@ -4629,11 +4647,13 @@ var ci = (e) => (t) => e(t), li = (e, t, n) => {
 			},
 			width: 1,
 			height: 1
-		}), this.context = e, this.settingsManager = t, this.layoutSubject = new m(), this.layout$ = this.layoutSubject.asObservable(), E(this.settingsManager.watch(["computedSpreadMode"]).pipe(M(() => {
+		}), this.context = e, this.settingsManager = t, this.layoutSubject = new m(), this.layout$ = this.layoutSubject.asObservable();
+		let r = this.settingsManager.watch(["computedSpreadMode"]).pipe(M(() => {
 			this.mergeCompare({ pageSize: this.calculatePageSize(this.value) });
-		})), this.context.watch("rootElement").pipe(M(() => {
+		})), i = this.context.watch("rootElement").pipe(M(() => {
 			this.layout();
-		}))).pipe(j(this.destroy$)).subscribe();
+		}));
+		E(r, i).pipe(j(this.destroy$)).subscribe();
 	}
 	calculatePageSize(e) {
 		let { computedSpreadMode: t } = this.settingsManager.values;
@@ -4702,9 +4722,9 @@ var ci = (e) => (t) => e(t), li = (e, t, n) => {
 		L.log("mount", { containerElement: e }), $e(l.document, a, Li);
 		let t = lo(e, i);
 		l.update({ rootElement: t }), te({ immediate: !0 });
-	}, re = u.watch(["computedSpreadMode"]).pipe(De(1), I(() => te())), ie = E(o.pipe(I((e) => {
+	}, re = u.watch(["computedSpreadMode"]).pipe(De(1), I(() => te())), ie = o.pipe(I((e) => {
 		l.value.rootElement && (f.layout(), v.layout(e));
-	}), F(s)), re).subscribe();
+	}), F(s)), b = E(ie, re).subscribe();
 	return {
 		id: i,
 		context: l,
@@ -4718,7 +4738,7 @@ var ci = (e) => (t) => e(t), li = (e, t, n) => {
 		mount: ne,
 		destroy: () => {
 			let e = l.value.rootElement;
-			e && (et(l.document, a), uo(e)), ie.unsubscribe(), p.destroy(), ee.destroy(), u.destroy(), _.destroy(), l.destroy(), y.destroy(), v.destroy(), d.destroy(), s.next(), s.complete(), f.destroy();
+			e && (et(l.document, a), uo(e)), b.unsubscribe(), p.destroy(), ee.destroy(), u.destroy(), _.destroy(), l.destroy(), y.destroy(), v.destroy(), d.destroy(), s.next(), s.complete(), f.destroy();
 		},
 		pagination: {
 			get state() {