Skip to content

Commit c67b974

Browse files
Move from Gitlens to the library the columns settings button (#2807)
* GK-3665 - Move from Gitlens to the library the columns settings button * Bumps graph to v10.1.9
1 parent 1ff2941 commit c67b974

File tree

4 files changed

+19
-16
lines changed

4 files changed

+19
-16
lines changed

package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14629,7 +14629,7 @@
1462914629
"vscode:prepublish": "yarn run bundle"
1463014630
},
1463114631
"dependencies": {
14632-
"@gitkraken/gitkraken-components": "10.1.8",
14632+
"@gitkraken/gitkraken-components": "10.1.9",
1463314633
"@microsoft/fast-element": "1.12.0",
1463414634
"@microsoft/fast-react-wrapper": "0.3.18",
1463514635
"@octokit/core": "4.2.4",

src/webviews/apps/plus/graph/GraphWrapper.tsx

Lines changed: 2 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -131,6 +131,7 @@ const createIconElements = (): Record<string, ReactElement> => {
131131
'message',
132132
'changes',
133133
'files',
134+
'settings',
134135
];
135136

136137
const miniIconList = ['upstream-ahead', 'upstream-behind'];
@@ -1397,6 +1398,7 @@ export function GraphWrapper({
13971398
onGraphColumnsReOrdered={handleOnGraphColumnsReOrdered}
13981399
onGraphMouseLeave={minimap.current ? handleOnGraphMouseLeave : undefined}
13991400
onGraphRowHovered={minimap.current ? handleOnGraphRowHovered : undefined}
1401+
onSettingsClick={handleToggleColumnSettings}
14001402
onSelectGraphRows={handleSelectGraphRows}
14011403
onToggleRefsVisibilityClick={handleOnToggleRefsVisibilityClick}
14021404
onEmailsMissingAvatarUrls={handleMissingAvatars}
@@ -1416,15 +1418,6 @@ export function GraphWrapper({
14161418
) : (
14171419
<p>No repository is selected</p>
14181420
)}
1419-
<button
1420-
className="column-button"
1421-
type="button"
1422-
role="button"
1423-
data-vscode-context={context?.settings || JSON.stringify({ webviewItem: 'gitlens:graph:settings' })}
1424-
onClick={handleToggleColumnSettings}
1425-
>
1426-
<span className="codicon codicon-settings-gear" aria-label="Column Settings"></span>
1427-
</button>
14281421
</main>
14291422
</>
14301423
);

src/webviews/apps/plus/graph/graph.scss

Lines changed: 12 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -411,7 +411,7 @@ button:not([disabled]),
411411
}
412412
}
413413

414-
.column-button {
414+
.columns-settings {
415415
--column-button-height: 19px;
416416

417417
position: absolute;
@@ -452,6 +452,10 @@ button:not([disabled]),
452452
}
453453
}
454454

455+
.gk-graph.bs-tooltip {
456+
z-index: 1040;
457+
}
458+
455459
.alert {
456460
--alert-foreground: var(--color-alert-foreground);
457461
--alert-background: var(--color-alert-infoBackground);
@@ -717,7 +721,13 @@ button:not([disabled]),
717721
content: '\ea9a';
718722
}
719723
}
720-
724+
&--settings {
725+
&::before {
726+
// codicon-settings-gear
727+
font-family: codicon;
728+
content: '\eb51';
729+
}
730+
}
721731
&--branch {
722732
&::before {
723733
// codicon-git-branch

yarn.lock

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -202,10 +202,10 @@
202202
resolved "https://registry.yarnpkg.com/@eslint/js/-/js-8.44.0.tgz#961a5903c74139390478bdc808bcde3fc45ab7af"
203203
integrity sha512-Ag+9YM4ocKQx9AarydN0KY2j0ErMHNIocPDrVo8zAE44xLTjEtz81OdR68/cydGtk6m6jDb5Za3r2useMzYmSw==
204204

205-
"@gitkraken/[email protected].8":
206-
version "10.1.8"
207-
resolved "https://registry.yarnpkg.com/@gitkraken/gitkraken-components/-/gitkraken-components-10.1.8.tgz#2ee9e70817d51b0928731e57e640ac49f3e7502c"
208-
integrity sha512-kq6d+HVlELdFHpIMMgVuopqjX63Jtt7udW7OHbhf1Za/rrlwczX2K1a+wPYEGVQvHjaOrghTVmG/mogNhMQ0qA==
205+
"@gitkraken/[email protected].9":
206+
version "10.1.9"
207+
resolved "https://registry.npmjs.org/@gitkraken/gitkraken-components/-/gitkraken-components-10.1.9.tgz#751a9bce02f46a11facc000fefe7844802a8c9c8"
208+
integrity sha512-1NicZneMfzj4zuqtZjlAMho/85+qseqM+cEHLR696qcEV0sp0AmujPTvj4PZCIV/Y7J/j3uKvAMFzBsbgdTi4g==
209209
dependencies:
210210
"@axosoft/react-virtualized" "9.22.3-gitkraken.3"
211211
classnames "2.3.2"

0 commit comments

Comments
 (0)