Merge origin/master (0.6.12 headless world and settings hooks) into feat/portable-characters

This commit is contained in:
Дмитрий committed 2026-10-10 08:12:25 +05:00
commit 9d570b7688
7 files changed
+109 -21

No files matched your search

+18 -18
View File
@@ -243,6 +243,24 @@ export function SettingsPage(props: {
});
const pending = dirtyKeys.length + Object.keys(rawEdits).length + Object.keys(colEdits).length;
useEffect(() => {
if (pending > 0) {
props.onRegisterGuard?.({
isDirty: () => pending > 0,
save: () => saveEverything(),
discard: () => {
setDraft({});
setErrors({});
setRawEdits({});
setColEdits({});
},
});
} else {
props.onRegisterGuard?.(null);
}
return () => props.onRegisterGuard?.(null);
}, [pending, props.onRegisterGuard]);
if (fatal) {
return (
<div className="max-w-xl">
@@ -354,24 +372,6 @@ export function SettingsPage(props: {
}
}
useEffect(() => {
if (pending > 0) {
props.onRegisterGuard?.({
isDirty: () => pending > 0,
save: () => saveEverything(),
discard: () => {
setDraft({});
setErrors({});
setRawEdits({});
setColEdits({});
},
});
} else {
props.onRegisterGuard?.(null);
}
return () => props.onRegisterGuard?.(null);
}, [pending, props.onRegisterGuard]);
async function openPreset(id: string) {
setSaved(null);
if (squid) {