diff --git a/src/utils/index.js b/src/utils/index.js index 2ee89ed..47e9c64 100644 --- a/src/utils/index.js +++ b/src/utils/index.js @@ -116,7 +116,7 @@ function getData(emoji, skin, set, data) { if (!variationData.variations && emojiData.variations) { delete emojiData.variations } - + if ( (set && (variationData[`has_img_${set}`] == undefined || @@ -124,7 +124,7 @@ function getData(emoji, skin, set, data) { !set ) { emojiData.skin_tone = skin - + for (let k in variationData) { let v = variationData[k] emojiData[k] = v diff --git a/src/utils/shared-props.js b/src/utils/shared-props.js index a2b869d..a0309dd 100644 --- a/src/utils/shared-props.js +++ b/src/utils/shared-props.js @@ -14,12 +14,7 @@ const EmojiPropTypes = { sheetSize: PropTypes.oneOf([16, 20, 32, 64]), sheetColumns: PropTypes.number, sheetRows: PropTypes.number, - set: PropTypes.oneOf([ - 'apple', - 'google', - 'twitter', - 'facebook', - ]), + set: PropTypes.oneOf(['apple', 'google', 'twitter', 'facebook']), size: PropTypes.number.isRequired, emoji: PropTypes.oneOfType([PropTypes.string, PropTypes.object]).isRequired, }