Skip to content

Add inspector range control #1144

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
youknowriad merged 6 commits into from
Jun 13, 2017
Merged

Add inspector range control #1144

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
39e9229
Add re-usable CSS classes for inspector controls.
paulwilde Jun 12, 2017
4b0ff41
Allow custom attributes for the inspector text control. Default the t…
paulwilde Jun 12, 2017
79711a5
Add inspector range control.
paulwilde Jun 12, 2017
858bd71
* Change attributes to props.
paulwilde Jun 13, 2017
3a400b2
Use default value/destructuring for the input type instead of definin…
paulwilde Jun 13, 2017
961be08
Fixed whitespace vs tab issue.
paulwilde Jun 13, 2017
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
23 changes: 23 additions & 0 deletions blocks/inspector-controls/range-control/index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@
/**
* WordPress dependencies
*/
import { withInstanceId } from 'components';

/**
* Internal dependencies
*/
import './style.scss';

function RangeControl( { label, value, instanceId, onChange, ...props } ) {
const id = 'inspector-range-control-' + instanceId;

return (
<div className="blocks-range-control">
<label className="blocks-range-control__label" htmlFor={ id }>{ label }</label>
<input className="blocks-range-control__input" id={ id } type="range" value={ value } onChange={ onChange } { ...props } />
<span>{ value }</span>
</div>
);
}

export default withInstanceId( RangeControl );
9 changes: 9 additions & 0 deletions blocks/inspector-controls/range-control/style.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
.blocks-range-control {
margin-bottom: 10px;
}

.blocks-range-control__label {
display: block;
font-weight: 500;
margin-bottom: 5px;
}
4 changes: 2 additions & 2 deletions blocks/inspector-controls/text-control/index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,14 +8,14 @@ import { withInstanceId } from 'components';
*/
import './style.scss';

function TextControl( { label, value, instanceId, onChange } ) {
function TextControl( { label, value, instanceId, onChange, type = 'text', ...props } ) {
const id = 'inspector-text-control-' + instanceId;
const onChangeValue = ( event ) => onChange( event.target.value );

return (
<div className="blocks-text-control">
<label className="blocks-text-control__label" htmlFor={ id }>{ label }</label>
<input className="blocks-text-control__input" id={ id } value={ value } onChange={ onChangeValue } />
<input className="blocks-text-control__input" type={ type } id={ id } value={ value } onChange={ onChangeValue } { ...props } />
</div>
);
}
Expand Down
1 change: 1 addition & 0 deletions blocks/inspector-controls/text-control/style.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,3 +12,4 @@
width: 100%;
padding: 6px 10px;
}

8 changes: 3 additions & 5 deletions blocks/library/gallery/index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@ import { Toolbar, Placeholder } from 'components';

import MediaUploadButton from '../../media-upload-button';
import InspectorControls from '../../inspector-controls';
import RangeControl from '../../inspector-controls/range-control';

import GalleryImage from './gallery-image';

Expand Down Expand Up @@ -118,10 +119,9 @@ registerBlockType( 'core/gallery', {
}
},

edit( { attributes, setAttributes, focus, id } ) {
edit( { attributes, setAttributes, focus } ) {
const { images = [], columns = defaultColumnsNumber( attributes ), align = 'none' } = attributes;
const setColumnsNumber = ( event ) => setAttributes( { columns: event.target.value } );
const rangeId = `blocks-gallery-range-${ id }`;
if ( images.length === 0 ) {
const setMediaUrl = ( imgs ) => setAttributes( { images: imgs } );
return (
Expand Down Expand Up @@ -156,9 +156,7 @@ registerBlockType( 'core/gallery', {
) ) }
{ focus && images.length > 1 &&
<InspectorControls>
<label className="blocks-text-control__label" htmlFor={ rangeId }>{ __( 'Columns' ) }</label>
<input id={ rangeId } type="range" min="1" max={ Math.min( MAX_COLUMNS, images.length ) } value={ columns } onChange={ setColumnsNumber } />
<span>{columns}</span>
<RangeControl label={ __( 'Columns' ) } value={ columns } onChange={ setColumnsNumber } min="1" max={ Math.min( MAX_COLUMNS, images.length ) } />
Copy link
Member

@aduth aduth Jun 13, 2017

Choose a reason for hiding this comment

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

Might have helped readability to split these props across multiple lines (very long line).

Copy link
Contributor

@youknowriad youknowriad Jun 13, 2017

Choose a reason for hiding this comment

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

👍 I missed it. We should probably add an eslint rule for this.

</InspectorControls> }
</div>
);
Expand Down