@silurus/ooxml 0.85.0 → 0.85.2

package/dist/{docx-qK0Qmyey.js → docx-BY7oyoml.js}

@@ -1,12 +1,12 @@
 import { t as e } from "./chunk-DmhlhrBa.js";
-import { B as t, R as n, W as r, Xt as i, a, et as o, on as s, pt as c, sn as l, ut as u, vt as d, z as f } from "./line-metrics-u87yCAfV.js";
-import { C as p, D as m, E as h, S as g, T as _, _ as v, a as y, b, c as x, d as ee, f as te, g as ne, h as re, i as S, l as C, m as ie, n as ae, o as oe, p as se, r as ce, s as le, t as ue, u as de, v as fe, w as pe, x as me, y as he } from "./canvas-viewer-mechanics-C-yTGbFC.js";
+import { B as t, R as n, W as r, Zt as i, a, cn as o, et as s, pt as c, sn as l, ut as u, vt as d, z as f } from "./line-metrics-BGtFM-ec.js";
+import { C as p, D as m, E as h, S as g, T as _, _ as v, a as y, b, c as x, d as ee, f as te, g as ne, h as re, i as S, l as C, m as ie, n as ae, o as oe, p as se, r as ce, s as le, t as ue, u as de, v as fe, w as pe, x as me, y as he } from "./canvas-viewer-mechanics-CDNMJ-Yz.js";
 import { a as ge, i as _e, t as ve } from "./bounded-raw-part-cache-C6ro6Ezf.js";
-import { c as ye, i as be, l as xe, n as Se, o as w, r as Ce, s as we, t as Te } from "./dom-interaction-boundary-CMDDgICk.js";
-import { A as Ee, C as T, D as E, E as De, O as D, S as Oe, T as O, _ as ke, a as Ae, b as je, c as Me, d as Ne, f as Pe, g as Fe, h as Ie, j as Le, k as Re, l as ze, m as Be, n as k, o as Ve, p as He, s as Ue, t as A, v as We, w as Ge, x as Ke, y as qe } from "./document-pull-client-BdYrjAep.js";
+import { c as ye, i as be, l as xe, n as Se, o as w, r as Ce, s as we, t as Te } from "./dom-interaction-boundary-CDGegIB5.js";
+import { A as Ee, C as T, D as E, E as De, O as D, S as Oe, T as O, _ as ke, a as Ae, b as je, c as Me, d as Ne, f as Pe, g as Fe, h as Ie, j as Le, k as Re, l as ze, m as Be, n as k, o as Ve, p as He, s as Ue, t as A, v as We, w as Ge, x as Ke, y as qe } from "./document-pull-client-BssAk95w.js";
 import { l as Je, s as Ye } from "./pixel-budget-Dgjw269h.js";
 import { a as j } from "./units-EJdC96r6.js";
-import { i as Xe, s as Ze } from "./raster-target-whZhvVMt.js";
+import { i as Xe, s as Ze } from "./raster-target-ojDdQizC.js";
 import { n as Qe } from "./renderer-module-contract-Cu-GKuPd.js";
 import { n as $e, t as M } from "./highlight-rect-DBcYVJDv.js";
 import { o as N } from "./source-key-BkBB3X82.js";
@@ -553,7 +553,7 @@ var J = class e {
 				t = await e.arrayBuffer();
 			} else t = r;
 			t = m(await h(t, i.password)), c.setSourceBytes(t.byteLength), c.checkpoint("container ready");
