From a89db6615abe5702cd15ebe77a34e336cdd83f7a Mon Sep 17 00:00:00 2001 From: Brandon Stites Date: Fri, 6 Sep 2024 16:46:35 -0400 Subject: [PATCH 1/4] Update name --- assets/emojis/common.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/assets/emojis/common.ts b/assets/emojis/common.ts index 5162a71367b2..1752dd5b5cd7 100644 --- a/assets/emojis/common.ts +++ b/assets/emojis/common.ts @@ -775,7 +775,7 @@ const emojis: PickerEmojis = [ types: ['🀞🏿', '🀞🏾', '🀞🏽', '🀞🏼', '🀞🏻'], }, { - name: 'hand_with_index_finger_and_thumb_crossed', + name: 'finger_heart', code: '🫰', types: ['🫰🏿', '🫰🏾', '🫰🏽', '🫰🏼', '🫰🏻'], }, From a5c91764782cd851c1521cbccfe7d31aaaef9780 Mon Sep 17 00:00:00 2001 From: Brandon Stites Date: Fri, 6 Sep 2024 16:52:42 -0400 Subject: [PATCH 2/4] Move emoji below other thumbs: --- assets/emojis/common.ts | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/assets/emojis/common.ts b/assets/emojis/common.ts index 1752dd5b5cd7..1039249f0ac8 100644 --- a/assets/emojis/common.ts +++ b/assets/emojis/common.ts @@ -774,11 +774,6 @@ const emojis: PickerEmojis = [ code: '🀞', types: ['🀞🏿', '🀞🏾', '🀞🏽', '🀞🏼', '🀞🏻'], }, - { - name: 'finger_heart', - code: '🫰', - types: ['🫰🏿', '🫰🏾', '🫰🏽', '🫰🏼', '🫰🏻'], - }, { name: 'love_you_gesture', code: '🀟', @@ -844,6 +839,11 @@ const emojis: PickerEmojis = [ code: 'πŸ‘Ž', types: ['πŸ‘ŽπŸΏ', 'πŸ‘ŽπŸΎ', 'πŸ‘ŽπŸ½', 'πŸ‘ŽπŸΌ', 'πŸ‘ŽπŸ»'], }, + { + name: 'hand_with_index_finger_and_thumb_crossed', + code: '🫰', + types: ['🫰🏿', '🫰🏾', '🫰🏽', '🫰🏼', '🫰🏻'], + }, { name: 'fist_raised', code: '✊', From e15c7133c46633e2cfefed856318d72ed868dd44 Mon Sep 17 00:00:00 2001 From: Brandon Stites Date: Fri, 6 Sep 2024 16:58:21 -0400 Subject: [PATCH 3/4] Update test to match emoji order --- package-lock.json | 16 ++++++++++++++++ package.json | 1 + tests/unit/EmojiTest.ts | 18 +++++++++--------- 3 files changed, 26 insertions(+), 9 deletions(-) diff --git a/package-lock.json b/package-lock.json index 8bcfb8fdda5e..fc536ec4e2d4 100644 --- a/package-lock.json +++ b/package-lock.json @@ -232,6 +232,7 @@ "eslint-plugin-you-dont-need-lodash-underscore": "^6.14.0", "html-webpack-plugin": "^5.5.0", "http-server": "^14.1.1", + "husky": "^9.1.5", "jest": "29.4.1", "jest-circus": "29.4.1", "jest-cli": "29.4.1", @@ -28727,6 +28728,21 @@ "ms": "^2.0.0" } }, + "node_modules/husky": { + "version": "9.1.5", + "resolved": "https://registry.npmjs.org/husky/-/husky-9.1.5.tgz", + "integrity": "sha512-rowAVRUBfI0b4+niA4SJMhfQwc107VLkBUgEYYAOQAbqDCnra1nYh83hF/MDmhYs9t9n1E3DuKOrs2LYNC+0Ag==", + "dev": true, + "bin": { + "husky": "bin.js" + }, + "engines": { + "node": ">=18" + }, + "funding": { + "url": "https://github.com/sponsors/typicode" + } + }, "node_modules/hyperdyperid": { "version": "1.2.0", "dev": true, diff --git a/package.json b/package.json index 106baeccc916..bf0bf0b1f1cc 100644 --- a/package.json +++ b/package.json @@ -289,6 +289,7 @@ "eslint-plugin-you-dont-need-lodash-underscore": "^6.14.0", "html-webpack-plugin": "^5.5.0", "http-server": "^14.1.1", + "husky": "^9.1.5", "jest": "29.4.1", "jest-circus": "29.4.1", "jest-cli": "29.4.1", diff --git a/tests/unit/EmojiTest.ts b/tests/unit/EmojiTest.ts index 6af24553bee9..688051b3ab38 100644 --- a/tests/unit/EmojiTest.ts +++ b/tests/unit/EmojiTest.ts @@ -154,11 +154,6 @@ describe('EmojiTest', () => { it('correct suggests emojis accounting for keywords', () => { const thumbEmojisEn: Emoji[] = [ - { - name: 'hand_with_index_finger_and_thumb_crossed', - code: '🫰', - types: ['🫰🏿', '🫰🏾', '🫰🏽', '🫰🏼', '🫰🏻'], - }, { code: 'πŸ‘', name: '+1', @@ -169,14 +164,14 @@ describe('EmojiTest', () => { name: '-1', types: ['πŸ‘ŽπŸΏ', 'πŸ‘ŽπŸΎ', 'πŸ‘ŽπŸ½', 'πŸ‘ŽπŸΌ', 'πŸ‘ŽπŸ»'], }, - ]; - - const thumbEmojisEs: Emoji[] = [ { - name: 'mano_con_dedos_cruzados', + name: 'hand_with_index_finger_and_thumb_crossed', code: '🫰', types: ['🫰🏿', '🫰🏾', '🫰🏽', '🫰🏼', '🫰🏻'], }, + ]; + + const thumbEmojisEs: Emoji[] = [ { code: 'πŸ‘', name: '+1', @@ -187,6 +182,11 @@ describe('EmojiTest', () => { name: '-1', types: ['πŸ‘ŽπŸΏ', 'πŸ‘ŽπŸΎ', 'πŸ‘ŽπŸ½', 'πŸ‘ŽπŸΌ', 'πŸ‘ŽπŸ»'], }, + { + name: 'mano_con_dedos_cruzados', + code: '🫰', + types: ['🫰🏿', '🫰🏾', '🫰🏽', '🫰🏼', '🫰🏻'], + }, ]; expect(EmojiUtils.suggestEmojis(':thumb', 'en')).toEqual(thumbEmojisEn); From 41d84e23d963886be1ea7251e250540a066c2e7c Mon Sep 17 00:00:00 2001 From: Brandon Stites Date: Fri, 6 Sep 2024 17:03:44 -0400 Subject: [PATCH 4/4] Fix order --- tests/unit/EmojiTest.ts | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/tests/unit/EmojiTest.ts b/tests/unit/EmojiTest.ts index 688051b3ab38..c96228b49fbc 100644 --- a/tests/unit/EmojiTest.ts +++ b/tests/unit/EmojiTest.ts @@ -194,11 +194,6 @@ describe('EmojiTest', () => { expect(EmojiUtils.suggestEmojis(':thumb', 'es')).toEqual(thumbEmojisEs); expect(EmojiUtils.suggestEmojis(':pulgar', 'es')).toEqual([ - { - name: 'mano_con_dedos_cruzados', - code: '🫰', - types: ['🫰🏿', '🫰🏾', '🫰🏽', '🫰🏼', '🫰🏻'], - }, { code: 'πŸ€™', name: 'mano_llΓ‘mame', @@ -214,6 +209,11 @@ describe('EmojiTest', () => { name: '-1', types: ['πŸ‘ŽπŸΏ', 'πŸ‘ŽπŸΎ', 'πŸ‘ŽπŸ½', 'πŸ‘ŽπŸΌ', 'πŸ‘ŽπŸ»'], }, + { + name: 'mano_con_dedos_cruzados', + code: '🫰', + types: ['🫰🏿', '🫰🏾', '🫰🏽', '🫰🏼', '🫰🏻'], + }, ]); }); });