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.

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

Jump to bottom

Change mode switcher to a select box #389

Merged
merged 4 commits into from
Apr 10, 2017
Merged

Change mode switcher to a select box #389

Show file tree
Hide file tree
Changes from 3 commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
dda0821
Change mode switcher to use a select box.
jasmussen Apr 10, 2017
3b3cd44
CSS style the selector.
jasmussen Apr 10, 2017
c3dc925
Use mode switcher mode value from state directly
aduth Apr 10, 2017
fe4cf93
Target mode switcher child styles by classname
aduth Apr 10, 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
5 changes: 5 additions & 0 deletions editor/assets/stylesheets/main.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,11 @@ body.toplevel_page_gutenberg {
ol {
list-style-type: decimal;
}

select {
font-size: 13px;
color: $dark-gray-500;
}
}

.gutenberg__editor {
Expand Down
83 changes: 36 additions & 47 deletions editor/header/mode-switcher/index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,56 +9,45 @@ import { connect } from 'react-redux';
import './style.scss';
import Dashicon from '../../components/dashicon';

class ModeSwitcher extends wp.element.Component {
constructor() {
super( ...arguments );
this.toggle = this.toggle.bind( this );
this.state = {
opened: false
};
}

toggle() {
this.setState( {
opened: ! this.state.opened
} );
/**
* Set of available mode options.
*
* @type {Array}
*/
const MODES = [
{
value: 'visual',
label: wp.i18n.__( 'Visual' )
},
{
value: 'text',
label: wp.i18n._x( 'Text', 'Name for the Text editor tab (formerly HTML)' )
}
];

render() {
const { opened } = this.state;
const modes = [
{ value: 'visual', label: wp.i18n.__( 'Visual' ) },
{ value: 'text', label: wp.i18n._x( 'Text', 'Name for the Text editor tab (formerly HTML)' ) },
];
const switchMode = ( mode ) => () => {
this.setState( { opened: false } );
this.props.onSwitch( mode );
};
const currentMode = modes.find( ( { value } ) => value === this.props.mode );
function ModeSwitcher( { mode, onSwitch } ) {
// Disable reason: Toggling between modes should take effect immediately,
// arguably even with keyboard navigation. `onBlur` only would require
// another action to remove focus from the select (tabbing or clicking
// outside the field), which is unexpected when submit button is omitted.

return (
<div className="editor-mode-switcher">
<button
className="editor-mode-switcher__toggle"
onClick={ this.toggle }
aria-label={ wp.i18n.__( 'Switch the editor mode' ) }
>
{ currentMode.label }
<Dashicon icon="arrow-down" />
</button>
{ opened &&
<div className="editor-mode-switcher__content">
<div className="editor-mode-switcher__arrow" />
{ modes.map( ( mode ) =>
<button key={ mode.value } type="button" onClick={ switchMode( mode.value ) }>
{ mode.label }
</button>
) }
</div>
}
</div>
);
}
/* eslint-disable jsx-a11y/no-onchange */
return (
<div className="editor-mode-switcher">
<select
value={ mode }
onChange={ ( event ) => onSwitch( event.target.value ) }
>
{ MODES.map( ( { value, label } ) =>
<option key={ value } value={ value }>
{ label }
</option>
) }
</select>
<Dashicon icon="arrow-down" />
</div>
);
/* eslint-enable jsx-a11y/no-onchange */
}

export default connect(
Expand Down
64 changes: 18 additions & 46 deletions editor/header/mode-switcher/style.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,64 +1,36 @@
.editor-mode-switcher {
position: relative;
margin-right: $item-spacing;
}

.editor-mode-switcher__toggle {
padding-right: $item-spacing;
color: $dark-gray-500;
padding: $item-spacing;
align-items: center;
cursor: pointer;
border: none;
background: none;
border-right: 1px solid $light-gray-500;
outline: none;
display: flex;
align-items: center;
}

.editor-mode-switcher__content {
position: absolute;
top: 40px;
border: 1px solid $light-gray-500;
color: $dark-gray-500;
min-width: 100px;

button {
padding: 8px;
display: block;
border: none;
background: white;
select {
background: transparent;
line-height: 1;
Copy link
Member

Choose a reason for hiding this comment

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

No linting to capture it, but we ought to be cautious of mixed spacing in SCSS files.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Just wanted to let you know that I really appreciate this and very much taking notes. Thanks for pushing fixes too.

border: 0;
border-radius: 0;
-webkit-appearance: none;
outline: none;
cursor: pointer;
width: 100%;
box-shadow: none;
padding-right: 24px;
}
}

.editor-mode-switcher__arrow {
border: 10px dashed $light-gray-500;
height: 0;
line-height: 0;
position: absolute;
width: 0;
z-index: 1;
top: -10px;
left: 50%;
margin-left: -10px;
border-bottom-style: solid;
border-top: none;
border-left-color: transparent;
border-right-color: transparent;
svg {
position: relative;
z-index: -1;
margin-left: -24px;
margin-top: -1px;
}

&:before {
top: 2px;
border: 10px solid white;
content: " ";
position: absolute;
left: 50%;
margin-left: -10px;
border-bottom-style: solid;
border-top: none;
border-left-color: transparent;
border-right-color: transparent;
&:hover,
select:hover {
color: $dark-gray-900;
}
}
8 changes: 2 additions & 6 deletions languages/gutenberg.pot
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,19 +31,15 @@ msgstr ""
msgid "Align right"
msgstr ""

#: editor/header/mode-switcher/index.js:30
#: editor/header/mode-switcher/index.js:20
msgid "Visual"
msgstr ""

#: editor/header/mode-switcher/index.js:31
#: editor/header/mode-switcher/index.js:24
msgctxt "Name for the Text editor tab (formerly HTML)"
msgid "Text"
msgstr ""

#: editor/header/mode-switcher/index.js:44
msgid "Switch the editor mode"
msgstr ""

#: editor/header/saved-state/index.js:11
msgid "Saved"
msgstr ""
Expand Down