Merge pull request #158 from ajbeaven/master

Emoji fallback shouldn't apply styling #157
nolan/hinaloe-test
Etienne Lemay 2018-01-15 17:03:27 -05:00 committed by GitHub
commit 1f8254de5e
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 1 additions and 3 deletions

View File

@ -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
}
@ -199,7 +198,6 @@ Emoji.defaultProps = {
onOver: () => {},
onLeave: () => {},
onClick: () => {},
fallback: emoji => {},
}
export default Emoji