tarrien/Mastodon
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix page refresh when trying to save custom profile fields (#39828)

Browse Source
This commit is contained in:
diondiondion 2026-07-15 11:28:44 +02:00 committed by Tarrien
parent fad750b2e6
commit bee749985a
1 changed files with 12 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
app/javascript/mastodon/features/ui/components/confirmation_modals/confirmation_modal.tsx
View File

@ -52,13 +52,18 @@ export const ConfirmationModal: React.FC<
noCloseOnConfirm = false,
noFocusButton = false,
}) => {
const handleClick = useCallback(() => {
if (!noCloseOnConfirm) {
onClose();
}
const handleSubmit = useCallback<React.SubmitEventHandler<HTMLFormElement>>(
(e) => {
e.preventDefault();
void onConfirm();
}, [onClose, onConfirm, noCloseOnConfirm]);
if (!noCloseOnConfirm) {
onClose();
}
void onConfirm();
},
[onClose, onConfirm, noCloseOnConfirm],
);
const handleSecondary = useCallback(() => {
onClose();
@ -66,7 +71,7 @@ export const ConfirmationModal: React.FC<
}, [onClose, onSecondary]);
return (
<ModalShell onSubmit={handleClick}>
<ModalShell onSubmit={handleSubmit}>
<ModalShellBody className={className}>
{noFocusButton ? (
<NavigationFocusTarget as='h1' id={titleId}>
@ -107,7 +112,6 @@ export const ConfirmationModal: React.FC<
{/* eslint-disable jsx-a11y/no-autofocus -- we are in a modal and thus autofocusing is justified */}
<Button
type='submit'
onClick={handleClick}
loading={updating}
disabled={disabled}
autoFocus={!noFocusButton}