Merge pull request #702 from VadimDez/fix-external-link-target

Fix external-link-target bug
VadimDez · Jan 1, 2021 · 61687f8 · 61687f8
2 parents 92a5e22 + 7f0221b
commit 61687f8
Showing 1 changed file with 15 additions and 14 deletions.
diff --git a/src/app/pdf-viewer/pdf-viewer.component.ts b/src/app/pdf-viewer/pdf-viewer.component.ts
@@ -219,14 +219,6 @@ export class PdfViewerComponent
     return null;
   }
 
-  static setExternalLinkTarget(type: string) {
-    const linkTarget = PdfViewerComponent.getLinkTarget(type);
-
-    if (linkTarget !== null) {
-      (PDFJS as any).externalLinkTarget = linkTarget;
-    }
-  }
-
   constructor(private element: ElementRef) {
     if (isSSR()) {
       return;
@@ -393,11 +385,20 @@ export class PdfViewerComponent
     }
   }
 
+  private getPDFLinkServiceConfig() {
+    const pdfLinkServiceConfig: any = {};
+    const linkTarget = PdfViewerComponent.getLinkTarget(this._externalLinkTarget);
+
+    if (linkTarget) {
+      pdfLinkServiceConfig.externalLinkTarget = linkTarget;
+    }
+
+    return pdfLinkServiceConfig;
+  }
+
   private setupMultiPageViewer() {
     (PDFJS as any).disableTextLayer = !this._renderText;
 
-    PdfViewerComponent.setExternalLinkTarget(this._externalLinkTarget);
-
     const eventBus = createEventBus(PDFJSViewer);
 
     eventBus.on('pagerendered', e => {
@@ -419,7 +420,9 @@ export class PdfViewerComponent
       this.textLayerRendered.emit(e);
     });
 
-    this.pdfMultiPageLinkService = new PDFJSViewer.PDFLinkService({ eventBus });
+    this.pdfMultiPageLinkService = new PDFJSViewer.PDFLinkService({
+      eventBus, ...this.getPDFLinkServiceConfig()
+    });
     this.pdfMultiPageFindController = new PDFJSViewer.PDFFindController({
       linkService: this.pdfMultiPageLinkService,
       eventBus
@@ -444,8 +447,6 @@ export class PdfViewerComponent
   private setupSinglePageViewer() {
     (PDFJS as any).disableTextLayer = !this._renderText;
 
-    PdfViewerComponent.setExternalLinkTarget(this._externalLinkTarget);
-
     const eventBus = createEventBus(PDFJSViewer);
 
     eventBus.on('pagechanging', e => {
@@ -463,7 +464,7 @@ export class PdfViewerComponent
     });
 
     this.pdfSinglePageLinkService = new PDFJSViewer.PDFLinkService({
-      eventBus
+      eventBus, ...this.getPDFLinkServiceConfig()
     });
     this.pdfSinglePageFindController = new PDFJSViewer.PDFFindController({
       linkService: this.pdfSinglePageLinkService,