fix issue of invalid aria-label values
This commit is contained in:
parent
e9710150ad
commit
6eca14f140
2 changed files with 7 additions and 1 deletions
|
@ -2040,5 +2040,8 @@
|
||||||
"Tip Creators": "Tip Creators",
|
"Tip Creators": "Tip Creators",
|
||||||
"Only select creators can receive tips at this time": "Only select creators can receive tips at this time",
|
"Only select creators can receive tips at this time": "Only select creators can receive tips at this time",
|
||||||
"The payment will be made from your saved card": "The payment will be made from your saved card",
|
"The payment will be made from your saved card": "The payment will be made from your saved card",
|
||||||
|
"Trending for #Art": "Trending for #Art",
|
||||||
|
"Trending for #Education": "Trending for #Education",
|
||||||
|
"Trending for #Technology": "Trending for #Technology",
|
||||||
"--end--": "--end--"
|
"--end--": "--end--"
|
||||||
}
|
}
|
||||||
|
|
|
@ -97,6 +97,9 @@ const Button = forwardRef<any, {}>((props: Props, ref: any) => {
|
||||||
const combinedRef = useCombinedRefs(ref, innerRef, myref);
|
const combinedRef = useCombinedRefs(ref, innerRef, myref);
|
||||||
const size = iconSize || (!label && !children) ? 18 : undefined; // Fall back to default
|
const size = iconSize || (!label && !children) ? 18 : undefined; // Fall back to default
|
||||||
|
|
||||||
|
// Label can be a string or object ( use title instead )
|
||||||
|
const ariaLabel = description || (typeof label === 'string' ? label : title);
|
||||||
|
|
||||||
const content = (
|
const content = (
|
||||||
<span className="button__content">
|
<span className="button__content">
|
||||||
{icon && <Icon icon={icon} iconColor={iconColor} size={iconSize} />}
|
{icon && <Icon icon={icon} iconColor={iconColor} size={iconSize} />}
|
||||||
|
@ -224,7 +227,7 @@ const Button = forwardRef<any, {}>((props: Props, ref: any) => {
|
||||||
<button
|
<button
|
||||||
ref={combinedRef}
|
ref={combinedRef}
|
||||||
title={title || defaultTooltip}
|
title={title || defaultTooltip}
|
||||||
aria-label={description || label || title}
|
aria-label={ariaLabel}
|
||||||
className={combinedClassName}
|
className={combinedClassName}
|
||||||
onClick={(e) => {
|
onClick={(e) => {
|
||||||
if (onClick) {
|
if (onClick) {
|
||||||
|
|
Loading…
Add table
Reference in a new issue