Skip to content

Facepile conditionally rendering aria-describedby #4183

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
dzearing merged 2 commits into from
Mar 6, 2018
Merged

Facepile conditionally rendering aria-describedby #4183

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
22cc922
Fix Facepile aria description
Mar 5, 2018
786ffd7
Adding changefile
Mar 5, 2018
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
11 changes: 11 additions & 0 deletions common/changes/office-ui-fabric-react/FirstBug_2018-03-05-22-47.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
{
"changes": [
{
"packageName": "office-ui-fabric-react",
"comment": "Facepile: Conditionally apply `aria-describedby` only when `ariaDescription` is provided",
"type": "patch"
}
],
"packageName": "office-ui-fabric-react",
"email": "adrum@microsoft.com"
}
3 changes: 2 additions & 1 deletion packages/office-ui-fabric-react/src/components/Facepile/Facepile.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,6 +48,7 @@ export class Facepile extends BaseComponent<IFacepileProps, {}> {
public render(): JSX.Element {
let { overflowButtonProps } = this.props;
const {
ariaDescription,
chevronButtonProps,
maxDisplayablePersonas,
className,
Expand All @@ -69,7 +70,7 @@ export class Facepile extends BaseComponent<IFacepileProps, {}> {
{ showAddButton ? this._getAddNewElement() : null }
{ this.onRenderAriaDescription() }
<FocusZone
ariaDescribedBy={ this._ariaDescriptionId }
ariaDescribedBy={ ariaDescription && this._ariaDescriptionId }
role='listbox'
className={ css('ms-Facepile-members', styles.members) }
direction={ FocusZoneDirection.horizontal }
Expand Down
2 changes: 1 addition & 1 deletion packages/office-ui-fabric-react/src/components/Facepile/__snapshots__/Facepile.test.tsx.snap
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ exports[`Facepile renders Facepile correctly 1`] = `
className="ms-Facepile-itemContainer"
>
<div
aria-describedby="id__0"
aria-describedby={undefined}
aria-labelledby={undefined}
className="ms-FocusZone ms-Facepile-members"
data-focuszone-id="FocusZone1"
Expand Down
2 changes: 1 addition & 1 deletion packages/office-ui-fabric-react/src/components/Facepile/examples/Facepile.Basic.Example.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@ export class FacepileBasicExample extends React.Component<{}, IFacepileBasicExam

return (
<div className={ 'ms-FacepileExample' }>
<Facepile {...facepileProps} />
<Facepile { ...facepileProps } />
<div className={ 'control' }>
<Slider
label='Number of Personas:'
Expand Down