Commit 3dc4fec0 authored by Paul Slaughter's avatar Paul Slaughter

Merge branch 'aqualls-add-emoji-title-a11y' into 'master'

Add aria-label and tooltip to the emoji picker

See merge request gitlab-org/gitlab!68297
parents 0565889d a59272bc
...@@ -108,6 +108,7 @@ export default { ...@@ -108,6 +108,7 @@ export default {
class="gl-mx-5! gl-mb-2!" class="gl-mx-5! gl-mb-2!"
autofocus autofocus
debounce="500" debounce="500"
:aria-label="__('Search for an emoji')"
@input="onSearchInput" @input="onSearchInput"
/> />
<div <div
......
...@@ -199,12 +199,15 @@ export default { ...@@ -199,12 +199,15 @@ export default {
<div v-if="canAwardEmoji" class="award-menu-holder gl-my-2"> <div v-if="canAwardEmoji" class="award-menu-holder gl-my-2">
<emoji-picker <emoji-picker
v-if="glFeatures.improvedEmojiPicker" v-if="glFeatures.improvedEmojiPicker"
v-gl-tooltip.viewport
:title="__('Add reaction')"
:toggle-class="['add-reaction-button btn-icon gl-relative!', { 'is-active': isMenuOpen }]" :toggle-class="['add-reaction-button btn-icon gl-relative!', { 'is-active': isMenuOpen }]"
@click="handleAward" @click="handleAward"
@shown="setIsMenuOpen(true)" @shown="setIsMenuOpen(true)"
@hidden="setIsMenuOpen(false)" @hidden="setIsMenuOpen(false)"
> >
<template #button-content> <template #button-content>
<span class="gl-sr-only">{{ __('Add reaction') }}</span>
<span class="reaction-control-icon reaction-control-icon-neutral"> <span class="reaction-control-icon reaction-control-icon-neutral">
<gl-icon name="slight-smile" /> <gl-icon name="slight-smile" />
</span> </span>
......
...@@ -32040,6 +32040,9 @@ msgstr "" ...@@ -32040,6 +32040,9 @@ msgstr ""
msgid "Search for a user" msgid "Search for a user"
msgstr "" msgstr ""
msgid "Search for an emoji"
msgstr ""
msgid "Search for projects, issues, etc." msgid "Search for projects, issues, etc."
msgstr "" msgstr ""
......
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