Skip to content

Add missing label and focus style to the code editor textarea #6262

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
afercia merged 3 commits into from
Apr 20, 2018
Merged

Add missing label and focus style to the code editor textarea #6262

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
52af2ab
Add label, placeholder, and filter to the content textarea.
afercia Apr 18, 2018
03754d1
Add focus style to the content textarea.
afercia Apr 18, 2018
31dfdc5
Use Write your story.
afercia Apr 20, 2018
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
3 changes: 1 addition & 2 deletions edit-post/components/text-editor/style.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,8 +27,7 @@
}

// Always show outlines in code editor
.editor-post-title div,
.editor-post-text-editor {
.editor-post-title div {
border: 1px solid $light-gray-500;
}

Expand Down
37 changes: 27 additions & 10 deletions editor/components/post-text-editor/index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,9 +6,12 @@ import Textarea from 'react-autosize-textarea';
/**
* WordPress dependencies
*/
import { Component, compose } from '@wordpress/element';
import { parse } from '@wordpress/blocks';
import { __ } from '@wordpress/i18n';
import { decodeEntities } from '@wordpress/utils';
import { Component, compose, Fragment } from '@wordpress/element';
import { parse, withEditorSettings } from '@wordpress/blocks';
import { withSelect, withDispatch } from '@wordpress/data';
import { withInstanceId } from '@wordpress/components';

/**
* Internal dependencies
Expand Down Expand Up @@ -58,15 +61,25 @@ class PostTextEditor extends Component {
}

render() {
const { value, placeholder, instanceId } = this.props;
const decodedPlaceholder = decodeEntities( placeholder );

return (
<Textarea
autoComplete="off"
value={ this.state.value || this.props.value }
onFocus={ this.startEditing }
onChange={ this.edit }
onBlur={ this.stopEditing }
className="editor-post-text-editor"
/>
<Fragment>
<label htmlFor={ `post-content-${ instanceId }` } className="screen-reader-text">
{ decodedPlaceholder || __( 'Write your story' ) }
</label>
<Textarea
autoComplete="off"
value={ this.state.value || value }
onFocus={ this.startEditing }
onChange={ this.edit }
onBlur={ this.stopEditing }
className="editor-post-text-editor"
id={ `post-content-${ instanceId }` }
placeholder={ decodedPlaceholder || __( 'Write your story' ) }
/>
</Fragment>
);
}
}
Expand All @@ -87,4 +100,8 @@ export default compose( [
},
};
} ),
withEditorSettings( ( settings ) => ( {
placeholder: settings.bodyPlaceholder,
} ) ),
withInstanceId,
] )( PostTextEditor );
10 changes: 7 additions & 3 deletions editor/components/post-text-editor/style.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,18 +1,22 @@
.editor-post-text-editor {
border: 1px solid $light-gray-500;
display: block;
margin: 0;
margin: 0 0 2em;
width: 100%;
border: none;
outline: none;
box-shadow: none;
resize: none;
overflow: hidden;
font-family: $editor-html-font;
font-size: $text-editor-font-size;
line-height: 150%;

&:hover,
&:focus {
border: 1px solid $light-gray-500;
box-shadow: none;
// Emulate the effect used on the post title.
outline: 1px solid $light-gray-500;
outline-offset: -2px;
}
}

Expand Down