-
Notifications
You must be signed in to change notification settings - Fork 4.3k
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
youknowriad
merged 6 commits into
WordPress:master
from
paulwilde:add/inspector-range-control
Jun 13, 2017
Merged
Changes from 3 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 4b0ff41
Allow custom attributes for the inspector text control. Default the t…
paulwilde 79711a5
Add inspector range control.
paulwilde 858bd71
* Change attributes to props.
paulwilde 3a400b2
Use default value/destructuring for the input type instead of definin…
paulwilde 961be08
Fixed whitespace vs tab issue.
paulwilde File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
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"> | ||
<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 ); |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
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; | ||
} | ||
} |
8 changes: 4 additions & 4 deletions
8
...nspector-controls/text-control/style.scss → blocks/inspector-controls/style.scss
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
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; | ||
} | ||
} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -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 } ) { | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe 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> | ||
); | ||
} | ||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -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'; | ||
|
||
|
@@ -120,8 +121,7 @@ registerBlockType( 'core/gallery', { | |
|
||
edit( { attributes, setAttributes, focus, id } ) { | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Should we remove |
||
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 ( | ||
|
@@ -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> | ||
); | ||
|
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
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.