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

Change font-size-picker markup to use select #16148

Merged
merged 6 commits into from
Jul 9, 2019
Merged

Change font-size-picker markup to use select #16148

Show file tree
Hide file tree
Changes from 5 commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
0122e22
Change font-size-picker markup to use select
tellthemachines Jun 13, 2019
e65c798
Improve naming.
tellthemachines Jun 14, 2019
a100d48
Fix e2e tests.
tellthemachines Jun 14, 2019
4c481d8
Fix more tests.
tellthemachines Jun 17, 2019
93846a5
Address PR feedback.
tellthemachines Jun 18, 2019
d87fe69
Address PR feedback.
tellthemachines Jul 3, 2019
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
2 changes: 1 addition & 1 deletion packages/block-editor/src/components/font-sizes/with-font-sizes.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -64,7 +64,7 @@ export default ( ...fontSizeNames ) => {

createSetFontSize( fontSizeAttributeName, customFontSizeAttributeName ) {
return ( fontSizeValue ) => {
const fontSizeObject = find( this.props.fontSizes, { size: fontSizeValue } );
const fontSizeObject = find( this.props.fontSizes, { size: Number( fontSizeValue ) } );
tellthemachines marked this conversation as resolved.
Show resolved Hide resolved
this.props.setAttributes( {
[ fontSizeAttributeName ]: fontSizeObject && fontSizeObject.slug ? fontSizeObject.slug : undefined,
[ customFontSizeAttributeName ]: fontSizeObject && fontSizeObject.slug ? undefined : fontSizeValue,
Expand Down
4 changes: 2 additions & 2 deletions packages/components/src/base-control/index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,11 +3,11 @@
*/
import classnames from 'classnames';

function BaseControl( { id, label, help, className, children } ) {
function BaseControl( { id, label, hideLabelFromVision, help, className, children } ) {
return (
<div className={ classnames( 'components-base-control', className ) }>
<div className="components-base-control__field">
{ label && id && <label className="components-base-control__label" htmlFor={ id }>{ label }</label> }
{ label && id && <label className={ classnames( 'components-base-control__label', hideLabelFromVision && 'screen-reader-text' ) } htmlFor={ id }>{ label }</label> }
Copy link
Contributor

Choose a reason for hiding this comment

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

This line is getting quite busy, it would be great to break it up onto multiple lines. The call to classnames could also be written like this, which is a pattern used more commonly across the codebase:

{ classnames( 'components-base-control__label', {
    'screen-reader-text': hideLabelFromVision,
} ) }

{ label && ! id && <BaseControl.VisualLabel>{ label }</BaseControl.VisualLabel> }
{ children }
</div>
Expand Down
106 changes: 49 additions & 57 deletions packages/components/src/font-size-picker/index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,22 +1,34 @@

/**
* External dependencies
* WordPress dependencies
tellthemachines marked this conversation as resolved.
Show resolved Hide resolved
*/
import { map } from 'lodash';

import { useState } from '@wordpress/element';
/**
* WordPress dependencies
*/
import { __, _x, sprintf } from '@wordpress/i18n';
import { __ } from '@wordpress/i18n';

/**
* Internal dependencies
*/
import Dashicon from '../dashicon';
import BaseControl from '../base-control';
import Button from '../button';
import Dropdown from '../dropdown';
import RangeControl from '../range-control';
import { NavigableMenu } from '../navigable-container';
import SelectControl from '../select-control';

function getInitialSelectValue( fontSizes, value ) {
if ( value ) {
const initialValue = fontSizes.find( ( font ) => font.size === value );
return initialValue ? initialValue.slug : 'custom';
}
return 'normal';
}

function getSelectOptions( optionsArray ) {
return [
...optionsArray.map( ( option ) => ( { value: option.slug, label: option.name } ) ),
{ value: 'custom', label: __( 'Custom' ) },
];
}

function FontSizePicker( {
fallbackFontSize,
Expand All @@ -26,84 +38,64 @@ function FontSizePicker( {
value,
withSlider = false,
} ) {
// eslint-disable-next-line @wordpress/no-unused-vars-before-return
const [ currentSelectValue, setCurrentSelectValue ] = useState( getInitialSelectValue( fontSizes, value ) );
tellthemachines marked this conversation as resolved.
Show resolved Hide resolved

if ( disableCustomFontSizes && ! fontSizes.length ) {
return null;
}

const onChangeValue = ( event ) => {
const newValue = event.target.value;
setCurrentSelectValue( getInitialSelectValue( fontSizes, Number( newValue ) ) );
tellthemachines marked this conversation as resolved.
Show resolved Hide resolved
if ( newValue === '' ) {
onChange( undefined );
return;
}
onChange( Number( newValue ) );
};

const currentFont = fontSizes.find( ( font ) => font.size === value );
const currentFontSizeName = ( currentFont && currentFont.name ) || ( ! value && _x( 'Normal', 'font size name' ) ) || _x( 'Custom', 'font size name' );
const onSelectChangeValue = ( eventValue ) => {
setCurrentSelectValue( eventValue );
const selectedFont = fontSizes.find( ( font ) => font.slug === eventValue );
if ( selectedFont ) {
onChange( selectedFont.size );
}
};

return (
<BaseControl>
<BaseControl.VisualLabel>
<fieldset>
<legend>
{ __( 'Font Size' ) }
</BaseControl.VisualLabel>
<div className="components-font-size-picker__buttons">
</legend>
<div className="components-font-size-picker__controls">
{ ( fontSizes.length > 0 ) &&
<Dropdown
className="components-font-size-picker__dropdown"
contentClassName="components-font-size-picker__dropdown-content"
position="bottom"
renderToggle={ ( { isOpen, onToggle } ) => (
<Button
className="components-font-size-picker__selector"
isLarge
onClick={ onToggle }
aria-expanded={ isOpen }
aria-label={ sprintf(
/* translators: %s: font size name */
__( 'Font size: %s' ), currentFontSizeName
) }
>
{ currentFontSizeName }
</Button>
) }
renderContent={ () => (
<NavigableMenu>
{ map( fontSizes, ( { name, size, slug } ) => {
const isSelected = ( value === size || ( ! value && slug === 'normal' ) );

return (
<Button
key={ slug }
onClick={ () => onChange( slug === 'normal' ? undefined : size ) }
className={ `is-font-${ slug }` }
role="menuitemradio"
aria-checked={ isSelected }
>
{ isSelected && <Dashicon icon="saved" /> }
<span className="components-font-size-picker__dropdown-text-size" style={ { fontSize: size } }>
{ name }
</span>
</Button>
);
} ) }
</NavigableMenu>
) }
<SelectControl
className={ 'components-font-size-picker__select' }
label={ 'Choose preset' }
hideLabelFromVision={ true }
value={ currentSelectValue }
onChange={ onSelectChangeValue }
options={ getSelectOptions( fontSizes ) }
/>
}
{ ( ! withSlider && ! disableCustomFontSizes ) &&
<input
className="components-range-control__number"
type="number"
onChange={ onChangeValue }
aria-label={ __( 'Custom font size' ) }
aria-label={ __( 'Custom' ) }
value={ value || '' }
/>
}
<Button
className="components-color-palette__clear"
type="button"
disabled={ value === undefined }
onClick={ () => onChange( undefined ) }
onClick={ () => {
onChange( undefined );
setCurrentSelectValue( getInitialSelectValue( fontSizes, undefined ) );
} }
isSmall
isDefault
>
Expand All @@ -123,7 +115,7 @@ function FontSizePicker( {
afterIcon="editor-textcolor"
/>
}
</BaseControl>
</fieldset>
);
}

Expand Down
50 changes: 8 additions & 42 deletions packages/components/src/font-size-picker/style.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,9 @@
.components-font-size-picker__buttons {
.components-font-size-picker__controls {
max-width: $sidebar-width - ( 2 * $panel-padding );
display: flex;
justify-content: space-between;
align-items: center;
margin-bottom: $grid-size * 3;

// Apply the same height as the isSmall Reset button.
.components-range-control__number {
Expand All @@ -18,51 +19,16 @@
}
}

// needed to override CSS set in https://github.com/WordPress/gutenberg/blob/9c438f93a7215d50d1efc0492c308e4cbaa59c52/packages/edit-post/src/components/sidebar/settings-sidebar/style.scss#L6
.components-font-size-picker__select.components-font-size-picker__select.components-font-size-picker__select.components-font-size-picker__select,
.components-font-size-picker__select .components-base-control__field {
margin-bottom: 0;
}

.components-font-size-picker__custom-input {
.components-range-control__slider + .dashicon {
width: 30px;
height: 30px;
}
}

.components-font-size-picker__dropdown-content .components-button {
display: block;
position: relative;
padding: 10px 20px 10px 40px;
width: 100%;
text-align: left;

.dashicon {
position: absolute;
top: calc(50% - 10px);
left: 10px;
}

&:hover {
@include menu-style__hover;
}

&:focus {
@include menu-style__focus;
}
}

.components-font-size-picker__buttons .components-font-size-picker__selector {
border: 1px solid;
background: none;
position: relative;
width: 110px;

@include input-style__neutral();

&:focus {
@include input-style__focus();
}

&::after {
@include dropdown-arrow();
right: 8px;
top: 12px;
position: absolute;
}
}
3 changes: 2 additions & 1 deletion packages/components/src/select-control/index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,7 @@ function SelectControl( {
onChange,
options = [],
className,
hideLabelFromVision,
...props
} ) {
const id = `inspector-select-control-${ instanceId }`;
Expand All @@ -38,7 +39,7 @@ function SelectControl( {

/* eslint-disable jsx-a11y/no-onchange */
return ! isEmpty( options ) && (
<BaseControl label={ label } id={ id } help={ help } className={ className }>
<BaseControl label={ label } hideLabelFromVision={ hideLabelFromVision } id={ id } help={ help } className={ className }>
<select
id={ id }
className="components-select-control__input"
Expand Down
6 changes: 2 additions & 4 deletions packages/e2e-tests/specs/editor-modes.test.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,7 @@ describe( 'Editing modes (visual/HTML)', () => {

// The font size picker for the paragraph block should appear, even in
// HTML editing mode.
const fontSizePicker = await page.$$( '.edit-post-sidebar .components-font-size-picker__buttons' );
const fontSizePicker = await page.$$( '.edit-post-sidebar .components-font-size-picker__controls' );
expect( fontSizePicker ).toHaveLength( 1 );
} );

Expand All @@ -74,9 +74,7 @@ describe( 'Editing modes (visual/HTML)', () => {
expect( htmlBlockContent ).toEqual( '<p>Hello world!</p>' );

// Change the font size using the sidebar.
await page.click( '.components-font-size-picker__selector' );
const changeSizeButton = await page.waitForSelector( '.components-button.is-font-large' );
await changeSizeButton.click();
await page.select( '.components-font-size-picker__select .components-select-control__input', 'large' );

// Make sure the HTML content updated.
htmlBlockContent = await page.$eval( '.block-editor-block-list__layout .block-editor-block-list__block .block-editor-block-list__block-html-textarea', ( node ) => node.textContent );
Expand Down
17 changes: 4 additions & 13 deletions packages/e2e-tests/specs/font-size-picker.test.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,9 +17,7 @@ describe( 'Font Size Picker', () => {
// Create a paragraph block with some content.
await clickBlockAppender();
await page.keyboard.type( 'Paragraph to be made "large"' );
await page.click( '.components-font-size-picker__selector' );
const changeSizeButton = await page.waitForSelector( '.components-button.is-font-large' );
await changeSizeButton.click();
await page.select( '.components-font-size-picker__select .components-select-control__input', 'large' );

// Ensure content matches snapshot.
const content = await getEditedPostContent();
Expand Down Expand Up @@ -58,14 +56,9 @@ describe( 'Font Size Picker', () => {
await clickBlockAppender();
await page.keyboard.type( 'Paragraph with font size reset using button' );

await page.click( '.blocks-font-size .components-range-control__number' );
// This should be the default font-size of the current theme.
await page.keyboard.type( '22' );

// Blur the range control
await page.click( '.components-base-control__label' );
await page.select( '.components-font-size-picker__select .components-select-control__input', 'normal' );

const resetButton = ( await page.$x( '//*[contains(concat(" ", @class, " "), " components-font-size-picker__buttons ")]//*[text()=\'Reset\']' ) )[ 0 ];
const resetButton = ( await page.$x( '//*[contains(concat(" ", @class, " "), " components-font-size-picker__controls ")]//*[text()=\'Reset\']' ) )[ 0 ];
await resetButton.click();

// Ensure content matches snapshot.
Expand All @@ -78,9 +71,7 @@ describe( 'Font Size Picker', () => {
await clickBlockAppender();
await page.keyboard.type( 'Paragraph with font size reset using input field' );

await page.click( '.components-font-size-picker__selector' );
const changeSizeButton = await page.waitForSelector( '.components-button.is-font-large' );
await changeSizeButton.click();
await page.select( '.components-font-size-picker__select .components-select-control__input', 'large' );

// Clear the custom font size input.
await page.click( '.blocks-font-size .components-range-control__number' );
Expand Down