Commit cedcd442 authored by David O'Regan's avatar David O'Regan

Merge branch 'cngo-add-aria-labels-to-icon-only-buttons' into 'master'

Add aria-labels to icon-only buttons

See merge request gitlab-org/gitlab!59037
parents 66ce587c 3baeab96
<script> <script>
import { GlTooltipDirective, GlIcon, GlLink, GlSafeHtmlDirective } from '@gitlab/ui'; import { GlTooltipDirective, GlIcon, GlLink, GlSafeHtmlDirective } from '@gitlab/ui';
import { ApolloMutation } from 'vue-apollo'; import { ApolloMutation } from 'vue-apollo';
import { __ } from '~/locale';
import TimelineEntryItem from '~/vue_shared/components/notes/timeline_entry_item.vue'; import TimelineEntryItem from '~/vue_shared/components/notes/timeline_entry_item.vue';
import TimeAgoTooltip from '~/vue_shared/components/time_ago_tooltip.vue'; import TimeAgoTooltip from '~/vue_shared/components/time_ago_tooltip.vue';
import UserAvatarLink from '~/vue_shared/components/user_avatar/user_avatar_link.vue'; import UserAvatarLink from '~/vue_shared/components/user_avatar/user_avatar_link.vue';
...@@ -10,6 +11,9 @@ import { findNoteId, extractDesignNoteId } from '../../utils/design_management_u ...@@ -10,6 +11,9 @@ import { findNoteId, extractDesignNoteId } from '../../utils/design_management_u
import DesignReplyForm from './design_reply_form.vue'; import DesignReplyForm from './design_reply_form.vue';
export default { export default {
i18n: {
editCommentLabel: __('Edit comment'),
},
components: { components: {
UserAvatarLink, UserAvatarLink,
TimelineEntryItem, TimelineEntryItem,
...@@ -113,7 +117,8 @@ export default { ...@@ -113,7 +117,8 @@ export default {
v-if="isEditButtonVisible" v-if="isEditButtonVisible"
v-gl-tooltip v-gl-tooltip
type="button" type="button"
:title="__('Edit comment')" :title="$options.i18n.editCommentLabel"
:aria-label="$options.i18n.editCommentLabel"
class="note-action-button js-note-edit btn btn-transparent qa-note-edit-button" class="note-action-button js-note-edit btn btn-transparent qa-note-edit-button"
@click="isEditing = true" @click="isEditing = true"
> >
......
...@@ -68,6 +68,7 @@ export default { ...@@ -68,6 +68,7 @@ export default {
}" }"
type="button" type="button"
class="js-diff-notes-toggle" class="js-diff-notes-toggle"
:aria-label="__('Show comments')"
@click="toggleDiscussion({ discussionId: discussion.id })" @click="toggleDiscussion({ discussionId: discussion.id })"
> >
<gl-icon v-if="discussion.expanded" name="collapse" class="collapse-icon" /> <gl-icon v-if="discussion.expanded" name="collapse" class="collapse-icon" />
......
...@@ -122,6 +122,7 @@ export default { ...@@ -122,6 +122,7 @@ export default {
:disabled="!shouldToggleDiscussion" :disabled="!shouldToggleDiscussion"
class="js-image-badge" class="js-image-badge"
type="button" type="button"
:aria-label="__('Show comments')"
@click="clickedToggle(discussion)" @click="clickedToggle(discussion)"
> >
<gl-icon v-if="showCommentIcon" name="image-comment-dark" :size="24" /> <gl-icon v-if="showCommentIcon" name="image-comment-dark" :size="24" />
......
...@@ -146,6 +146,7 @@ export default { ...@@ -146,6 +146,7 @@ export default {
type="button" type="button"
class="add-diff-note note-button js-add-diff-note-button" class="add-diff-note note-button js-add-diff-note-button"
:disabled="line.commentsDisabled" :disabled="line.commentsDisabled"
:aria-label="addCommentTooltip"
@click="handleCommentButton" @click="handleCommentButton"
> >
<gl-icon :size="12" name="comment" /> <gl-icon :size="12" name="comment" />
......
...@@ -195,6 +195,7 @@ export default { ...@@ -195,6 +195,7 @@ export default {
type="button" type="button"
class="add-diff-note note-button js-add-diff-note-button qa-diff-comment" class="add-diff-note note-button js-add-diff-note-button qa-diff-comment"
:disabled="line.left.commentsDisabled" :disabled="line.left.commentsDisabled"
:aria-label="addCommentTooltipLeft"
@click="handleCommentButton(line.left)" @click="handleCommentButton(line.left)"
> >
<gl-icon :size="12" name="comment" /> <gl-icon :size="12" name="comment" />
...@@ -252,6 +253,7 @@ export default { ...@@ -252,6 +253,7 @@ export default {
type="button" type="button"
class="add-diff-note note-button js-add-diff-note-button qa-diff-comment" class="add-diff-note note-button js-add-diff-note-button qa-diff-comment"
:disabled="line.right.commentsDisabled" :disabled="line.right.commentsDisabled"
:aria-label="addCommentTooltipRight"
@click="handleCommentButton(line.right)" @click="handleCommentButton(line.right)"
> >
<gl-icon :size="12" name="comment" /> <gl-icon :size="12" name="comment" />
......
...@@ -105,6 +105,7 @@ export default { ...@@ -105,6 +105,7 @@ export default {
}" }"
type="button" type="button"
class="gl-border-0 gl-border-b-2 gl-border-b-solid gl-flex-fill-1 gl-text-gray-300 gl-pt-3 gl-pb-3 gl-bg-transparent emoji-picker-category-tab" class="gl-border-0 gl-border-b-2 gl-border-b-solid gl-flex-fill-1 gl-text-gray-300 gl-pt-3 gl-pb-3 gl-bg-transparent emoji-picker-category-tab"
:aria-label="category.name"
@click="scrollToCategory(category.name)" @click="scrollToCategory(category.name)"
> >
<gl-icon :name="category.icon" :size="12" /> <gl-icon :name="category.icon" :size="12" />
......
...@@ -51,6 +51,7 @@ export default { ...@@ -51,6 +51,7 @@ export default {
v-gl-tooltip.hover v-gl-tooltip.hover
class="gl-display-block gl-mb-4 mb-md-0 gl-w-full" class="gl-display-block gl-mb-4 mb-md-0 gl-w-full"
:title="ignoreBtn.title" :title="ignoreBtn.title"
:aria-label="ignoreBtn.title"
@click="$emit('update-issue-status', { errorId: error.id, status: ignoreBtn.status })" @click="$emit('update-issue-status', { errorId: error.id, status: ignoreBtn.status })"
> >
<gl-icon class="gl-display-none d-md-inline gl-m-0" :name="ignoreBtn.icon" :size="12" /> <gl-icon class="gl-display-none d-md-inline gl-m-0" :name="ignoreBtn.icon" :size="12" />
...@@ -62,6 +63,7 @@ export default { ...@@ -62,6 +63,7 @@ export default {
v-gl-tooltip.hover v-gl-tooltip.hover
class="gl-display-block gl-mb-4 mb-md-0 gl-w-full" class="gl-display-block gl-mb-4 mb-md-0 gl-w-full"
:title="resolveBtn.title" :title="resolveBtn.title"
:aria-label="resolveBtn.title"
@click="$emit('update-issue-status', { errorId: error.id, status: resolveBtn.status })" @click="$emit('update-issue-status', { errorId: error.id, status: resolveBtn.status })"
> >
<gl-icon class="gl-display-none d-md-inline gl-m-0" :name="resolveBtn.icon" :size="12" /> <gl-icon class="gl-display-none d-md-inline gl-m-0" :name="resolveBtn.icon" :size="12" />
......
...@@ -55,6 +55,7 @@ export default { ...@@ -55,6 +55,7 @@ export default {
:disabled="disabled" :disabled="disabled"
class="btn-scroll btn-transparent btn-blank" class="btn-scroll btn-transparent btn-blank"
type="button" type="button"
:aria-label="tooltipTitle"
@click="clickedScroll" @click="clickedScroll"
> >
<gl-icon :name="iconName" /> <gl-icon :name="iconName" />
......
...@@ -9,10 +9,13 @@ import { ...@@ -9,10 +9,13 @@ import {
GlSkeletonLoader, GlSkeletonLoader,
GlTooltipDirective, GlTooltipDirective,
} from '@gitlab/ui'; } from '@gitlab/ui';
import { __ } from '~/locale';
import { ANY_OPTION } from '../constants'; import { ANY_OPTION } from '../constants';
export default { export default {
i18n: {
clearLabel: __('Clear'),
},
name: 'SearchableDropdown', name: 'SearchableDropdown',
components: { components: {
GlDropdown, GlDropdown,
...@@ -96,7 +99,8 @@ export default { ...@@ -96,7 +99,8 @@ export default {
v-gl-tooltip v-gl-tooltip
name="clear" name="clear"
category="tertiary" category="tertiary"
:title="__('Clear')" :title="$options.i18n.clearLabel"
:aria-label="$options.i18n.clearLabel"
class="gl-p-0! gl-mr-2" class="gl-p-0! gl-mr-2"
@keydown.enter.stop="resetDropdown" @keydown.enter.stop="resetDropdown"
@click.stop="resetDropdown" @click.stop="resetDropdown"
......
...@@ -68,6 +68,7 @@ export default { ...@@ -68,6 +68,7 @@ export default {
category="primary" category="primary"
size="small" size="small"
:title="buttonTitle" :title="buttonTitle"
:aria-label="buttonTitle"
:loading="isLoading" :loading="isLoading"
:disabled="isActionInProgress" :disabled="isActionInProgress"
:class="`inline gl-ml-2 ${containerClasses}`" :class="`inline gl-ml-2 ${containerClasses}`"
......
...@@ -25,7 +25,7 @@ export default { ...@@ -25,7 +25,7 @@ export default {
</script> </script>
<template> <template>
<span> <span>
<gl-button ref="popoverTrigger" variant="link" icon="question" tabindex="0" /> <gl-button ref="popoverTrigger" variant="link" icon="question" :aria-label="__('Help')" />
<gl-popover :target="() => $refs.popoverTrigger.$el" v-bind="options"> <gl-popover :target="() => $refs.popoverTrigger.$el" v-bind="options">
<template v-if="options.title" #title> <template v-if="options.title" #title>
<span v-safe-html="options.title"></span> <span v-safe-html="options.title"></span>
......
...@@ -21,7 +21,11 @@ export default { ...@@ -21,7 +21,11 @@ export default {
}; };
</script> </script>
<template> <template>
<button v-gl-tooltip="{ title: tooltip }" class="p-0 gl-display-flex toolbar-button"> <button
v-gl-tooltip="{ title: tooltip }"
:aria-label="tooltip"
class="p-0 gl-display-flex toolbar-button"
>
<gl-icon class="gl-mx-auto gl-align-self-center" :name="icon" /> <gl-icon class="gl-mx-auto gl-align-self-center" :name="icon" />
</button> </button>
</template> </template>
---
title: Add aria labels to icon-only buttons
merge_request: 59037
author:
type: fixed
...@@ -326,7 +326,12 @@ export default { ...@@ -326,7 +326,12 @@ export default {
</span> </span>
</gl-dropdown-item> </gl-dropdown-item>
</gl-dropdown> </gl-dropdown>
<gl-button v-gl-tooltip.hover :title="sortTooltipTitle" @click="toggleSortOrder"> <gl-button
v-gl-tooltip.hover
:title="sortTooltipTitle"
:aria-label="sortTooltipTitle"
@click="toggleSortOrder"
>
<gl-icon :name="sortIcon" /> <gl-icon :name="sortIcon" />
</gl-button> </gl-button>
</div> </div>
......
<script> <script>
import { GlButton, GlDropdown, GlDropdownItem, GlIcon, GlTooltipDirective } from '@gitlab/ui'; import { GlButton, GlDropdown, GlDropdownItem, GlIcon, GlTooltipDirective } from '@gitlab/ui';
import { mapActions, mapState } from 'vuex'; import { mapActions, mapState } from 'vuex';
import { __ } from '~/locale';
import { DEPENDENCY_LIST_TYPES } from '../store/constants'; import { DEPENDENCY_LIST_TYPES } from '../store/constants';
import { SORT_FIELDS, SORT_ORDER } from '../store/modules/list/constants'; import { SORT_FIELDS, SORT_ORDER } from '../store/modules/list/constants';
export default { export default {
i18n: {
sortDirectionLabel: __('Sort direction'),
},
name: 'DependenciesActions', name: 'DependenciesActions',
components: { components: {
GlButton, GlButton,
...@@ -80,7 +84,8 @@ export default { ...@@ -80,7 +84,8 @@ export default {
</gl-dropdown> </gl-dropdown>
<gl-button <gl-button
v-gl-tooltip v-gl-tooltip
:title="__('Sort direction')" :title="$options.i18n.sortDirectionLabel"
:aria-label="$options.i18n.sortDirectionLabel"
class="flex-grow-0 js-sort-order" class="flex-grow-0 js-sort-order"
@click="toggleSortOrder" @click="toggleSortOrder"
> >
......
...@@ -87,6 +87,7 @@ export default { ...@@ -87,6 +87,7 @@ export default {
v-if="!childrenFetchInProgress && hasChildren" v-if="!childrenFetchInProgress && hasChildren"
v-gl-tooltip.viewport.hover v-gl-tooltip.viewport.hover
:title="chevronTooltip" :title="chevronTooltip"
:aria-label="chevronTooltip"
:class="chevronType" :class="chevronType"
variant="link" variant="link"
class="btn-svg btn-tree-item-chevron align-self-start" class="btn-svg btn-tree-item-chevron align-self-start"
......
...@@ -83,6 +83,7 @@ exports[`DependenciesActions component matches the snapshot 1`] = ` ...@@ -83,6 +83,7 @@ exports[`DependenciesActions component matches the snapshot 1`] = `
</gl-dropdown-stub> </gl-dropdown-stub>
<gl-button-stub <gl-button-stub
aria-label="Sort direction"
buttontextclasses="" buttontextclasses=""
category="primary" category="primary"
class="flex-grow-0 js-sort-order" class="flex-grow-0 js-sort-order"
......
...@@ -34,7 +34,6 @@ describe('HelpPopover', () => { ...@@ -34,7 +34,6 @@ describe('HelpPopover', () => {
icon: 'question', icon: 'question',
variant: 'link', variant: 'link',
}); });
expect(findQuestionButton().attributes().tabindex).toBe('0');
}); });
it('renders popover that uses the question button as target', () => { it('renders popover that uses the question button as target', () => {
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment