Skip to content

Focus confirm button instead of cancel in modals #2340

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
david-crespo merged 1 commit into from
Jul 25, 2024
Merged

Focus confirm button instead of cancel in modals #2340

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 6 additions & 4 deletions app/ui/lib/Modal.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -135,10 +135,9 @@ Modal.Footer = ({
}) => (
<footer className="flex items-center justify-between border-t px-3 py-3 border-secondary">
<div className="mr-4">{children}</div>
<div className="space-x-2">
<Button variant="secondary" size="sm" onClick={onDismiss}>
{cancelText || 'Cancel'}
</Button>
<div className="flex flex-row-reverse gap-2">
{/* Note the confirm button is first so it autofocuses when the modal opens,
but it displays in the right order because of flex-row-reverse */}
<Button
size="sm"
variant={actionType}
Expand All @@ -148,6 +147,9 @@ Modal.Footer = ({
>
{actionText}
</Button>
<Button variant="secondary" size="sm" onClick={onDismiss}>
{cancelText || 'Cancel'}
</Button>
</div>
</footer>
)