fix: middle click to open file/diff in new tab

Vinzent03 · Sep 21, 2022 · ddb1164 · ddb1164
1 parent 7b2c1da
commit ddb1164
Show file tree

Hide file tree

Showing 5 changed files with 21 additions and 28 deletions.
diff --git a/src/main.ts b/src/main.ts
@@ -141,8 +141,9 @@ export default class ObsidianGit extends Plugin {
                 const file = this.app.workspace.getActiveFile();
                 if (checking) {
                     return file !== null;
+
                 } else {
-                    getNewLeaf().setViewState({ type: DIFF_VIEW_CONFIG.type, state: { staged: false, file: file!.path } });
+                    getNewLeaf()?.setViewState({ type: DIFF_VIEW_CONFIG.type, state: { staged: false, file: file!.path } });
                 }
             }
 

diff --git a/src/ui/sidebar/components/fileComponent.svelte b/src/ui/sidebar/components/fileComponent.svelte
@@ -35,8 +35,10 @@
 
 	function open(event: MouseEvent) {
 		const file = view.app.vault.getAbstractFileByPath(change.vault_path);
+		console.log(event);
+
 		if (file instanceof TFile) {
-			getNewLeaf(event).openFile(file);
+			getNewLeaf(event)?.openFile(file);
 		}
 	}
 
@@ -47,7 +49,7 @@
 	}
 
 	function showDiff(event: MouseEvent) {
-		getNewLeaf(event).setViewState({
+		getNewLeaf(event)?.setViewState({
 			type: DIFF_VIEW_CONFIG.type,
 			active: true,
 			state: {
@@ -89,6 +91,7 @@
 			? change.vault_path
 			: ""}
 		on:click|self={showDiff}
+		on:auxclick|self={showDiff}
 	>
 		{change.vault_path.split("/").last()?.replace(".md", "")}
 	</span>
@@ -99,6 +102,7 @@
 					data-icon="go-to-file"
 					aria-label="Open File"
 					bind:this={buttons[1]}
+					on:auxclick={open}
 					on:click={open}
 				/>
 			{/if}

diff --git a/src/ui/sidebar/components/pulledFileComponent.svelte b/src/ui/sidebar/components/pulledFileComponent.svelte
@@ -26,7 +26,7 @@
 	function open(event: MouseEvent) {
 		const file = view.app.vault.getAbstractFileByPath(change.vault_path);
 		if (file instanceof TFile) {
-			getNewLeaf(event).openFile(file);
+			getNewLeaf(event)?.openFile(file);
 		}
 	}
 </script>

diff --git a/src/ui/sidebar/components/stagedFileComponent.svelte b/src/ui/sidebar/components/stagedFileComponent.svelte
@@ -36,12 +36,12 @@
 	function open(event: MouseEvent) {
 		const file = view.app.vault.getAbstractFileByPath(change.vault_path);
 		if (file instanceof TFile) {
-			getNewLeaf(event).openFile(file);
+			getNewLeaf(event)?.openFile(file);
 		}
 	}
 
 	function showDiff(event: MouseEvent) {
-		getNewLeaf(event).setViewState({
+		getNewLeaf(event)?.setViewState({
 			type: DIFF_VIEW_CONFIG.type,
 			active: true,
 			state: {

diff --git a/src/utils.ts b/src/utils.ts
@@ -1,4 +1,4 @@
-import { requireApiVersion, WorkspaceLeaf } from "obsidian";
+import { Keymap, WorkspaceLeaf } from "obsidian";
 
 export const worthWalking = (filepath: string, root?: string) => {
     if (filepath === '.' || root == null || root.length === 0 || root === '.') {
@@ -12,28 +12,16 @@ export const worthWalking = (filepath: string, root?: string) => {
 };
 
 
-export function getNewLeaf(event?: MouseEvent | KeyboardEvent): WorkspaceLeaf {
-    let leaf: WorkspaceLeaf;
-    if (!event) {
-        leaf = app.workspace.getLeaf(false);
-    } else {
-        if (requireApiVersion("0.16.0")) {
-            if (event.ctrlKey && event.altKey && event.shiftKey) {
-                leaf = app.workspace.getLeaf("window");
-            } else if (event.ctrlKey && event.altKey) {
-                leaf = app.workspace.getLeaf("split");
-            } else if (event.ctrlKey) {
-                leaf = app.workspace.getLeaf("tab");
-            } else {
-                leaf = app.workspace.getLeaf(false);
-            }
-        } else {
-            if (event.ctrlKey) {
-                leaf = app.workspace.getLeaf(true);
-            } else {
-                leaf = app.workspace.getLeaf(false);
-            }
+export function getNewLeaf(event?: MouseEvent): WorkspaceLeaf | undefined {
+    let leaf: WorkspaceLeaf | undefined;
+    if (event) {
+        if ((event.button === 0 || event.button === 1)) {
+            const type = Keymap.isModEvent(event);
+            leaf = app.workspace.getLeaf(type);
         }
+    } else {
+        leaf = app.workspace.getLeaf(false);
+
     }
     return leaf;
 }