Speed up page label extraction and await for it before navigating

zotero · Jul 4, 2024 · eb00f28 · eb00f28
1 parent 927cf8a
commit eb00f28
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 4 deletions.
diff --git a/pdfjs/pdf.js b/pdfjs/pdf.js
diff --git a/src/pdf/pdf-view.js b/src/pdf/pdf-view.js
@@ -130,6 +130,7 @@ class PDFView {
 		this._iframeWindow = null;
 
 		this.initializedPromise = new Promise(resolve => this._resolveInitializedPromise = resolve);
+		this._pageLabelsPromise = new Promise(resolve => this._resolvePageLabelsPromise = resolve);
 
 		let setOptions = () => {
 			if (!this._iframeWindow?.PDFViewerApplicationOptions) {
@@ -387,11 +388,15 @@ class PDFView {
 	}
 
 	async _initProcessedData() {
-		let { pageLabels, pages } = await this._iframeWindow.PDFViewerApplication.pdfDocument.getProcessedData();
+		let pageLabels = await this._iframeWindow.PDFViewerApplication.pdfDocument.getPageLabels2();
+		this._onSetPageLabels(pageLabels);
+		this._resolvePageLabelsPromise();
+		this._render();
+		this._updateViewStats();
+		let { pages } = await this._iframeWindow.PDFViewerApplication.pdfDocument.getProcessedData();
 		for (let key in pages) {
 			this._pdfPages[key] = pages[key];
 		}
-		this._onSetPageLabels(pageLabels);
 		this._render();
 		this._updateViewStats();
 	}
@@ -760,7 +765,7 @@ class PDFView {
 		}, 2000);
 	}
 
-	navigate(location, skipHistory) {
+	async navigate(location, skipHistory) {
 		if (location.annotationID && this._annotations.find(x => x.id === location.annotationID)) {
 			let annotation = this._annotations.find(x => x.id === location.annotationID);
 			this.navigateToPosition(annotation.position);
@@ -778,12 +783,14 @@ class PDFView {
 			});
 		}
 		else if (location.pageLabel) {
+			await this._pageLabelsPromise;
 			let pageIndex = this._pageLabels.findIndex(x => x === location.pageLabel);
 			if (pageIndex !== -1) {
 				this._iframeWindow.PDFViewerApplication.pdfViewer.scrollPageIntoView({ pageNumber: pageIndex + 1 });
 			}
 		}
 		else if (location.pageNumber) {
+			await this._pageLabelsPromise;
 			let pageIndex = this._pageLabels.findIndex(x => x === location.pageNumber);
 			if (pageIndex !== -1) {
 				this._iframeWindow.PDFViewerApplication.pdfViewer.scrollPageIntoView({ pageNumber: pageIndex + 1 });
+11 −1		src/core/module/module.js
+13 −0		src/core/worker.js
+4 −0		src/display/api.js
+43 −43		web/app.js