refactor: combine all history view tooltips in one

denolehov · Mar 3, 2024 · 4397d86 · 4397d86
1 parent 675cef5
commit 4397d86
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 16 deletions.
diff --git a/src/gitManager/simpleGit.ts b/src/gitManager/simpleGit.ts
@@ -574,7 +574,7 @@ export class SimpleGit extends GitManager {
                 name: e.author_name,
                 email: e.author_email,
             },
-            refs: e.refs.split(", "),
+            refs: e.refs.split(", ").filter((e) => e.length > 0),
             diff: {
                 ...e.diff!,
                 files:

diff --git a/src/ui/history/components/logComponent.svelte b/src/ui/history/components/logComponent.svelte
@@ -39,6 +39,10 @@
     <div class="tree-item nav-folder" class:is-collapsed={isCollapsed}>
         <div
             class="tree-item-self is-clickable nav-folder-title"
+            aria-label={`${log.refs.length > 0 ? log.refs.join(", ") + "\n" : ""}${log.author?.name}
+${moment(log.date).format(plugin.settings.commitDateFormat)}
+${log.message}`}
+            data-tooltip-position={side}
             on:click={() => (isCollapsed = !isCollapsed)}
         >
             <div
@@ -66,31 +70,19 @@
                     </div>
                 {/if}
                 {#if plugin.settings.authorInHistoryView != "hide" && log.author?.name}
-                    <div
-                        class="git-author"
-                        aria-label={log.author.name}
-                        data-tooltip-position={side}
-                    >
+                    <div class="git-author">
                         {authorToString(log)}
                     </div>
                 {/if}
                 {#if plugin.settings.dateInHistoryView}
-                    <div
-                        class="git-date"
-                        aria-label={log.date}
-                        data-tooltip-position={side}
-                    >
+                    <div class="git-date">
                         {moment(log.date).format(
                             plugin.settings.commitDateFormat
                         )}
                     </div>
                 {/if}
 
-                <div
-                    class="tree-item-inner nav-folder-title-content"
-                    aria-label={log.message}
-                    data-tooltip-position={side}
-                >
+                <div class="tree-item-inner nav-folder-title-content">
                     {log.message}
                 </div>
             </div>