fix: minor source control view improvements

denolehov · Mar 20, 2023 · fd7792c · fd7792c
1 parent a59d38a
commit fd7792c
Show file tree

Hide file tree

Showing 6 changed files with 24 additions and 48 deletions.
diff --git a/src/ui/sidebar/components/fileComponent.svelte b/src/ui/sidebar/components/fileComponent.svelte
@@ -5,7 +5,7 @@
     import { GitManager } from "src/gitManager";
     import { FileStatusResult } from "src/types";
     import { DiscardModal } from "src/ui/modals/discardModal";
-    import { getNewLeaf } from "src/utils";
+    import { getDisplayPath, getNewLeaf } from "src/utils";
     import GitView from "../sidebarView";
 
     export let change: FileStatusResult;
@@ -21,15 +21,8 @@
 
     function hover(event: MouseEvent) {
         //Don't show previews of config- or hidden files.
-        if (
-            !change.path.startsWith(view.app.vault.configDir) ||
-            !change.path.startsWith(".")
-        ) {
-            hoverPreview(
-                event,
-                view as any,
-                change.vault_path.split("/").last()!.replace(".md", "")
-            );
+        if (app.vault.getAbstractFileByPath(change.vault_path)) {
+            hoverPreview(event, view as any, change.vault_path);
         }
     }
 
@@ -87,9 +80,7 @@
     <div
         class="nav-file-title"
         aria-label-position={side}
-        aria-label={change.vault_path.split("/").last() != change.vault_path
-            ? change.vault_path
-            : ""}
+        aria-label={change.vault_path}
         on:click|self={showDiff}
         on:auxclick|self={showDiff}
     >
@@ -103,7 +94,7 @@
             on:auxclick={showDiff}
             class="nav-file-title-content"
         >
-            {change.vault_path.split("/").last()?.replace(".md", "")}
+            {getDisplayPath(change.vault_path)}
         </div>
         <div class="tools">
             <div class="buttons">

diff --git a/src/ui/sidebar/components/pulledFileComponent.svelte b/src/ui/sidebar/components/pulledFileComponent.svelte
@@ -2,7 +2,7 @@
     import { TFile } from "obsidian";
     import { hoverPreview } from "obsidian-community-lib";
     import { FileStatusResult } from "src/types";
-    import { getNewLeaf } from "src/utils";
+    import { getDisplayPath, getNewLeaf } from "src/utils";
     import GitView from "../sidebarView";
 
     export let change: FileStatusResult;
@@ -11,15 +11,8 @@
 
     function hover(event: MouseEvent) {
         //Don't show previews of config- or hidden files.
-        if (
-            !change.path.startsWith(view.app.vault.configDir) ||
-            !change.path.startsWith(".")
-        ) {
-            hoverPreview(
-                event,
-                view as any,
-                change.vault_path.split("/").last()!.replace(".md", "")
-            );
+        if (app.vault.getAbstractFileByPath(change.vault_path)) {
+            hoverPreview(event, view as any, change.vault_path);
         }
     }
 
@@ -36,12 +29,10 @@
     <div
         class="nav-file-title"
         aria-label-position={side}
-        aria-label={change.vault_path.split("/").last() != change.vault_path
-            ? change.vault_path
-            : ""}
+        aria-label={change.vault_path}
     >
         <div class="nav-file-title-content">
-            {change.vault_path.split("/").last()?.replace(".md", "")}
+            {getDisplayPath(change.vault_path)}
         </div>
         <div class="tools">
             <span class="type" data-type={change.working_dir}

diff --git a/src/ui/sidebar/components/stagedFileComponent.svelte b/src/ui/sidebar/components/stagedFileComponent.svelte
@@ -4,7 +4,7 @@
     import { DIFF_VIEW_CONFIG } from "src/constants";
     import { GitManager } from "src/gitManager";
     import { FileStatusResult } from "src/types";
-    import { getNewLeaf } from "src/utils";
+    import { getDisplayPath, getNewLeaf } from "src/utils";
     import GitView from "../sidebarView";
 
     export let change: FileStatusResult;
@@ -21,15 +21,8 @@
 
     function hover(event: MouseEvent) {
         //Don't show previews of config- or hidden files.
-        if (
-            !change.path.startsWith(view.app.vault.configDir) ||
-            !change.path.startsWith(".")
-        ) {
-            hoverPreview(
-                event,
-                view as any,
-                formattedPath.split("/").last()!.replace(".md", "")
-            );
+        if (app.vault.getAbstractFileByPath(change.vault_path)) {
+            hoverPreview(event, view as any, change.vault_path);
         }
     }
 
@@ -63,21 +56,19 @@
     <div
         class="nav-file-title"
         aria-label-position={side}
-        aria-label={formattedPath.split("/").last() != formattedPath
-            ? formattedPath
-            : ""}
+        aria-label={change.vault_path}
         on:click|self={showDiff}
     >
         <div
             on:click={showDiff}
             on:auxclick={showDiff}
             class="nav-file-title-content"
         >
-            {formattedPath.split("/").last()?.replace(".md", "")}
+            {getDisplayPath(change.vault_path)}
         </div>
         <div class="tools">
             <div class="buttons">
-                {#if view.app.vault.getAbstractFileByPath(formattedPath)}
+                {#if view.app.vault.getAbstractFileByPath(change.vault_path)}
                     <div
                         data-icon="go-to-file"
                         aria-label="Open File"

diff --git a/src/ui/sidebar/components/treeComponent.svelte b/src/ui/sidebar/components/treeComponent.svelte
@@ -72,10 +72,7 @@
                 <div
                     class="nav-folder-title"
                     aria-label-position={side}
-                    aria-label={entity.vaultPath.split("/").last() !=
-                    entity.vaultPath
-                        ? entity.vaultPath
-                        : ""}
+                    aria-label={entity.vaultPath}
                     on:click|self={() => fold(entity)}
                 >
                     <div

diff --git a/src/ui/sidebar/gitView.svelte b/src/ui/sidebar/gitView.svelte
@@ -8,6 +8,7 @@
         RootTreeItem,
         Status,
     } from "src/types";
+    import { getDisplayPath } from "src/utils";
     import { onDestroy } from "svelte";
     import { slide } from "svelte/transition";
     import { DiscardModal } from "../modals/discardModal";
@@ -112,7 +113,7 @@
                 return a.vault_path
                     .split("/")
                     .last()!
-                    .localeCompare(b.vault_path.split("/").last()!);
+                    .localeCompare(getDisplayPath(b.vault_path));
             };
             status.changed.sort(sort);
             status.staged.sort(sort);

diff --git a/src/utils.ts b/src/utils.ts
@@ -30,3 +30,8 @@ export function splitRemoteBranch(
     const [remote, ...branch] = remoteBranch.split("/");
     return [remote, branch.length === 0 ? undefined : branch.join("/")];
 }
+
+export function getDisplayPath(path: string): string {
+    if (path.endsWith("/")) return path;
+    return path.split("/").last()!.replace(".md", "");
+}