-			let n = s === "worker" ? (await import("./render-worker-host-GZ7ez-l3.js")).createRenderWorker() : new at(), l = s === "worker" ? Qe(i) : void 0, u = s === "worker" && !!i.progressiveLayout, d;
+			let n = s === "worker" ? (await import("./render-worker-host-BAXcBGq3.js")).createRenderWorker() : new at(), l = s === "worker" ? Qe(i) : void 0, u = s === "worker" && !!i.progressiveLayout, d;
 			try {
 				d = new e(n, s, o, i.wasmUrl), d._metrics = c;
 				let r = E(d), f = O(i.currentDate, r.defaultCurrentDateMs, i.showTrackedChanges === !0);
@@ -1021,7 +1021,7 @@ var J = class e {
 	async renderPageToBitmap(e, t = {}) {
 		let { onTextRun: n, ...r } = t, i = {
 			...this._withActiveView(r),
-			dpr: r.dpr ?? o()
+			dpr: r.dpr ?? s()
 		};
 		if (this._mode === "worker") {
 			let t = await this._bridge.request((t) => ({
@@ -1810,7 +1810,6 @@ var cn = class e {
 	_lastReportedLayoutComplete = null;
 	_layoutUnsubscribe = null;
 	_presentedPageCount = 0;
-	_pendingLayoutPublication = null;
 	_scrollListener = null;
 	_selectionChangeListener = null;
 	_selectionContextKey = "null";
@@ -1942,7 +1941,7 @@ var cn = class e {
 		});
 	}
 	_bindLayoutDocument(e) {
-		this._unbindLayoutDocument(), this._layoutViewPublicationGeneration = 0, this._presentedPageCount = e.pageCount, this._pendingLayoutPublication = null;
+		this._unbindLayoutDocument(), this._layoutViewPublicationGeneration = 0, this._presentedPageCount = e.pageCount;
 		let t = zt(e, (t) => this._onLayoutViewPublication(e, t), (e) => this._reportRenderError(e)), n = !0, r = Ft(e, () => ({
 			pageCount: e.pageCount,
 			exact: e.layoutComplete,
@@ -1959,7 +1958,7 @@ var cn = class e {
 		};
 	}
 	_unbindLayoutDocument() {
-		this._layoutUnsubscribe?.(), this._layoutUnsubscribe = null, this._presentedPageCount = 0, this._pendingLayoutPublication = null;
+		this._layoutUnsubscribe?.(), this._layoutUnsubscribe = null, this._presentedPageCount = 0;
 	}
 	_onLayoutPublication(e, t) {
 		if (!(this._destroyed || e !== this._doc)) {
@@ -1967,19 +1966,11 @@ var cn = class e {
 				this._errorRouter.reportBackground(t.error, this._opts.onLayoutComplete !== void 0);
 				return;
 			}
-			if (this._find.invalidate(), this._refreshCommentSurface(), !t.complete) {
-				if (this._pendingLayoutPublication = t, this._lastRange && this._emitVisiblePageChange(this._lastRange), this._presentedPageCount === 0 || t.pageCount < this._presentedPageCount) {
-					this._pendingLayoutPublication = null, this._applyLayoutPublication(t);
-					return;
-				}
-				this._revealPendingLayoutAtPresentedTail();
-				return;
-			}
-			this._pendingLayoutPublication = null, this._applyLayoutPublication(t);
+			this._find.invalidate(), this._refreshCommentSurface(), this._applyLayoutPublication(t);
 		}
 	}
 	_onLayoutViewPublication(e, t) {
-		this._destroyed || e !== this._doc || t.generation <= this._layoutViewPublicationGeneration || (this._layoutViewPublicationGeneration = t.generation, t.requester !== this && (this._layoutViewGeneration++, this._showTrackedChanges = t.view.showTrackedChanges, this._currentDate = t.view.currentDate, this._find.invalidate(), this._pendingLayoutPublication = null, this._applyLayoutPublication({
+		this._destroyed || e !== this._doc || t.generation <= this._layoutViewPublicationGeneration || (this._layoutViewPublicationGeneration = t.generation, t.requester !== this && (this._layoutViewGeneration++, this._showTrackedChanges = t.view.showTrackedChanges, this._currentDate = t.view.currentDate, this._find.invalidate(), this._applyLayoutPublication({
 			pageCount: e.pageCount,
 			exact: !0,
 			complete: e.layoutComplete
@@ -1996,14 +1987,6 @@ var cn = class e {
 		this._presentedPageCount = e.pageCount, this._renderEpoch++, this.relayout();
 		for (let [e, n] of t) e >= this._presentedPageCount || this._slots.get(e) !== n || this._refreshSlotAtomically(e, n);
 	}
-	_revealPendingLayoutAtPresentedTail() {
-		let e = this._pendingLayoutPublication;
-		!e || this._presentedPageCount === 0 || w(this._scrollGeometry, this._scrollHost.scrollTop, this._scrollHost.clientHeight, 0).end < this._presentedPageCount - 1 || (this._pendingLayoutPublication = null, this._applyLayoutPublication(e));
-	}
-	_revealPendingLayoutThroughPage(e) {
-		let t = this._pendingLayoutPublication;
-		!t || e < this._presentedPageCount || (this._pendingLayoutPublication = null, this._applyLayoutPublication(t));
-	}
 	_pageWidthPx(e) {
 		return this._doc.pageSize(e).widthPt * j * this._scale;
 	}
@@ -2051,11 +2034,20 @@ var cn = class e {
 		let t = this._commentZoom(), n = `calc(100% + ${nn * t}px)`;
 		e.style.left = this._commentSide() === "right" ? n : "", e.style.right = this._commentSide() === "left" ? n : "", e.style.width = `${280 * t}px`, e.style.fontSize = `${rn}px`, e.dataset.ooxmlCommentZoom = String(t);
 	}
+	_widestPageWidthPt() {
+		if (!this._doc) return 0;
+		let e = 0, t = this._presentedPageCount || this._doc.pageCount;
+		for (let n = 0; n < t; n++) {
+			let t = this._doc.pageSize(n).widthPt;
+			t > e && (e = t);
+		}
+		return e;
+	}
 	_baseScale() {
 		if (!this._doc || this._doc.pageCount === 0) return 0;
 		let e = this._fitWidthPx();
 		if (e <= 0) return 0;
-		let t = this._doc.pageSize(0).widthPt;
+		let t = this._widestPageWidthPt();
 		return t <= 0 ? 0 : e / (t * j);
 	}
 	relayout() {
@@ -2063,7 +2055,13 @@ var cn = class e {
 	}
 	_relayout(e) {
 		if (this._doc) {
-			if (this._doc.layoutComplete !== !1 && this._pendingLayoutPublication === null && (this._presentedPageCount = this._doc.pageCount), !this._scaleEstablished) {
+			if (this._doc.layoutComplete !== !1 && (this._presentedPageCount = this._doc.pageCount), this._scaleEstablished) {
+				let e = this._baseScale();
+				if (e > 0 && e !== this._prevBase) {
+					let t = this._prevBase > 0 ? this._scale / this._prevBase : 1;
+					this._prevBase = e, this.setScale(e * t);
+				}
+			} else {
 				let e = this._baseScale();
 				if (e > 0) {
 					if (this._scale = e, this._prevBase = e, this._lastFitWidth = this._fitWidthPx(), this._scaleEstablished = !0, this._pendingScale !== null) {
@@ -2126,7 +2124,7 @@ var cn = class e {
 		this._spacer.style.width = `${n + r + e + t}px`, a !== 0 && (this._reviewOriginPx = i, this._scrollHost.style["--ooxml-review-origin-x"] = `${i}px`, this._scrollHost.scrollLeft = o);
 	}
 	_onScroll() {
-		!this._doc || !this._scaleEstablished || (this._revealPendingLayoutAtPresentedTail(), this._mountVisible(void 0, !1));
+		!this._doc || !this._scaleEstablished || this._mountVisible(void 0, !1);
 	}
 	_mountVisible(e, t = !0) {
 		if (!this._doc || this._doc.pageCount === 0) return;
@@ -2302,7 +2300,7 @@ var cn = class e {
 		}
 	}
 	setScale(e) {
-		let t = this._opts.zoomMin ?? .1, n = this._opts.zoomMax ?? 4, r = Math.min(n, Math.max(t, e)), i = this._pendingZoomAnchor;
+		let t = this._effectiveZoomMin(), n = this._opts.zoomMax ?? 4, r = Math.min(n, Math.max(t, e)), i = this._pendingZoomAnchor;
 		if (this._pendingZoomAnchor = null, !this._doc || this._doc.pageCount === 0 || !this._scaleEstablished) {
 			this._pendingScale = r;
 			return;
@@ -2328,7 +2326,11 @@ var cn = class e {
 		this.setScale(fe(this.getScale()));
 	}
 	zoomOut() {
-		this.setScale(he(this.getScale()));
+		this.setScale(he(this.getScale(), this._effectiveZoomMin()));
+	}
+	_effectiveZoomMin() {
+		let e = this._opts.zoomMin ?? .1;
+		return this._scaleEstablished && this._prevBase > 0 ? Math.min(e, this._prevBase) : e;
 	}
 	fitWidth() {
 		this._fit("width");
@@ -2339,7 +2341,7 @@ var cn = class e {
 	_fit(e) {
 		if (!this._doc || this._doc.pageCount === 0) return;
 		let t = this._doc.pageSize(0), n = v({
-			contentWidth: t.widthPt * j,
+			contentWidth: (e === "width" ? this._widestPageWidthPt() : t.widthPt) * j,
 			contentHeight: t.heightPt * j,
 			containerWidth: this._fitWidthPx(),
 			containerHeight: this._scrollHost.clientHeight
@@ -2427,7 +2429,7 @@ var cn = class e {
 		(!n || await K(n, {
 			showTrackedChanges: e,
 			currentDate: this._currentDate
-		}, this)) && (this._destroyed || t !== this._layoutViewGeneration || n !== this._doc || (this._showTrackedChanges = e, this._find.invalidate(), this._pendingLayoutPublication = null, this._applyLayoutPublication({
+		}, this)) && (this._destroyed || t !== this._layoutViewGeneration || n !== this._doc || (this._showTrackedChanges = e, this._find.invalidate(), this._applyLayoutPublication({
 			pageCount: n?.pageCount ?? 0,
 			exact: !0,
 			complete: n?.layoutComplete !== !1
@@ -2435,16 +2437,13 @@ var cn = class e {
 	}
 	scrollToPage(e, t) {
 		if (!this._doc || this._doc.pageCount === 0 || !this._scaleEstablished) return;
-		let n = Math.max(0, Math.min(e, this._doc.pageCount - 1));
-		this._revealPendingLayoutThroughPage(n);
-		let r = w(this._scrollGeometry, 0, this._scrollHost.clientHeight, this._overscan()), i = r.offsets[n] ?? 0, a = Math.max(0, r.totalHeight - this._scrollHost.clientHeight), o = Math.min(a, Math.max(0, i)), s = this._scrollHost;
+		let n = Math.max(0, Math.min(e, this._doc.pageCount - 1)), r = w(this._scrollGeometry, 0, this._scrollHost.clientHeight, this._overscan()), i = r.offsets[n] ?? 0, a = Math.max(0, r.totalHeight - this._scrollHost.clientHeight), o = Math.min(a, Math.max(0, i)), s = this._scrollHost;
 		typeof s.scrollTo == "function" ? s.scrollTo({
 			top: o,
 			behavior: t?.behavior ?? "auto"
 		}) : this._scrollHost.scrollTop = o, this._mountVisible();
 	}
 	_scrollToPageTarget(e, t, n) {
-		this._revealPendingLayoutThroughPage(e);
 		let r = w(this._scrollGeometry, 0, this._scrollHost.clientHeight, this._overscan()), i = this._pageWidthPx(e), { left: a } = this._padH(), o = Math.max(a, (this._scrollHost.clientWidth - i) / 2) + this._reviewOriginPx, s = Math.max(0, r.totalHeight - this._scrollHost.clientHeight), c = this._spacer.offsetWidth || Number.parseFloat(this._spacer.style.width) || 0, l = Math.max(0, c - this._scrollHost.clientWidth), u = Math.min(s, Math.max(0, (r.offsets[e] ?? 0) + t.y + t.h / 2 - this._scrollHost.clientHeight / 2)), d = Math.min(l, Math.max(0, o + t.x + t.w / 2 - this._scrollHost.clientWidth / 2)), f = this._scrollHost;
 		typeof f.scrollTo == "function" ? f.scrollTo({
 			top: u,
@@ -2782,8 +2781,8 @@ var un = /* @__PURE__ */ e({
 	DocxScrollViewer: () => cn,
 	DocxViewer: () => $t,
 	OoxmlDecodedImageLimitError: () => Ye,
-	OoxmlError: () => s,
-	OoxmlResourceLimitError: () => l,
+	OoxmlError: () => l,
+	OoxmlResourceLimitError: () => o,
 	TiffDecodeError: () => Xe,
 	autoResize: () => _,
 	buildDocxHighlightLayer: () => Z,

package/dist/docx.mjs

@@ -1,7 +1,7 @@
-import { a as e, on as t, sn as n } from "./line-metrics-u87yCAfV.js";
-import { T as r } from "./canvas-viewer-mechanics-C-yTGbFC.js";
+import { a as e, cn as t, sn as n } from "./line-metrics-BGtFM-ec.js";
+import { T as r } from "./canvas-viewer-mechanics-CDNMJ-Yz.js";
 import { l as i, s as a } from "./pixel-budget-Dgjw269h.js";
-import { i as o, s } from "./raster-target-whZhvVMt.js";
-import { a as c, c as l, i as u, l as d, n as f, o as p, r as m, s as h } from "./docx-qK0Qmyey.js";
+import { i as o, s } from "./raster-target-ojDdQizC.js";
+import { a as c, c as l, i as u, l as d, n as f, o as p, r as m, s as h } from "./docx-BY7oyoml.js";
 import { n as g, r as _ } from "./comments-Brfxa3hQ.js";
-export { l as DocxDocument, m as DocxScrollViewer, u as DocxViewer, a as OoxmlDecodedImageLimitError, t as OoxmlError, n as OoxmlResourceLimitError, o as TiffDecodeError, r as autoResize, p as buildDocxHighlightLayer, h as buildDocxTextLayer, i as isOoxmlDecodedImageLimitError, s as isTiffDecodeError, f as noteText, e as openExternalHyperlink, c as readDocxTextSelectionContext, g as resolveCommentAnchorRuns, _ as resolveDocxCommentThreads, d as resolveRevisionAnchorRuns };
+export { l as DocxDocument, m as DocxScrollViewer, u as DocxViewer, a as OoxmlDecodedImageLimitError, n as OoxmlError, t as OoxmlResourceLimitError, o as TiffDecodeError, r as autoResize, p as buildDocxHighlightLayer, h as buildDocxTextLayer, i as isOoxmlDecodedImageLimitError, s as isTiffDecodeError, f as noteText, e as openExternalHyperlink, c as readDocxTextSelectionContext, g as resolveCommentAnchorRuns, _ as resolveDocxCommentThreads, d as resolveRevisionAnchorRuns };

package/dist/{dom-interaction-boundary-CMDDgICk.js → dom-interaction-boundary-CDGegIB5.js}

@@ -1,4 +1,4 @@
-import { Kt as e } from "./line-metrics-u87yCAfV.js";
+import { qt as e } from "./line-metrics-BGtFM-ec.js";
 import { c as t, o as n, r, s as i } from "./bounded-raw-part-cache-C6ro6Ezf.js";
 //#region packages/core/src/fonts/embedded.ts
 function a(e, t) {

package/dist/index.mjs

@@ -1,4 +1,4 @@
-import { t as e } from "./xlsx-57OZsbD9.js";
-import { t } from "./pptx-DxZwhOWr.js";
-import { t as n } from "./docx-qK0Qmyey.js";
+import { t as e } from "./xlsx-DSU6pV1O.js";
+import { t } from "./pptx-C4z96sAA.js";
+import { t as n } from "./docx-BY7oyoml.js";
 export { n as docx, t as pptx, e as xlsx };