Skip to content

ConfirmDialog: Fix affirmative action being triggered an extra time when selecting a button via keyboard #51730

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
ciampo merged 7 commits into from
Jun 23, 2023
Merged

ConfirmDialog: Fix affirmative action being triggered an extra time when selecting a button via keyboard #51730

Changes from 1 commit
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
2cfca50
Ensure the confirm dialog cannnot be submitted using enter when the c…
talldan Jun 21, 2023
a6292f7
Add test case
talldan Jun 21, 2023
6af106d
Add CHANGELOG entry
talldan Jun 21, 2023
0e58169
Add PR number to changelog
talldan Jun 21, 2023
acde51c
Also prevent double submission of Confirm button
talldan Jun 22, 2023
00d17b3
Use actions in storybook example rather than outputting to a heading
talldan Jun 22, 2023
18f2cd8
Fix typo
talldan Jun 23, 2023
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
Use actions in storybook example rather than outputting to a heading
  • Loading branch information
@talldan
talldan committed Jun 23, 2023
commit 00d17b300730228e533d1cf8169a7890270739f7
23 changes: 8 additions & 15 deletions packages/components/src/confirm-dialog/stories/index.js
View file
Open in desktop
Copy link
Member

@mirka mirka Jun 22, 2023

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Perfect, thank you!

Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,6 @@ import { useState } from '@wordpress/element';
* Internal dependencies
*/
import Button from '../../button';
import { Heading } from '../../heading';
import { ConfirmDialog } from '..';

const meta = {
Expand All @@ -26,12 +25,8 @@ const meta = {
isOpen: {
control: { type: null },
},
onConfirm: {
control: { type: null },
},
onCancel: {
control: { type: null },
},
onConfirm: { action: 'onConfirm' },
onCancel: { action: 'onCancel' },
},
args: {
children: 'Would you like to privately publish the post now?',
Expand All @@ -43,19 +38,19 @@ const meta = {

export default meta;

const Template = ( args ) => {
const Template = ( { onConfirm, onCancel, ...args } ) => {
const [ isOpen, setIsOpen ] = useState( false );
const [ confirmVal, setConfirmVal ] = useState( '' );

const handleConfirm = () => {
setConfirmVal( 'Confirmed!' );
const handleConfirm = ( ...confirmArgs ) => {
onConfirm( ...confirmArgs );
setIsOpen( false );
};

const handleCancel = () => {
setConfirmVal( 'Cancelled' );
const handleCancel = ( ...cancelArgs ) => {
onCancel( ...cancelArgs );
setIsOpen( false );
};

return (
<>
<Button variant="primary" onClick={ () => setIsOpen( true ) }>
Expand All @@ -70,8 +65,6 @@ const Template = ( args ) => {
>
{ args.children }
</ConfirmDialog>

<Heading level={ 1 }>{ confirmVal }</Heading>
</>
);
};
Expand Down