1 files changed, 21 insertions, 10 deletions
diff --git a/src/components/emoji-selector/emoji-selector.js b/src/components/emoji-selector/emoji-selector.js
index 77107573..4771f4c6 100644
--- a/src/components/emoji-selector/emoji-selector.js
+++ b/src/components/emoji-selector/emoji-selector.js
@@ -1,24 +1,35 @@
+const filterByKeyword = (list, keyword = '') => {
+  return list.filter(x => x.shortcode.indexOf(keyword) !== -1)
+}
+
 const EmojiSelector = {
   data () {
     return {
-      open: false
+      open: false,
+      keyword: ''
     }
   },
-  mounted () {
-    console.log(this.$store.state.instance.emoji)
-    console.log(this.$store.state.instance.customEmoji)
-  },
   methods: {
     togglePanel () {
       this.open = !this.open
     }
   },
   computed: {
-    standardEmoji () {
-      return this.$store.state.instance.emoji || []
-    },
-    customEmoji () {
-      return this.$store.state.instance.customEmoji || []
+    emojis () {
+      const standardEmojis = this.$store.state.instance.emoji || []
+      const customEmojis = this.$store.state.instance.customEmoji || []
+      return {
+        standard: {
+          text: 'Standard',
+          icon: 'icon-star',
+          emojis: filterByKeyword(standardEmojis, this.keyword)
+        },
+        custom: {
+          text: 'Custom',
+          icon: 'icon-picture',
+          emojis: filterByKeyword(customEmojis, this.keyword)
+        }
+      }
     }
   }
 }