Bind visible inventory to the active view and test concurrent bootstrap
This commit is contained in:
+14
-13
@@ -1,4 +1,4 @@
|
||||
import React, { useEffect, useState } from 'react';
|
||||
import React, { useEffect, useMemo, useState } from 'react';
|
||||
|
||||
export const errorText = (error: unknown) =>
|
||||
error instanceof Error ? error.message : 'Unbekannter Fehler';
|
||||
@@ -14,24 +14,23 @@ export function useResource<T>(
|
||||
deps: React.DependencyList,
|
||||
poll = false
|
||||
) {
|
||||
const [data, setData] = useState<T | null>(null),
|
||||
[error, setError] = useState<string | null>(null),
|
||||
[revision, setRevision] = useState(0);
|
||||
const [revision, setRevision] = useState(0);
|
||||
const requestKey = useMemo(() => ({}), [...deps, revision]);
|
||||
const [response, setResponse] = useState<{ key: object; data: T | null; error: string | null } | null>(null);
|
||||
useEffect(() => {
|
||||
let active = true;
|
||||
const controller = new AbortController();
|
||||
let timer: ReturnType<typeof setTimeout> | undefined;
|
||||
setData(null);
|
||||
setError(null);
|
||||
const run = async () => {
|
||||
try {
|
||||
const result = await load(controller.signal);
|
||||
if (active) {
|
||||
setData(result);
|
||||
setError(null);
|
||||
}
|
||||
if (active) setResponse({ key: requestKey, data: result, error: null });
|
||||
} catch (e) {
|
||||
if (active) setError(errorText(e));
|
||||
if (active) setResponse(previous => ({
|
||||
key: requestKey,
|
||||
data: previous?.key === requestKey ? previous.data : null,
|
||||
error: errorText(e)
|
||||
}));
|
||||
} finally {
|
||||
if (active && poll) timer = setTimeout(run, 4000);
|
||||
}
|
||||
@@ -42,6 +41,8 @@ export function useResource<T>(
|
||||
controller.abort();
|
||||
clearTimeout(timer);
|
||||
};
|
||||
}, [...deps, revision]);
|
||||
return { data, error, reload: () => setRevision((v) => v + 1) };
|
||||
}, [requestKey]);
|
||||
// A view change can render before its effect runs. Only expose data for the active request.
|
||||
const current = response?.key === requestKey ? response : null;
|
||||
return { data: current?.data ?? null, error: current?.error ?? null, reload: () => setRevision((v) => v + 1) };
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user