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

Add inspector range control #1144

Merged
merged 6 commits into from
Jun 13, 2017
Merged
Show file tree
Hide file tree
Changes from 3 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
5 changes: 5 additions & 0 deletions blocks/inspector-controls/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,11 @@
*/
import { Fill } from 'react-slot-fill';

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

export default function InspectorControls( { children } ) {
return (
<Fill name="Inspector.Controls">
Expand Down
25 changes: 25 additions & 0 deletions blocks/inspector-controls/range-control/index.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,25 @@
/**
* WordPress dependencies
*/
import { withInstanceId } from 'components';

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

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

return (
<div className="blocks-inspector-control">
Copy link
Contributor

Choose a reason for hiding this comment

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

this breaks our css guidelines https://github.com/WordPress/gutenberg/blob/master/docs/coding-guidelines.md#css

The className here should be "blocks-range-control" and the subclassNames "blocks-range-control__label". This forces us to think in shared components instead of shared classNames. We could probably create a generic BaseControl responsible of showing the label and the surroundings.

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

export default withInstanceId( RangeControl );
10 changes: 10 additions & 0 deletions blocks/inspector-controls/range-control/style.scss
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
.blocks-range-control {
display: flex;

input[type="range"] {
width: 100%;
}
> span {
margin-left: 10px;
}
}
Original file line number Diff line number Diff line change
@@ -1,14 +1,14 @@
.blocks-text-control {
.blocks-inspector-control {
margin-bottom: 10px;
}

.blocks-text-control__label {
.blocks-inspector-control__label {
display: block;
font-weight: 500;
margin-bottom: 5px;
}

.blocks-text-control__input {
.blocks-inspector-control__input {
width: 100%;
padding: 6px 10px;
}
}
14 changes: 5 additions & 9 deletions blocks/inspector-controls/text-control/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -3,19 +3,15 @@
*/
import { withInstanceId } from 'components';

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

function TextControl( { label, value, instanceId, onChange } ) {
function TextControl( { label, value, instanceId, onChange, ...attributes } ) {
Copy link
Contributor

Choose a reason for hiding this comment

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

Maybe props instead of attributes just to respect React's wording

const id = 'inspector-text-control-' + instanceId;
const type = attributes.type || 'text';
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 } />
<div className="blocks-inspector-control">
<label className="blocks-inspector-control__label" htmlFor={ id }>{ label }</label>
<input className="blocks-inspector-control__input" type={ type } id={ id } value={ value } onChange={ onChangeValue } { ...attributes } />
</div>
);
}
Expand Down
8 changes: 3 additions & 5 deletions blocks/library/gallery/index.js
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 @@ -120,8 +121,7 @@ registerBlockType( 'core/gallery', {

edit( { attributes, setAttributes, focus, id } ) {
Copy link
Contributor

Choose a reason for hiding this comment

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

Should we remove id here since it's no longer used?

const { images = [], columns = defaultColumnsNumber( attributes ), align = 'none' } = attributes;
const setColumnsNumber = ( event ) => setAttributes( { columns: event.target.value } );
const rangeId = `blocks-gallery-range-${ id }`;
const setColumnsNumber = ( event ) => setAttributes( { columns: event.target.value } );
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 ) } />
</InspectorControls> }
</div>
);
Expand Down