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

Make font size dropdown more accessible. #33941

Merged
merged 8 commits into from
Aug 12, 2021
Merged

Make font size dropdown more accessible. #33941

Show file tree
Hide file tree
Changes from 5 commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
5795eda
Make font size dropdown more accessible.
alexstine Aug 9, 2021
800d7bc
Address feedback.
alexstine Aug 10, 2021
b7884a3
Merge branch 'trunk' of https://github.com/wordpress/gutenberg into u…
alexstine Aug 10, 2021
92e5c6b
Add a fallback if describedBy is not passed. Add translation.
alexstine Aug 11, 2021
3057ba2
Merge branch 'trunk' of https://github.com/wordpress/gutenberg into u…
alexstine Aug 11, 2021
f17834b
Use better variable name. Try to fix linter error.
alexstine Aug 11, 2021
ab36ab8
Fix linter errors.
alexstine Aug 11, 2021
a4c741c
fix linting issue
ntsekouras Aug 12, 2021
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
7 changes: 7 additions & 0 deletions packages/components/src/custom-select-control/README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -93,6 +93,13 @@ The label for the control.
- Type: `String`
- Required: Yes

#### describedBy

Pass in a description that will be shown to screen readers associated with the select trigger button. If no value is passed, the text "Currently selected: selectedItem.name" will be used fully translated.

- Type: `String`
- Required: No

#### options

The options that can be chosen from.
Expand Down
9 changes: 9 additions & 0 deletions packages/components/src/custom-select-control/index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@ import classnames from 'classnames';
* WordPress dependencies
*/
import { Icon, check, chevronDown } from '@wordpress/icons';
import { __, sprintf } from '@wordpress/i18n';
/**
* Internal dependencies
*/
Expand Down Expand Up @@ -56,6 +57,7 @@ export default function CustomSelectControl( {
className,
hideLabelFromVision,
label,
describedBy,
ntsekouras marked this conversation as resolved.
Show resolved Hide resolved
options: items,
onChange: onSelectedItemChange,
value: _selectedItem,
Expand All @@ -77,6 +79,12 @@ export default function CustomSelectControl( {
stateReducer,
} );

const describedByBuild = describedBy
alexstine marked this conversation as resolved.
Show resolved Hide resolved
? describedBy
: sprintf(
alexstine marked this conversation as resolved.
Show resolved Hide resolved
// translators: %s: The selected option.
__( 'Currently selected: %s' ), selectedItem.name );

const menuProps = getMenuProps( {
className: 'components-custom-select-control__menu',
'aria-hidden': ! isOpen,
Expand Down Expand Up @@ -120,6 +128,7 @@ export default function CustomSelectControl( {
'aria-labelledby': undefined,
className: 'components-custom-select-control__button',
isSmall: true,
describedBy: describedByBuild,
} ) }
>
{ itemToString( selectedItem ) }
Expand Down
9 changes: 8 additions & 1 deletion packages/components/src/font-size-picker/index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ import { isNumber, isString } from 'lodash';
/**
* WordPress dependencies
*/
import { __ } from '@wordpress/i18n';
import { __, sprintf } from '@wordpress/i18n';
import { textColor } from '@wordpress/icons';
import { useMemo, forwardRef } from '@wordpress/element';

Expand Down Expand Up @@ -92,6 +92,12 @@ function FontSizePicker(

const selectedFontSizeSlug = getSelectValueFromFontSize( fontSizes, value );

const currentFontSizeSR = sprintf(
// translators: %s: Currently selected font size.
__( 'Currently selected font size: %s' ),
options.find( ( option ) => option.key === selectedFontSizeSlug ).name
);

return (
<fieldset
className="components-font-size-picker"
Expand All @@ -103,6 +109,7 @@ function FontSizePicker(
<CustomSelectControl
className={ 'components-font-size-picker__select' }
label={ __( 'Font size' ) }
describedBy={ currentFontSizeSR }
options={ options }
value={ options.find(
( option ) => option.key === selectedFontSizeSlug
Expand Down