From c007b15176fcf5308b8d1f24d47adc280be36e02 Mon Sep 17 00:00:00 2001
From: Keith Daulton <kdaulton@d13design.com>
Date: Wed, 24 Aug 2022 23:04:54 -0400
Subject: [PATCH] Updates commit graph status bar

- adds feedback link
- updates focus state colors
- updates aria-activedescendant when viewing repos
---
 src/webviews/apps/plus/graph/GraphWrapper.tsx | 23 +++++++++++++++++------
 src/webviews/apps/plus/graph/graph.scss       | 10 ++++++++++
 2 files changed, 27 insertions(+), 6 deletions(-)

diff --git a/src/webviews/apps/plus/graph/GraphWrapper.tsx b/src/webviews/apps/plus/graph/GraphWrapper.tsx
index c4b5ba8..50ed5f8 100644
--- a/src/webviews/apps/plus/graph/GraphWrapper.tsx
+++ b/src/webviews/apps/plus/graph/GraphWrapper.tsx
@@ -274,7 +274,13 @@ export function GraphWrapper({
 							id="repo-actioncombo-label"
 							className="actioncombo__label"
 							role="combobox"
-							aria-activedescendant=""
+							aria-activedescendant={
+								repoExpanded
+									? `repo-actioncombo-item-${reposList.findIndex(
+											item => item.path === currentRepository?.path,
+									  )}`
+									: undefined
+							}
 							onClick={() => handleToggleRepos()}
 						>
 							<span className="codicon codicon-repo actioncombo__icon" aria-label="Repository "></span>
@@ -304,14 +310,14 @@ export function GraphWrapper({
 									</button>
 								))
 							) : (
-								<li
+								<span
 									className="actioncombo__item"
 									role="option"
 									id="repo-actioncombo-item-0"
 									aria-selected="true"
 								>
 									None available
-								</li>
+								</span>
 							)}
 						</div>
 					</div>
@@ -320,11 +326,16 @@ export function GraphWrapper({
 							{graphList.length} commit{graphList.length ? 's' : ''}
 						</span>
 					)}
-					{isLoading && (
-						<span className={'icon--loading'}/>
-					)}
+					{isLoading && <span className="icon--loading" />}
 				</div>
 				<div className="actionbar__group">
+					<a
+						href="https://github.com/gitkraken/vscode-gitlens/discussions/2158"
+						title="Commit Graph Feedback"
+						aria-label="Commit Graph Feedback"
+					>
+						<span className="codicon codicon-feedback"></span>
+					</a>{' '}
 					<span className="badge">Preview</span>
 				</div>
 			</footer>
diff --git a/src/webviews/apps/plus/graph/graph.scss b/src/webviews/apps/plus/graph/graph.scss
index 1c032f4..958b815 100644
--- a/src/webviews/apps/plus/graph/graph.scss
+++ b/src/webviews/apps/plus/graph/graph.scss
@@ -46,6 +46,15 @@ a {
 			margin: 0;
 		}
 	}
+
+	a {
+		color: inherit;
+	}
+
+	:focus {
+		outline: 1px solid var(--vscode-focusBorder);
+		outline-offset: -1x;
+	}
 }
 
 .actioncombo {
@@ -105,6 +114,7 @@ a {
 		min-width: 100%;
 		width: max-content;
 		z-index: 100;
+		background-color: var(--actionbar-background-color);
 	}
 
 	&__label:not([aria-expanded='true']) + &__list {