Skip to content
This repository has been archived by the owner on Jul 12, 2024. It is now read-only.

Commit

Permalink
Switch to span tags in a div for advanced number filter screen reader…
Browse files Browse the repository at this point in the history
… text.
  • Loading branch information
jeffstieler committed Jan 4, 2019
1 parent 079ff48 commit 2532539
Showing 1 changed file with 10 additions and 11 deletions.
21 changes: 10 additions & 11 deletions packages/components/src/filters/advanced/number-filter.js
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
/**
* External dependencies
*/
import { Component, Fragment } from '@wordpress/element';
import { Component } from '@wordpress/element';
import { SelectControl, TextControl } from '@wordpress/components';
import { get, find, partial } from 'lodash';
import interpolateComponents from 'interpolate-components';
Expand All @@ -13,7 +13,6 @@ import { sprintf, __, _x } from '@wordpress/i18n';
* Internal dependencies
*/
import TextControlWithAffixes from '../../text-control-with-affixes';
import { textContent } from './utils';

/**
* WooCommerce dependencies
Expand Down Expand Up @@ -53,20 +52,20 @@ class NumberFilter extends Component {
filterStr = interpolateComponents( {
mixedString: this.getBetweenString(),
components: {
rangeStart: <Fragment>{ rangeStart }</Fragment>,
rangeEnd: <Fragment>{ rangeEnd }</Fragment>,
span: <Fragment />,
rangeStart: <span>{ rangeStart }</span>,
rangeEnd: <span>{ rangeEnd }</span>,
span: <span />,
},
} );
}

return textContent( interpolateComponents( {
return interpolateComponents( {
mixedString: config.labels.title,
components: {
filter: <Fragment>{ filterStr }</Fragment>,
rule: <Fragment>{ rule.label }</Fragment>,
filter: <span>{ filterStr }</span>,
rule: <span>{ rule.label }</span>,
},
} ) );
} );
}

getFormControl( { type, value, label, onChange } ) {
Expand Down Expand Up @@ -231,9 +230,9 @@ class NumberFilter extends Component {
{ children }
</div>
{ screenReaderText && (
<span className="screen-reader-text">
<div className="screen-reader-text">
{ screenReaderText }
</span>
</div>
) }
</fieldset>
);
Expand Down

0 comments on commit 2532539

Please sign in to comment.