Consistent page-width/fit scaling, disable pdf.js recovery scroll

James-Yu · Jun 23, 2024 · 299e786 · 299e786
1 parent 4e0a053
commit 299e786
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 2 deletions.
diff --git a/dev/editviewer.py b/dev/editviewer.py
@@ -39,6 +39,8 @@
                     .replace('''value: "../web/standard_fonts/"''', '''value: "../standard_fonts/"''')
                     .replace('''(this.container.clientWidth - hPadding) / currentPage.width * currentPage.scale / this.#pageWidthScaleFactor;''', '''(this.container.clientWidth - hPadding) / currentPage.width * currentPage.scale / this.#pageWidthScaleFactor * (1 / (1 - (viewerTrim ?? 0) / 100));''')
                     .replace('''(this.container.clientHeight - vPadding) / currentPage.height * currentPage.scale;''', '''(this.container.clientHeight - vPadding) / currentPage.height * currentPage.scale * (1 / (1 - (viewerTrim ?? 0) / 100));''')
+                    .replace('''parent.scrollLeft = offsetX;''', '''// parent.scrollLeft = offsetX;''')
+                    .replace('''parent.scrollTop = offsetY;''', '''// parent.scrollTop = offsetY;''')
                     # .replace('''parent.document.dispatchEvent(event);''', '''parent.document.dispatchEvent(event); \n    document.dispatchEvent(event);''')
                 )
 

diff --git a/viewer/components/interface.ts b/viewer/components/interface.ts
@@ -60,6 +60,7 @@ export interface IPDFViewerApplication {
             },
             getPagePoint(x: number, y: number): [number, number]
         }[],
+        currentPageNumber: number,
         currentScaleValue: string,
         scrollMode: number,
         spreadMode: number

diff --git a/viewer/components/refresh.ts b/viewer/components/refresh.ts
@@ -8,6 +8,7 @@ declare const PDFViewerApplication: IPDFViewerApplication
 declare const PDFViewerApplicationOptions: IPDFViewerApplicationOptions
 
 let prevState: {
+    page: number,
     trim: number,
     scale: string,
     scrollMode: number,
@@ -20,6 +21,7 @@ let prevState: {
 export async function refresh() {
     // Fail-safe. For unknown reasons, the pack may have null values #4076
     const currentState = {
+        page: PDFViewerApplication.pdfViewer.currentPageNumber ?? prevState?.page,
         trim: getTrimValue(),
         scale: PDFViewerApplication.pdfViewer.currentScaleValue ?? prevState?.scale,
         scrollMode: PDFViewerApplication.pdfViewer.scrollMode ?? prevState?.scrollMode,
@@ -54,6 +56,9 @@ export async function restoreState() {
         return
     }
 
+    if (prevState.page !== undefined) {
+        PDFViewerApplication.pdfViewer.currentPageNumber = prevState.page
+    }
     if (prevState.trim !== undefined) {
         setTrimValue(prevState.trim)
     }

diff --git a/viewer/viewer.mjs b/viewer/viewer.mjs
@@ -14521,10 +14521,10 @@ function scrollIntoView(element, spot, scrollMatches = false) {
     }
     if (spot.left !== undefined) {
       offsetX += spot.left;
-      parent.scrollLeft = offsetX;
+      // parent.scrollLeft = offsetX;
     }
   }
-  parent.scrollTop = offsetY;
+  // parent.scrollTop = offsetY;
 }
 function watchScroll(viewAreaElement, callback) {
   const debounceScroll = function (evt) {