Commit 12aff0b7 authored by Kushal Pandya's avatar Kushal Pandya

Merge branch '60987-emoji-picker-popup' into 'master'

Fix emoji picker popup is not always fully visible

Closes #60987

See merge request gitlab-org/gitlab-ce!28984
parents 4e888212 7099211e
...@@ -147,6 +147,7 @@ export default { ...@@ -147,6 +147,7 @@ export default {
class="note-action-button note-emoji-button js-add-award js-note-emoji" class="note-action-button note-emoji-button js-add-award js-note-emoji"
href="#" href="#"
title="Add reaction" title="Add reaction"
data-position="right"
> >
<icon css-classes="link-highlight award-control-icon-neutral" name="slight-smile" /> <icon css-classes="link-highlight award-control-icon-neutral" name="slight-smile" />
<icon css-classes="link-highlight award-control-icon-positive" name="smiley" /> <icon css-classes="link-highlight award-control-icon-positive" name="smiley" />
......
---
title: Fix emoji picker visibility issue
merge_request: 28984
author:
type: fixed
...@@ -58,6 +58,7 @@ describe('noteActions', () => { ...@@ -58,6 +58,7 @@ describe('noteActions', () => {
it('should render emoji link', () => { it('should render emoji link', () => {
expect(wrapper.find('.js-add-award').exists()).toBe(true); expect(wrapper.find('.js-add-award').exists()).toBe(true);
expect(wrapper.find('.js-add-award').attributes('data-position')).toBe('right');
}); });
describe('actions dropdown', () => { describe('actions dropdown', () => {
......
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