forked/topola-viewer
1
0
Fork 0
mirror of https://github.com/PeWu/topola-viewer.git synced 2026-07-17 17:21:48 +00:00
Code Issues Packages Projects Releases Wiki Activity

Split long useEffect in useGenealogyLoader

Browse Source
This commit is contained in:
Przemek Więch
2026-06-24 16:49:18 +02:00
parent 445009a89b
commit 6c8a716ed0
1 changed files with 117 additions and 107 deletions
Download Patch File Download Diff File Expand all files Collapse all files

140
src/hooks/use_genealogy_loader.ts
View File

@@ -195,43 +195,29 @@ export function useGenealogyLoader(options: {
loadedSelectionRef.current = undefined;
}, []);
// Main data loading and updating side-effect
useEffect(() => {
(async () => {
if (location.pathname !== '/view') {
if (state !== AppState.INITIAL) {
setState(AppState.INITIAL);
}
setData(undefined);
return;
}
const args = getArguments(location);
if (!args.sourceSpec) {
navigate({pathname: '/'}, {replace: true});
return;
}
if (
const shouldTriggerNewLoad = useCallback(
(newSourceSpec: DataSourceSpec, newSelection?: IndiInfo) => {
return (
(state === AppState.INITIAL ||
isNewData(args.sourceSpec, args.selection)) &&
isNewData(newSourceSpec, newSelection)) &&
state !== AppState.LOADING &&
state !== AppState.LOADING_MORE
) {
);
},
[state, isNewData],
);
const triggerNewLoad = useCallback(
async (newSourceSpec: DataSourceSpec, newSelection?: IndiInfo) => {
setState(AppState.LOADING);
setSourceSpec(args.sourceSpec);
loadedSelectionRef.current = args.selection;
setSourceSpec(newSourceSpec);
loadedSelectionRef.current = newSelection;
const currentFetchId = ++fetchIdRef.current;
setLoadingStatus('Loading…');
try {
const data = await loadData(
args.sourceSpec,
args.selection,
(status) => {
const data = await loadData(newSourceSpec, newSelection, (status) => {
if (isMountedRef.current) setLoadingStatus(status);
},
);
});
if (!isMountedRef.current || fetchIdRef.current !== currentFetchId) {
return;
}
@@ -239,54 +225,54 @@ export function useGenealogyLoader(options: {
`Rendering chart (${data.chartData.indis.length.toLocaleString()} people)…`,
);
setData(data);
loadedSelectionRef.current = getSelection(
data.chartData,
args.selection,
);
loadedSelectionRef.current = getSelection(data.chartData, newSelection);
setState(AppState.SHOWING_CHART);
} catch (error: unknown) {
if (!isMountedRef.current || fetchIdRef.current !== currentFetchId) {
return;
}
if (error instanceof GoogleDriveAuthError) {
if (args.sourceSpec.source === DataSourceEnum.GOOGLE_DRIVE) {
onAuthError((args.sourceSpec as GoogleDriveSourceSpec).fileId);
if (newSourceSpec.source === DataSourceEnum.GOOGLE_DRIVE) {
onAuthError((newSourceSpec as GoogleDriveSourceSpec).fileId);
}
} else {
setErrorMessage(getI18nMessage(error as Error, intl));
}
}
} else if (
state === AppState.SHOWING_CHART ||
state === AppState.LOADING_MORE
) {
const loadMoreFromWikitree =
args.sourceSpec.source === DataSourceEnum.WIKITREE &&
!!args.selection &&
(!loadedSelectionRef.current ||
loadedSelectionRef.current.id !== args.selection.id);
setState(
loadMoreFromWikitree ? AppState.LOADING_MORE : AppState.SHOWING_CHART,
},
[intl, loadData, onAuthError, setErrorMessage],
);
if (loadMoreFromWikitree && args.selection) {
const shouldTriggerWikiTreeLoadMore = useCallback(
(newSourceSpec: DataSourceSpec, newSelection?: IndiInfo) => {
if (state !== AppState.SHOWING_CHART && state !== AppState.LOADING_MORE) {
return false;
}
return (
newSourceSpec.source === DataSourceEnum.WIKITREE &&
!!newSelection &&
(!loadedSelectionRef.current ||
loadedSelectionRef.current.id !== newSelection.id)
);
},
[state],
);
const triggerWikiTreeLoadMore = useCallback(
async (selection: IndiInfo) => {
setState(AppState.LOADING_MORE);
const currentFetchId = ++fetchIdRef.current;
try {
const data = await loadWikiTree(args.selection.id, intl);
if (
!isMountedRef.current ||
fetchIdRef.current !== currentFetchId
) {
const data = await loadWikiTree(selection.id, intl);
if (!isMountedRef.current || fetchIdRef.current !== currentFetchId) {
return;
}
const newSelection = getSelection(data.chartData, args.selection);
const newSelection = getSelection(data.chartData, selection);
setData(data);
loadedSelectionRef.current = newSelection;
setState(AppState.SHOWING_CHART);
} catch (error: unknown) {
if (
!isMountedRef.current ||
fetchIdRef.current !== currentFetchId
) {
if (!isMountedRef.current || fetchIdRef.current !== currentFetchId) {
return;
}
setState(AppState.SHOWING_CHART);
@@ -300,20 +286,44 @@ export function useGenealogyLoader(options: {
),
);
}
},
[intl, displayErrorPopup],
);
// Main data loading and updating side-effect
useEffect(() => {
if (location.pathname !== '/view') {
if (state !== AppState.INITIAL) {
setState(AppState.INITIAL);
}
setData(undefined);
return;
}
const args = getArguments(location);
if (!args.sourceSpec) {
navigate({pathname: '/'}, {replace: true});
return;
}
if (shouldTriggerNewLoad(args.sourceSpec, args.selection)) {
triggerNewLoad(args.sourceSpec, args.selection);
} else if (
shouldTriggerWikiTreeLoadMore(args.sourceSpec, args.selection) &&
args.selection
) {
triggerWikiTreeLoadMore(args.selection);
} else if (state === AppState.LOADING_MORE) {
setState(AppState.SHOWING_CHART);
}
})();
}, [
location,
state,
data,
navigate,
intl,
isNewData,
loadData,
onAuthError,
setErrorMessage,
displayErrorPopup,
shouldTriggerNewLoad,
triggerNewLoad,
shouldTriggerWikiTreeLoadMore,
triggerWikiTreeLoadMore,
]);
// Clean up object URLs created for uploaded images/files when the dataset