From 8f64b3c7d17211750fe83aca240a8bb4044c56ef Mon Sep 17 00:00:00 2001
From: Etienne Lemay <etienne@heliom.ca>
Date: Wed, 12 Oct 2016 20:26:10 -0400
Subject: [PATCH] Handle unknown emojis [Fix #14]

---
 src/components/emoji.js |  7 ++++++-
 src/utils/index.js      | 13 +++++++++----
 2 files changed, 15 insertions(+), 5 deletions(-)

diff --git a/src/components/emoji.js b/src/components/emoji.js
index 3020a64..6414da8 100644
--- a/src/components/emoji.js
+++ b/src/components/emoji.js
@@ -59,7 +59,12 @@ export default class Emoji extends React.Component {
   }
 
   render() {
-    var { sheetURL, size, onOver, onLeave } = this.props
+    var { sheetURL, size, onOver, onLeave } = this.props,
+        { unified } = this.getData()
+
+    if (!unified) {
+      return null
+    }
 
     return <span
       onClick={this.handleClick.bind(this)}
diff --git a/src/utils/index.js b/src/utils/index.js
index 32ee325..cdef2cb 100644
--- a/src/utils/index.js
+++ b/src/utils/index.js
@@ -36,13 +36,18 @@ function getSanitizedData() {
 }
 
 function getData(emoji, skin, sheetURL) {
-  var emojiData = {}
+  var emojiData = {},
+      _emojiData = null
 
   if (typeof emoji == 'string') {
-    emojiData = data.emojis[emoji]
+    if (_emojiData = data.emojis[emoji]) {
+      emojiData = _emojiData
+    }
   } else if (emoji.id) {
-    emojiData = data.emojis[emoji.id]
-    skin || (skin = emoji.skin)
+    if (_emojiData = data.emojis[emoji.id]) {
+      emojiData = _emojiData
+      skin || (skin = emoji.skin)
+    }
   }
 
   if (emojiData.skin_variations && skin > 1 && sheetURL) {