release: 0.8.5

README.md

@@ -26,7 +26,7 @@ These features enrich Obsidian as a stand-alone PDF annotation tool. I recommend
 ### Opening links to PDF files
 
 - **Open PDF links cleverly**: When opening a link to a PDF file, a new tab will not be opened if the file is already opened. Useful for annotating PDFs using "Copy link to selection."
-- **Don\'t move focus to PDF viewer after opening a link**
+- **Don\'t move focus to PDF viewer after opening a PDF link**
 - **Clear highlights after a certain amount of time**
 
 ### Copying links to PDF files

manifest.json

@@ -1,7 +1,7 @@
 {
     "id": "pdf-plus",
     "name": "PDF++",
-    "version": "0.8.4",
+    "version": "0.8.5",
     "minAppVersion": "1.3.5",
     "description": "Enhance PDF viewer & embeds.",
     "author": "Ryota Ushio",

package.json

@@ -1,6 +1,6 @@
 {
     "name": "obsidian-pdf-plus",
-    "version": "0.8.4",
+    "version": "0.8.5",
     "description": "An Obsidian.md plugin to enhance PDF viewer & embeds.",
     "scripts": {
         "dev": "node esbuild.config.mjs",

src/backlinks.ts

@@ -1,5 +1,5 @@
 import PDFPlus from "main";
-import { App, Component, HoverParent, HoverPopover, Keymap, MarkdownView, Notice, PaneType, SectionCache, TFile, parseLinktext } from "obsidian";
+import { App, Component, HoverParent, HoverPopover, Keymap, Notice, SectionCache, TFile, parseLinktext } from "obsidian";
 import { BacklinkView, ObsidianViewer } from "typings";
 
 
@@ -16,6 +16,7 @@ export class BacklinkManager extends Component implements HoverParent {
         this.file = null;
         this.hoverPopover = null;
         this.eventManager = this.addChild(new Component());
+        plugin.addChild(this); // clear highlight on plugin unload
     }
 
     onload() {
@@ -27,6 +28,10 @@ export class BacklinkManager extends Component implements HoverParent {
         }
     }
 
+    onunload() {
+        this.clearTextHighlight();
+    }
+
     highlightBacklinks() {
         try {
             this._highlightBacklinks();

src/patch.ts

@@ -150,7 +150,7 @@ export const patchWorkspace = (plugin: PDFPlus) => {
                         });
                         if (leaf) {
                             openViewState = openViewState ?? {};
-                            openViewState.active = !plugin.settings.dontActivateAfterOpen;
+                            openViewState.active = !plugin.settings.dontActivateAfterOpenPDF;
                             return leaf.openLinkText(linktext, sourcePath, openViewState).then(() => {
                                 const view = leaf.view as PDFView;
                                 const child = view.viewer.child;
@@ -197,7 +197,7 @@ export const patchPagePreview = (plugin: PDFPlus) => {
                             ? app.workspace.createLeafInParent(markdownLeafParent, -1)
                             : app.workspace.getLeaf(plugin.settings.paneTypeForFirstMDLeaf || false);
                     }
-                    markdownLeaf.openLinkText(linktext, sourcePath, { eState: { line: state.scroll } });
+                    markdownLeaf.openLinkText(linktext, sourcePath, { active: !plugin.settings.dontActivateAfterOpenMD, eState: { line: state.scroll } });
                     return;
                 }
                 old.call(this, hoverParent, targetEl, linktext, sourcePath, state);

src/settings.ts

@@ -23,7 +23,8 @@ export interface PDFPlusSettings {
 	embedUnscrollable: boolean;
 	zoomInEmbed: number;
 	openLinkCleverly: boolean;
-	dontActivateAfterOpen: boolean;
+	dontActivateAfterOpenPDF: boolean;
+	dontActivateAfterOpenMD: boolean;
 	highlightDuration: number;
 	persistentHighlightsInEmbed: boolean;
 	highlightBacklinks: boolean;
@@ -45,7 +46,8 @@ export const DEFAULT_SETTINGS: PDFPlusSettings = {
 	embedUnscrollable: false,
 	zoomInEmbed: 0,
 	openLinkCleverly: true,
-	dontActivateAfterOpen: true,
+	dontActivateAfterOpenPDF: true,
+	dontActivateAfterOpenMD: true,
 	highlightDuration: 0,
 	persistentHighlightsInEmbed: true,
 	highlightBacklinks: true,
@@ -264,6 +266,8 @@ export class PDFPlusSettingTab extends PluginSettingTab {
 		if (this.plugin.settings.hoverHighlightAction === 'open') {
 			this.addDropdowenSetting('paneTypeForFirstMDLeaf', PANE_TYPE)
 				.setName(`How to open markdown file with ${getModifierNameInPlatform('Mod').toLowerCase()}+hover when there is no open markdown file`);
+			this.addToggleSetting('dontActivateAfterOpenMD')
+				.setName('Don\'t move focus to markdown view after opening a backlink');
 		}
 		this.addSetting()
 			.setName(`Require ${getModifierNameInPlatform('Mod')} to the above action`)
@@ -324,8 +328,8 @@ export class PDFPlusSettingTab extends PluginSettingTab {
 			.setName('Open PDF links cleverly')
 			.setDesc('When opening a link to a PDF file, a new tab will not be opened if the file is already opened. Useful for annotating PDFs using "Copy link to selection."');
 		if (this.plugin.settings.openLinkCleverly) {
-			this.addToggleSetting('dontActivateAfterOpen')
-				.setName('Don\'t move focus to PDF viewer after opening a link');
+			this.addToggleSetting('dontActivateAfterOpenPDF')
+				.setName('Don\'t move focus to PDF viewer after opening a PDF link');
 		}
 
 		this.addSetting()