From 7abe936cd17b4d254634ebfc75ba9ae4ae24fff5 Mon Sep 17 00:00:00 2001
From: HF <pixelplanetdev@gmail.com>
Date: Fri, 10 Jan 2020 20:50:25 +0100
Subject: [PATCH] fix Loading... message on date select in historical view

---
 src/components/HistorySelect.jsx | 11 +++++++----
 src/components/base.tcss         |  3 +--
 2 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/src/components/HistorySelect.jsx b/src/components/HistorySelect.jsx
index bc8e0cf4..c68c540a 100644
--- a/src/components/HistorySelect.jsx
+++ b/src/components/HistorySelect.jsx
@@ -21,7 +21,8 @@ async function getTimes(day, canvasId) {
       return [];
     }
     const times = await response.json();
-    const parsedTimes = times.map((a) => `${a.substr(0, 2)}:${a.substr(-2, 2)}`);
+    const parsedTimes = times
+      .map((a) => `${a.substr(0, 2)}:${a.substr(-2, 2)}`);
     return parsedTimes;
   } catch {
     return [];
@@ -41,7 +42,7 @@ class HistorySelect extends React.Component {
 
     this.state = {
       submitting: false,
-      selectedDate: new Date(),
+      selectedDate: null,
       max,
     };
 
@@ -59,6 +60,7 @@ class HistorySelect extends React.Component {
 
     this.setState({
       submitting: true,
+      times: [],
     });
     const {
       canvasId,
@@ -99,14 +101,15 @@ class HistorySelect extends React.Component {
         <div>
           { (times && times.length > 0)
             ? (
-              <select onChange={(evt) => setTime(selectedDate, evt.target.value)}>
+              <select onChange={(e) => setTime(selectedDate, e.target.value)}>
                 {times.map((value) => (
                   <option value={value}>{value}</option>
                 ))}
               </select>
             )
-            : <p>Select Date</p> }
+            : null }
           { (submitting) ? <p>Loading...</p> : null }
+          { (!selectedDate && !submitting) ? <p>Select Date above</p> : null }
         </div>
       </div>
     );
diff --git a/src/components/base.tcss b/src/components/base.tcss
index 103a39a7..1f883516 100644
--- a/src/components/base.tcss
+++ b/src/components/base.tcss
@@ -180,9 +180,8 @@ kbd {
     background-color: rgba(226, 226, 226, 0.80);
     color: black;
     font-size: 14px;
-    line-height: 30px;
+    line-height: 26px;
     text-align: center;
-    vertical-align: middle;
     border: solid black;
     border-width: thin;
     padding: 0 24px;