Don't replace calendar with note when tab is pinned (#235)

fixes #126
obsidian-community · Dec 23, 2022 · 0e33ba1 · 0e33ba1
1 parent 894f5bf
commit 0e33ba1
Show file tree

Hide file tree

Showing 5 changed files with 30 additions and 8 deletions.
diff --git a/src/models/DailyNoteEvent.ts b/src/models/DailyNoteEvent.ts
@@ -4,6 +4,7 @@ import {
 	MetadataCache,
 	TFile,
 	Vault,
+	Workspace,
 	WorkspaceLeaf,
 } from "obsidian";
 import {
@@ -50,7 +51,10 @@ export class DailyNoteEvent extends LocalEvent {
 		this.heading = heading;
 	}
 
-	async openIn(leaf: WorkspaceLeaf): Promise<void> {
+	async openIn(leaf: WorkspaceLeaf, workspace: Workspace): Promise<void> {
+		if (leaf.getViewState().pinned) {
+			leaf = workspace.getLeaf("tab");
+		}
 		await leaf.openFile(this.file);
 		if (leaf.view instanceof MarkdownView) {
 			leaf.view.editor.setCursor({

diff --git a/src/models/Event.ts b/src/models/Event.ts
@@ -1,6 +1,12 @@
 import { Calendar, EventInput } from "@fullcalendar/core";
 import { dir } from "console";
-import { MetadataCache, TFile, Vault, WorkspaceLeaf } from "obsidian";
+import {
+	MetadataCache,
+	TFile,
+	Vault,
+	Workspace,
+	WorkspaceLeaf,
+} from "obsidian";
 import { toEventInput } from "src/fullcalendar_interop";
 import { CalendarSource, OFCEvent, FCError } from "src/types";
 import { getColors } from "./util";
@@ -111,7 +117,7 @@ export abstract class LocalEvent extends EditableEvent {
 		this.filename = filename;
 	}
 
-	abstract openIn(leaf: WorkspaceLeaf): Promise<void>;
+	abstract openIn(leaf: WorkspaceLeaf, workspace: Workspace): Promise<void>;
 	abstract get path(): string;
 
 	get file(): TFile {

diff --git a/src/models/NoteEvent.ts b/src/models/NoteEvent.ts
@@ -1,4 +1,10 @@
-import { MetadataCache, TFile, Vault, WorkspaceLeaf } from "obsidian";
+import {
+	MetadataCache,
+	TFile,
+	Vault,
+	Workspace,
+	WorkspaceLeaf,
+} from "obsidian";
 import { modifyFrontmatter } from "src/serialization/frontmatter";
 import { OFCEvent, FCError, validateEvent } from "src/types";
 import { basenameFromEvent, LocalEvent } from "./Event";
@@ -97,7 +103,10 @@ export class NoteEvent extends LocalEvent {
 		return event;
 	}
 
-	async openIn(leaf: WorkspaceLeaf): Promise<void> {
+	async openIn(leaf: WorkspaceLeaf, workspace: Workspace): Promise<void> {
+		if (leaf.getViewState().pinned) {
+			leaf = workspace.getLeaf("tab");
+		}
 		await leaf.openFile(this.file);
 	}
 	async delete(): Promise<void> {

diff --git a/src/ui/modal.ts b/src/ui/modal.ts
@@ -160,7 +160,10 @@ export class EventModal extends Modal {
 									let leaf =
 										this.app.workspace.getMostRecentLeaf();
 									if (leaf) {
-										await this.event.openIn(leaf);
+										await this.event.openIn(
+											leaf,
+											this.app.workspace
+										);
 										this.close();
 									}
 								}

diff --git a/src/ui/view.ts b/src/ui/view.ts
@@ -181,7 +181,7 @@ export class CalendarView extends ItemView {
 					}
 					let leaf = this.app.workspace.getMostRecentLeaf();
 					if (leaf) {
-						await leaf.openFile(event.file);
+						event.openIn(leaf, this.app.workspace);
 					}
 				} else {
 					new EventModal(
@@ -287,7 +287,7 @@ export class CalendarView extends ItemView {
 						item.setTitle("Go to note").onClick(() => {
 							let leaf = this.app.workspace.getMostRecentLeaf();
 							if (leaf) {
-								event.openIn(leaf);
+								event.openIn(leaf, this.app.workspace);
 								new Notice(`Opening "${e.title}"`);
 							}
 						})