toki/mattermost-mobile
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 1

MM-27849 render emojis with appended skin tone (#5297)

Browse source
This commit is contained in:
Elias Nahum 2021-04-15 11:26:03 -04:00 committed by GitHub
parent c9a02d5c8f
commit 9131b25310
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
4 changed files with 19 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
app/components/autocomplete/emoji_suggestion/__snapshots__/emoji_suggestion.test.js.snap
View file

@ -200,6 +200,7 @@ exports[`components/autocomplete/emoji_suggestion should match snapshot 2`] = `
"bust_in_silhouette",
"busts_in_silhouette",
"butterfly",
"ca",
"cactus",
"cake",
"calendar",
@ -1023,6 +1024,7 @@ exports[`components/autocomplete/emoji_suggestion should match snapshot 2`] = `
"pisces",
"pitcairn_islands",
"pizza",
"pk",
"place_of_worship",
"plate_with_cutlery",
"play_or_pause_button",
@ -1505,6 +1507,7 @@ exports[`components/autocomplete/emoji_suggestion should match snapshot 2`] = `
"yen",
"yin_yang",
"yum",
"za",
"zambia",
"zap",
"zero",
@ -1712,6 +1715,7 @@ exports[`components/autocomplete/emoji_suggestion should match snapshot 2`] = `
"bust_in_silhouette",
"busts_in_silhouette",
"butterfly",
"ca",
"cactus",
"cake",
"calendar",
@ -2535,6 +2539,7 @@ exports[`components/autocomplete/emoji_suggestion should match snapshot 2`] = `
"pisces",
"pitcairn_islands",
"pizza",
"pk",
"place_of_worship",
"plate_with_cutlery",
"play_or_pause_button",
@ -3017,6 +3022,7 @@ exports[`components/autocomplete/emoji_suggestion should match snapshot 2`] = `
"yen",
"yin_yang",
"yum",
"za",
"zambia",
"zap",
"zero",

3
app/components/emoji_picker/__snapshots__/emoji_picker.test.js.snap
View file

@ -8473,6 +8473,7 @@ exports[`components/emoji_picker/emoji_picker.ios should match snapshot 1`] = `
Object {
"aliases": Array [
"canada",
"ca",
],
"name": "canada",
},
@ -9332,6 +9333,7 @@ exports[`components/emoji_picker/emoji_picker.ios should match snapshot 1`] = `
Object {
"aliases": Array [
"pakistan",
"pk",
],
"name": "pakistan",
},
@ -9584,6 +9586,7 @@ exports[`components/emoji_picker/emoji_picker.ios should match snapshot 1`] = `
Object {
"aliases": Array [
"south_africa",
"za",
],
"name": "south_africa",
},

6
app/selectors/emojis.js
View file

@ -74,7 +74,9 @@ export const selectEmojisByName = createIdsSelector(
(customEmojis) => {
const emoticons = new Set();
for (const [key] of [...EmojiIndicesByAlias.entries(), ...customEmojis.entries()]) {
emoticons.add(key);
if (!key.includes('skin_tone')) {
emoticons.add(key);
}
}
return Array.from(emoticons);
@ -85,7 +87,7 @@ export const selectEmojisBySection = createSelector(
selectCustomEmojisByName,
(state) => state.views.recentEmojis,
(customEmojis, recentEmojis) => {
const emoticons = CategoryNames.filter((name) => name !== 'custom').map((category) => {
const emoticons = CategoryNames.filter((name) => name !== 'custom' && name !== 'skintone').map((category) => {
const items = EmojiIndicesByCategory.get(category).map(fillEmoji);
const section = {

11
app/utils/emojis.js
View file

File diff suppressed because one or more lines are too long