Merge branch 'fix-not-render-emoji' into 'master'

Fix not render emoji in filter dropdown

See merge request gitlab-org/gitlab-ce!23112

app/assets/javascripts/filtered_search/dropdown_emoji.js

@@ -69,10 +69,13 @@ export default class DropdownEmoji extends FilteredSearchDropdown {
     // Replace empty gl-emoji tag to real content
     const dropdownItems = [...this.dropdown.querySelectorAll('.filter-dropdown-item')];
     dropdownItems.forEach(dropdownItem => {
-      const name = dropdownItem.querySelector('.js-data-value').innerText;
+      const valueElement = dropdownItem.querySelector('.js-data-value');
+      if (valueElement !== null) {
+        const name = valueElement.innerText;
         const emojiTag = this.glEmojiTag(name);
         const emojiElement = dropdownItem.querySelector('gl-emoji');
         emojiElement.outerHTML = emojiTag;
+      }
     });
   }
 

changelogs/unreleased/fix-not-render-emoji.yml

+---
+title: Fix not render emoji in filter dropdown
+merge_request: 23112
+author: Hiroyuki Sato
+type: fixed

spec/features/issues/filtered_search/dropdown_emoji_spec.rb

@@ -20,7 +20,7 @@ describe 'Dropdown emoji', :js do
   end
 
   def dropdown_emoji_size
-    page.all('#js-dropdown-my-reaction .filter-dropdown .filter-dropdown-item').size
+    all('gl-emoji[data-name]').size
   end
 
   def click_emoji(text)