Skip to content

Ensure placeholder description is read by VoiceOver #38366

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
tellthemachines merged 2 commits into from
Feb 4, 2022
Merged

Ensure placeholder description is read by VoiceOver #38366

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
8f9d44a
Ensure placeholder description is read by screen reader
tellthemachines Jan 31, 2022
4157600
Fix styles and markup; add test for semantics.
tellthemachines Feb 2, 2022
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
14 changes: 8 additions & 6 deletions packages/components/src/placeholder/index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -73,12 +73,14 @@ function Placeholder( {
<Icon icon={ icon } />
{ label }
</div>
{ !! instructions && (
<div className="components-placeholder__instructions">
{ instructions }
</div>
) }
<div className={ fieldsetClasses }>{ children }</div>
<fieldset className={ fieldsetClasses }>
{ !! instructions && (
<legend className="components-placeholder__instructions">
{ instructions }
</legend>
) }
{ children }
</fieldset>
</div>
);
}
Expand Down
12 changes: 12 additions & 0 deletions packages/components/src/placeholder/style.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -77,6 +77,18 @@
}
}

// Overrides for browser and editor fieldset styles.
.components-placeholder__fieldset.components-placeholder__fieldset {
border: none;
padding: 0;

.components-placeholder__instructions {
padding: 0;
font-weight: normal;
font-size: 1em;
}
}

.components-placeholder__fieldset.is-column-layout,
.components-placeholder__fieldset.is-column-layout form {
flex-direction: column;
Expand Down
19 changes: 18 additions & 1 deletion packages/components/src/placeholder/test/index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -88,14 +88,31 @@ describe( 'Placeholder', () => {
const element = <div>Fieldset</div>;
const placeholder = shallow( <Placeholder children={ element } /> );
const placeholderFieldset = placeholder.find(
'.components-placeholder__fieldset'
'fieldset.components-placeholder__fieldset'
);
const child = placeholderFieldset.childAt( 0 );

expect( placeholderFieldset.exists() ).toBe( true );
expect( child.matchesElement( element ) ).toBe( true );
} );

it( 'should display a legend if instructions are passed', () => {
const element = <div>Fieldset</div>;
const instructions = 'Choose an option.';
const placeholder = shallow(
<Placeholder
children={ element }
instructions={ instructions }
/>
);
const placeholderLegend = placeholder.find(
'legend.components-placeholder__instructions'
);

expect( placeholderLegend.exists() ).toBe( true );
expect( placeholderLegend.text() ).toEqual( instructions );
} );

it( 'should add an additional className to the top container', () => {
const placeholder = shallow(
<Placeholder className="wp-placeholder" />
Expand Down