@foxycape/core 1.1.6 → 1.1.7

package/dist/mediaTypes/html/renderer/location/HtmlLayoutStatePreserver.mjs

@@ -0,0 +1,164 @@
+import { parseNumber as e } from "../../../../kernal/common/number.mjs";
+import { getElementByNameAndIndex as t } from "../../../../kernal/html/finder.mjs";
+import { isHtmlElement as n } from "../../../../kernal/html/realm.mjs";
+import { resolveVisibleTranslationAnchor as r } from "../../../../kernal/html/translationAnchor.mjs";
+import { getTransformLength as i } from "../../../../kernal/html/style.mjs";
+import { HtmlSettings as a } from "../../HtmlSettings.mjs";
+import { excludeResizingCompensationDocument as o, pickAbsoluteCompensationUrl as s, pickVisibleCompensationDocument as c, resolveRestoreCompensationAnchor as l } from "../layout/geometry/restoreLayoutState.mjs";
+import { getLayoutGeometry as u } from "../layout/resolveLayoutRoute.mjs";
+import { beginProgrammaticScroll as d, endProgrammaticScroll as f, isHoldingAbsoluteAnchor as p, isUserScrollSettling as m } from "./scrollActivity.mjs";
+//#region mediaTypes/html/renderer/location/HtmlLayoutStatePreserver.ts
+var h = 1, g = class {
+	constructor(e, t, n) {
+		this.doc = e, this.viewport = t, this.options = n;
+	}
+	capture() {
+		let e = this.doc.owner.getRenderer(), t = this.viewport.getScrollElement() ?? e?.getScrollElement(), n = this.getTransformContainer(), r = this.doc.getWrapperContainer(), a = u(this.options), o = this.findLocationAnchor(), s = r ? a.getCaptureExtent(r) : {
+			width: 0,
+			height: 0
+		};
+		return {
+			scrollLeft: t?.scrollLeft ?? 0,
+			scrollTop: t?.scrollTop ?? 0,
+			width: s.width,
+			height: s.height,
+			transformLeft: n ? i(n, "x") : 0,
+			transformTop: n ? i(n, "y") : 0,
+			firstVisibleDocument: this.resolveCompensationAnchor() ?? e?.getFirstVisibleDocument(),
+			offsetLeft: o?.offsetLeft ?? 0,
+			offsetTop: o?.offsetTop ?? 0,
+			foundElement: !!o
+		};
+	}
+	async restore(e) {
+		let t = this.doc.owner.getRenderer();
+		if (!t || !e) return;
+		let n = t.getDocuments(), r = n.indexOf(this.doc);
+		if (r < 0) return;
+		let i = u(this.options);
+		if (i.flipMode == "page") {
+			let t = n.indexOf(e.firstVisibleDocument);
+			if (t < 0 || r > t) return;
+			await this.waitUntilPageTransformStable(), this.restorePageTransform(e, r === t, i.pageAxis);
+			return;
+		}
+		let a = i.holdsAbsoluteLocate && p() ? this.resolveCompensationAnchor() : void 0, o = l(e.firstVisibleDocument, a, !!(i.holdsAbsoluteLocate && p())), s = n.indexOf(o);
+		s < 0 || (this.clearPageTransformIfNeeded(), this.restoreScroll(e, r, s, i.blockAxis));
+	}
+	async waitUntilPageTransformStable() {
+		if (u(this.options).flipMode != "page") return;
+		let e = this.getTransformContainer();
+		if (!e) return;
+		let t = Date.now() + 400;
+		for (; this.hasActiveTransformTransition(e) && !(Date.now() >= t);) await new Promise((t) => {
+			let n = () => {
+				e.removeEventListener("transitionend", r), clearTimeout(i);
+			}, r = (r) => {
+				r.target === e && (n(), t());
+			};
+			e.addEventListener("transitionend", r);
+			let i = setTimeout(() => {
+				n(), t();
+			}, 120);
+		});
+	}
+	restorePageTransform(t, n, r) {
+		let a = this.getTransformContainer();
+		if (!a) return;
+		let o = a.getAttribute("data-target-transform"), s = 0;
+		s = o ? e(o, 0, "parseFloat") : i(a, r);
+		let c = this.doc.getWrapperContainer(), l = u(this.options), d = r == "y" ? (c?.scrollHeight ?? 0) - t.height : (c?.scrollWidth ?? 0) - t.width, f = 0, p = n ? this.findLocationAnchor() : null;
+		p && t.foundElement && (f = r == "y" ? p.offsetTop - t.offsetTop : p.offsetLeft - t.offsetLeft);
+		let m = l.restorePageTransform({
+			currentTransform: s,
+			sizeDelta: d,
+			offsetDelta: f,
+			isFirstVisible: n,
+			foundElement: !!(p && t.foundElement)
+		});
+		a.style.removeProperty("transition"), a.setAttribute("data-target-transform", `${m}`), a.style.transform = l.getPageTranslateCss(m);
+	}
+	restoreScroll(e, t, n, r) {
+		let i = this.doc.owner.getRenderer(), a = this.viewport.getScrollElement() ?? i?.getScrollElement();
+		if (!a) return;
+		let o = this.doc.getWrapperContainer(), s = u(this.options);
+		if (s.skipsRestoreWhileSettling && m()) return;
+		let c = r == "x" ? a.scrollLeft : a.scrollTop, l = r == "x" ? e.scrollLeft : e.scrollTop, p = r == "x" ? (o?.scrollWidth ?? 0) - e.width : (o?.offsetHeight ?? 0) - e.height, g = 0, _ = t === n ? this.findLocationAnchor() : null, v = !!(_ && e.foundElement);
+		v && _ && (g = r == "x" ? _.offsetLeft - e.offsetLeft : _.offsetTop - e.offsetTop);
+		let y = s.restoreScroll({
+			liveScroll: c,
+			capturedScroll: l,
+			sizeDelta: p,
+			offsetDelta: g,
+			foundElement: v,
+			currentIndex: t,
+			anchorIndex: n
+		});
+		if (!(Math.abs(y - c) <= h) && s.shouldApplyRestoredScroll(y, c)) {
+			d();
+			try {
+				r == "x" ? a.scrollTo({
+					left: y,
+					top: a.scrollTop
+				}) : a.scrollTo({
+					left: a.scrollLeft,
+					top: y
+				});
+			} finally {
+				f();
+			}
+		}
+	}
+	resolveCompensationAnchor() {
+		let e = this.doc.owner.getRenderer();
+		if (!e) return;
+		if (u(this.options).compensationAnchorMode == "first-visible") {
+			let t = this.doc.owner.context.currentLocation;
+			if (t?.direction == "next" || t?.direction == "previous") return e.getFirstVisibleDocument();
+			let n = this.doc.owner.context.redirectingDocUrl;
+			return n ? e.getDocument(n) ?? e.getFirstVisibleDocument() : e.getFirstVisibleDocument();
+		}
+		let t = this.doc.owner.context.currentLocation, n = s({
+			direction: t?.direction,
+			currentLocationUrl: t?.url,
+			redirectingDocUrl: this.doc.owner.context.redirectingDocUrl,
+			holdAbsoluteAnchor: p()
+		});
+		return n ? e.getDocument(n) ?? this.pickVisibleCompensation() : this.pickVisibleCompensation();
+	}
+	pickVisibleCompensation() {
+		let e = this.doc.owner.getRenderer();
+		if (!e) return;
+		let t = u(this.options), n = o(e.getVisibleDocuments(), this.doc);
+		return c(n, t.compensationAnchorEdge, (e) => {
+			let n = e.getWrapperContainer()?.getBoundingClientRect();
+			if (n) return t.getCompensationRect(n);
+		}) ?? e.getFirstVisibleDocument();
+	}
+	findLocationAnchor() {
+		let e = this.doc.owner.context.currentLocation, n = this.doc.getContentContainer();
+		if (!n || !e?.precise || !e.tagName || e.tagIndex == null) return null;
+		let i = t(n, e.tagName, e.tagIndex);
+		return r(i);
+	}
+	clearPageTransformIfNeeded() {
+		let e = this.getTransformContainer();
+		e && (e.style.removeProperty("transition"), e.style.removeProperty("transform"), e.removeAttribute("data-target-transform"));
+	}
+	getTransformContainer() {
+		try {
+			let e = this.viewport.getRendererContainer()?.querySelector("." + a.TransformContainerCssName);
+			return n(e) ? e : null;
+		} catch {
+			return null;
+		}
+	}
+	hasActiveTransformTransition(e) {
+		let t = e.getAnimations;
+		if (typeof t != "function") return !1;
+		for (let n of t.call(e, { subtree: !1 })) if (n.playState === "running" || n.playState === "pending") return !0;
+		return !1;
+	}
+};
+//#endregion
+export { g as HtmlLayoutStatePreserver };

