From 3647fe58c1069909e2ce610ff85910b74f89ff31 Mon Sep 17 00:00:00 2001
From: Jared Deckard <jared.deckard@gmail.com>
Date: Tue, 6 Feb 2018 15:36:49 -0600
Subject: [PATCH 1/3] The emoji menu should not close when the search box is
 clicked

---
 spec/javascripts/awards_handler_spec.js | 13 ++++++++++++-
 1 file changed, 12 insertions(+), 1 deletion(-)

diff --git a/spec/javascripts/awards_handler_spec.js b/spec/javascripts/awards_handler_spec.js
index 268b5b83b73..1c1b3f3ced3 100644
--- a/spec/javascripts/awards_handler_spec.js
+++ b/spec/javascripts/awards_handler_spec.js
@@ -79,7 +79,7 @@ import '~/lib/utils/common_utils';
           return expect($emojiMenu.length).toBe(1);
         });
       });
-      return it('should remove emoji menu when body is clicked', function(done) {
+      it('should remove emoji menu when body is clicked', function(done) {
         $('.js-add-award').eq(0).click();
         return lazyAssert(done, function() {
           var $emojiMenu;
@@ -90,6 +90,17 @@ import '~/lib/utils/common_utils';
           return expect($('.js-awards-block.current').length).toBe(0);
         });
       });
+      it('should not remove emoji menu when search is clicked', function(done) {
+        $('.js-add-award').eq(0).click();
+        return lazyAssert(done, function() {
+          var $emojiMenu;
+          $emojiMenu = $('.emoji-menu');
+          $('.emoji-search').click();
+          expect($emojiMenu.length).toBe(1);
+          expect($emojiMenu.hasClass('is-visible')).toBe(true);
+          return expect($('.js-awards-block.current').length).toBe(1);
+        });
+      });
     });
     describe('::addAwardToEmojiBar', function() {
       it('should add emoji to votes block', function() {

From 37a396560cc5b78f39308b03b34ae734cc5fcefc Mon Sep 17 00:00:00 2001
From: Jared Deckard <jared.deckard@gmail.com>
Date: Tue, 6 Feb 2018 15:41:41 -0600
Subject: [PATCH 2/3] Don't reset the awards block when the emoji search is
 clicked

---
 app/assets/javascripts/awards_handler.js | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/app/assets/javascripts/awards_handler.js b/app/assets/javascripts/awards_handler.js
index 87109a802e5..3283ce5ec36 100644
--- a/app/assets/javascripts/awards_handler.js
+++ b/app/assets/javascripts/awards_handler.js
@@ -50,10 +50,8 @@ class AwardsHandler {
 
     this.registerEventListener('on', $('html'), 'click', (e) => {
       const $target = $(e.target);
-      if (!$target.closest('.emoji-menu-content').length) {
-        $('.js-awards-block.current').removeClass('current');
-      }
       if (!$target.closest('.emoji-menu').length) {
+        $('.js-awards-block.current').removeClass('current');
         if ($('.emoji-menu').is(':visible')) {
           $('.js-add-award.is-active').removeClass('is-active');
           this.hideMenuElement($('.emoji-menu'));

From 85c93d896495045e54a89461156daa9ec0c2c071 Mon Sep 17 00:00:00 2001
From: Jared Deckard <jared.deckard@gmail.com>
Date: Tue, 6 Feb 2018 15:46:50 -0600
Subject: [PATCH 3/3] Add changelog entry

---
 changelogs/unreleased/35530-teleporting-emoji.yml | 5 +++++
 1 file changed, 5 insertions(+)
 create mode 100644 changelogs/unreleased/35530-teleporting-emoji.yml

diff --git a/changelogs/unreleased/35530-teleporting-emoji.yml b/changelogs/unreleased/35530-teleporting-emoji.yml
new file mode 100644
index 00000000000..a60a42b9e48
--- /dev/null
+++ b/changelogs/unreleased/35530-teleporting-emoji.yml
@@ -0,0 +1,5 @@
+---
+title: Fix Teleporting Emoji
+merge_request: 16963
+author: Jared Deckard <jared.deckard@gmail.com>
+type: fixed