From bc64f1f2f70ddfff13a8217ab5b9f5a85894d696 Mon Sep 17 00:00:00 2001
From: Tom Moor <tom@getoutline.com>
Date: Thu, 25 Apr 2024 19:39:32 -0400
Subject: [PATCH] Upgrade `emoji-mart` (#6848)

---
 app/components/EmojiPicker/index.tsx | 11 ++---------
 package.json                         |  4 ++--
 yarn.lock                            | 16 ++++++++--------
 3 files changed, 12 insertions(+), 19 deletions(-)

diff --git a/app/components/EmojiPicker/index.tsx b/app/components/EmojiPicker/index.tsx
index 7f817b5a6..c85d94ab7 100644
--- a/app/components/EmojiPicker/index.tsx
+++ b/app/components/EmojiPicker/index.tsx
@@ -27,7 +27,7 @@ const supportedLocales = [
   "hi",
   "it",
   "ja",
-  "kr",
+  "ko",
   "nl",
   "pl",
   "pt",
@@ -197,14 +197,7 @@ function EmojiPicker({
             )}
             <PickerStyles ref={pickerRef}>
               <Picker
-                // https://github.com/missive/emoji-mart/issues/800
-                locale={
-                  locale === "ko"
-                    ? "kr"
-                    : supportedLocales.includes(locale)
-                    ? locale
-                    : "en"
-                }
+                locale={supportedLocales.includes(locale) ? locale : "en"}
                 data={data}
                 onEmojiSelect={handleEmojiChange}
                 theme={pickerTheme}
diff --git a/package.json b/package.json
index 794430894..6dfb1a927 100644
--- a/package.json
+++ b/package.json
@@ -60,7 +60,7 @@
     "@dnd-kit/core": "^6.1.0",
     "@dnd-kit/modifiers": "^6.0.1",
     "@dnd-kit/sortable": "^7.0.2",
-    "@emoji-mart/data": "^1.0.6",
+    "@emoji-mart/data": "^1.2.1",
     "@emoji-mart/react": "^1.1.1",
     "@fortawesome/fontawesome-svg-core": "^6.5.2",
     "@fortawesome/free-solid-svg-icons": "^6.5.2",
@@ -104,7 +104,7 @@
     "diff": "^5.2.0",
     "dotenv": "^16.4.5",
     "email-providers": "^1.14.0",
-    "emoji-mart": "^5.5.2",
+    "emoji-mart": "^5.6.0",
     "emoji-regex": "^10.3.0",
     "es6-error": "^4.1.1",
     "fetch-retry": "^5.0.6",
diff --git a/yarn.lock b/yarn.lock
index 62cde0372..e876a8fff 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -1297,10 +1297,10 @@
   dependencies:
     tslib "^2.0.0"
 
-"@emoji-mart/data@^1.0.6":
-  version "1.1.2"
-  resolved "https://registry.yarnpkg.com/@emoji-mart/data/-/data-1.1.2.tgz#777c976f8f143df47cbb23a7077c9ca9fe5fc513"
-  integrity "sha1-d3yXb48UPfR8uyOnB3ycqf5fxRM= sha512-1HP8BxD2azjqWJvxIaWAMyTySeZY0Osr83ukYjltPVkNXeJvTz7yDrPLBtnrD5uqJ3tg4CcLuuBW09wahqL/fg=="
+"@emoji-mart/data@^1.2.1":
+  version "1.2.1"
+  resolved "https://registry.yarnpkg.com/@emoji-mart/data/-/data-1.2.1.tgz#0ad70c662e3bc603e23e7d98413bd1e64c4fcb6c"
+  integrity sha512-no2pQMWiBy6gpBEiqGeU77/bFejDqUTRY7KX+0+iur13op3bqUsXdnwoZs6Xb1zbv0gAj5VvS1PWoUUckSr5Dw==
 
 "@emoji-mart/react@^1.1.1":
   version "1.1.1"
@@ -6291,10 +6291,10 @@ emittery@^0.13.1:
   resolved "https://registry.yarnpkg.com/emittery/-/emittery-0.13.1.tgz#c04b8c3457490e0847ae51fced3af52d338e3dad"
   integrity "sha1-wEuMNFdJDghHrlH87Tr1LTOOPa0= sha512-DeWwawk6r5yR9jFgnDKYt4sLS0LmHJJi3ZOnb5/JdbYwj3nW+FxQnHIjhBKz8YLC7oRNPVM9NQ47I3CVx34eqQ=="
 
-emoji-mart@^5.5.2:
-  version "5.5.2"
-  resolved "https://registry.yarnpkg.com/emoji-mart/-/emoji-mart-5.5.2.tgz#3ddbaf053139cf4aa217650078bc1c50ca8381af"
-  integrity "sha1-PduvBTE5z0qiF2UAeLwcUMqDga8= sha512-Sqc/nso4cjxhOwWJsp9xkVm8OF5c+mJLZJFoFfzRuKO+yWiN7K8c96xmtughYb0d/fZ8UC6cLIQ/p4BR6Pv3/A=="
+emoji-mart@^5.6.0:
+  version "5.6.0"
+  resolved "https://registry.yarnpkg.com/emoji-mart/-/emoji-mart-5.6.0.tgz#71b3ed0091d3e8c68487b240d9d6d9a73c27f023"
+  integrity sha512-eJp3QRe79pjwa+duv+n7+5YsNhRcMl812EcFVwrnRvYKoNPoQb5qxU8DG6Bgwji0akHdp6D4Ln6tYLG58MFSow==
 
 emoji-regex@*, emoji-regex@^10.3.0:
   version "10.3.0"