Allow keyboard modal form submission (#38826)

This commit is contained in:
Echo 2026-04-28 14:37:58 +02:00 committed by GitHub
parent 4f76bdfcb7
commit 03045425b7
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
4 changed files with 18 additions and 12 deletions

View File

@ -1,7 +1,6 @@
.input {
box-sizing: border-box;
display: block;
resize: vertical;
width: 100%;
padding: 10px 16px;
font-family: inherit;
@ -50,6 +49,10 @@
}
}
textarea.input {
resize: vertical;
}
.iconWrapper {
position: relative;
}

View File

@ -1,16 +1,17 @@
import classNames from 'classnames';
import { polymorphicForwardRef } from '@/types/polymorphic';
interface ModalShellProps {
className?: string;
children?: React.ReactNode;
}
export const ModalShell: React.FC<ModalShellProps> = ({
children,
className,
}) => {
return (
<div
export const ModalShell = polymorphicForwardRef<'form', ModalShellProps>(
({ as: Comp = 'form', children, className, ...restProps }, ref) => (
<Comp
{...restProps}
ref={ref}
className={classNames(
'modal-root__modal',
'safety-action-modal',
@ -18,9 +19,10 @@ export const ModalShell: React.FC<ModalShellProps> = ({
)}
>
{children}
</div>
);
};
</Comp>
),
);
ModalShell.displayName = 'ModalShell';
export const ModalShellBody: React.FC<ModalShellProps> = ({
children,

View File

@ -97,7 +97,7 @@ export const AccountJoinModal: FC<{
}, [anniversary, handle, dispatch, isMe]);
return (
<ModalShell className={classes.joinShell}>
<ModalShell as='div' className={classes.joinShell}>
<ModalShellBody className={classes.joinWrapper}>
<AccountAnniversaryImage anniversary={anniversary} />

View File

@ -65,7 +65,7 @@ export const ConfirmationModal: React.FC<
}, [onClose, onSecondary]);
return (
<ModalShell>
<ModalShell onSubmit={handleClick}>
<ModalShellBody className={className}>
<h1 id={titleId}>{title}</h1>
{message && <p>{message}</p>}
@ -99,6 +99,7 @@ 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}