feat: highlight opened diff view file

close #545
Vinzent03 · Aug 29, 2023 · 5708c63 · 5708c63
1 parent a9adfff
commit 5708c63
Show file tree

Hide file tree

Showing 4 changed files with 66 additions and 0 deletions.
diff --git a/src/main.ts b/src/main.ts
@@ -32,6 +32,7 @@ import { SimpleGit } from "./gitManager/simpleGit";
 import { openHistoryInGitHub, openLineInGitHub } from "./openInGitHub";
 import { LocalStorageSettings } from "./setting/localStorageSettings";
 import {
+    DiffViewState,
     FileStatusResult,
     mergeSettingsByPriority,
     ObsidianGitSettings,
@@ -68,6 +69,9 @@ export default class ObsidianGit extends Plugin {
     offlineMode = false;
     loading = false;
     cachedStatus: Status | undefined;
+    // Used to store the path of the file that is currently shown in the diff view.
+    lastDiffViewState: DiffViewState | undefined;
+    openEvent: EventRef;
     modifyEvent: EventRef;
     deleteEvent: EventRef;
     createEvent: EventRef;
@@ -681,6 +685,7 @@ export default class ObsidianGit extends Plugin {
             "git-head-update",
             this.refreshUpdatedHead.bind(this)
         );
+        this.app.workspace.offref(this.openEvent);
         this.app.metadataCache.offref(this.modifyEvent);
         this.app.metadataCache.offref(this.deleteEvent);
         this.app.metadataCache.offref(this.createEvent);
@@ -761,6 +766,11 @@ export default class ObsidianGit extends Plugin {
                     this.gitReady = true;
                     this.setState(PluginState.idle);
 
+                    this.openEvent = this.app.workspace.on(
+                        "active-leaf-change",
+                        (leaf) => this.handleViewActiveState(leaf)
+                    );
+
                     this.modifyEvent = this.app.vault.on("modify", () => {
                         this.debRefresh();
                     });
@@ -1667,6 +1677,52 @@ I strongly recommend to use "Source mode" for viewing the conflicted files. For
         }
     }
 
+    handleViewActiveState(leaf: WorkspaceLeaf | null): void {
+        // Prevent removing focus when switching to other panes than file panes like search or GitView
+        if (!leaf?.view.getState().file) return;
+
+        const sourceControlLeaf = this.app.workspace
+            .getLeavesOfType(SOURCE_CONTROL_VIEW_CONFIG.type)
+            .first();
+        const historyLeaf = this.app.workspace
+            .getLeavesOfType(HISTORY_VIEW_CONFIG.type)
+            .first();
+
+        // Clear existing active state
+        sourceControlLeaf?.view.containerEl
+            .querySelector(`div.nav-file-title.is-active`)
+            ?.removeClass("is-active");
+        historyLeaf?.view.containerEl
+            .querySelector(`div.nav-file-title.is-active`)
+            ?.removeClass("is-active");
+
+        if (leaf?.view instanceof DiffView) {
+            const path = leaf.view.state.file;
+            this.lastDiffViewState = leaf.view.getState();
+            let el: Element | undefined | null;
+            if (sourceControlLeaf && leaf.view.state.staged) {
+                el = sourceControlLeaf.view.containerEl.querySelector(
+                    `div.staged div.nav-file-title[data-path='${path}']`
+                );
+            } else if (
+                sourceControlLeaf &&
+                leaf.view.state.staged === false &&
+                !leaf.view.state.hash
+            ) {
+                el = sourceControlLeaf.view.containerEl.querySelector(
+                    `div.changes div.nav-file-title[data-path='${path}']`
+                );
+            } else if (historyLeaf && leaf.view.state.hash) {
+                el = historyLeaf.view.containerEl.querySelector(
+                    `div.nav-file-title[data-path='${path}']`
+                );
+            }
+            el?.addClass("is-active");
+        } else {
+            this.lastDiffViewState = undefined;
+        }
+    }
+
     // region: displaying / formatting messages
     displayMessage(message: string, timeout: number = 4 * 1000): void {
         this.statusBar?.displayMessage(message.toLowerCase(), timeout);

diff --git a/src/ui/history/components/logFileComponent.svelte b/src/ui/history/components/logFileComponent.svelte
@@ -45,6 +45,8 @@
 >
     <div
         class="tree-item-self is-clickable nav-file-title"
+        class:is-active={view.plugin.lastDiffViewState?.file ==
+            diff.vault_path && view.plugin.lastDiffViewState?.hash}
         data-path={diff.vault_path}
         aria-label-position={side}
         aria-label={diff.vault_path}

diff --git a/src/ui/sourceControl/components/fileComponent.svelte b/src/ui/sourceControl/components/fileComponent.svelte
@@ -84,6 +84,10 @@
 >
     <div
         class="tree-item-self is-clickable nav-file-title"
+        class:is-active={view.plugin.lastDiffViewState?.file ==
+            change.vault_path &&
+            !view.plugin.lastDiffViewState?.hash &&
+            !view.plugin.lastDiffViewState?.staged}
         data-path={change.vault_path}
         aria-label-position={side}
         aria-label={change.vault_path}

diff --git a/src/ui/sourceControl/components/stagedFileComponent.svelte b/src/ui/sourceControl/components/stagedFileComponent.svelte
@@ -60,6 +60,10 @@
 >
     <div
         class="tree-item-self is-clickable nav-file-title"
+        class:is-active={view.plugin.lastDiffViewState?.file ==
+            change.vault_path &&
+            !view.plugin.lastDiffViewState?.hash &&
+            view.plugin.lastDiffViewState?.staged}
         data-path={change.vault_path}
         aria-label-position={side}
         aria-label={change.vault_path}