Skip to content

ComboBox: Correct invalid ARIA attributes. (#4873) #5001

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
JasonGore merged 4 commits into from
May 31, 2018
Merged

ComboBox: Correct invalid ARIA attributes. (#4873) #5001

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
357ac59
ComboBox: Correct invalid ARIA attributes. (#4873)
JasonGore May 25, 2018
d208957
Change file.
JasonGore May 25, 2018
8c12857
Merge branch 'master' into 4873-accessibility-combobox
JasonGore May 31, 2018
786eb78
Merge branch 'master' into 4873-accessibility-combobox
JasonGore May 31, 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/4873-accessibility-combobox_2018-05-25-22-21.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": "Fix ComboBox ARIA attributes.",
"type": "patch"
}
],
"packageName": "office-ui-fabric-react",
"email": "jagore@microsoft.com"
}
7 changes: 2 additions & 5 deletions packages/office-ui-fabric-react/src/components/ComboBox/ComboBox.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -352,8 +352,6 @@ export class ComboBox extends BaseComponent<IComboBoxProps, IComboBoxState> {
!!hasErrorMessage
);

const describedBy = id + '-option';

return (
<div { ...divProps } ref={ this._root } className={ this._classNames.container }>
{ label && (
Expand Down Expand Up @@ -384,14 +382,13 @@ export class ComboBox extends BaseComponent<IComboBoxProps, IComboBoxState> {
aria-expanded={ isOpen }
aria-autocomplete={ this._getAriaAutoCompleteValue() }
role='combobox'
aria-readonly={ ((allowFreeform || disabled) ? undefined : 'true') }
readOnly={ disabled || !allowFreeform }
aria-labelledby={ (label && (id + '-label')) }
aria-label={ ((ariaLabel && !label) ? ariaLabel : undefined) }
aria-describedby={ describedBy + (keytipAttributes['aria-describedby'] || '') }
aria-describedby={ keytipAttributes['aria-describedby'] }
aria-activedescendant={ this._getAriaActiveDescentValue() }
aria-disabled={ disabled }
aria-owns={ (id + '-list') }
aria-owns={ isOpen ? (id + '-list') : undefined }
spellCheck={ false }
defaultVisibleValue={ this._currentVisibleValue }
suggestedDisplayValue={ suggestedDisplayValue }
Expand Down
10 changes: 4 additions & 6 deletions ...e-ui-fabric-react/src/components/ComboBox/__snapshots__/ComboBox.deprecated.test.tsx.snap
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -110,13 +110,12 @@ exports[`ComboBox Renders ComboBox correctly 1`] = `
<input
aria-activedescendant={undefined}
aria-autocomplete="both"
aria-describedby="ComboBox0-option"
aria-describedby={undefined}
aria-disabled={undefined}
aria-expanded={false}
aria-label={undefined}
aria-labelledby={undefined}
aria-owns="ComboBox0-list"
aria-readonly="true"
aria-owns={undefined}
autoCapitalize="off"
autoComplete="off"
className=
Expand Down Expand Up @@ -397,13 +396,12 @@ exports[`ComboBox renders a ComboBox with a Keytip correctly 1`] = `
<input
aria-activedescendant={undefined}
aria-autocomplete="both"
aria-describedby="ComboBox4-option ktp-layer-id ktp-a"
aria-describedby=" ktp-layer-id ktp-a"
aria-disabled={undefined}
aria-expanded={false}
aria-label={undefined}
aria-labelledby={undefined}
aria-owns="ComboBox4-list"
aria-readonly="true"
aria-owns={undefined}
autoCapitalize="off"
autoComplete="off"
className=
Expand Down
10 changes: 4 additions & 6 deletions packages/office-ui-fabric-react/src/components/ComboBox/__snapshots__/ComboBox.test.tsx.snap
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -109,13 +109,12 @@ exports[`ComboBox Renders ComboBox correctly 1`] = `
<input
aria-activedescendant={undefined}
aria-autocomplete="both"
aria-describedby="ComboBox0-option"
aria-describedby={undefined}
aria-disabled={undefined}
aria-expanded={false}
aria-label={undefined}
aria-labelledby={undefined}
aria-owns="ComboBox0-list"
aria-readonly="true"
aria-owns={undefined}
autoCapitalize="off"
autoComplete="off"
className=
Expand Down Expand Up @@ -396,13 +395,12 @@ exports[`ComboBox renders a ComboBox with a Keytip correctly 1`] = `
<input
aria-activedescendant={undefined}
aria-autocomplete="both"
aria-describedby="ComboBox4-option ktp-layer-id ktp-a"
aria-describedby=" ktp-layer-id ktp-a"
aria-disabled={undefined}
aria-expanded={false}
aria-label={undefined}
aria-labelledby={undefined}
aria-owns="ComboBox4-list"
aria-readonly="true"
aria-owns={undefined}
autoCapitalize="off"
autoComplete="off"
className=
Expand Down