fix: full directory path on hover

Vinzent03 · Oct 18, 2022 · 0f2c9d5 · 0f2c9d5
1 parent a09bc4a
commit 0f2c9d5
Show file tree

Hide file tree

Showing 4 changed files with 27 additions and 12 deletions.
diff --git a/src/gitManager.ts b/src/gitManager.ts
@@ -100,13 +100,20 @@ export abstract class GitManager {
                     return item.path.substring(beginLength).startsWith(title + "/");
                 });
                 childrenWithSameTitle.forEach((item) => children.remove(item));
+                const path = first.path.substring(0, restPath.indexOf("/") + beginLength);
                 list.push({
                     title: title,
-                    path: first.path.substring(0, restPath.indexOf("/") + beginLength),
+                    path: path,
+                    vaultPath: this.getVaultPath(path),
                     children: this._getTreeStructure(childrenWithSameTitle, (beginLength > 0 ? (beginLength + title.length) : title.length) + 1)
                 });
             } else {
-                list.push({ title: restPath, statusResult: first, path: first.path });
+                list.push({
+                    title: restPath,
+                    statusResult: first,
+                    path: first.path,
+                    vaultPath: this.getVaultPath(first.path)
+                });
                 children.remove(first);
             }
         }
@@ -124,11 +131,12 @@ export abstract class GitManager {
                 const singleChildIsDir = node.children?.first()?.statusResult == undefined;
 
                 if (!(node.children != undefined && singleChild && singleChildIsDir)) break;
-
-                node.title += "/" + node.children.first()!.title;
-                node.statusResult = node.children.first()!.statusResult;
-                node.path = node.children.first()!.path;
-                node.children = node.children.first()!.children;
+                const child = node.children.first()!;
+                node.title += "/" + child.title;
+                node.statusResult = child.statusResult;
+                node.path = child.path;
+                node.vaultPath = child.vaultPath;
+                node.children = child.children;
             }
             if (node.children != undefined) {
                 this.simplify(node.children);

diff --git a/src/types.ts b/src/types.ts
@@ -140,6 +140,7 @@ export interface BranchInfo {
 export interface TreeItem {
     title: string;
     path: string;
+    vaultPath: string;
     statusResult?: FileStatusResult;
     children?: TreeItem[];
 }

diff --git a/src/ui/sidebar/components/treeComponent.svelte b/src/ui/sidebar/components/treeComponent.svelte
@@ -14,6 +14,8 @@
 	export let fileType: FileType;
 	export let topLevel = false;
 	const closed: Record<string, boolean> = {};
+	$: side = (view.leaf.getRoot() as any).side == "left" ? "right" : "left";
+
 	function stage(path: string) {
 		plugin.gitManager.stageAll({ dir: path }).finally(() => {
 			dispatchEvent(new CustomEvent("git-refresh"));
@@ -25,11 +27,7 @@
 		});
 	}
 	function discard(item: TreeItem) {
-		new DiscardModal(
-			view.app,
-			false,
-			plugin.gitManager.getVaultPath(item.path)
-		)
+		new DiscardModal(view.app, false, item.vaultPath)
 			.myOpen()
 			.then((shouldDiscard) => {
 				if (shouldDiscard === true) {
@@ -73,6 +71,11 @@
 			<div class="nav-folder" class:is-collapsed={closed[entity.title]}>
 				<div
 					class="nav-folder-title"
+					aria-label-position={side}
+					aria-label={entity.vaultPath.split("/").last() !=
+					entity.vaultPath
+						? entity.vaultPath
+						: ""}
 					on:click|self={() => fold(entity)}
 				>
 					<div

diff --git a/src/ui/sidebar/gitView.svelte b/src/ui/sidebar/gitView.svelte
@@ -88,6 +88,7 @@
 			lastPulledFilesHierarchy = {
 				title: "",
 				path: "",
+				vaultPath: "",
 				children: plugin.gitManager.getTreeStructure(lastPulledFiles),
 			};
 		}
@@ -109,13 +110,15 @@
 				changeHierarchy = {
 					title: "",
 					path: "",
+					vaultPath: "",
 					children: plugin.gitManager.getTreeStructure(
 						status.changed
 					),
 				};
 				stagedHierarchy = {
 					title: "",
 					path: "",
+					vaultPath: "",
 					children: plugin.gitManager.getTreeStructure(status.staged),
 				};
 			}