From b421a1916c5041678d97dabe7202b94a9c2c0583 Mon Sep 17 00:00:00 2001
From: Koen Vlaswinkel <koesie10@github.com>
Date: Wed, 6 Dec 2023 11:04:45 +0100
Subject: [PATCH] Switch to styled-components for compare components

---
 .../ql-vscode/src/view/compare/Compare.tsx    | 21 +++++++++++++++----
 .../src/view/compare/CompareTable.tsx         | 13 ++++++++++--
 .../src/view/results/resultsView.css          | 21 -------------------
 3 files changed, 28 insertions(+), 27 deletions(-)

diff --git a/extensions/ql-vscode/src/view/compare/Compare.tsx b/extensions/ql-vscode/src/view/compare/Compare.tsx
index 57e3fc2bf..99395d2f8 100644
--- a/extensions/ql-vscode/src/view/compare/Compare.tsx
+++ b/extensions/ql-vscode/src/view/compare/Compare.tsx
@@ -1,5 +1,6 @@
 import * as React from "react";
 import { useState, useEffect } from "react";
+import { styled } from "styled-components";
 
 import {
   ToCompareViewMessage,
@@ -21,6 +22,18 @@ const emptyComparison: SetComparisonsMessage = {
   message: "Empty comparison",
 };
 
+const Header = styled.div`
+  display: flex;
+`;
+
+const HeaderTitle = styled.div`
+  margin: 0 1.5rem;
+`;
+
+const Message = styled.div`
+  padding: 1.5rem;
+`;
+
 export function Compare(_: Record<string, never>): JSX.Element {
   const [comparison, setComparison] =
     useState<SetComparisonsMessage>(emptyComparison);
@@ -57,8 +70,8 @@ export function Compare(_: Record<string, never>): JSX.Element {
   try {
     return (
       <>
-        <div className="vscode-codeql__compare-header">
-          <div className="vscode-codeql__compare-header-item">Comparing:</div>
+        <Header>
+          <HeaderTitle>Comparing:</HeaderTitle>
           <CompareSelector
             availableResultSets={comparison.commonResultSetNames}
             currentResultSetName={comparison.currentResultSetName}
@@ -66,11 +79,11 @@ export function Compare(_: Record<string, never>): JSX.Element {
               vscode.postMessage({ t: "changeCompare", newResultSetName })
             }
           />
-        </div>
+        </Header>
         {hasRows ? (
           <CompareTable comparison={comparison}></CompareTable>
         ) : (
-          <div className="vscode-codeql__compare-message">{message}</div>
+          <Message>{message}</Message>
         )}
       </>
     );
diff --git a/extensions/ql-vscode/src/view/compare/CompareTable.tsx b/extensions/ql-vscode/src/view/compare/CompareTable.tsx
index 14d375da8..feedc077f 100644
--- a/extensions/ql-vscode/src/view/compare/CompareTable.tsx
+++ b/extensions/ql-vscode/src/view/compare/CompareTable.tsx
@@ -20,6 +20,15 @@ const OpenButton = styled(TextButton)`
   padding: 0;
 `;
 
+const Table = styled.table`
+  margin: 20px 0;
+  width: 100%;
+
+  & > tbody {
+    vertical-align: top;
+  }
+`;
+
 export default function CompareTable(props: Props) {
   const comparison = props.comparison;
   const result = props.comparison.result!;
@@ -50,7 +59,7 @@ export default function CompareTable(props: Props) {
   }
 
   return (
-    <table className="vscode-codeql__compare-body">
+    <Table>
       <thead>
         <tr>
           <td>
@@ -97,6 +106,6 @@ export default function CompareTable(props: Props) {
           </td>
         </tr>
       </tbody>
-    </table>
+    </Table>
   );
 }
diff --git a/extensions/ql-vscode/src/view/results/resultsView.css b/extensions/ql-vscode/src/view/results/resultsView.css
index ca2966385..c1f52636b 100644
--- a/extensions/ql-vscode/src/view/results/resultsView.css
+++ b/extensions/ql-vscode/src/view/results/resultsView.css
@@ -168,27 +168,6 @@ td.vscode-codeql__path-index-cell {
   opacity: 0.6;
 }
 
-.vscode-codeql__compare-header {
-  display: flex;
-}
-
-.vscode-codeql__compare-header-item {
-  margin: 0 1.5rem;
-}
-
-.vscode-codeql__compare-message {
-  padding: 1.5rem;
-}
-
-.vscode-codeql__compare-body {
-  margin: 20px 0;
-  width: 100%;
-}
-
-.vscode-codeql__compare-body > tbody {
-  vertical-align: top;
-}
-
 .vscode-codeql__empty-query-message {
   height: 300px;
   display: flex;