diff --git a/css/emoji-mart.css b/css/emoji-mart.css index 1941011..e7c09f1 100644 --- a/css/emoji-mart.css +++ b/css/emoji-mart.css @@ -186,7 +186,7 @@ } .emoji-mart-emoji-native { - font-family: "Segoe UI Emoji", "Segoe UI Symbol", "Segoe UI", "Apple Color Emoji", "Twemoji Mozilla", "Noto Color Emoji", "EmojiOne Color", "Android Emoji"; + font-family: "Segoe UI Emoji", "Segoe UI Symbol", "Segoe UI", "Apple Color Emoji", "Twemoji Mozilla", "Noto Color Emoji", "Android Emoji"; } .emoji-mart-no-results { diff --git a/package.json b/package.json index b315e96..cd4a37c 100644 --- a/package.json +++ b/package.json @@ -41,7 +41,7 @@ "babel-jest": "^24.9.0", "babel-loader": "^8.0.0", "babel-plugin-transform-define": "^2.0.0", - "emoji-datasource": "4.0.4", + "emoji-datasource": "5.0.1", "emojilib": "^2.2.1", "enzyme": "^3.9.0", "enzyme-adapter-react-16": "^1.11.2", diff --git a/scripts/build-data.js b/scripts/build-data.js index f6c3f7a..9c7bc8b 100644 --- a/scripts/build-data.js +++ b/scripts/build-data.js @@ -1,5 +1,5 @@ const build = require('./build') -const sets = ['apple', 'emojione', 'facebook', 'google', 'messenger', 'twitter'] +const sets = ['apple', 'facebook', 'google', 'twitter'] build({ output: 'data/all.json' }) diff --git a/scripts/build.js b/scripts/build.js index b8dc5ef..0a748c7 100644 --- a/scripts/build.js +++ b/scripts/build.js @@ -6,7 +6,8 @@ var fs = require('fs'), var { compress } = require('../dist/utils/data') var categories = [ - ['Smileys & People', 'people'], + ['Smileys & Emotion', 'people'], + ['People & Body', 'people'], ['Animals & Nature', 'nature'], ['Food & Drink', 'foods'], ['Activities', 'activity'], @@ -16,7 +17,7 @@ var categories = [ ['Flags', 'flags'], ] -var sets = ['apple', 'emojione', 'facebook', 'google', 'messenger', 'twitter'] +var sets = ['apple', 'facebook', 'google', 'twitter'] module.exports = (options) => { delete require.cache[require.resolve('emoji-datasource')] @@ -84,7 +85,7 @@ module.exports = (options) => { datum.keywords = emojiLib.lib[datum.short_name].keywords } - if (datum.category != 'Skin Tones') { + if (datum.category && datum.category != 'Skin Tones') { categoryIndex = categoriesIndex[category] data.categories[categoryIndex].emojis.push(datum.short_name) data.emojis[datum.short_name] = datum diff --git a/src/components/picker/nimble-picker.js b/src/components/picker/nimble-picker.js index 631f091..8477d5d 100644 --- a/src/components/picker/nimble-picker.js +++ b/src/components/picker/nimble-picker.js @@ -22,7 +22,8 @@ const I18N = { categories: { search: 'Search Results', recent: 'Frequently Used', - people: 'Smileys & People', + smileys: 'Smileys & Emotion', + people: 'People & People', nature: 'Animals & Nature', foods: 'Food & Drink', activity: 'Activity', diff --git a/src/svgs/index.js b/src/svgs/index.js index 5f1a024..b3936a8 100644 --- a/src/svgs/index.js +++ b/src/svgs/index.js @@ -101,6 +101,18 @@ const categories = { ), + smileys: () => ( + + + + + ), + places: () => ( 1) { emojiData = JSON.parse(JSON.stringify(emojiData)) - var skinKey = SKINS[skin - 1], - variationData = emojiData.skin_variations[skinKey] + var skinKey = SKINS[skin - 1] + if (emojiData.skin_variations[skinKey] !== undefined) { + var variationData = emojiData.skin_variations[skinKey] - if (!variationData.variations && emojiData.variations) { - delete emojiData.variations - } - - if ( - (set && - (variationData[`has_img_${set}`] == undefined || - variationData[`has_img_${set}`])) || - !set - ) { - emojiData.skin_tone = skin - - for (let k in variationData) { - let v = variationData[k] - emojiData[k] = v + if (!variationData.variations && emojiData.variations) { + delete emojiData.variations + } + + if ( + (set && + (variationData[`has_img_${set}`] == undefined || + variationData[`has_img_${set}`])) || + !set + ) { + emojiData.skin_tone = skin + + for (let k in variationData) { + let v = variationData[k] + emojiData[k] = v + } } } } diff --git a/src/utils/shared-default-props.js b/src/utils/shared-default-props.js index 81fe54a..8d58606 100644 --- a/src/utils/shared-default-props.js +++ b/src/utils/shared-default-props.js @@ -2,8 +2,8 @@ const EmojiDefaultProps = { skin: 1, set: 'apple', sheetSize: 64, - sheetColumns: 52, - sheetRows: 52, + sheetColumns: 57, + sheetRows: 57, native: false, forceSize: false, tooltip: false, diff --git a/src/utils/shared-props.js b/src/utils/shared-props.js index 6bc7ff9..a2b869d 100644 --- a/src/utils/shared-props.js +++ b/src/utils/shared-props.js @@ -18,8 +18,6 @@ const EmojiPropTypes = { 'apple', 'google', 'twitter', - 'emojione', - 'messenger', 'facebook', ]), size: PropTypes.number.isRequired, diff --git a/stories/index.js b/stories/index.js index 18c9f26..8908102 100644 --- a/stories/index.js +++ b/stories/index.js @@ -15,7 +15,7 @@ import { Picker, Emoji, emojiIndex, NimbleEmojiIndex, getEmojiDataFromNative } f import data from '../data/all.json' import '../css/emoji-mart.css' -const SETS = ['apple', 'google', 'twitter', 'emojione', 'messenger', 'facebook'] +const SETS = ['apple', 'google', 'twitter', 'facebook'] const CUSTOM_EMOJIS = [ { name: 'Octocat', @@ -93,6 +93,17 @@ storiesOf('Picker', module) ), + people: () => ( + + Reddit icon + + + ), nature: () => (