Better listening for path changes

This commit is contained in:
Gregory Schier
2023-10-28 23:41:24 -07:00
parent c2c3a28aab
commit 899092b4d2
5 changed files with 37 additions and 28 deletions

View File

@@ -1,21 +0,0 @@
import { appWindow } from '@tauri-apps/api/window';
import { NAMESPACE_NO_SYNC, getKeyValue, setKeyValue } from './keyValueStore';
const key = ['window_pathname', appWindow.label];
const namespace = NAMESPACE_NO_SYNC;
const fallback = undefined;
export async function initPathnamePersistance() {
if (window.location.pathname === '/') {
const pathname = await getKeyValue<string | undefined>({ key, namespace, fallback });
if (pathname != null) {
window.location.replace(pathname);
}
return;
}
window.addEventListener('pushstate', async () => {
const { pathname: value } = window.location;
await setKeyValue<string | undefined>({ key, namespace, value });
});
}

View File

@@ -36,7 +36,7 @@ export async function getKeyValue<T>({
return extractKeyValueOrFallback(kv, fallback);
}
export function extractKeyValue<T>(kv: KeyValue | null): T | undefined {
function extractKeyValue<T>(kv: KeyValue | null): T | undefined {
if (kv === null) return undefined;
try {
return JSON.parse(kv.value) as T;
@@ -45,7 +45,7 @@ export function extractKeyValue<T>(kv: KeyValue | null): T | undefined {
}
}
export function extractKeyValueOrFallback<T>(kv: KeyValue | null, fallback: T): T {
function extractKeyValueOrFallback<T>(kv: KeyValue | null, fallback: T): T {
const v = extractKeyValue<T>(kv);
if (v === undefined) return fallback;
return v;

View File

@@ -0,0 +1,21 @@
import { appWindow } from '@tauri-apps/api/window';
import { NAMESPACE_NO_SYNC, getKeyValue, setKeyValue } from './keyValueStore';
const key = ['window_pathname', appWindow.label];
const namespace = NAMESPACE_NO_SYNC;
const fallback = undefined;
export async function setPathname(value: string) {
await setKeyValue<string | undefined>({ key, namespace, value });
}
export async function maybeRestorePathname() {
if (window.location.pathname !== '/') {
return;
}
const pathname = await getKeyValue<string | undefined>({ key, namespace, fallback });
if (pathname != null) {
window.location.replace(pathname);
}
}