Skip to content

Commit

Permalink
Merge pull request #158 from ajbeaven/master
Browse files Browse the repository at this point in the history
Emoji fallback shouldn't apply styling #157
  • Loading branch information
EtienneLem authored Jan 15, 2018
2 parents cab9f14 + 238b2d2 commit 1f8254d
Showing 1 changed file with 1 addition and 3 deletions.
4 changes: 1 addition & 3 deletions src/components/emoji.js
Original file line number Diff line number Diff line change
Expand Up @@ -123,8 +123,7 @@ const Emoji = props => {

if (!setHasEmoji) {
if (props.fallback) {
style = { fontSize: props.size }
children = props.fallback(data)
return props.fallback(data)
} else {
return null
}
Expand Down Expand Up @@ -199,7 +198,6 @@ Emoji.defaultProps = {
onOver: () => {},
onLeave: () => {},
onClick: () => {},
fallback: emoji => {},
}

export default Emoji

0 comments on commit 1f8254d

Please sign in to comment.