#68: hide reply annotations

RyotaUshio · Mar 1, 2024 · 87497f8 · 87497f8
1 parent 27f2fd1
commit 87497f8
Show file tree

Hide file tree

Showing 3 changed files with 24 additions and 4 deletions.
diff --git a/src/patchers/pdf-internals.ts b/src/patchers/pdf-internals.ts
@@ -152,15 +152,23 @@ const patchPDFViewerChild = (plugin: PDFPlus, child: PDFViewerChild) => {
                     const { source: pageView } = data;
 
                     pageView.annotationLayer?.div
-                        ?.querySelectorAll<HTMLElement>('section.linkAnnotation[data-internal-link][data-annotation-id]')
+                        ?.querySelectorAll<HTMLElement>('section[data-annotation-id]')
                         .forEach((el) => {
                             const annotationId = el.dataset.annotationId;
                             if (!annotationId) return;
 
                             const annot = pageView.annotationLayer?.annotationLayer.getAnnotation(annotationId);
                             if (!annot) return;
 
-                            PDFInternalLinkPostProcessor.registerEvents(plugin, self, annot);
+                            if (annot.data.subtype === 'Link' && typeof annot.container.dataset.internalLink === 'string') {
+                                PDFInternalLinkPostProcessor.registerEvents(plugin, self, annot);
+                            }
+
+                            // Avoid rendering annotations that are replies to other annotations
+                            // https://github.com/RyotaUshio/obsidian-pdf-plus/issues/68
+                            if (plugin.settings.hideReplyAnnotation && annot.data.inReplyTo && annot.data.replyType === 'R') {
+                                annot.container.hide();
+                            }
                         });
                 });
 
@@ -229,7 +237,7 @@ const patchPDFViewerChild = (plugin: PDFPlus, child: PDFViewerChild) => {
                                 const view = lib.workspace.getActivePDFView();
                                 if (view && view.viewer.child === self) {
                                     const override = { state: { file: self.file!.path, page: pageNumber } };
-                                    this.app.workspace.trigger('view-sync:state-change', view, override);
+                                    app.workspace.trigger('view-sync:state-change', view, override);
                                 }
                             }
                         }, plugin.settings.viewSyncPageDebounceInterval * 1000)

diff --git a/src/settings.ts b/src/settings.ts
@@ -203,6 +203,7 @@ export interface PDFPlusSettings {
 	showBacklinkIconForOffset: boolean;
 	showBacklinkIconForRect: boolean;
 	showBoundingRectForBacklinkedAnnot: boolean;
+	hideReplyAnnotation: boolean;
 }
 
 export const DEFAULT_SETTINGS: PDFPlusSettings = {
@@ -397,6 +398,7 @@ export const DEFAULT_SETTINGS: PDFPlusSettings = {
 	showBacklinkIconForOffset: true,
 	showBacklinkIconForRect: false,
 	showBoundingRectForBacklinkedAnnot: false,
+	hideReplyAnnotation: false,
 };
 
 
@@ -443,7 +445,6 @@ export class PDFPlusSettingTab extends PluginSettingTab {
 					parentEl.insertBefore(createDiv('spacer'), setting.settingEl);
 				}
 
-				setting.nameEl.appendChild(createSpan({ text: heading }));
 				if (icon) {
 					const parentEl = setting.settingEl.parentElement;
 					if (parentEl) {
@@ -2022,6 +2023,15 @@ export class PDFPlusSettingTab extends PluginSettingTab {
 						});
 				});
 		}
+		this.addToggleSetting('hideReplyAnnotation')
+			.setName('Hide reply annotations')
+			.then((setting) => {
+				this.renderMarkdown([
+					'Hide annotations that are replies to other annotations in the PDF viewer.',
+					'',
+					'This is a temporary fix for the issue that PDF.js (the library Obsidian\'s PDF viewer is based on) does not fulfill the PDF specification in that it renders reply annotations as if a standalone annotation.',
+				], setting.descEl);
+			});
 
 
 		this.addHeading('Style settings', 'lucide-external-link')

diff --git a/src/typings.d.ts b/src/typings.d.ts
@@ -306,6 +306,8 @@ interface AnnotationElement {
         subtype: string;
         id: string;
         rect: Rect;
+        inReplyTo?: string;
+        replyType?: 'R' | 'Group';
         [key: string]: any;
     }
 }