From 5d05d828a25a37b25a33c5064532dc3e9bed62e4 Mon Sep 17 00:00:00 2001
From: Martin Berg Alstad <600878@stud.hvl.no>
Date: Sat, 21 Jan 2023 11:55:56 +0100
Subject: [PATCH] Fixed error on load and search path should be removed when
 user clicks x

---
 src/truth-table.tsx | 23 +++++++++++++----------
 1 file changed, 13 insertions(+), 10 deletions(-)

diff --git a/src/truth-table.tsx b/src/truth-table.tsx
index e11956a..ceb6959 100644
--- a/src/truth-table.tsx
+++ b/src/truth-table.tsx
@@ -57,7 +57,7 @@ const TruthTablePage: Component = () => {
 
     const [sortValues, setSortValues] = createSignal(sortOptions[0]);
 
-    const [isLoaded, setIsLoaded] = createSignal(true);
+    const [isLoaded, setIsLoaded] = createSignal<boolean | null>(null);
 
     const [error, setError] = createSignal<string | null>(null);
 
@@ -68,16 +68,16 @@ const TruthTablePage: Component = () => {
     function onClick(e: { preventDefault: () => void; }): void {
         e.preventDefault(); // Stops the page from reloading onClick
         const exp = getInputElement()?.value;
-
-        history.pushState(null, "", `?exp=${ encodeURIComponent(exp) }`);
-
-        getFetchResult(exp).then(null);
+        if (exp) {
+            history.pushState(null, "", `?exp=${ encodeURIComponent(exp) }`);
+            getFetchResult(exp).then(null);
+        }
     }
 
-    async function getFetchResult(exp: string | null): Promise<void> {
+    async function getFetchResult(exp: string): Promise<void> {
         setFetchResult(null);
 
-        if (exp && exp !== "") {
+        if (exp !== "") {
             setError(null);
             setIsLoaded(false);
             fetch(`https://api.martials.no/simplify-truths/simplify/table?exp=${ encodeURIComponent(exp) }&simplify=${ simplifyEnabled() }
@@ -107,6 +107,7 @@ const TruthTablePage: Component = () => {
         if (el) {
             el.value = "";
             setTyping(false);
+            history.replaceState(null, "", location.pathname);
             el.focus();
         }
     }
@@ -118,8 +119,10 @@ const TruthTablePage: Component = () => {
         const searchParams = new URLSearchParams(location.search);
         if (searchParams.has("exp")) {
             const exp = searchParams.get("exp");
-            getInputElement().value = exp;
-            getFetchResult(exp).then(null);
+            if (exp !== "") {
+                getInputElement().value = exp;
+                getFetchResult(exp).then(null);
+            }
         }
 
         // Focuses searchbar on load
@@ -248,7 +251,7 @@ const TruthTablePage: Component = () => {
 
                     </Row>
 
-                    <Show when={ !isLoaded() } keyed>
+                    <Show when={ isLoaded() === false } keyed>
                         <Icon path={ arrowPath } aria-label={ "Loading indicator" } class={ "animate-spin mx-auto" } />
                     </Show>