From 818b4a1600ea34f35a0b363759777eb796057e17 Mon Sep 17 00:00:00 2001
From: Andrew Beaven <ajbeaven@gmail.com>
Date: Wed, 10 Jan 2018 11:24:51 +1300
Subject: [PATCH 1/3] Emoji fallback shouldn't apply styling #157

---
 src/components/emoji.js | 1 -
 1 file changed, 1 deletion(-)

diff --git a/src/components/emoji.js b/src/components/emoji.js
index a4fad09..13cd6e4 100644
--- a/src/components/emoji.js
+++ b/src/components/emoji.js
@@ -123,7 +123,6 @@ const Emoji = props => {
 
     if (!setHasEmoji) {
       if (props.fallback) {
-        style = { fontSize: props.size }
         children = props.fallback(data)
       } else {
         return null

From 4008363e73b573234adbbe72e65d3773e9675ebc Mon Sep 17 00:00:00 2001
From: Andrew Beaven <ajbeaven@gmail.com>
Date: Wed, 10 Jan 2018 11:38:30 +1300
Subject: [PATCH 2/3] Don't render fallback inside an emoji `<span>`

---
 src/components/emoji.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/components/emoji.js b/src/components/emoji.js
index 13cd6e4..7082f13 100644
--- a/src/components/emoji.js
+++ b/src/components/emoji.js
@@ -123,7 +123,7 @@ const Emoji = props => {
 
     if (!setHasEmoji) {
       if (props.fallback) {
-        children = props.fallback(data)
+        return props.fallback(data)
       } else {
         return null
       }

From 238b2d2ff245eb62bf6300642ce6d9648d3cf627 Mon Sep 17 00:00:00 2001
From: Andrew Beaven <ajbeaven@gmail.com>
Date: Thu, 11 Jan 2018 10:45:02 +1300
Subject: [PATCH 3/3] Remove Emoji fallback defaultProp

---
 src/components/emoji.js | 1 -
 1 file changed, 1 deletion(-)

diff --git a/src/components/emoji.js b/src/components/emoji.js
index 7082f13..6938992 100644
--- a/src/components/emoji.js
+++ b/src/components/emoji.js
@@ -198,7 +198,6 @@ Emoji.defaultProps = {
   onOver: () => {},
   onLeave: () => {},
   onClick: () => {},
-  fallback: emoji => {},
 }
 
 export default Emoji