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

Updated ComboBox error to have role="alert" #20013

Merged
merged 4 commits into from
Sep 29, 2021
Merged

Updated ComboBox error to have role="alert" #20013

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
43da031
Updated error to be role alert
GeoffCoxMSFT Sep 28, 2021
9fceedc
Change files
GeoffCoxMSFT Sep 28, 2021
1a3c61b
Updated snapshot in react-experiments
GeoffCoxMSFT Sep 28, 2021
4ceea9b
Change files
GeoffCoxMSFT Sep 28, 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 change/@fluentui-react-814bb693-05b1-4c4b-9b33-a4695b4bf333.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
{
"type": "patch",
"comment": "Updated error to be role alert",
"packageName": "@fluentui/react",
"email": "[email protected]",
"dependentChangeType": "patch"
}
7 changes: 7 additions & 0 deletions change/@fluentui-react-experiments-d2d23199-aaa3-4462-9e1c-6466930b4b33.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
{
"type": "patch",
"comment": "Updated experiment snapshot that uses ComboBox",
"packageName": "@fluentui/react-experiments",
"email": "[email protected]",
"dependentChangeType": "patch"
}
18 changes: 0 additions & 18 deletions packages/react-examples/src/react/__snapshots__/ComboBox.Basic.Example.tsx.shot
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -398,15 +398,6 @@ exports[`Component Examples renders ComboBox.Basic.Example.tsx correctly 1`] = `
</span>
</button>
</div>
<div
aria-atomic="true"
aria-hidden={true}
aria-live="polite"
id="ComboBox0-error"
role="region"
>

</div>
</div>
<button
className=
Expand Down Expand Up @@ -963,15 +954,6 @@ exports[`Component Examples renders ComboBox.Basic.Example.tsx correctly 1`] = `
</span>
</button>
</div>
<div
aria-atomic="true"
aria-hidden={true}
aria-live="polite"
id="ComboBox7-error"
role="region"
>

</div>
</div>
</div>
`;
9 changes: 0 additions & 9 deletions packages/react-examples/src/react/__snapshots__/ComboBox.Controlled.Example.tsx.shot
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -418,15 +418,6 @@ exports[`Component Examples renders ComboBox.Controlled.Example.tsx correctly 1`
</span>
</button>
</div>
<div
aria-atomic="true"
aria-hidden={true}
aria-live="polite"
id="ComboBox0-error"
role="region"
>

</div>
</div>
<div
className=
Expand Down
9 changes: 0 additions & 9 deletions packages/react-examples/src/react/__snapshots__/ComboBox.ControlledMulti.Example.tsx.shot
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -440,15 +440,6 @@ exports[`Component Examples renders ComboBox.ControlledMulti.Example.tsx correct
</span>
</button>
</div>
<div
aria-atomic="true"
aria-hidden={true}
aria-live="polite"
id="ComboBox0-error"
role="region"
>

