martials/old.martials.no
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fixed error on load and search path should be removed when user clicks x

Browse Source
This commit is contained in:
Martin Berg Alstad 2023-01-21 11:55:56 +01:00
parent 4c95704f86
commit 5d05d828a2
1 changed files with 13 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
src/truth-table.tsx
View File

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