Skip to content

TooltipHost: Include aria-described #1628

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
cschleiden merged 7 commits into from
Apr 27, 2017
Merged

TooltipHost: Include aria-described #1628

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
e511175
Include aria-describedf by on tooltips
ostreifel Apr 26, 2017
519c9cf
Patch notes
ostreifel Apr 26, 2017
6b7aed3
id
ostreifel Apr 26, 2017
37f629e
Condition describedby on visibility
ostreifel Apr 27, 2017
c47d01d
read id from props
ostreifel Apr 27, 2017
d8f4079
Merge branch 'master' into users/ottost/tooltipDescribedBy
cschleiden Apr 27, 2017
21c2c0a
Merge branch 'master' into users/ottost/tooltipDescribedBy
cschleiden Apr 27, 2017
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
10 changes: 10 additions & 0 deletions common/changes/users-ottost-tooltipDescribedBy_2017-04-26-20-18.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
{
"changes": [
{
"packageName": "office-ui-fabric-react",
"comment": "Add aria-describedby to tooltiphost component",
"type": "patch"
}
],
"email": "ottost@microsoft.com"
}
7 changes: 5 additions & 2 deletions packages/office-ui-fabric-react/src/components/Tooltip/TooltipHost.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@ import { TooltipDelay } from './Tooltip.Props';

import * as stylesImport from './TooltipHost.scss';
const styles: any = stylesImport;
import { getId } from '@uifabric/utilities';

export interface ITooltipHostState {
isTooltipVisible?: boolean;
Expand All @@ -40,9 +41,9 @@ export class TooltipHost extends BaseComponent<ITooltipHostProps, ITooltipHostSt

// Render
public render() {
const { calloutProps, content, children, directionalHint, delay } = this.props;
const { calloutProps, content, children, directionalHint, delay, id } = this.props;
const { isTooltipVisible } = this.state;

const tooltipId = id || getId('tooltip');
return (
<div
className={ css('ms-TooltipHost', styles.host) }
Expand All @@ -51,10 +52,12 @@ export class TooltipHost extends BaseComponent<ITooltipHostProps, ITooltipHostSt
{ ...{ onBlurCapture: this._onTooltipMouseLeave } }
onMouseEnter={ this._onTooltipMouseEnter }
onMouseLeave={ this._onTooltipMouseLeave }
aria-describedby={ isTooltipVisible ? tooltipId : undefined }
>
{ children }
{ isTooltipVisible && (
<Tooltip
id={ tooltipId }
Copy link
Copy Markdown
Contributor

@cschleiden cschleiden Apr 26, 2017

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

this doesn't work

Copy link
Copy Markdown
Contributor

@cschleiden cschleiden Apr 26, 2017

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@ostreifel the tooltip is lying to us :) these props are never applied, unfortunately

Copy link
Copy Markdown
Contributor Author

@ostreifel ostreifel Apr 27, 2017 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@cschleiden https://github.com/OfficeDev/office-ui-fabric-react/blob/master/packages/office-ui-fabric-react/src/components/Tooltip/Tooltip.tsx#L32

delay={ delay }
content={ content }
targetElement={ this._getTargetElement() }
Expand Down