diff --git a/packages/grafana-ui/src/components/Select/SelectMenu.tsx b/packages/grafana-ui/src/components/Select/SelectMenu.tsx index 628c8660365..8032180e566 100644 --- a/packages/grafana-ui/src/components/Select/SelectMenu.tsx +++ b/packages/grafana-ui/src/components/Select/SelectMenu.tsx @@ -52,7 +52,7 @@ export const SelectMenuOptions = React.forwardRef {data.icon && } - {data.imgUrl && } + {data.imgUrl && {data.label}
{renderOptionLabel ? renderOptionLabel(data) : children} {data.description &&
{data.description}
} diff --git a/packages/grafana-ui/src/components/Select/SingleValue.tsx b/packages/grafana-ui/src/components/Select/SingleValue.tsx index eb19839bb30..9f371c5d960 100644 --- a/packages/grafana-ui/src/components/Select/SingleValue.tsx +++ b/packages/grafana-ui/src/components/Select/SingleValue.tsx @@ -46,6 +46,8 @@ type StylesType = ReturnType; interface Props extends SingleValueProps<{ imgUrl?: string; + label?: string; + value: string; loading?: boolean; hideText?: boolean; }> { @@ -61,7 +63,7 @@ export const SingleValue = (props: Props) => {
{data.imgUrl ? ( - + ) : (
@@ -75,14 +77,14 @@ export const SingleValue = (props: Props) => { ); }; -const FadeWithImage = (props: { loading: boolean; imgUrl: string; styles: StylesType }) => { +const FadeWithImage = (props: { loading: boolean; imgUrl: string; styles: StylesType; alt: string }) => { return (
- + {props.alt}
); diff --git a/public/app/features/explore/ExploreToolbar.tsx b/public/app/features/explore/ExploreToolbar.tsx index d3e42087edb..623879fdad4 100644 --- a/public/app/features/explore/ExploreToolbar.tsx +++ b/public/app/features/explore/ExploreToolbar.tsx @@ -146,7 +146,11 @@ export class UnConnectedExploreToolbar extends PureComponent { ) : null} - createAndCopyShortLink(window.location.href)} /> + createAndCopyShortLink(window.location.href)} + aria-label="Copy shortened link to the executed query" + /> {!isLive && (