From 6fc4e4b94d1776710ff6acc725e0d02ae3da95a8 Mon Sep 17 00:00:00 2001 From: Brandon Stites Date: Mon, 19 Apr 2021 14:47:23 -0600 Subject: [PATCH] Remove emojis that are not implemented on mobile safari, and update header indices to reflect the change --- assets/emojis.js | 50 ------------------- .../home/report/EmojiPickerMenu/index.js | 2 +- .../report/EmojiPickerMenu/index.native.js | 2 +- 3 files changed, 2 insertions(+), 52 deletions(-) diff --git a/assets/emojis.js b/assets/emojis.js index 937d8ac2a822..a6d07bcee332 100644 --- a/assets/emojis.js +++ b/assets/emojis.js @@ -1564,28 +1564,6 @@ const emojis = [ 'romance', ], }, - { - code: '👩‍❤️‍💋‍👨', - keywords: [ - 'kiss', - 'man', - 'woman', - ], - }, - { - code: '👨‍❤️‍💋‍👨', - keywords: [ - 'kiss', - 'man', - ], - }, - { - code: '👩‍❤️‍💋‍👩', - keywords: [ - 'kiss', - 'woman', - ], - }, { code: '💑', keywords: [ @@ -1595,28 +1573,6 @@ const emojis = [ 'romance', ], }, - { - code: '👩‍❤️‍👨', - keywords: [ - 'couple', - 'man', - 'woman', - ], - }, - { - code: '👨‍❤️‍👨', - keywords: [ - 'couple', - 'man', - ], - }, - { - code: '👩‍❤️‍👩', - keywords: [ - 'couple', - 'woman', - ], - }, { code: '👪', keywords: [ @@ -2824,12 +2780,6 @@ const emojis = [ 'romance', ], }, - { - code: CONST.EMOJI_SPACER, - }, - { - code: CONST.EMOJI_SPACER, - }, { code: 'Animals & Nature', header: true, diff --git a/src/pages/home/report/EmojiPickerMenu/index.js b/src/pages/home/report/EmojiPickerMenu/index.js index f46a3ea16e97..e5ddfc56a44c 100644 --- a/src/pages/home/report/EmojiPickerMenu/index.js +++ b/src/pages/home/report/EmojiPickerMenu/index.js @@ -32,7 +32,7 @@ class EmojiPickerMenu extends Component { // The positions are static, and are calculated as index/numColumns (8 in our case) // This is because each row of 8 emojis counts as one index // If more emojis are ever added to emojis.js this will need to be updated or things will break - this.unfilteredHeaderIndices = [0, 34, 60, 88, 99, 121, 148]; + this.unfilteredHeaderIndices = [0, 33, 59, 87, 98, 120, 147]; this.filterEmojis = _.debounce(this.filterEmojis.bind(this), 300); this.renderItem = this.renderItem.bind(this); diff --git a/src/pages/home/report/EmojiPickerMenu/index.native.js b/src/pages/home/report/EmojiPickerMenu/index.native.js index 7b8c585a042f..e119b893eba1 100644 --- a/src/pages/home/report/EmojiPickerMenu/index.native.js +++ b/src/pages/home/report/EmojiPickerMenu/index.native.js @@ -26,7 +26,7 @@ class EmojiPickerMenu extends Component { // The positions are static, and are calculated as index/numColumns (8 in our case) // This is because each row of 8 emojis counts as one index // If this emojis are ever added to emojis.js this will need to be updated or things will break - this.unfilteredHeaderIndices = [0, 34, 60, 88, 99, 121, 148]; + this.unfilteredHeaderIndices = [0, 33, 59, 87, 98, 120, 147]; this.renderItem = this.renderItem.bind(this); }