Open new tabs instead of new splits

manifest.json

@@ -2,7 +2,7 @@
   "id": "calendar",
   "name": "Calendar",
   "description": "Calendar view of your daily notes",
-  "version": "1.5.10",
+  "version": "1.5.11",
   "author": "Liam Cain",
   "authorUrl": "https://github.com/liamcain/",
   "fundingUrl": "https://www.buymeacoffee.com/liamcain",

src/io/dailyNotes.ts

@@ -4,6 +4,7 @@ import {
   createDailyNote,
   getDailyNoteSettings,
 } from "obsidian-daily-notes-interface";
+import openLeaf from "../openLeaf";
 
 import type { ISettings } from "src/settings";
 import { createConfirmationDialog } from "src/ui/modal";
@@ -13,21 +14,17 @@ import { createConfirmationDialog } from "src/ui/modal";
  */
 export async function tryToCreateDailyNote(
   date: Moment,
-  inNewSplit: boolean,
+  inNewTab: boolean,
   settings: ISettings,
   cb?: (newFile: TFile) => void
 ): Promise<void> {
-  const { workspace } = window.app;
   const { format } = getDailyNoteSettings();
   const filename = date.format(format);
 
   const createFile = async () => {
     const dailyNote = await createDailyNote(date);
-    const leaf = inNewSplit
-      ? workspace.splitActiveLeaf()
-      : workspace.getUnpinnedLeaf();
-
-    await leaf.openFile(dailyNote, { active : true });
+    const leaf = openLeaf(inNewTab);
+    await leaf.openFile(dailyNote, { active: true });
     cb?.(dailyNote);
   };
 

src/io/weeklyNotes.ts

@@ -4,6 +4,7 @@ import {
   createWeeklyNote,
   getWeeklyNoteSettings,
 } from "obsidian-daily-notes-interface";
+import openLeaf from "../openLeaf";
 
 import type { ISettings } from "src/settings";
 import { createConfirmationDialog } from "src/ui/modal";
@@ -13,21 +14,18 @@ import { createConfirmationDialog } from "src/ui/modal";
  */
 export async function tryToCreateWeeklyNote(
   date: Moment,
-  inNewSplit: boolean,
+  inNewTab: boolean,
   settings: ISettings,
   cb?: (file: TFile) => void
 ): Promise<void> {
-  const { workspace } = window.app;
   const { format } = getWeeklyNoteSettings();
   const filename = date.format(format);
 
   const createFile = async () => {
     const dailyNote = await createWeeklyNote(date);
-    const leaf = inNewSplit
-      ? workspace.splitActiveLeaf()
-      : workspace.getUnpinnedLeaf();
+    const leaf = openLeaf(inNewTab);
 
-    await leaf.openFile(dailyNote, { active : true });
+    await leaf.openFile(dailyNote, { active: true });
     cb?.(dailyNote);
   };
 

src/openLeaf.ts

@@ -0,0 +1,8 @@
+import type { WorkspaceLeaf } from "obsidian";
+
+export default function openLeaf(inNewTab: boolean): WorkspaceLeaf {
+  return inNewTab
+    ? // @ts-expect-error: we're on an old version of obsidian types, for now this will cause error
+      window.app.workspace.createLeafInTabGroup()
+    : window.app.workspace.getUnpinnedLeaf();
+}

src/view.ts

@@ -23,6 +23,7 @@ import {
   tasksSource,
   wordCountSource,
 } from "./ui/sources";
+import openLeaf from "./openLeaf";
 
 export default class CalendarView extends ItemView {
   private calendar: Calendar;
@@ -255,10 +256,7 @@ export default class CalendarView extends ItemView {
     }
   }
 
-  async openOrCreateWeeklyNote(
-    date: Moment,
-    inNewSplit: boolean
-  ): Promise<void> {
+  async openOrCreateWeeklyNote(date: Moment, inNewTab: boolean): Promise<void> {
     const { workspace } = this.app;
 
     const startOfWeek = date.clone().startOf("week");
@@ -267,47 +265,38 @@ export default class CalendarView extends ItemView {
 
     if (!existingFile) {
       // File doesn't exist
-      tryToCreateWeeklyNote(startOfWeek, inNewSplit, this.settings, (file) => {
+      tryToCreateWeeklyNote(startOfWeek, inNewTab, this.settings, (file) => {
         activeFile.setFile(file);
       });
       return;
     }
 
-    const leaf = inNewSplit
-      ? workspace.splitActiveLeaf()
-      : workspace.getUnpinnedLeaf();
+    const leaf = openLeaf(inNewTab);
     await leaf.openFile(existingFile);
 
     activeFile.setFile(existingFile);
-    workspace.setActiveLeaf(leaf, true, true)
+    workspace.setActiveLeaf(leaf, true, true);
   }
 
-  async openOrCreateDailyNote(
-    date: Moment,
-    inNewSplit: boolean
-  ): Promise<void> {
-    const { workspace } = this.app;
+  async openOrCreateDailyNote(date: Moment, inNewTab: boolean): Promise<void> {
     const existingFile = getDailyNote(date, get(dailyNotes));
     if (!existingFile) {
       // File doesn't exist
       tryToCreateDailyNote(
         date,
-        inNewSplit,
+        inNewTab,
         this.settings,
         (dailyNote: TFile) => {
           activeFile.setFile(dailyNote);
         }
       );
-      return;
-    }
-
-    // eslint-disable-next-line @typescript-eslint/no-explicit-any
-    const mode = (this.app.vault as any).getConfig("defaultViewMode");
-    const leaf = inNewSplit
-      ? workspace.splitActiveLeaf()
-      : workspace.getUnpinnedLeaf();
-    await leaf.openFile(existingFile, { active : true, mode });
+    } else {
+      // eslint-disable-next-line @typescript-eslint/no-explicit-any
+      const mode = (this.app.vault as any).getConfig("defaultViewMode");
+      const leaf = openLeaf(inNewTab);
+      await leaf.openFile(existingFile, { active: true, mode });
 
-    activeFile.setFile(existingFile);
+      activeFile.setFile(existingFile);
+    }
   }
 }