Skip to content
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

Jump to bottom

Default ConfirmationDialog to focusing cancel when the confirmation is a dangerous one #2185

Merged
merged 5 commits into from
Aug 1, 2022
Merged

Default ConfirmationDialog to focusing cancel when the confirmation is a dangerous one #2185

Changes from 1 commit
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
2e8cdf5
allow configuration of the initial focus in a confirmation dialog
mattcosta7 Jul 25, 2022
b707dc6
changeset
mattcosta7 Jul 25, 2022
937e828
explicitly set the autoFocus when danger to cancel
mattcosta7 Jul 26, 2022
e016508
intermediate value
mattcosta7 Jul 26, 2022
f4b2979
Merge branch 'main' into configureable-confirmation-dialog-autofocus
siddharthkp Aug 1, 2022
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
Prev Previous commit
Next Next commit
intermediate value
  • Loading branch information
@mattcosta7
mattcosta7 committed Jul 26, 2022
commit e0165085fa6fb50fb8d8f548790bdd9393996bfe
6 changes: 3 additions & 3 deletions src/Dialog/ConfirmationDialog.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -116,17 +116,17 @@ export const ConfirmationDialog: React.FC<ConfirmationDialogProps> = props => {
const onConfirmButtonClick = useCallback(() => {
onClose('confirm')
}, [onClose])

const isConfirmationDangerous = confirmButtonType === 'danger'
const cancelButton: DialogButtonProps = {
content: cancelButtonContent,
onClick: onCancelButtonClick,
autoFocus: confirmButtonType === 'danger'
autoFocus: isConfirmationDangerous
}
const confirmButton: DialogButtonProps = {
content: confirmButtonContent,
buttonType: confirmButtonType,
onClick: onConfirmButtonClick,
autoFocus: confirmButtonType !== 'danger'
autoFocus: !isConfirmationDangerous
}
const footerButtons = [cancelButton, confirmButton]
return (
Expand Down