fix(presentation): re-translate form errors on locale change (08-10)
The form kept translated strings in state, so errors already on screen stayed in the old language. It now keeps message keys and translates on render. Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
This commit is contained in:
co-authored by
Claude Opus 5.5
parent
9d61eacdc7
commit
ee9b09563a
@@ -43,7 +43,7 @@ export function useAppForm<
|
||||
Command,
|
||||
Output,
|
||||
>(options: AppFormOptions<Values, Command, Output>) {
|
||||
const { message } = useLocale();
|
||||
const { resolve } = useLocale();
|
||||
const {
|
||||
schema,
|
||||
defaultValues,
|
||||
@@ -59,10 +59,28 @@ export function useAppForm<
|
||||
const [touched, setTouched] = useState<ReadonlySet<FieldName<Values>>>(
|
||||
() => new Set(),
|
||||
);
|
||||
const [fieldErrors, setFieldErrors] = useState<FieldErrors<Values>>(
|
||||
// 08-10. Errors are held as message keys and translated on render, so a
|
||||
// locale change re-translates the ones already on screen.
|
||||
const [fieldErrorKeys, setFieldErrors] = useState<FieldErrors<Values>>(
|
||||
() => ({} as FieldErrors<Values>),
|
||||
);
|
||||
const [formErrors, setFormErrors] = useState<readonly string[]>([]);
|
||||
const [formErrorKeys, setFormErrors] = useState<readonly string[]>([]);
|
||||
const fieldErrors = useMemo(
|
||||
() =>
|
||||
Object.freeze(
|
||||
Object.fromEntries(
|
||||
Object.entries(fieldErrorKeys).map(([name, key]) => [
|
||||
name,
|
||||
resolve(String(key)),
|
||||
]),
|
||||
),
|
||||
) as FieldErrors<Values>,
|
||||
[fieldErrorKeys, resolve],
|
||||
);
|
||||
const formErrors = useMemo(
|
||||
() => formErrorKeys.map((key) => resolve(key)),
|
||||
[formErrorKeys, resolve],
|
||||
);
|
||||
const [pending, setPending] = useState(false);
|
||||
const [result, setResult] = useState<FormResultState>("idle");
|
||||
const [statusFailure, setStatusFailure] = useState<AppFailure | null>(null);
|
||||
@@ -188,7 +206,7 @@ export function useAppForm<
|
||||
const mapped = mapValidationFailureToFields<Values>(
|
||||
outcome.error,
|
||||
allowedServerFields,
|
||||
message,
|
||||
messageKey,
|
||||
);
|
||||
setFieldErrors(mapped.fieldErrors);
|
||||
setFormErrors(mapped.formErrors);
|
||||
@@ -208,9 +226,7 @@ export function useAppForm<
|
||||
settleSuccessfulValues(submittedValues);
|
||||
} else if (outcome.error.kind === "CONFLICT") {
|
||||
unknownSubmissionRef.current = null;
|
||||
setFormErrors([
|
||||
message("form.conflict"),
|
||||
]);
|
||||
setFormErrors(["form.conflict"]);
|
||||
setResult("conflict");
|
||||
} else if (
|
||||
outcome.error.kind === "FORBIDDEN" ||
|
||||
@@ -224,11 +240,11 @@ export function useAppForm<
|
||||
);
|
||||
} else {
|
||||
unknownSubmissionRef.current = null;
|
||||
setFormErrors([message("form.unavailable")]);
|
||||
setFormErrors(["form.unavailable"]);
|
||||
setResult("unavailable");
|
||||
}
|
||||
},
|
||||
[allowedServerFields, focusFirstError, message, settleSuccessfulValues],
|
||||
[allowedServerFields, focusFirstError, settleSuccessfulValues],
|
||||
);
|
||||
|
||||
const validateAndSubmit = useCallback(
|
||||
@@ -241,14 +257,14 @@ export function useAppForm<
|
||||
const errors = issuesToFieldErrors<Values>(
|
||||
parsed.error.issues,
|
||||
allowedServerFields,
|
||||
message,
|
||||
messageKey,
|
||||
);
|
||||
setFieldErrors(errors);
|
||||
setFormErrors(
|
||||
parsed.error.issues.some(
|
||||
(issue) => !allowedServerFields.includes(issue.path[0] as FieldName<Values>),
|
||||
)
|
||||
? [message("form.validation.configuration")]
|
||||
? ["form.validation.configuration"]
|
||||
: [],
|
||||
);
|
||||
setTouched(new Set(allowedServerFields));
|
||||
@@ -272,7 +288,6 @@ export function useAppForm<
|
||||
applyOutcome,
|
||||
focusFirstError,
|
||||
mapToCommand,
|
||||
message,
|
||||
schema,
|
||||
submit,
|
||||
values,
|
||||
@@ -349,6 +364,9 @@ export function useAppForm<
|
||||
});
|
||||
}
|
||||
|
||||
/** Keeps the key: the form translates at render time. */
|
||||
const messageKey = (key: ParameterlessMessageKey): string => key;
|
||||
|
||||
const STATUS_RESULTS: ReadonlySet<FormResultState> = new Set([
|
||||
"reauth-required",
|
||||
"forbidden",
|
||||
|
||||
Reference in New Issue
Block a user