From 668fa77428b3b2ad3788202342f49ad7ba0d5c88 Mon Sep 17 00:00:00 2001 From: shamoon <4887959+shamoon@users.noreply.github.com> Date: Wed, 29 Jul 2026 09:25:37 -0700 Subject: [PATCH] Fix: prevent scale vs page loop in pngx PDF viewer (#13406) --- .../pdf-viewer/pdf-viewer.component.spec.ts | 18 +++++++++++++++--- .../common/pdf-viewer/pdf-viewer.component.ts | 9 ++++++--- 2 files changed, 21 insertions(+), 6 deletions(-) diff --git a/src-ui/src/app/components/common/pdf-viewer/pdf-viewer.component.spec.ts b/src-ui/src/app/components/common/pdf-viewer/pdf-viewer.component.spec.ts index 0e16ac2b23..ffb1fe8b5b 100644 --- a/src-ui/src/app/components/common/pdf-viewer/pdf-viewer.component.spec.ts +++ b/src-ui/src/app/components/common/pdf-viewer/pdf-viewer.component.spec.ts @@ -129,13 +129,25 @@ describe('PngxPdfViewerComponent', () => { ;(component as any).applyScale() expect(viewer.currentScaleValue).toBe(PdfZoomScale.PageFit) expect(viewer.currentScale).toBe(2) + }) + it('does not reapply scale for page-only changes', async () => { + await initComponent() + + const pdf = (component as any).pdf as { numPages: number } + pdf.numPages = 3 + const viewer = (component as any).pdfViewer as PDFViewer + viewer.setDocument(pdf) const applyScaleSpy = jest.spyOn(component as any, 'applyScale') component.page = 2 - ;(component as any).lastViewerPage = 2 - ;(component as any).applyViewerState() + + component.ngOnChanges({ + page: new SimpleChange(1, 2, false), + }) + + expect(viewer.currentPageNumber).toBe(2) expect((component as any).lastViewerPage).toBeUndefined() - expect(applyScaleSpy).toHaveBeenCalled() + expect(applyScaleSpy).not.toHaveBeenCalled() }) it('does not reset the viewer when it is already on the requested page', async () => { diff --git a/src-ui/src/app/components/common/pdf-viewer/pdf-viewer.component.ts b/src-ui/src/app/components/common/pdf-viewer/pdf-viewer.component.ts index 4a0478316a..153c67d91e 100644 --- a/src-ui/src/app/components/common/pdf-viewer/pdf-viewer.component.ts +++ b/src-ui/src/app/components/common/pdf-viewer/pdf-viewer.component.ts @@ -116,7 +116,10 @@ export class PngxPdfViewerComponent changes['zoomScale'] || changes['rotation'] ) { - this.applyViewerState() + // Prevent loop with page / scale application see https://github.com/paperless-ngx/paperless-ngx/issues/13404 + this.applyViewerState( + !!(changes['zoom'] || changes['zoomScale'] || changes['rotation']) + ) } if (changes['searchQuery']) { @@ -240,7 +243,7 @@ export class PngxPdfViewerComponent } } - private applyViewerState(): void { + private applyViewerState(applyScale = true): void { if (!this.pdfViewer) { return } @@ -264,7 +267,7 @@ export class PngxPdfViewerComponent if (this.page === this.lastViewerPage) { this.lastViewerPage = undefined } - if (hasPages) { + if (hasPages && applyScale) { this.applyScale() } this.dispatchFindIfReady()