From efd6e5b1b0d5377ffa1ab3c4d34e81032b920b41 Mon Sep 17 00:00:00 2001 From: Wojciech Duda <69160975+wojd0@users.noreply.github.com> Date: Thu, 15 May 2025 13:50:36 +0200 Subject: [PATCH] AAE-34826 Incorrect scale for rendered pdf documents (#10857) * AAE-34826 Fix missing class for pdf viewer * AAE-34826 Remove double initial scale * AAE-34826 Fix missing scale * AAE-34826 Remove unnecessary condition * AAE-34826 Remove surplus id * AAE-34826 converted scale to string --------- Co-authored-by: Ehsan Rezaei --- .../pdf-viewer/pdf-viewer.component.html | 2 +- .../pdf-viewer/pdf-viewer.component.ts | 16 ++++++++++------ 2 files changed, 11 insertions(+), 7 deletions(-) diff --git a/lib/core/src/lib/viewer/components/pdf-viewer/pdf-viewer.component.html b/lib/core/src/lib/viewer/components/pdf-viewer/pdf-viewer.component.html index 8d4edfc390..defce60eb2 100644 --- a/lib/core/src/lib/viewer/components/pdf-viewer/pdf-viewer.component.html +++ b/lib/core/src/lib/viewer/components/pdf-viewer/pdf-viewer.component.html @@ -27,7 +27,7 @@ class="adf-viewer-pdf-viewer" (window:resize)="onResize()">
diff --git a/lib/core/src/lib/viewer/components/pdf-viewer/pdf-viewer.component.ts b/lib/core/src/lib/viewer/components/pdf-viewer/pdf-viewer.component.ts index 622685f465..dc59f3a69f 100644 --- a/lib/core/src/lib/viewer/components/pdf-viewer/pdf-viewer.component.ts +++ b/lib/core/src/lib/viewer/components/pdf-viewer/pdf-viewer.component.ts @@ -114,7 +114,7 @@ export class PdfViewerComponent implements OnChanges, OnDestroy { displayPage: number; totalPages: number; loadingPercent: number; - pdfViewer: any; + pdfViewer: PDFViewer; pdfJsWorkerUrl: string; pdfJsWorkerInstance: Worker; currentScaleMode: PdfScaleMode = 'init'; @@ -132,7 +132,12 @@ export class PdfViewerComponent implements OnChanges, OnDestroy { documentOverflow = false; get currentScaleText(): string { - return this.pdfViewer?.currentScaleValue ? Math.round(this.pdfViewer.currentScaleValue * 100) + '%' : ''; + const currentScaleValueStr = this.pdfViewer?.currentScaleValue; + const scaleNumber = Number(currentScaleValueStr); + + const currentScaleText = scaleNumber ? `${Math.round(scaleNumber * 100)}%` : ''; + + return currentScaleText; } private pdfjsLib = inject(PDFJS_MODULE); @@ -452,10 +457,9 @@ export class PdfViewerComponent implements OnChanges, OnDestroy { */ setScaleUpdatePages(newScale: number) { if (this.pdfViewer) { - if (!this.isSameScale(this.pdfViewer.currentScaleValue, newScale)) { - this.pdfViewer.currentScaleValue = newScale; + if (!this.isSameScale(this.pdfViewer.currentScaleValue, newScale.toString())) { + this.pdfViewer.currentScaleValue = newScale.toString(); } - this.pdfViewer.update(); } this.setDocumentOverflow(); @@ -468,7 +472,7 @@ export class PdfViewerComponent implements OnChanges, OnDestroy { * @param newScale - new scale page * @returns `true` if the scale is the same, otherwise `false` */ - isSameScale(oldScale: number, newScale: number): boolean { + isSameScale(oldScale: string, newScale: string): boolean { return newScale === oldScale; }