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.

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

Chrome: Adding a confirm utility to replace window.confirm calls #960

Closed
wants to merge 2 commits into from
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
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
1 change: 1 addition & 0 deletions editor/assets/stylesheets/_z-index.scss
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@ $z-layers: (
'.editor-header': 20,
'.editor-post-visibility__dialog': 30,
'.editor-post-schedule__dialog': 30,
'.utils-accept__backdrop': 100000
);

@function z-index( $key ) {
Expand Down
14 changes: 9 additions & 5 deletions editor/sidebar/post-visibility/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@ import { find } from 'lodash';
*/
import { __ } from 'i18n';
import { Component } from 'element';
import { accept } from 'utils';

/**
* Internal Dependencies
Expand Down Expand Up @@ -48,11 +49,14 @@ class PostVisibility extends Component {
this.setState( { hasPassword: false } );
};
const setPrivate = () => {
if ( window.confirm( __( 'Would you like to privately publish this post now?' ) ) ) { // eslint-disable-line no-alert
onUpdateVisibility( 'private' );
onSave();
this.setState( { opened: false } );
}
const message = __( 'Would you like to privately publish this post now?' );
accept( message, ( accepted ) => {
if ( accepted ) {
onUpdateVisibility( 'private' );
onSave();
this.setState( { opened: false } );
}
}, __( 'Yes' ), __( 'No' ) );
};
const setPasswordProtected = () => {
onUpdateVisibility( visibility === 'private' ? 'draft' : status, password || '' );
Expand Down
10 changes: 8 additions & 2 deletions lib/client-assets.php
Original file line number Diff line number Diff line change
Expand Up @@ -78,7 +78,7 @@ function gutenberg_register_scripts() {
wp_register_script(
'wp-utils',
gutenberg_url( 'utils/build/index.js' ),
array(),
array( 'wp-components', 'wp-i18n' ),
filemtime( gutenberg_dir_path() . 'utils/build/index.js' )
);
wp_register_script(
Expand Down Expand Up @@ -145,6 +145,12 @@ function gutenberg_register_scripts() {
array(),
filemtime( gutenberg_dir_path() . 'components/build/style.css' )
);
wp_register_style(
'wp-utils',
gutenberg_url( 'utils/build/style.css' ),
array(),
filemtime( gutenberg_dir_path() . 'utils/build/style.css' )
);
wp_register_style(
'wp-blocks',
gutenberg_url( 'blocks/build/style.css' ),
Expand Down Expand Up @@ -343,7 +349,7 @@ function gutenberg_scripts_and_styles( $hook ) {
wp_enqueue_style(
'wp-editor',
gutenberg_url( 'editor/build/style.css' ),
array( 'wp-components', 'wp-blocks' ),
array( 'wp-components', 'wp-blocks', 'wp-utils' ),
filemtime( gutenberg_dir_path() . 'editor/build/style.css' )
);
}
Expand Down
43 changes: 43 additions & 0 deletions utils/accept/dialog.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,43 @@
/**
* External dependencies
*/
import clickOutside from 'react-click-outside';

/**
* WordPress Dependencies
*/
import { Component } from 'element';
import { Button } from 'components';
import { __ } from 'i18n';

class AcceptDialog extends Component {
handleClickOutside() {
this.props.onClose( 'cancel' );
}

render() {
const { message, onClose, confirmButtonText, cancelButtonText } = this.props;
const accept = () => onClose( 'accept' );
const cancel = () => onClose( 'cancel' );

return (
<div>
<div className="utils-accept__dialog">
<div className="utils-accept__dialog-content">
{ message }
</div>
<div className="utils-accept__dialog-buttons">
<Button onClick={ cancel } className="button">
{ cancelButtonText || __( 'Cancel' ) }
</Button>
<Button isPrimary onClick={ accept }>
{ confirmButtonText || __( 'OK' ) }
</Button>
</div>
</div>
</div>
);
}
}

export default clickOutside( AcceptDialog );
38 changes: 38 additions & 0 deletions utils/accept/index.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,38 @@
/**
* External dependencies
*/
import { render, unmountComponentAtNode } from 'react-dom';

/**
* Internal dependencies
*/
import './style.scss';
import AcceptDialog from './dialog';

export default function accept( message, callback, confirmButtonText, cancelButtonText ) {
let wrapper = document.createElement( 'div' );
wrapper.className = 'utils-accept__backdrop';
document.body.appendChild( wrapper );

function onClose( result ) {
if ( wrapper ) {
unmountComponentAtNode( wrapper );
document.body.removeChild( wrapper );
wrapper = null;
}

if ( callback ) {
callback( result === 'accept' );
}
}

render(
<AcceptDialog
message={ message }
onClose={ onClose }
confirmButtonText={ confirmButtonText }
cancelButtonText={ cancelButtonText }
/>,
wrapper
);
}
36 changes: 36 additions & 0 deletions utils/accept/style.scss
Original file line number Diff line number Diff line change
@@ -0,0 +1,36 @@
.utils-accept__dialog {
top: 10px;
bottom: 10px;
max-width: 400px;
width: 100%;
margin: auto;
box-shadow: $shadow-popover;
border: 1px solid $light-gray-500;
background: $white;
}

.utils-accept__dialog-content {
padding: 20px;
}

.utils-accept__dialog-buttons {
text-align: right;
padding: 10px 20px 20px 20px;

.components-button {
margin-left: 10px;
}
}

.utils-accept__backdrop {
align-items: center;
bottom: 0;
left: 0;
right: 0;
top: 0;
display: flex;
justify-content: center;
position: fixed;
z-index: z-index( '.utils-accept__backdrop' );
background-color: rgba( $dark-gray-900, 0.4 );
}
55 changes: 55 additions & 0 deletions utils/accept/test/index.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,55 @@
/**
* External dependencies
*/
import { expect } from 'chai';

/**
* Internal dependencies
*/
import accept from '../';

describe( '#accept()', () => {
beforeEach( () => {
document.body.innerHTML = '';
} );

it( 'should render a dialog to the document body', () => {
const message = 'Are you sure?';

accept( message, () => {} );

const dialog = document.querySelector( '.utils-accept__dialog-content' );
expect( dialog ).to.be.an.instanceof( window.Element );
expect( dialog.textContent ).to.equal( message );
} );

it( 'should trigger the callback with an accepted prompt', ( done ) => {
accept( 'Are you sure?', ( accepted ) => {
expect( accepted ).to.be.be.true();
done();
} );

document.querySelector( '.components-button.button-primary' ).click();
} );

it( 'should trigger the callback with a denied prompt', ( done ) => {
accept( 'Are you sure?', ( accepted ) => {
expect( accepted ).to.be.be.false();
done();
} );

document.querySelector( '.components-button:not( .button-primary )' ).click();
} );

it( 'should clean up after itself once the prompt is closed', ( done ) => {
accept( 'Are you sure?', () => {
process.nextTick( () => {
expect( document.querySelector( '.utils-accept__dialog' ) ).to.be.null();

done();
} );
} );

document.querySelector( '.components-button.button-primary' ).click();
} );
} );
1 change: 1 addition & 0 deletions utils/index.js
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
import * as keycodes from './keycodes';

export { default as accept } from './accept';
export { keycodes };