</div>
</div>
<div
className=
Expand Down
18 changes: 0 additions & 18 deletions packages/react-examples/src/react/__snapshots__/ComboBox.CustomStyled.Example.tsx.shot
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -418,15 +418,6 @@ exports[`Component Examples renders ComboBox.CustomStyled.Example.tsx correctly
</span>
</button>
</div>
<div
aria-atomic="true"
aria-hidden={true}
aria-live="polite"
id="ComboBox0-error"
role="region"
>

</div>
</div>
<div
className="ms-ComboBox-container "
Expand Down Expand Up @@ -824,15 +815,6 @@ exports[`Component Examples renders ComboBox.CustomStyled.Example.tsx correctly
</span>
</button>
</div>
<div
aria-atomic="true"
aria-hidden={true}
aria-live="polite"
id="ComboBox4-error"
role="region"
>

</div>
</div>
</div>
`;
13 changes: 1 addition & 12 deletions packages/react-examples/src/react/__snapshots__/ComboBox.ErrorHandling.Example.tsx.shot
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -355,8 +355,6 @@ exports[`Component Examples renders ComboBox.ErrorHandling.Example.tsx correctly
</button>
</div>
<div
aria-atomic="true"
aria-live="polite"
className=

{
Expand All @@ -369,7 +367,7 @@ exports[`Component Examples renders ComboBox.ErrorHandling.Example.tsx correctly
margin-top: 5px;
}
id="ComboBox0-error"
role="region"
role="alert"
>
Oh no! This ComboBox has an error!
</div>
Expand Down Expand Up @@ -770,15 +768,6 @@ exports[`Component Examples renders ComboBox.ErrorHandling.Example.tsx correctly
</span>
</button>
</div>
<div
aria-atomic="true"
aria-hidden={true}
aria-live="polite"
id="ComboBox4-error"
role="region"
>

</div>
</div>
</div>
`;
9 changes: 0 additions & 9 deletions packages/react-examples/src/react/__snapshots__/ComboBox.Inline.Example.tsx.shot
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -398,15 +398,6 @@ exports[`Component Examples renders ComboBox.Inline.Example.tsx correctly 1`] =
</span>
</button>
</div>
<div
aria-atomic="true"
aria-hidden={true}
aria-live="polite"
id="ComboBox0-error"
role="region"
>

</div>
</div>
<div
style={
Expand Down
18 changes: 0 additions & 18 deletions packages/react-examples/src/react/__snapshots__/ComboBox.SelectAll.Example.tsx.shot
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -420,15 +420,6 @@ exports[`Component Examples renders ComboBox.SelectAll.Example.tsx correctly 1`]
</span>
</button>
</div>
<div
aria-atomic="true"
aria-hidden={true}
aria-live="polite"
id="ComboBox0-error"
role="region"
>

</div>
</div>
<div
className="ms-ComboBox-container "
Expand Down Expand Up @@ -848,15 +839,6 @@ exports[`Component Examples renders ComboBox.SelectAll.Example.tsx correctly 1`]
</span>
</button>
</div>
<div
aria-atomic="true"
aria-hidden={true}
aria-live="polite"
id="ComboBox4-error"
role="region"
>

</div>
</div>
</div>
`;
9 changes: 0 additions & 9 deletions packages/react-examples/src/react/__snapshots__/ComboBox.Toggles.Example.tsx.shot
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -418,15 +418,6 @@ exports[`Component Examples renders ComboBox.Toggles.Example.tsx correctly 1`] =
</span>
</button>
</div>
<div
aria-atomic="true"
aria-hidden={true}
aria-live="polite"
id="ComboBox0-error"
role="region"
>

</div>
</div>
<div
className=
Expand Down
9 changes: 0 additions & 9 deletions packages/react-examples/src/react/__snapshots__/ComboBox.Virtualized.Example.tsx.shot
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -397,14 +397,5 @@ exports[`Component Examples renders ComboBox.Virtualized.Example.tsx correctly 1
</span>
</button>
</div>
<div
aria-atomic="true"
aria-hidden={true}
aria-live="polite"
id="ComboBox0-error"
role="region"
>

</div>
</div>
`;
27 changes: 0 additions & 27 deletions packages/react-examples/src/react/__snapshots__/TimePicker.Example.tsx.shot
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -421,15 +421,6 @@ exports[`Component Examples renders TimePicker.Example.tsx correctly 1`] = `
</span>
</button>
</div>
<div
aria-atomic="true"
aria-hidden={true}
aria-live="polite"
id="ComboBox0-error"
role="region"
>

</div>
</div>
<div
className="ms-ComboBox-container "
Expand Down Expand Up @@ -829,15 +820,6 @@ exports[`Component Examples renders TimePicker.Example.tsx correctly 1`] = `
</span>
</button>
</div>
<div
aria-atomic="true"
aria-hidden={true}
aria-live="polite"
id="ComboBox4-error"
role="region"
>

</div>
</div>
<div
className="ms-ComboBox-container "
Expand Down Expand Up @@ -1237,15 +1219,6 @@ exports[`Component Examples renders TimePicker.Example.tsx correctly 1`] = `
</span>
</button>
</div>
<div
aria-atomic="true"
aria-hidden={true}
aria-live="polite"
id="ComboBox8-error"
role="region"
>

</div>
</div>
</div>
`;
9 changes: 0 additions & 9 deletions packages/react-experiments/src/components/Pagination/__snapshots__/Pagination.test.tsx.snap
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1718,15 +1718,6 @@ exports[`Pagination render comboBox Pagination correctly 1`] = `
</span>
</button>
</div>
<div
aria-atomic="true"
aria-hidden={true}
aria-live="polite"
id="ComboBox6-error"
role="region"
>

</div>
</div>
<button
aria-label="next page"
Expand Down
14 changes: 5 additions & 9 deletions packages/react/src/components/ComboBox/ComboBox.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -464,15 +464,11 @@ class ComboBoxInternal extends React.Component<IComboBoxInternalProps, IComboBox
},
this._onRenderContainer,
)}
<div
role="region"
aria-live="polite"
aria-atomic="true"
id={errorMessageId}
{...(hasErrorMessage ? { className: this._classNames.errorMessage } : { 'aria-hidden': true })}
>
{errorMessage !== undefined ? errorMessage : ''}
</div>
{hasErrorMessage && (
<div role="alert" id={errorMessageId} className={this._classNames.errorMessage}>
{errorMessage}
</div>
)}
</div>
);
}
Expand Down
30 changes: 0 additions & 30 deletions packages/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 @@ -367,15 +367,6 @@ exports[`ComboBox Renders correctly 1`] = `
</span>
</button>
</div>
<div
aria-atomic="true"
aria-hidden={true}
aria-live="polite"
id="ComboBox0-error"
role="region"
>

</div>
</div>
`;

Expand Down Expand Up @@ -1136,13 +1127,6 @@ exports[`ComboBox Renders correctly when open 1`] = `
</div>
</div>
</span>
<div
aria-atomic="true"
aria-hidden="true"
aria-live="polite"
id="ComboBox0-error"
role="region"
/>
</div>
`;

Expand Down Expand Up @@ -2012,13 +1996,6 @@ exports[`ComboBox Renders correctly when opened in multi-select mode 1`] = `
</div>
</div>
</span>
<div
aria-atomic="true"
aria-hidden="true"
aria-live="polite"
id="ComboBox0-error"
role="region"
/>
</div>
`;

Expand Down Expand Up @@ -2364,12 +2341,5 @@ exports[`ComboBox renders with a Keytip correctly 1`] = `
</span>
</button>
</div>
<div
aria-atomic="true"
aria-hidden="true"
aria-live="polite"
id="ComboBox0-error"
role="region"
/>
</div>
`;