mirrors
/
emoji-mart-lazyload
mirror of https://github.com/mashirozx/emoji-mart.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

prettier

dependabot/npm_and_yarn/websocket-extensions-0.1.4
Thomas Piard 2020-01-26 19:23:41 +01:00 committed by Etienne Lemay
parent 4404e71264
commit 9bab24f3c6
2 changed files with 3 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/utils/index.js
View File

@ -116,7 +116,7 @@ function getData(emoji, skin, set, data) {
if (!variationData.variations && emojiData.variations) { if (!variationData.variations && emojiData.variations) {
delete emojiData.variations delete emojiData.variations
} }
if ( if (
(set && (set &&
(variationData[`has_img_${set}`] == undefined || (variationData[`has_img_${set}`] == undefined ||
@ -124,7 +124,7 @@ function getData(emoji, skin, set, data) {
!set !set
) { ) {
emojiData.skin_tone = skin emojiData.skin_tone = skin
for (let k in variationData) { for (let k in variationData) {
let v = variationData[k] let v = variationData[k]
emojiData[k] = v emojiData[k] = v

7
src/utils/shared-props.js
View File

@ -14,12 +14,7 @@ const EmojiPropTypes = {
sheetSize: PropTypes.oneOf([16, 20, 32, 64]), sheetSize: PropTypes.oneOf([16, 20, 32, 64]),
sheetColumns: PropTypes.number, sheetColumns: PropTypes.number,
sheetRows: PropTypes.number, sheetRows: PropTypes.number,
set: PropTypes.oneOf([ set: PropTypes.oneOf(['apple', 'google', 'twitter', 'facebook']),
'apple',
'google',
'twitter',
'facebook',
]),
size: PropTypes.number.isRequired, size: PropTypes.number.isRequired,
emoji: PropTypes.oneOfType([PropTypes.string, PropTypes.object]).isRequired, emoji: PropTypes.oneOfType([PropTypes.string, PropTypes.object]).isRequired,
} }