Skip to content

Commit b421a19

Browse files
committed
Switch to styled-components for compare components
1 parent cce8585 commit b421a19

File tree

3 files changed

+28
-27
lines changed

3 files changed

+28
-27
lines changed

extensions/ql-vscode/src/view/compare/Compare.tsx

Lines changed: 17 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
import * as React from "react";
22
import { useState, useEffect } from "react";
3+
import { styled } from "styled-components";
34

45
import {
56
ToCompareViewMessage,
@@ -21,6 +22,18 @@ const emptyComparison: SetComparisonsMessage = {
2122
message: "Empty comparison",
2223
};
2324

25+
const Header = styled.div`
26+
display: flex;
27+
`;
28+
29+
const HeaderTitle = styled.div`
30+
margin: 0 1.5rem;
31+
`;
32+
33+
const Message = styled.div`
34+
padding: 1.5rem;
35+
`;
36+
2437
export function Compare(_: Record<string, never>): JSX.Element {
2538
const [comparison, setComparison] =
2639
useState<SetComparisonsMessage>(emptyComparison);
@@ -57,20 +70,20 @@ export function Compare(_: Record<string, never>): JSX.Element {
5770
try {
5871
return (
5972
<>
60-
<div className="vscode-codeql__compare-header">
61-
<div className="vscode-codeql__compare-header-item">Comparing:</div>
73+
<Header>
74+
<HeaderTitle>Comparing:</HeaderTitle>
6275
<CompareSelector
6376
availableResultSets={comparison.commonResultSetNames}
6477
currentResultSetName={comparison.currentResultSetName}
6578
updateResultSet={(newResultSetName: string) =>
6679
vscode.postMessage({ t: "changeCompare", newResultSetName })
6780
}
6881
/>
69-
</div>
82+
</Header>
7083
{hasRows ? (
7184
<CompareTable comparison={comparison}></CompareTable>
7285
) : (
73-
<div className="vscode-codeql__compare-message">{message}</div>
86+
<Message>{message}</Message>
7487
)}
7588
</>
7689
);

extensions/ql-vscode/src/view/compare/CompareTable.tsx

Lines changed: 11 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,15 @@ const OpenButton = styled(TextButton)`
2020
padding: 0;
2121
`;
2222

23+
const Table = styled.table`
24+
margin: 20px 0;
25+
width: 100%;
26+
27+
& > tbody {
28+
vertical-align: top;
29+
}
30+
`;
31+
2332
export default function CompareTable(props: Props) {
2433
const comparison = props.comparison;
2534
const result = props.comparison.result!;
@@ -50,7 +59,7 @@ export default function CompareTable(props: Props) {
5059
}
5160

5261
return (
53-
<table className="vscode-codeql__compare-body">
62+
<Table>
5463
<thead>
5564
<tr>
5665
<td>
@@ -97,6 +106,6 @@ export default function CompareTable(props: Props) {
97106
</td>
98107
</tr>
99108
</tbody>
100-
</table>
109+
</Table>
101110
);
102111
}

extensions/ql-vscode/src/view/results/resultsView.css

Lines changed: 0 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -168,27 +168,6 @@ td.vscode-codeql__path-index-cell {
168168
opacity: 0.6;
169169
}
170170

171-
.vscode-codeql__compare-header {
172-
display: flex;
173-
}
174-
175-
.vscode-codeql__compare-header-item {
176-
margin: 0 1.5rem;
177-
}
178-
179-
.vscode-codeql__compare-message {
180-
padding: 1.5rem;
181-
}
182-
183-
.vscode-codeql__compare-body {
184-
margin: 20px 0;
185-
width: 100%;
186-
}
187-
188-
.vscode-codeql__compare-body > tbody {
189-
vertical-align: top;
190-
}
191-
192171
.vscode-codeql__empty-query-message {
193172
height: 300px;
194173
display: flex;

0 commit comments

Comments
 (0)