package/dist/mediaTypes/html/renderer/location/remapStoredPageNumber.cjs

@@ -0,0 +1 @@
+Object.defineProperty(exports,Symbol.toStringTag,{value:`Module`});var e=(e,t)=>{let n=e.current??0;if(e.unit!=`page`||n<=0||t<=0)return n>0?n:1;let r=e.total&&e.total>0?e.total:1;return r==t?Math.min(n,t):e.direction==`previous`&&n>=r?t:r>1?Math.max(1,Math.ceil(n/r*t)):n},t=(e,t)=>{if(!e||e.url!=t||e.unit!=`page`||e.direction!=`previous`)return!1;let n=e.current??0,r=e.total??0;return n>0&&r>0&&n>=r};exports.remapStoredPageNumber=e,exports.shouldKeepPageEndOnContentGrow=t;

package/dist/mediaTypes/html/renderer/location/remapStoredPageNumber.d.ts

@@ -0,0 +1,4 @@
+import { FileLocation } from '../../../../kernal';
+
+export declare const remapStoredPageNumber: (location: Pick<FileLocation, "current" | "total" | "direction" | "unit">, numberOfPages: number) => number;
+export declare const shouldKeepPageEndOnContentGrow: (location: Pick<FileLocation, "url" | "unit" | "current" | "total" | "direction"> | undefined, docUrl: string) => boolean;

package/dist/mediaTypes/html/renderer/location/remapStoredPageNumber.mjs

@@ -0,0 +1,13 @@
+//#region mediaTypes/html/renderer/location/remapStoredPageNumber.ts
+var e = (e, t) => {
+	let n = e.current ?? 0;
+	if (e.unit != "page" || n <= 0 || t <= 0) return n > 0 ? n : 1;
+	let r = e.total && e.total > 0 ? e.total : 1;
+	return r == t ? Math.min(n, t) : e.direction == "previous" && n >= r ? t : r > 1 ? Math.max(1, Math.ceil(n / r * t)) : n;
+}, t = (e, t) => {
+	if (!e || e.url != t || e.unit != "page" || e.direction != "previous") return !1;
+	let n = e.current ?? 0, r = e.total ?? 0;
+	return n > 0 && r > 0 && n >= r;
+};
+//#endregion
+export { e as remapStoredPageNumber, t as shouldKeepPageEndOnContentGrow };

package/dist/mediaTypes/html/renderer/location/scrollActivity.cjs

@@ -0,0 +1 @@
+Object.defineProperty(exports,Symbol.toStringTag,{value:`Module`});var e=160,t=160,n=0,r=0,i=0,a=!1,o=!1,s=(e=Date.now())=>{n=e},c=(e=Date.now())=>{i++,r=e},l=(e=Date.now())=>{i=Math.max(0,i-1),r=e},u=(e=Date.now())=>i>0||e-r<160,d=()=>{o=!1},f=(e,t=!1)=>t&&e!=`next`&&e!=`previous`,p=(e=160)=>Date.now()-n<e,m=()=>{o=!0,a=!1},h=()=>o,g=e=>{a=e},_=()=>a,v=()=>{n=0,r=0,i=0,a=!1,o=!1};exports.PROGRAMMATIC_SCROLL_QUIET_MS=t,exports.USER_SCROLL_SETTLE_MS=e,exports.beginAbsoluteLocate=m,exports.beginProgrammaticScroll=c,exports.endProgrammaticScroll=l,exports.isHoldingAbsoluteAnchor=h,exports.isPinReadingStart=_,exports.isProgrammaticScroll=u,exports.isUserScrollSettling=p,exports.markUserScroll=s,exports.releaseAbsoluteLocate=d,exports.resetUserScroll=v,exports.setPinReadingStart=g,exports.shouldBeginAbsoluteLocate=f;

package/dist/mediaTypes/html/renderer/location/scrollActivity.d.ts

@@ -0,0 +1,14 @@
+export declare const USER_SCROLL_SETTLE_MS = 160;
+export declare const PROGRAMMATIC_SCROLL_QUIET_MS = 160;
+export declare const markUserScroll: (at?: number) => void;
+export declare const beginProgrammaticScroll: (at?: number) => void;
+export declare const endProgrammaticScroll: (at?: number) => void;
+export declare const isProgrammaticScroll: (at?: number) => boolean;
+export declare const releaseAbsoluteLocate: () => void;
+export declare const shouldBeginAbsoluteLocate: (direction?: string, holdsAbsoluteLocate?: boolean) => boolean;
+export declare const isUserScrollSettling: (settleMs?: number) => boolean;
+export declare const beginAbsoluteLocate: () => void;
+export declare const isHoldingAbsoluteAnchor: () => boolean;
+export declare const setPinReadingStart: (value: boolean) => void;
+export declare const isPinReadingStart: () => boolean;
+export declare const resetUserScroll: () => void;

package/dist/mediaTypes/html/renderer/location/scrollActivity.mjs

@@ -0,0 +1,18 @@
+//#region mediaTypes/html/renderer/location/scrollActivity.ts
+var e = 160, t = 160, n = 0, r = 0, i = 0, a = !1, o = !1, s = (e = Date.now()) => {
+	n = e;
+}, c = (e = Date.now()) => {
+	i++, r = e;
+}, l = (e = Date.now()) => {
+	i = Math.max(0, i - 1), r = e;
+}, u = (e = Date.now()) => i > 0 || e - r < 160, d = () => {
+	o = !1;
+}, f = (e, t = !1) => t && e != "next" && e != "previous", p = (e = 160) => Date.now() - n < e, m = () => {
+	o = !0, a = !1;
+}, h = () => o, g = (e) => {
+	a = e;
+}, _ = () => a, v = () => {
+	n = 0, r = 0, i = 0, a = !1, o = !1;
+};
+//#endregion
+export { t as PROGRAMMATIC_SCROLL_QUIET_MS, e as USER_SCROLL_SETTLE_MS, m as beginAbsoluteLocate, c as beginProgrammaticScroll, l as endProgrammaticScroll, h as isHoldingAbsoluteAnchor, _ as isPinReadingStart, u as isProgrammaticScroll, p as isUserScrollSettling, s as markUserScroll, d as releaseAbsoluteLocate, v as resetUserScroll, g as setPinReadingStart, f as shouldBeginAbsoluteLocate };

package/dist/mediaTypes/html/renderer/navigator/HtmlCoreNavigator.cjs

@@ -1 +1 @@
-Object.defineProperty(exports,Symbol.toStringTag,{value:`Module`});const e=require("../../../../kernal/progress/Progress.cjs");var t=class{constructor(e,t){this.documentsProvider=e,this.options=t}async goto(e){await this.documentsProvider.load(e)}async gotoUrl(t){let n=new e.FileLocation(t,1,`ratio`);n.storeCurrent=!0,await this.goto(n)}async gotoPercentage(t,n){let r=await this.recoverCurrentPercentage(t,n?.percentageSymbolType??`custom`),i=new e.FileLocation(r.url,1,`ratio`);if(i.current=r.current,n?.percentageSymbolType&&(i.symbolType=n.percentageSymbolType),i.current!=null&&i.current==0&&this.options.flipMode==`page`){let e=this.documentsProvider.getDocument(i.url);this.documentsProvider.getDocuments().indexOf(e)==0&&(i.current=1)}i.storeCurrent=!0,i.from=`drag`,await this.goto(i)}async recoverCurrentPercentage(e,t){let n=await this.documentsProvider.fileParser.getSpineFiles();if(e==1)return{url:n[n.length-1].url,current:1};if(e==0)return{url:n[0].url,current:0};let r=e=>t==`custom`||e.charRatio==0,i=n.find(t=>(r(t)?t.endProgress:t.charEndProgress)>=e)??n[n.length-1],a=r(i)?i.startProgress:i.charStartProgress,o=r(i)?i.ratio:i.charRatio,s=e-a,c=0;return o>0&&(c=s/o),{url:i?.url??``,current:c}}};exports.HtmlCoreNavigator=t;
+Object.defineProperty(exports,Symbol.toStringTag,{value:`Module`});const e=require("../../../../kernal/progress/Progress.cjs");var t=class{constructor(e,t){this.documentsProvider=e,this.options=t}async goto(e){await this.documentsProvider.load(e)}async gotoUrl(t){let n=new e.FileLocation(t,1,`ratio`);n.storeCurrent=!0,n.from=`toc`,await this.goto(n)}async gotoPercentage(t,n){let r=await this.recoverCurrentPercentage(t,n?.percentageSymbolType??`custom`),i=new e.FileLocation(r.url,1,`ratio`);if(i.current=r.current,n?.percentageSymbolType&&(i.symbolType=n.percentageSymbolType),i.current!=null&&i.current==0&&this.options.flipMode==`page`){let e=this.documentsProvider.getDocument(i.url);this.documentsProvider.getDocuments().indexOf(e)==0&&(i.current=1)}i.storeCurrent=!0,i.from=n?.from??`drag`,await this.goto(i)}async recoverCurrentPercentage(e,t){let n=await this.documentsProvider.fileParser.getSpineFiles();if(e==1)return{url:n[n.length-1].url,current:1};if(e==0)return{url:n[0].url,current:0};let r=e=>t==`custom`||e.charRatio==0,i=n.find(t=>(r(t)?t.endProgress:t.charEndProgress)>=e)??n[n.length-1],a=r(i)?i.startProgress:i.charStartProgress,o=r(i)?i.ratio:i.charRatio,s=e-a,c=0;return o>0&&(c=s/o),{url:i?.url??``,current:c}}};exports.HtmlCoreNavigator=t;

