Update after pdf viewer merge

paperless-ngx · May 16, 2024 · f009c81 · f009c81
1 parent 244e166
commit f009c81
Show file tree

Hide file tree

Showing 4 changed files with 18 additions and 11 deletions.
diff --git a/...mon/confirm-dialog/delete-pages-confirm-dialog/delete-pages-confirm-dialog.component.html b/...mon/confirm-dialog/delete-pages-confirm-dialog/delete-pages-confirm-dialog.component.html
@@ -18,14 +18,14 @@ <h4 class="modal-title" id="modal-basic-title">{{title}}</h4>
                 </div>
             </div>
             <div class="pdf-viewer-container w-100 mt-3">
-                <pngx-pdf-viewer #pdfViewer [src]="pdfSrc" [(page)]="currentPage"
+                <pdf-viewer #pdfViewer [src]="pdfSrc" [(page)]="currentPage"
                 [original-size]="false"
                 [zoom]="1"
                 zoom-scale="page-fit"
                 [render-text]="false"
                 (pagerendered)="pageRendered($event)"
                 (after-load-complete)="pdfPreviewLoaded($event)">
-                </pngx-pdf-viewer>
+                </pdf-viewer>
             </div>
         </div>
     </div>

diff --git a/...mon/confirm-dialog/delete-pages-confirm-dialog/delete-pages-confirm-dialog.component.scss b/...mon/confirm-dialog/delete-pages-confirm-dialog/delete-pages-confirm-dialog.component.scss
@@ -1,19 +1,27 @@
 .pdf-viewer-container {
-    background-color: gray;
-    height: 350px;
+  background-color: gray;
+  height: 350px;
 
-    pngx-pdf-viewer {
-      width: 100%;
-      height: 100%;
+  ::ng-deep .page {
+    background-color: transparent;
+
+    canvas {
+      margin: 0 auto;
     }
   }
 
+  pdf-viewer {
+    width: 100%;
+    height: 100%;
+  }
+}
+
 .mw-60 {
   max-width: 60px;
 }
 
 div.position-absolute:has(.form-check-input:checked) {
-  background-color: rgba(var(--bs-dark-rgb), 0.25);
+  background-color: rgba(var(--bs-dark-rgb), 0.4);
 }
 
 .form-check-input {

diff --git a/.../confirm-dialog/delete-pages-confirm-dialog/delete-pages-confirm-dialog.component.spec.ts b/.../confirm-dialog/delete-pages-confirm-dialog/delete-pages-confirm-dialog.component.spec.ts
@@ -4,8 +4,8 @@ import { HttpClientTestingModule } from '@angular/common/http/testing'
 import { NgbActiveModal } from '@ng-bootstrap/ng-bootstrap'
 import { NgxBootstrapIconsModule, allIcons } from 'ngx-bootstrap-icons'
 import { SafeHtmlPipe } from 'src/app/pipes/safehtml.pipe'
-import { PdfViewerComponent } from '../../pdf-viewer/pdf-viewer.component'
 import { FormsModule, ReactiveFormsModule } from '@angular/forms'
+import { PdfViewerComponent } from 'ng2-pdf-viewer'
 
 describe('DeletePagesConfirmDialogComponent', () => {
   let component: DeletePagesConfirmDialogComponent

diff --git a/...ommon/confirm-dialog/delete-pages-confirm-dialog/delete-pages-confirm-dialog.component.ts b/...ommon/confirm-dialog/delete-pages-confirm-dialog/delete-pages-confirm-dialog.component.ts
@@ -2,8 +2,7 @@ import { Component, TemplateRef, ViewChild } from '@angular/core'
 import { NgbActiveModal } from '@ng-bootstrap/ng-bootstrap'
 import { DocumentService } from 'src/app/services/rest/document.service'
 import { ConfirmDialogComponent } from '../confirm-dialog.component'
-import { PDFDocumentProxy } from 'pdfjs-dist'
-import { PdfViewerComponent } from '../../pdf-viewer/pdf-viewer.component'
+import { PDFDocumentProxy, PdfViewerComponent } from 'ng2-pdf-viewer'
 
 @Component({
   selector: 'pngx-delete-pages-confirm-dialog',