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.

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

feat(a11y): add screen reader support for Tooltip #490

Merged
merged 17 commits into from
Jan 7, 2025
Merged
Show file tree
Hide file tree
Changes from 6 commits
Commits
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: 5 additions & 2 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -43,11 +43,14 @@
"dependencies": {
"@babel/runtime": "^7.11.2",
"@rc-component/trigger": "^2.0.0",
"classnames": "^2.3.1"
"classnames": "^2.3.1",
"rc-util": "^5.44.3"
},
"devDependencies": {
"@rc-component/father-plugin": "^1.0.0",
"@testing-library/jest-dom": "^6.6.3",
"@testing-library/react": "^14.0.0",
"@testing-library/user-event": "^14.5.2",
"@types/jest": "^29.4.0",
"@types/react": "^18.0.26",
"@types/react-dom": "^18.0.10",
Expand All @@ -69,4 +72,4 @@
"react": ">=16.9.0",
"react-dom": ">=16.9.0"
}
}
}
2 changes: 1 addition & 1 deletion src/Popup.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -18,9 +18,9 @@ export default function Popup(props: ContentProps) {
return (
<div className={classNames(`${prefixCls}-content`, className)} style={style}>
<div
className={classNames(`${prefixCls}-inner`, bodyClassName)}
id={id}
role="tooltip"
className={classNames(`${prefixCls}-inner`, bodyClassName)}
aojunhao123 marked this conversation as resolved.
Show resolved Hide resolved
style={innerStyle}
>
{typeof children === 'function' ? children() : children}
Expand Down
24 changes: 19 additions & 5 deletions src/Tooltip.tsx
Original file line number Diff line number Diff line change
@@ -1,11 +1,12 @@
import type { ArrowType, TriggerProps, TriggerRef } from '@rc-component/trigger';
import Trigger from '@rc-component/trigger';
import type { ActionType, AlignType, AnimationType } from '@rc-component/trigger/lib/interface';
import classNames from 'classnames';
import * as React from 'react';
import { forwardRef, useImperativeHandle, useRef } from 'react';
import { forwardRef, useImperativeHandle, useRef, cloneElement } from 'react';
import { placements } from './placements';
import Popup from './Popup';
import classNames from 'classnames';
import useId from 'rc-util/lib/hooks/useId';

export interface TooltipProps
extends Pick<
Expand Down Expand Up @@ -60,9 +61,11 @@ export interface TooltipClassNames {
body?: string;
}

export interface TooltipRef extends TriggerRef {}
export interface TooltipRef extends TriggerRef { }

const Tooltip = (props: TooltipProps, ref: React.Ref<TooltipRef>) => {
const defaultId = useId();

const {
overlayClassName,
trigger = ['hover'],
Expand All @@ -84,7 +87,7 @@ const Tooltip = (props: TooltipProps, ref: React.Ref<TooltipRef>) => {
overlayInnerStyle,
arrowContent,
overlay,
id,
id = defaultId,
aojunhao123 marked this conversation as resolved.
Show resolved Hide resolved
showArrow = true,
classNames: tooltipClassNames,
styles: tooltipStyles,
Expand All @@ -111,6 +114,17 @@ const Tooltip = (props: TooltipProps, ref: React.Ref<TooltipRef>) => {
</Popup>
);

const getChildren = () => {
aojunhao123 marked this conversation as resolved.
Show resolved Hide resolved
const originalProps = (children as React.ReactElement)?.props || {};

const childProps = {
...originalProps,
'aria-describedby': overlay ? id : null,
};

return cloneElement(children, childProps);
};

return (
<Trigger
popupClassName={classNames(overlayClassName, tooltipClassNames?.root)}
Expand All @@ -135,7 +149,7 @@ const Tooltip = (props: TooltipProps, ref: React.Ref<TooltipRef>) => {
arrow={showArrow}
{...extraProps}
>
{children}
{getChildren()}
</Trigger>
);
};
Expand Down
2 changes: 1 addition & 1 deletion tests/popup.test.tsx
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { Popup } from '../src';
import Popup from '../src/Popup';

describe('Popup', () => {
// Used in antd for C2D2C
Expand Down
2 changes: 1 addition & 1 deletion tests/setup.js
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ if (typeof window !== 'undefined') {
global.window.innerHeight = height || global.window.innerHeight;
global.window.dispatchEvent(new Event('resize'));
};
global.window.scrollTo = () => {};
global.window.scrollTo = () => { };
aojunhao123 marked this conversation as resolved.
Show resolved Hide resolved
// ref: https://github.com/ant-design/ant-design/issues/18774
if (!window.matchMedia) {
Object.defineProperty(global.window, 'matchMedia', {
Expand Down