package/dist/mediaTypes/html/renderer/navigator/HtmlCoreNavigator.mjs

@@ -9,7 +9,7 @@ var t = class {
 	}
 	async gotoUrl(t) {
 		let n = new e(t, 1, "ratio");
-		n.storeCurrent = !0, await this.goto(n);
+		n.storeCurrent = !0, n.from = "toc", await this.goto(n);
 	}
 	async gotoPercentage(t, n) {
 		let r = await this.recoverCurrentPercentage(t, n?.percentageSymbolType ?? "custom"), i = new e(r.url, 1, "ratio");
@@ -17,7 +17,7 @@ var t = class {
 			let e = this.documentsProvider.getDocument(i.url);
 			this.documentsProvider.getDocuments().indexOf(e) == 0 && (i.current = 1);
 		}
-		i.storeCurrent = !0, i.from = "drag", await this.goto(i);
+		i.storeCurrent = !0, i.from = n?.from ?? "drag", await this.goto(i);
 	}
 	async recoverCurrentPercentage(e, t) {
 		let n = await this.documentsProvider.fileParser.getSpineFiles();

package/dist/mediaTypes/html/renderer/navigator/HtmlNavPointNavigator.cjs

@@ -1 +1 @@
-Object.defineProperty(exports,Symbol.toStringTag,{value:`Module`});const e=require("../../../../kernal/common/url.cjs"),t=require("../../../../kernal/html/geometry.cjs");var n=class{constructor(e,t,n,r,i){this.locale=e,this.notifier=t,this.documentsProvider=n,this.htmlCoreNavigator=r,this.navPointProvider=i}async getNavPointProgress(){let e=await this.navPointProvider.getFlattingNavPoints();if(e.length>1){let t=await this.navPointProvider.getCurrentNavPoint();if(!t)return null;let n=e.findIndex(e=>e.key==t.key);return{total:e.length,current:n,type:`navpoint`}}{let e=this.documentsProvider.getFirstVisibleDocument(),t=this.documentsProvider.getDocuments(),n=t.findIndex(t=>t.url==e.url);return{total:t.length,current:n,type:`file`}}}async gotoNavPoint(e){await this.htmlCoreNavigator.gotoUrl(e.url)}async gotoNextNavPointOrFile(){let e=await this.navPointProvider.getFlattingNavPoints();if(e.length>1){let t=await this.navPointProvider.getCurrentNavPoint();if(!t)return;let n=e.findIndex(e=>e.key==t.key);if(n<0)return;if(n==e.length-1){this.notifier.info(this.locale?.getText(`navigator_alreadyislastnavPoint`,`Already at the last chapter`));return}let r=await this.getNextNavPoint(t,n,e);if(r)await this.gotoNavPoint(r);else{this.notifier.info(this.locale?.getText(`navigator_alreadyislastnavPoint`,`Already at the last chapter`));return}}else{let e=this.documentsProvider.getLastVisibleDocument();if(!e)return;let t=this.documentsProvider.getDocuments(),n=t.indexOf(e);if(n==t.length-1){this.notifier.info(this.locale?.getText(`navigator_alreadyislastnavPoint`,`Already at the last chapter`));return}await this.htmlCoreNavigator.gotoUrl(t[n+1].url)}}async getNextNavPoint(n,r,i){let a=i[r+1];if(a){let o=e.getUrlFragment(n.url),s=e.getUrlFragment(a.url),c=this.documentsProvider.getFirstVisibleDocument();if(c&&c.url==s.urlWithoutAnchor&&s.urlWithoutAnchor==o.urlWithoutAnchor){if(s.anchor){let e=c.getContentContainer().ownerDocument.getElementById(s.anchor);if(e){let n=this.documentsProvider.getRendererContainer(),o=t.checkRangeOrElementIsVisible(n,e,n.ownerDocument.defaultView);if(o&&o.visible)return await this.getNextNavPoint(a,r+1,i)}}else return await this.getNextNavPoint(a,r+1,i)}}return a}async gotoPreviousNavPointOrFile(){let e=await this.navPointProvider.getFlattingNavPoints();if(e.length>0){let t=await this.navPointProvider.getCurrentNavPoint();if(!t)return;let n=e.findIndex(e=>e.key==t.key);if(n<0)return;if(n==0){this.notifier.info(this.locale?.getText(`navigator_alreadyisfirstnavPoint`,`Already at the first chapter`));return}let r=await this.getPreviousNavPoint(t,n,e);if(r)await this.gotoNavPoint(r);else{this.notifier.info(this.locale?.getText(`navigator_alreadyisfirstnavPoint`,`Already at the first chapter`));return}}else{let e=this.documentsProvider.getLastVisibleDocument();if(!e)return;let t=this.documentsProvider.getDocuments(),n=t.indexOf(e);if(n==0){this.notifier.info(this.locale?.getText(`navigator_alreadyisfirstnavPoint`,`Already at the first chapter`));return}await this.htmlCoreNavigator.gotoUrl(t[n-1].url)}}async getPreviousNavPoint(n,r,i){let a=i[r-1];if(a){let o=e.getUrlFragment(n.url),s=e.getUrlFragment(a.url),c=this.documentsProvider.getFirstVisibleDocument();if(c&&c.url==s.urlWithoutAnchor&&s.urlWithoutAnchor==o.urlWithoutAnchor){if(s.anchor){let e=c.getContentContainer().ownerDocument.getElementById(s.anchor);if(e){let n=this.documentsProvider.getRendererContainer(),o=t.checkRangeOrElementIsVisible(n,e,n.ownerDocument.defaultView);if(o&&o.visible)return await this.getPreviousNavPoint(a,r-1,i)}}else return await this.getPreviousNavPoint(a,r-1,i)}}return a}};exports.HtmlNavPointNavigator=n;
+Object.defineProperty(exports,Symbol.toStringTag,{value:`Module`});const e=require("../../../../kernal/common/url.cjs"),t=require("../../../../kernal/html/geometry.cjs");var n=class{constructor(e,t,n,r,i){this.locale=e,this.notifier=t,this.documentsProvider=n,this.htmlCoreNavigator=r,this.navPointProvider=i}async getNavPointProgress(){let e=await this.navPointProvider.getFlattingNavPoints();if(e.length>1){let t=await this.navPointProvider.getCurrentNavPoint();if(!t)return null;let n=e.findIndex(e=>e.key==t.key);return{total:e.length,current:n,type:`navpoint`}}{let e=this.documentsProvider.getFirstVisibleDocument(),t=this.documentsProvider.getDocuments(),n=t.findIndex(t=>t.url==e.url);return{total:t.length,current:n,type:`file`}}}async gotoNavPoint(e){await this.htmlCoreNavigator.gotoUrl(e.url)}async gotoNextNavPointOrFile(){let e=await this.navPointProvider.getFlattingNavPoints();if(e.length>1){let t=await this.navPointProvider.getCurrentNavPoint();if(!t)return;let n=e.findIndex(e=>e.key==t.key);if(n<0)return;if(n==e.length-1){this.notifier.info(this.locale?.getText(`navigator_alreadyislastnavPoint`,`You have finished this chapter.`));return}let r=await this.getNextNavPoint(t,n,e);if(r)await this.gotoNavPoint(r);else{this.notifier.info(this.locale?.getText(`navigator_alreadyislastnavPoint`,`You have finished this chapter.`));return}}else{let e=this.documentsProvider.getLastVisibleDocument();if(!e)return;let t=this.documentsProvider.getDocuments(),n=t.indexOf(e);if(n==t.length-1){this.notifier.info(this.locale?.getText(`navigator_alreadyislastnavPoint`,`You have finished this chapter.`));return}await this.htmlCoreNavigator.gotoUrl(t[n+1].url)}}async getNextNavPoint(n,r,i){let a=i[r+1];if(a){let o=e.getUrlFragment(n.url),s=e.getUrlFragment(a.url),c=this.documentsProvider.getFirstVisibleDocument();if(c&&c.url==s.urlWithoutAnchor&&s.urlWithoutAnchor==o.urlWithoutAnchor){if(s.anchor){let e=c.getContentContainer().ownerDocument.getElementById(s.anchor);if(e){let n=this.documentsProvider.getRendererContainer(),o=t.checkRangeOrElementIsVisible(n,e,n.ownerDocument.defaultView);if(o&&o.visible)return await this.getNextNavPoint(a,r+1,i)}}else return await this.getNextNavPoint(a,r+1,i)}}return a}async gotoPreviousNavPointOrFile(){let e=await this.navPointProvider.getFlattingNavPoints();if(e.length>0){let t=await this.navPointProvider.getCurrentNavPoint();if(!t)return;let n=e.findIndex(e=>e.key==t.key);if(n<0)return;if(n==0){this.notifier.info(this.locale?.getText(`navigator_alreadyisfirstnavPoint`,`Already at the first chapter`));return}let r=await this.getPreviousNavPoint(t,n,e);if(r)await this.gotoNavPoint(r);else{this.notifier.info(this.locale?.getText(`navigator_alreadyisfirstnavPoint`,`Already at the first chapter`));return}}else{let e=this.documentsProvider.getLastVisibleDocument();if(!e)return;let t=this.documentsProvider.getDocuments(),n=t.indexOf(e);if(n==0){this.notifier.info(this.locale?.getText(`navigator_alreadyisfirstnavPoint`,`Already at the first chapter`));return}await this.htmlCoreNavigator.gotoUrl(t[n-1].url)}}async getPreviousNavPoint(n,r,i){let a=i[r-1];if(a){let o=e.getUrlFragment(n.url),s=e.getUrlFragment(a.url),c=this.documentsProvider.getFirstVisibleDocument();if(c&&c.url==s.urlWithoutAnchor&&s.urlWithoutAnchor==o.urlWithoutAnchor){if(s.anchor){let e=c.getContentContainer().ownerDocument.getElementById(s.anchor);if(e){let n=this.documentsProvider.getRendererContainer(),o=t.checkRangeOrElementIsVisible(n,e,n.ownerDocument.defaultView);if(o&&o.visible)return await this.getPreviousNavPoint(a,r-1,i)}}else return await this.getPreviousNavPoint(a,r-1,i)}}return a}};exports.HtmlNavPointNavigator=n;

package/dist/mediaTypes/html/renderer/navigator/HtmlNavPointNavigator.mjs

@@ -37,13 +37,13 @@ var n = class {
 			let n = e.findIndex((e) => e.key == t.key);
 			if (n < 0) return;
 			if (n == e.length - 1) {
-				this.notifier.info(this.locale?.getText("navigator_alreadyislastnavPoint", "Already at the last chapter"));
+				this.notifier.info(this.locale?.getText("navigator_alreadyislastnavPoint", "You have finished this chapter."));
 				return;
 			}
 			let r = await this.getNextNavPoint(t, n, e);
 			if (r) await this.gotoNavPoint(r);
 			else {
-				this.notifier.info(this.locale?.getText("navigator_alreadyislastnavPoint", "Already at the last chapter"));
+				this.notifier.info(this.locale?.getText("navigator_alreadyislastnavPoint", "You have finished this chapter."));
 				return;
 			}
 		} else {
@@ -51,7 +51,7 @@ var n = class {
 			if (!e) return;
 			let t = this.documentsProvider.getDocuments(), n = t.indexOf(e);
 			if (n == t.length - 1) {
-				this.notifier.info(this.locale?.getText("navigator_alreadyislastnavPoint", "Already at the last chapter"));
+				this.notifier.info(this.locale?.getText("navigator_alreadyislastnavPoint", "You have finished this chapter."));
 				return;
 			}
 			await this.htmlCoreNavigator.gotoUrl(t[n + 1].url);

package/dist/mediaTypes/html/renderer/navigator/HtmlNavPointProvider.cjs

@@ -1 +1 @@
-Object.defineProperty(exports,Symbol.toStringTag,{value:`Module`});const e=require("../../../../kernal/web/BrowserCapabilities.cjs"),t=require("../../../../kernal/common/object.cjs"),n=require("../../../../kernal/common/text.cjs"),r=require("../../../../kernal/html/finder.cjs"),i=require("../../../../kernal/html/position.cjs"),a=require("../../../../kernal/common/array.cjs");var o=class{constructor(e,n){this.documentsProvider=e,this.options=n,this.flattingNavPoints=[],this.isInitNav=!1,this.navUrlWithAnchors=new Map,this.navPointsByDocUrl=new Map,this.navPointByFullUrl=new Map,this.isInitNavUrlWithAnchors=!1,this.toDocUrlKey=e=>(e??``).toLowerCase(),this.clearNavUrlIndexes=()=>{this.isInitNavUrlWithAnchors=!1,this.navUrlWithAnchors=new Map,this.navPointsByDocUrl=new Map,this.navPointByFullUrl=new Map},this.getNavPointsForDocUrl=e=>e?this.navPointsByDocUrl.get(this.toDocUrlKey(e))??[]:[],this.getAnchorsForDocUrl=e=>{if(e)return this.navUrlWithAnchors.get(this.toDocUrlKey(e))},this.findNavPointByFullUrl=(e,t)=>this.navPointByFullUrl.get(e)||(t??this.flattingNavPoints).find(t=>t.url.indexOf(e)>=0),this.cloneNavPoint=e=>{if(e)return t.deepClone(e)},this.resolveNavPointByElements=(e,t,n,i)=>{let a=this.getNavPointsForDocUrl(e);if(a.length==0)return;if(!i&&n.length==0)return this.cloneNavPoint(a[a.length-1]);let o=this.getAnchorsForDocUrl(e);if(!o||o.length==1&&o[0]==``)return this.cloneNavPoint(this.findNavPointByFullUrl(e,a));if(n.length>0){let t=new Set(this.getElementIds(n));if(t.size>0){let n=o.find(e=>e!=``&&t.has(e));if(n)return this.cloneNavPoint(this.findNavPointByFullUrl(e+`#`+n,a))}}let s=i??n[0];if(!s)return this.cloneNavPoint(a[a.length-1]);let c=r.getElementIndex(t,s,`all`),l=new Map;for(let e=0;e<o.length;e++){let n=o[e];if(n==``||l.has(n))continue;let i=t.getElementById(n);i&&l.set(n,r.getElementIndex(t,i,`all`))}for(let t=o.length-1;t>=0;t--){let n=o[t];if(n==``)return this.cloneNavPoint(this.findNavPointByFullUrl(e,a));let r=l.get(n);if(r!==void 0&&r<=c)return this.cloneNavPoint(this.findNavPointByFullUrl(e+`#`+n,a))}return this.cloneNavPoint(a[0])},this.findGroupNavPoint=e=>{for(let t=e.length-1;t>=0;t--){let n=this.getNavPointsForDocUrl(e[t]);if(n.length>0)return n[0]}return null},this.fileParser=e.fileParser}async getFlattingNavPoints(){return await this.getInternalFlattingNavPoints()}async getInternalFlattingNavPoints(e){if(!this.isInitNav){let e=await this.fileParser.getNav();this.initialNav(e),this.isInitNav=!0}return e?this.reversedFlattingNavPoints?this.reversedFlattingNavPoints:this.flattingNavPoints&&this.flattingNavPoints.length>0?(this.reversedFlattingNavPoints=t.deepClone(this.flattingNavPoints).reverse(),this.reversedFlattingNavPoints):(this.reversedFlattingNavPoints=[],this.reversedFlattingNavPoints):this.flattingNavPoints}initialNav(e){this.flattingNavPoints=[],this.reversedFlattingNavPoints=void 0,this.clearNavUrlIndexes(),a.containValues(e?.navPoints)&&this.initialNavPoints(e.navPoints)}initialNavPoints(e){e.length!=0&&e.forEach(e=>{(!n.isNullOrWhiteSpace(e.url)||e.startPageNumber>0)&&this.flattingNavPoints.push(e),a.containValues(e.children)&&this.initialNavPoints(e.children)})}async findPreviousDocNavPoint(e){let t=await this.fileParser.getTextDocuments(),n=t.findIndex(t=>this.toDocUrlKey(t.url)==this.toDocUrlKey(e));if(!(n<0))for(let e=n;e>=0;e--){let n=this.getNavPointsForDocUrl(t[e].url);if(n.length>0)return this.cloneNavPoint(n[n.length-1])}}async getCurrentNavPoint(){if((await this.getFlattingNavPoints()).length==0)return;await this.initNavUrlWithAnchors(),await e.BrowserCapabilities.yieldToMain();let t=this.documentsProvider.getFirstVisibleDocument();if(!t)return;let n=t.url??``,r=this.getNavPointsForDocUrl(n);if(r.length>0){let e=t.getVisibleElements();if(e.length==0)return this.cloneNavPoint(r[r.length-1]);let i=this.getAnchorsForDocUrl(n);if(!i||i.length==1&&i[0]==``)return this.cloneNavPoint(this.findNavPointByFullUrl(n,r));let a=t.getVisibleElements(!0),o=a.length>0?a[0]:e[e.length-1],s=t.getContentContainer()?.ownerDocument;return s?this.resolveNavPointByElements(n,s,a,o):void 0}let i=this.documentsProvider.getDocuments();try{let n=i.indexOf(t),r=[],a=[];for(let e=0;e<=n;e++)a.push(i[e].url),e>0&&e%25==24&&(r.push(a),a=[]);a.length>0&&r.push(a),r.reverse();for(let t=0;t<r.length;t++){let n=r[t],i=this.findGroupNavPoint(n);if(await e.BrowserCapabilities.yieldToMain(),i)return this.cloneNavPoint(i)}return}catch{return}}async getNavPoint(e,t,n){if((await this.getFlattingNavPoints()).length==0)return;await this.initNavUrlWithAnchors();let r,a,o=e;if(typeof t==`number`){let o=await this.fileParser.getTextDocument(e);if(!o||(r=await o.getFormattedDocument(),!r))return;a=i.getElementByProgress(r,t,n,{removeHtmlWhitespace:this.options.removeHtmlWhitespace,whitespaceRegex:this.options.whitespaceRegex,nonWhiteSpaceSymbolTagNames:this.options.nonWhiteSpaceSymbolTagNames}).element}else r=t.ownerDocument,a=t;let s=this.getNavPointsForDocUrl(o);return s.length>0?a?this.resolveNavPointByElements(o,r,[a],a):this.cloneNavPoint(s[s.length-1]):await this.findPreviousDocNavPoint(o)}async initNavUrlWithAnchors(){if(this.isInitNavUrlWithAnchors)return;let e=await this.getFlattingNavPoints();this.navUrlWithAnchors=new Map,this.navPointsByDocUrl=new Map,this.navPointByFullUrl=new Map,e.forEach(e=>{let t=e.url;if(n.isNullOrWhiteSpace(t))return;this.navPointByFullUrl.set(t,e);let r=t.lastIndexOf(`#`),i=r>0?t.substring(0,r):t,a=r>0?t.substring(r+1):``,o=this.toDocUrlKey(i);this.navUrlWithAnchors.has(o)?this.navUrlWithAnchors.get(o).push(a):this.navUrlWithAnchors.set(o,[a]),this.navPointsByDocUrl.has(o)?this.navPointsByDocUrl.get(o).push(e):this.navPointsByDocUrl.set(o,[e])}),this.isInitNavUrlWithAnchors=!0}getElementIds(e){let t=[];for(let r=0;r<e.length;r++){let i=e[r];n.isNullOrWhiteSpace(i.id)||t.push(i.id),i.parentElement&&i.parentElement.children.length==1&&!n.isNullOrWhiteSpace(i.parentElement.id)&&t.push(i.parentElement.id),this.getChildrenIds(i.children,t)}return t}getChildrenIds(e,t){for(let r=0;r<e.length;r++){let i=e[r];n.isNullOrWhiteSpace(i.id)||t.push(i.id),i.children.length>0&&this.getChildrenIds(i.children,t)}}async dispose(){this.docUrls&&this.docUrls.splice(0),this.flattingNavPoints&&this.flattingNavPoints.splice(0),this.reversedFlattingNavPoints&&this.reversedFlattingNavPoints.splice(0),this.clearNavUrlIndexes()}};exports.HtmlNavPointProvider=o;
+Object.defineProperty(exports,Symbol.toStringTag,{value:`Module`});const e=require("../../../../kernal/common/object.cjs"),t=require("../../../../kernal/common/text.cjs"),n=require("../../../../kernal/html/finder.cjs"),r=require("../../../../kernal/web/scheduler.cjs"),i=require("../../../../kernal/common/array.cjs"),a=require("../../fileParser/IHtmlFileParser.cjs");var o=class{constructor(t,r){this.documentsProvider=t,this.options=r,this.flattingNavPoints=[],this.isInitNav=!1,this.navUrlWithAnchors=new Map,this.navPointsByDocUrl=new Map,this.navPointByFullUrl=new Map,this.isInitNavUrlWithAnchors=!1,this.toDocUrlKey=e=>(e??``).toLowerCase(),this.clearNavUrlIndexes=()=>{this.isInitNavUrlWithAnchors=!1,this.navUrlWithAnchors=new Map,this.navPointsByDocUrl=new Map,this.navPointByFullUrl=new Map},this.getNavPointsForDocUrl=e=>e?this.navPointsByDocUrl.get(this.toDocUrlKey(e))??[]:[],this.getAnchorsForDocUrl=e=>{if(e)return this.navUrlWithAnchors.get(this.toDocUrlKey(e))},this.findNavPointByFullUrl=(e,t)=>this.navPointByFullUrl.get(e)||(t??this.flattingNavPoints).find(t=>t.url.indexOf(e)>=0),this.cloneNavPoint=t=>{if(t)return e.deepClone(t)},this.resolveNavPointByElements=(e,t,r,i)=>{let a=this.getNavPointsForDocUrl(e);if(a.length==0)return;if(!i&&r.length==0)return this.cloneNavPoint(a[a.length-1]);let o=this.getAnchorsForDocUrl(e);if(!o||o.length==1&&o[0]==``)return this.cloneNavPoint(this.findNavPointByFullUrl(e,a));if(r.length>0){let t=new Set(this.getElementIds(r));if(t.size>0){let n=o.find(e=>e!=``&&t.has(e));if(n)return this.cloneNavPoint(this.findNavPointByFullUrl(e+`#`+n,a))}}let s=i??r[0];if(!s)return this.cloneNavPoint(a[a.length-1]);let c=n.getElementIndex(t,s,`all`),l=new Map;for(let e=0;e<o.length;e++){let r=o[e];if(r==``||l.has(r))continue;let i=t.getElementById(r);i&&l.set(r,n.getElementIndex(t,i,`all`))}for(let t=o.length-1;t>=0;t--){let n=o[t];if(n==``)return this.cloneNavPoint(this.findNavPointByFullUrl(e,a));let r=l.get(n);if(r!==void 0&&r<=c)return this.cloneNavPoint(this.findNavPointByFullUrl(e+`#`+n,a))}return this.cloneNavPoint(a[0])},this.findGroupNavPoint=e=>{for(let t=e.length-1;t>=0;t--){let n=this.getNavPointsForDocUrl(e[t]);if(n.length>0)return n[0]}return null},this.fileParser=t.fileParser}async getFlattingNavPoints(){return await this.getInternalFlattingNavPoints()}async getInternalFlattingNavPoints(t){if(!this.isInitNav){let e=await this.fileParser.getNav();this.initialNav(e),this.isInitNav=!0}return t?this.reversedFlattingNavPoints?this.reversedFlattingNavPoints:this.flattingNavPoints&&this.flattingNavPoints.length>0?(this.reversedFlattingNavPoints=e.deepClone(this.flattingNavPoints).reverse(),this.reversedFlattingNavPoints):(this.reversedFlattingNavPoints=[],this.reversedFlattingNavPoints):this.flattingNavPoints}initialNav(e){this.flattingNavPoints=[],this.reversedFlattingNavPoints=void 0,this.clearNavUrlIndexes(),i.containValues(e?.navPoints)&&this.initialNavPoints(e.navPoints)}initialNavPoints(e){e.length!=0&&e.forEach(e=>{(!t.isNullOrWhiteSpace(e.url)||e.startPageNumber>0)&&this.flattingNavPoints.push(e),i.containValues(e.children)&&this.initialNavPoints(e.children)})}async findPreviousDocNavPoint(e){let t=await this.fileParser.getTextDocuments(),n=t.findIndex(t=>this.toDocUrlKey(t.url)==this.toDocUrlKey(e));if(!(n<0))for(let e=n;e>=0;e--){let n=this.getNavPointsForDocUrl(t[e].url);if(n.length>0)return this.cloneNavPoint(n[n.length-1])}}async getCurrentNavPoint(){if((await this.getFlattingNavPoints()).length==0)return;await this.initNavUrlWithAnchors(),await r.yieldToMain();let e=this.documentsProvider.getFirstVisibleDocument();if(!e)return;let t=e.url??``,n=this.getNavPointsForDocUrl(t);if(n.length>0){let r=e.getVisibleElements();if(r.length==0)return this.cloneNavPoint(n[n.length-1]);let i=this.getAnchorsForDocUrl(t);if(!i||i.length==1&&i[0]==``)return this.cloneNavPoint(this.findNavPointByFullUrl(t,n));let a=e.getVisibleElements(!0),o=a.length>0?a[0]:r[r.length-1],s=e.getContentContainer()?.ownerDocument;return s?this.resolveNavPointByElements(t,s,a,o):void 0}let i=this.documentsProvider.getDocuments();try{let t=i.indexOf(e),n=[],a=[];for(let e=0;e<=t;e++)a.push(i[e].url),e>0&&e%25==24&&(n.push(a),a=[]);a.length>0&&n.push(a),n.reverse();for(let e=0;e<n.length;e++){let t=n[e],i=this.findGroupNavPoint(t);if(await r.yieldToMain(),i)return this.cloneNavPoint(i)}return}catch{return}}async getNavPoint(e,t,n){if((await this.getFlattingNavPoints()).length==0)return;await this.initNavUrlWithAnchors();let r,i,o=e;if(typeof t==`number`){let o=await this.fileParser.getTextDocument(e);if(!o||(r=await o.getFormattedDocument(),!r))return;i=a.asHtmlFileParser(this.fileParser).symbolMeasure.getElementByProgress(r,t,n).element}else r=t.ownerDocument,i=t;let s=this.getNavPointsForDocUrl(o);return s.length>0?i?this.resolveNavPointByElements(o,r,[i],i):this.cloneNavPoint(s[s.length-1]):await this.findPreviousDocNavPoint(o)}async initNavUrlWithAnchors(){if(this.isInitNavUrlWithAnchors)return;let e=await this.getFlattingNavPoints();this.navUrlWithAnchors=new Map,this.navPointsByDocUrl=new Map,this.navPointByFullUrl=new Map,e.forEach(e=>{let n=e.url;if(t.isNullOrWhiteSpace(n))return;this.navPointByFullUrl.set(n,e);let r=n.lastIndexOf(`#`),i=r>0?n.substring(0,r):n,a=r>0?n.substring(r+1):``,o=this.toDocUrlKey(i);this.navUrlWithAnchors.has(o)?this.navUrlWithAnchors.get(o).push(a):this.navUrlWithAnchors.set(o,[a]),this.navPointsByDocUrl.has(o)?this.navPointsByDocUrl.get(o).push(e):this.navPointsByDocUrl.set(o,[e])}),this.isInitNavUrlWithAnchors=!0}getElementIds(e){let n=[];for(let r=0;r<e.length;r++){let i=e[r];t.isNullOrWhiteSpace(i.id)||n.push(i.id),i.parentElement&&i.parentElement.children.length==1&&!t.isNullOrWhiteSpace(i.parentElement.id)&&n.push(i.parentElement.id),this.getChildrenIds(i.children,n)}return n}getChildrenIds(e,n){for(let r=0;r<e.length;r++){let i=e[r];t.isNullOrWhiteSpace(i.id)||n.push(i.id),i.children.length>0&&this.getChildrenIds(i.children,n)}}async dispose(){this.docUrls&&this.docUrls.splice(0),this.flattingNavPoints&&this.flattingNavPoints.splice(0),this.reversedFlattingNavPoints&&this.reversedFlattingNavPoints.splice(0),this.clearNavUrlIndexes()}};exports.HtmlNavPointProvider=o;

package/dist/mediaTypes/html/renderer/navigator/HtmlNavPointProvider.mjs

@@ -1,39 +1,39 @@
-import { BrowserCapabilities as e } from "../../../../kernal/web/BrowserCapabilities.mjs";
-import { deepClone as t } from "../../../../kernal/common/object.mjs";
-import { isNullOrWhiteSpace as n } from "../../../../kernal/common/text.mjs";
-import { getElementIndex as r } from "../../../../kernal/html/finder.mjs";
-import { getElementByProgress as i } from "../../../../kernal/html/position.mjs";
-import { containValues as a } from "../../../../kernal/common/array.mjs";
+import { deepClone as e } from "../../../../kernal/common/object.mjs";
+import { isNullOrWhiteSpace as t } from "../../../../kernal/common/text.mjs";
+import { getElementIndex as n } from "../../../../kernal/html/finder.mjs";
+import { yieldToMain as r } from "../../../../kernal/web/scheduler.mjs";
+import { containValues as i } from "../../../../kernal/common/array.mjs";
+import { asHtmlFileParser as a } from "../../fileParser/IHtmlFileParser.mjs";
 //#region mediaTypes/html/renderer/navigator/HtmlNavPointProvider.ts
 var o = class {
-	constructor(e, n) {
-		this.documentsProvider = e, this.options = n, this.flattingNavPoints = [], this.isInitNav = !1, this.navUrlWithAnchors = /* @__PURE__ */ new Map(), this.navPointsByDocUrl = /* @__PURE__ */ new Map(), this.navPointByFullUrl = /* @__PURE__ */ new Map(), this.isInitNavUrlWithAnchors = !1, this.toDocUrlKey = (e) => (e ?? "").toLowerCase(), this.clearNavUrlIndexes = () => {
+	constructor(t, r) {
+		this.documentsProvider = t, this.options = r, this.flattingNavPoints = [], this.isInitNav = !1, this.navUrlWithAnchors = /* @__PURE__ */ new Map(), this.navPointsByDocUrl = /* @__PURE__ */ new Map(), this.navPointByFullUrl = /* @__PURE__ */ new Map(), this.isInitNavUrlWithAnchors = !1, this.toDocUrlKey = (e) => (e ?? "").toLowerCase(), this.clearNavUrlIndexes = () => {
 			this.isInitNavUrlWithAnchors = !1, this.navUrlWithAnchors = /* @__PURE__ */ new Map(), this.navPointsByDocUrl = /* @__PURE__ */ new Map(), this.navPointByFullUrl = /* @__PURE__ */ new Map();
 		}, this.getNavPointsForDocUrl = (e) => e ? this.navPointsByDocUrl.get(this.toDocUrlKey(e)) ?? [] : [], this.getAnchorsForDocUrl = (e) => {
 			if (e) return this.navUrlWithAnchors.get(this.toDocUrlKey(e));
-		}, this.findNavPointByFullUrl = (e, t) => this.navPointByFullUrl.get(e) || (t ?? this.flattingNavPoints).find((t) => t.url.indexOf(e) >= 0), this.cloneNavPoint = (e) => {
-			if (e) return t(e);
-		}, this.resolveNavPointByElements = (e, t, n, i) => {
+		}, this.findNavPointByFullUrl = (e, t) => this.navPointByFullUrl.get(e) || (t ?? this.flattingNavPoints).find((t) => t.url.indexOf(e) >= 0), this.cloneNavPoint = (t) => {
+			if (t) return e(t);
+		}, this.resolveNavPointByElements = (e, t, r, i) => {
 			let a = this.getNavPointsForDocUrl(e);
 			if (a.length == 0) return;
-			if (!i && n.length == 0) return this.cloneNavPoint(a[a.length - 1]);
+			if (!i && r.length == 0) return this.cloneNavPoint(a[a.length - 1]);
 			let o = this.getAnchorsForDocUrl(e);
 			if (!o || o.length == 1 && o[0] == "") return this.cloneNavPoint(this.findNavPointByFullUrl(e, a));
-			if (n.length > 0) {
-				let t = new Set(this.getElementIds(n));
+			if (r.length > 0) {
+				let t = new Set(this.getElementIds(r));
 				if (t.size > 0) {
 					let n = o.find((e) => e != "" && t.has(e));
 					if (n) return this.cloneNavPoint(this.findNavPointByFullUrl(e + "#" + n, a));
 				}
 			}
-			let s = i ?? n[0];
+			let s = i ?? r[0];
 			if (!s) return this.cloneNavPoint(a[a.length - 1]);
-			let c = r(t, s, "all"), l = /* @__PURE__ */ new Map();
+			let c = n(t, s, "all"), l = /* @__PURE__ */ new Map();
 			for (let e = 0; e < o.length; e++) {
-				let n = o[e];
-				if (n == "" || l.has(n)) continue;
-				let i = t.getElementById(n);
-				i && l.set(n, r(t, i, "all"));
+				let r = o[e];
+				if (r == "" || l.has(r)) continue;
+				let i = t.getElementById(r);
+				i && l.set(r, n(t, i, "all"));
 			}
 			for (let t = o.length - 1; t >= 0; t--) {
 				let n = o[t];
@@ -48,24 +48,24 @@ var o = class {
 				if (n.length > 0) return n[0];
 			}
 			return null;
-		}, this.fileParser = e.fileParser;
+		}, this.fileParser = t.fileParser;
 	}
 	async getFlattingNavPoints() {
 		return await this.getInternalFlattingNavPoints();
 	}
-	async getInternalFlattingNavPoints(e) {
+	async getInternalFlattingNavPoints(t) {
 		if (!this.isInitNav) {
 			let e = await this.fileParser.getNav();
 			this.initialNav(e), this.isInitNav = !0;
 		}
-		return e ? this.reversedFlattingNavPoints ? this.reversedFlattingNavPoints : this.flattingNavPoints && this.flattingNavPoints.length > 0 ? (this.reversedFlattingNavPoints = t(this.flattingNavPoints).reverse(), this.reversedFlattingNavPoints) : (this.reversedFlattingNavPoints = [], this.reversedFlattingNavPoints) : this.flattingNavPoints;
+		return t ? this.reversedFlattingNavPoints ? this.reversedFlattingNavPoints : this.flattingNavPoints && this.flattingNavPoints.length > 0 ? (this.reversedFlattingNavPoints = e(this.flattingNavPoints).reverse(), this.reversedFlattingNavPoints) : (this.reversedFlattingNavPoints = [], this.reversedFlattingNavPoints) : this.flattingNavPoints;
 	}
 	initialNav(e) {
-		this.flattingNavPoints = [], this.reversedFlattingNavPoints = void 0, this.clearNavUrlIndexes(), a(e?.navPoints) && this.initialNavPoints(e.navPoints);
+		this.flattingNavPoints = [], this.reversedFlattingNavPoints = void 0, this.clearNavUrlIndexes(), i(e?.navPoints) && this.initialNavPoints(e.navPoints);
 	}
 	initialNavPoints(e) {
 		e.length != 0 && e.forEach((e) => {
-			(!n(e.url) || e.startPageNumber > 0) && this.flattingNavPoints.push(e), a(e.children) && this.initialNavPoints(e.children);
+			(!t(e.url) || e.startPageNumber > 0) && this.flattingNavPoints.push(e), i(e.children) && this.initialNavPoints(e.children);
 		});
 	}
 	async findPreviousDocNavPoint(e) {
@@ -77,26 +77,26 @@ var o = class {
 	}
 	async getCurrentNavPoint() {
 		if ((await this.getFlattingNavPoints()).length == 0) return;
-		await this.initNavUrlWithAnchors(), await e.yieldToMain();
-		let t = this.documentsProvider.getFirstVisibleDocument();
-		if (!t) return;
-		let n = t.url ?? "", r = this.getNavPointsForDocUrl(n);
-		if (r.length > 0) {
-			let e = t.getVisibleElements();
-			if (e.length == 0) return this.cloneNavPoint(r[r.length - 1]);
-			let i = this.getAnchorsForDocUrl(n);
-			if (!i || i.length == 1 && i[0] == "") return this.cloneNavPoint(this.findNavPointByFullUrl(n, r));
-			let a = t.getVisibleElements(!0), o = a.length > 0 ? a[0] : e[e.length - 1], s = t.getContentContainer()?.ownerDocument;
-			return s ? this.resolveNavPointByElements(n, s, a, o) : void 0;
+		await this.initNavUrlWithAnchors(), await r();
+		let e = this.documentsProvider.getFirstVisibleDocument();
+		if (!e) return;
+		let t = e.url ?? "", n = this.getNavPointsForDocUrl(t);
+		if (n.length > 0) {
+			let r = e.getVisibleElements();
+			if (r.length == 0) return this.cloneNavPoint(n[n.length - 1]);
+			let i = this.getAnchorsForDocUrl(t);
+			if (!i || i.length == 1 && i[0] == "") return this.cloneNavPoint(this.findNavPointByFullUrl(t, n));
+			let a = e.getVisibleElements(!0), o = a.length > 0 ? a[0] : r[r.length - 1], s = e.getContentContainer()?.ownerDocument;
+			return s ? this.resolveNavPointByElements(t, s, a, o) : void 0;
 		}
 		let i = this.documentsProvider.getDocuments();
 		try {
-			let n = i.indexOf(t), r = [], a = [];
-			for (let e = 0; e <= n; e++) a.push(i[e].url), e > 0 && e % 25 == 24 && (r.push(a), a = []);
-			a.length > 0 && r.push(a), r.reverse();
-			for (let t = 0; t < r.length; t++) {
-				let n = r[t], i = this.findGroupNavPoint(n);
-				if (await e.yieldToMain(), i) return this.cloneNavPoint(i);
+			let t = i.indexOf(e), n = [], a = [];
+			for (let e = 0; e <= t; e++) a.push(i[e].url), e > 0 && e % 25 == 24 && (n.push(a), a = []);
+			a.length > 0 && n.push(a), n.reverse();
+			for (let e = 0; e < n.length; e++) {
+				let t = n[e], i = this.findGroupNavPoint(t);
+				if (await r(), i) return this.cloneNavPoint(i);
 			}
 			return;
 		} catch {
@@ -106,42 +106,38 @@ var o = class {
 	async getNavPoint(e, t, n) {
 		if ((await this.getFlattingNavPoints()).length == 0) return;
 		await this.initNavUrlWithAnchors();
-		let r, a, o = e;
+		let r, i, o = e;
 		if (typeof t == "number") {
 			let o = await this.fileParser.getTextDocument(e);
 			if (!o || (r = await o.getFormattedDocument(), !r)) return;
-			a = i(r, t, n, {
-				removeHtmlWhitespace: this.options.removeHtmlWhitespace,
-				whitespaceRegex: this.options.whitespaceRegex,
-				nonWhiteSpaceSymbolTagNames: this.options.nonWhiteSpaceSymbolTagNames
-			}).element;
-		} else r = t.ownerDocument, a = t;
+			i = a(this.fileParser).symbolMeasure.getElementByProgress(r, t, n).element;
+		} else r = t.ownerDocument, i = t;
 		let s = this.getNavPointsForDocUrl(o);
-		return s.length > 0 ? a ? this.resolveNavPointByElements(o, r, [a], a) : this.cloneNavPoint(s[s.length - 1]) : await this.findPreviousDocNavPoint(o);
+		return s.length > 0 ? i ? this.resolveNavPointByElements(o, r, [i], i) : this.cloneNavPoint(s[s.length - 1]) : await this.findPreviousDocNavPoint(o);
 	}
 	async initNavUrlWithAnchors() {
 		if (this.isInitNavUrlWithAnchors) return;
 		let e = await this.getFlattingNavPoints();
 		this.navUrlWithAnchors = /* @__PURE__ */ new Map(), this.navPointsByDocUrl = /* @__PURE__ */ new Map(), this.navPointByFullUrl = /* @__PURE__ */ new Map(), e.forEach((e) => {
-			let t = e.url;
-			if (n(t)) return;
-			this.navPointByFullUrl.set(t, e);
-			let r = t.lastIndexOf("#"), i = r > 0 ? t.substring(0, r) : t, a = r > 0 ? t.substring(r + 1) : "", o = this.toDocUrlKey(i);
+			let n = e.url;
+			if (t(n)) return;
+			this.navPointByFullUrl.set(n, e);
+			let r = n.lastIndexOf("#"), i = r > 0 ? n.substring(0, r) : n, a = r > 0 ? n.substring(r + 1) : "", o = this.toDocUrlKey(i);
 			this.navUrlWithAnchors.has(o) ? this.navUrlWithAnchors.get(o).push(a) : this.navUrlWithAnchors.set(o, [a]), this.navPointsByDocUrl.has(o) ? this.navPointsByDocUrl.get(o).push(e) : this.navPointsByDocUrl.set(o, [e]);
 		}), this.isInitNavUrlWithAnchors = !0;
 	}
 	getElementIds(e) {
-		let t = [];
+		let n = [];
 		for (let r = 0; r < e.length; r++) {
 			let i = e[r];
-			n(i.id) || t.push(i.id), i.parentElement && i.parentElement.children.length == 1 && !n(i.parentElement.id) && t.push(i.parentElement.id), this.getChildrenIds(i.children, t);
+			t(i.id) || n.push(i.id), i.parentElement && i.parentElement.children.length == 1 && !t(i.parentElement.id) && n.push(i.parentElement.id), this.getChildrenIds(i.children, n);
 		}
-		return t;
+		return n;
 	}
-	getChildrenIds(e, t) {
+	getChildrenIds(e, n) {
 		for (let r = 0; r < e.length; r++) {
 			let i = e[r];
-			n(i.id) || t.push(i.id), i.children.length > 0 && this.getChildrenIds(i.children, t);
+			t(i.id) || n.push(i.id), i.children.length > 0 && this.getChildrenIds(i.children, n);
 		}
 	}
 	async dispose() {

package/dist/mediaTypes/html/renderer/navigator/HtmlPagingNavigator.cjs

@@ -1 +1 @@
-Object.defineProperty(exports,Symbol.toStringTag,{value:`Module`});const e=require("../../../../kernal/EventNames.cjs"),t=require("../../../../kernal/progress/Progress.cjs"),n=require("../../../../kernal/navigator/IPagingNavigator.cjs");var r=class{constructor(t,r,i){this.documentsProvider=t,this.htmlCoreNavigator=r,this.options=i,this.notify=async(t,r,i)=>{let a=new n.PageChangeOptions;if(a.doc=t,a.pageNumber=r,a.extra=i,this.state){let n=this.documentsProvider.getDocuments(),i=n.indexOf(this.state.doc),o=n.indexOf(t);a.direction=i==o?r>this.state.pageNumber?`next`:`previous`:o>i?`next`:`previous`,this.owner.events.emit(e.EventNames.PageChange,a),this.state={doc:t,pageNumber:r}}else this.state={doc:t,pageNumber:r},a.direction=`next`,this.owner.events.emit(e.EventNames.PageChange,a)},this.owner=t.owner,this.locale=this.owner.locale,this.logger=this.owner.loggerFactory.getLogger(this.constructor.name)}async dispose(){this.state=null}async gotoPage(e,t,n){return await this.internalGotoPage(e,t,null,n)}async internalGotoPage(e,n,r,i){if(this.options.flipMode==`scroll`)return this.logger.warn(this.locale?.getText(`unsupportTurnPageWhenScrolling`,`Page turning is not supported in scroll mode`)),!1;await e.load();let a=await e.getNumberOfPages(),o=new t.FileLocation(e.url,a,`page`);if(o.current=n,o.direction=r,n<=0){let n=this.documentsProvider.getDocuments(),r=n.indexOf(e);if(r==0)return this.owner.notifier.info(this.locale.getText(`navigotor_alreadyisfirstpage`,`Already at the first page`)),!1;let a=n[r-1];await a.load();let s=await a.getNumberOfPages();return o=new t.FileLocation(a.url,s,`page`),o.current=s,o.direction=`previous`,await this.htmlCoreNavigator.goto(o),await this.notify(a,s,i),!0}if(n>a){let n=this.documentsProvider.getDocuments(),r=n.indexOf(e);if(r==n.length-1)return this.owner.notifier.info(this.locale.getText(`navigotor_alreadyislastpage`,`Already at the last page`)),!1;let a=n[r+1];await a.load();let s=await a.getNumberOfPages();return o=new t.FileLocation(a.url,s,`page`),o.current=1,o.direction=`next`,await this.htmlCoreNavigator.goto(o),await this.notify(a,1,i),!0}return await this.htmlCoreNavigator.goto(o),await this.notify(e,n,i),!0}async gotoNextPage(e){if(this.options.flipMode==`scroll`)return!1;let t=this.documentsProvider.getFirstVisibleDocument();if(!t){let e=this.documentsProvider.getDocuments();t=e[e.length-1]}await t.load();let n=this.documentsProvider.getCurrentPageNumber(t);this.state={doc:t,pageNumber:n};let r=n+1;return await this.internalGotoPage(t,r,`next`,e)}async gotoPreviousPage(e){if(this.options.flipMode==`scroll`)return!1;let t=this.documentsProvider.getLastVisibleDocument();t||=this.documentsProvider.getDocuments()[0],await t.load();let n=this.documentsProvider.getCurrentPageNumber(t);this.state={doc:t,pageNumber:n};let r=n-1;return await this.internalGotoPage(t,r,`previous`,e)}};exports.HtmlPagingNavigator=r;
+Object.defineProperty(exports,Symbol.toStringTag,{value:`Module`});const e=require("../../../../kernal/EventNames.cjs"),t=require("../../../../kernal/progress/Progress.cjs"),n=require("../../../../kernal/progress/userChangedProgress.cjs"),r=require("../../../../kernal/navigator/IPagingNavigator.cjs"),i=require("../layout/resolveLayoutRoute.cjs");var a=class{constructor(t,n,i){this.documentsProvider=t,this.htmlCoreNavigator=n,this.options=i,this.resolveCurrentDocument=e=>{let t=this.owner.context.currentLocation?.url,n=t?this.documentsProvider.getDocument(t):null;return n?.getLoadStatus()===`success`?n:e===`next`?this.documentsProvider.getFirstVisibleDocument():this.documentsProvider.getLastVisibleDocument()},this.notify=async(t,n,i)=>{let a=new r.PageChangeOptions;if(a.doc=t,a.pageNumber=n,a.extra=i,this.state){let r=this.documentsProvider.getDocuments(),i=r.indexOf(this.state.doc),o=r.indexOf(t);a.direction=i==o?n>this.state.pageNumber?`next`:`previous`:o>i?`next`:`previous`,this.owner.events.emit(e.EventNames.PageChange,a),this.state={doc:t,pageNumber:n}}else this.state={doc:t,pageNumber:n},a.direction=`next`,this.owner.events.emit(e.EventNames.PageChange,a)},this.owner=t.owner,this.locale=this.owner.locale,this.logger=this.owner.loggerFactory.getLogger(this.constructor.name)}async dispose(){this.state=null}async gotoPage(e,t,n){return await this.internalGotoPage(e,t,null,n)}async internalGotoPage(e,r,a,o){if(i.getLayoutGeometry(this.options).flipMode==`scroll`)return this.logger.warn(this.locale?.getText(`unsupportTurnPageWhenScrolling`,`Page turning is not supported in scroll mode`)),!1;await e.load();let s=await e.getNumberOfPages(),c=new t.FileLocation(e.url,s,`page`);if(c.current=r,c.direction=a,n.applyPagingLocationFrom(c,o),r<=0){let r=this.documentsProvider.getDocuments(),i=r.indexOf(e);if(i==0)return this.owner.notifier.info(this.locale.getText(`navigotor_alreadyisfirstpage`,`Already at the first page`)),!1;let a=r[i-1];await a.load();let s=await a.getNumberOfPages();return c=new t.FileLocation(a.url,s,`page`),c.current=s,c.direction=`previous`,n.applyPagingLocationFrom(c,o),await this.htmlCoreNavigator.goto(c),await this.notify(a,s,o),!0}if(r>s){let r=this.documentsProvider.getDocuments(),i=r.indexOf(e);if(i==r.length-1)return this.owner.notifier.info(this.locale.getText(`navigotor_alreadyislastpage`,`You have reached the end of the book.`)),!1;let a=r[i+1];await a.load();let s=await a.getNumberOfPages();return c=new t.FileLocation(a.url,s,`page`),c.current=1,c.direction=`next`,n.applyPagingLocationFrom(c,o),await this.htmlCoreNavigator.goto(c),await this.notify(a,1,o),!0}return await this.htmlCoreNavigator.goto(c),await this.notify(e,r,o),!0}async gotoNextPage(e){if(i.getLayoutGeometry(this.options).flipMode==`scroll`)return!1;let t=this.resolveCurrentDocument(`next`);if(!t){let e=this.documentsProvider.getDocuments();t=e[e.length-1]}await t.load();let{current:n}=await this.documentsProvider.syncPageState(t);return this.state={doc:t,pageNumber:n},await this.internalGotoPage(t,n+1,`next`,e)}async gotoPreviousPage(e){if(i.getLayoutGeometry(this.options).flipMode==`scroll`)return!1;let t=this.resolveCurrentDocument(`previous`);t||=this.documentsProvider.getDocuments()[0],await t.load();let{current:n}=await this.documentsProvider.syncPageState(t);return this.state={doc:t,pageNumber:n},await this.internalGotoPage(t,n-1,`previous`,e)}};exports.HtmlPagingNavigator=a;

package/dist/mediaTypes/html/renderer/navigator/HtmlPagingNavigator.d.ts

@@ -17,5 +17,6 @@ export declare class HtmlPagingNavigator implements IPagingNavigator {
     private internalGotoPage;
     gotoNextPage(extra?: PagingExtra): Promise<boolean>;
     gotoPreviousPage(extra?: PagingExtra): Promise<boolean>;
+    private resolveCurrentDocument;
     private notify;
 }