Merge branch 'main' into main

missive · Jan 6, 2024 · 43abe6b · 43abe6b
2 parents 17553dc + c57635f
commit 43abe6b
Show file tree

Hide file tree

Showing 71 changed files with 93 additions and 86 deletions.
diff --git a/README.md b/README.md
@@ -103,7 +103,7 @@ function App() {
 | **emojiVersion** | `14` | `1`, `2`, `3`, `4`, `5`, `11`, `12`, `12.1`, `13`, `13.1`, `14` | The version of the emoji data to use. Latest version supported in `@emoji-mart/data` is currently [14](https://emojipedia.org/emoji-14.0) |
 | **exceptEmojis** | `[]` | | List of emoji IDs that will be excluded from the picker |
 | **icons** | `auto` | `auto`, `outline`, `solid` | The type of icons to use for the picker. `outline` with light theme and `solid` with dark theme. |
-| **locale** | `en` | `en`, `ar`, `be`, `cs`, `de`, `es`, `fa`, `fi`, `fr`, `hi`, `it`, `ja`, `kr`, `nl`, `pl`, `pt`, `ru`, `sa`, `tr`, `uk`, `vi`, `zh` | The locale to use for the picker |
+| **locale** | `en` | `en`, `ar`, `be`, `cs`, `de`, `es`, `fa`, `fi`, `fr`, `hi`, `it`, `ja`, `ko`, `nl`, `pl`, `pt`, `ru`, `sa`, `tr`, `uk`, `vi`, `zh` | The locale to use for the picker |
 | **maxFrequentRows** | `4` | | The maximum number of frequent rows to show. `0` will disable frequent category |
 | **navPosition** | `top` | `top`, `bottom`, `none` | The position of the navigation bar |
 | **noCountryFlags** | `false` | | Whether to show country flags or not. If not provided, tbhis is handled automatically (Windows doesn’t support country flags) |

diff --git a/packages/emoji-mart-data/build.js b/packages/emoji-mart-data/build.js
@@ -7,7 +7,7 @@ const unicodeEmoji = require('unicode-emoji-json')
 
 const DRY_RUN = process.argv.indexOf('--dry') != -1
 
-const VERSIONS = [1, 2, 3, 4, 5, 11, 12, 12.1, 13, 13.1, 14]
+const VERSIONS = [1, 2, 3, 4, 5, 11, 12, 12.1, 13, 13.1, 14, 15]
 const SKINS = ['1F3FB', '1F3FC', '1F3FD', '1F3FE', '1F3FF']
 const SETS = ['native', 'apple', 'facebook', 'google', 'twitter']
 const CATEGORIES = [

diff --git a/packages/emoji-mart-data/i18n/kr.json → packages/emoji-mart-data/i18n/ko.json b/packages/emoji-mart-data/i18n/kr.json → packages/emoji-mart-data/i18n/ko.json
diff --git a/packages/emoji-mart-data/package.json b/packages/emoji-mart-data/package.json
@@ -9,17 +9,17 @@
     "url": "https://github.com/missive/emoji-mart",
     "directory": "packages/emoji-mart-data"
   },
-  "main": "sets/14/native.json",
+  "main": "sets/15/native.json",
   "types": "index.d.ts",
   "scripts": {
     "build": "node ./build.js"
   },
   "sideEffects": false,
   "devDependencies": {
-    "emoji-datasource": "14.0.0",
-    "emojilib": "3.0.6",
-    "inflection": "1.13.2",
-    "unicode-emoji-json": "0.3.1"
+    "emoji-datasource": "15.0.1",
+    "emojilib": "3.0.10",
+    "inflection": "2.0.1",
+    "unicode-emoji-json": "0.4.0"
   },
   "files": [
     "/i18n",

diff --git a/packages/emoji-mart-data/sets/1/apple.json b/packages/emoji-mart-data/sets/1/apple.json
diff --git a/packages/emoji-mart-data/sets/1/facebook.json b/packages/emoji-mart-data/sets/1/facebook.json
diff --git a/packages/emoji-mart-data/sets/1/google.json b/packages/emoji-mart-data/sets/1/google.json
diff --git a/packages/emoji-mart-data/sets/1/native.json b/packages/emoji-mart-data/sets/1/native.json
diff --git a/packages/emoji-mart-data/sets/1/twitter.json b/packages/emoji-mart-data/sets/1/twitter.json
diff --git a/packages/emoji-mart-data/sets/11/apple.json b/packages/emoji-mart-data/sets/11/apple.json
diff --git a/packages/emoji-mart-data/sets/11/facebook.json b/packages/emoji-mart-data/sets/11/facebook.json
diff --git a/packages/emoji-mart-data/sets/11/google.json b/packages/emoji-mart-data/sets/11/google.json
diff --git a/packages/emoji-mart-data/sets/11/native.json b/packages/emoji-mart-data/sets/11/native.json
diff --git a/packages/emoji-mart-data/sets/11/twitter.json b/packages/emoji-mart-data/sets/11/twitter.json
diff --git a/packages/emoji-mart-data/sets/12.1/apple.json b/packages/emoji-mart-data/sets/12.1/apple.json
diff --git a/packages/emoji-mart-data/sets/12.1/facebook.json b/packages/emoji-mart-data/sets/12.1/facebook.json
diff --git a/packages/emoji-mart-data/sets/12.1/google.json b/packages/emoji-mart-data/sets/12.1/google.json
diff --git a/packages/emoji-mart-data/sets/12.1/native.json b/packages/emoji-mart-data/sets/12.1/native.json
diff --git a/packages/emoji-mart-data/sets/12.1/twitter.json b/packages/emoji-mart-data/sets/12.1/twitter.json
diff --git a/packages/emoji-mart-data/sets/12/apple.json b/packages/emoji-mart-data/sets/12/apple.json
diff --git a/packages/emoji-mart-data/sets/12/facebook.json b/packages/emoji-mart-data/sets/12/facebook.json
diff --git a/packages/emoji-mart-data/sets/12/google.json b/packages/emoji-mart-data/sets/12/google.json
diff --git a/packages/emoji-mart-data/sets/12/native.json b/packages/emoji-mart-data/sets/12/native.json
diff --git a/packages/emoji-mart-data/sets/12/twitter.json b/packages/emoji-mart-data/sets/12/twitter.json
diff --git a/packages/emoji-mart-data/sets/13.1/apple.json b/packages/emoji-mart-data/sets/13.1/apple.json
diff --git a/packages/emoji-mart-data/sets/13.1/facebook.json b/packages/emoji-mart-data/sets/13.1/facebook.json
diff --git a/packages/emoji-mart-data/sets/13.1/google.json b/packages/emoji-mart-data/sets/13.1/google.json
diff --git a/packages/emoji-mart-data/sets/13.1/native.json b/packages/emoji-mart-data/sets/13.1/native.json
diff --git a/packages/emoji-mart-data/sets/13.1/twitter.json b/packages/emoji-mart-data/sets/13.1/twitter.json
diff --git a/packages/emoji-mart-data/sets/13/apple.json b/packages/emoji-mart-data/sets/13/apple.json
diff --git a/packages/emoji-mart-data/sets/13/facebook.json b/packages/emoji-mart-data/sets/13/facebook.json
diff --git a/packages/emoji-mart-data/sets/13/google.json b/packages/emoji-mart-data/sets/13/google.json
diff --git a/packages/emoji-mart-data/sets/13/native.json b/packages/emoji-mart-data/sets/13/native.json
diff --git a/packages/emoji-mart-data/sets/13/twitter.json b/packages/emoji-mart-data/sets/13/twitter.json
diff --git a/packages/emoji-mart-data/sets/14/apple.json b/packages/emoji-mart-data/sets/14/apple.json
diff --git a/packages/emoji-mart-data/sets/14/facebook.json b/packages/emoji-mart-data/sets/14/facebook.json
diff --git a/packages/emoji-mart-data/sets/14/google.json b/packages/emoji-mart-data/sets/14/google.json
diff --git a/packages/emoji-mart-data/sets/14/native.json b/packages/emoji-mart-data/sets/14/native.json
diff --git a/packages/emoji-mart-data/sets/14/twitter.json b/packages/emoji-mart-data/sets/14/twitter.json
diff --git a/packages/emoji-mart-data/sets/15/apple.json b/packages/emoji-mart-data/sets/15/apple.json
diff --git a/packages/emoji-mart-data/sets/15/facebook.json b/packages/emoji-mart-data/sets/15/facebook.json
diff --git a/packages/emoji-mart-data/sets/15/google.json b/packages/emoji-mart-data/sets/15/google.json
diff --git a/packages/emoji-mart-data/sets/15/native.json b/packages/emoji-mart-data/sets/15/native.json
diff --git a/packages/emoji-mart-data/sets/15/twitter.json b/packages/emoji-mart-data/sets/15/twitter.json
diff --git a/packages/emoji-mart-data/sets/2/apple.json b/packages/emoji-mart-data/sets/2/apple.json
diff --git a/packages/emoji-mart-data/sets/2/facebook.json b/packages/emoji-mart-data/sets/2/facebook.json
diff --git a/packages/emoji-mart-data/sets/2/google.json b/packages/emoji-mart-data/sets/2/google.json
diff --git a/packages/emoji-mart-data/sets/2/native.json b/packages/emoji-mart-data/sets/2/native.json
diff --git a/packages/emoji-mart-data/sets/2/twitter.json b/packages/emoji-mart-data/sets/2/twitter.json
diff --git a/packages/emoji-mart-data/sets/3/apple.json b/packages/emoji-mart-data/sets/3/apple.json
diff --git a/packages/emoji-mart-data/sets/3/facebook.json b/packages/emoji-mart-data/sets/3/facebook.json
diff --git a/packages/emoji-mart-data/sets/3/google.json b/packages/emoji-mart-data/sets/3/google.json
diff --git a/packages/emoji-mart-data/sets/3/native.json b/packages/emoji-mart-data/sets/3/native.json
diff --git a/packages/emoji-mart-data/sets/3/twitter.json b/packages/emoji-mart-data/sets/3/twitter.json
diff --git a/packages/emoji-mart-data/sets/4/apple.json b/packages/emoji-mart-data/sets/4/apple.json
diff --git a/packages/emoji-mart-data/sets/4/facebook.json b/packages/emoji-mart-data/sets/4/facebook.json
diff --git a/packages/emoji-mart-data/sets/4/google.json b/packages/emoji-mart-data/sets/4/google.json
diff --git a/packages/emoji-mart-data/sets/4/native.json b/packages/emoji-mart-data/sets/4/native.json
diff --git a/packages/emoji-mart-data/sets/4/twitter.json b/packages/emoji-mart-data/sets/4/twitter.json
diff --git a/packages/emoji-mart-data/sets/5/apple.json b/packages/emoji-mart-data/sets/5/apple.json
diff --git a/packages/emoji-mart-data/sets/5/facebook.json b/packages/emoji-mart-data/sets/5/facebook.json
diff --git a/packages/emoji-mart-data/sets/5/google.json b/packages/emoji-mart-data/sets/5/google.json
diff --git a/packages/emoji-mart-data/sets/5/native.json b/packages/emoji-mart-data/sets/5/native.json
diff --git a/packages/emoji-mart-data/sets/5/twitter.json b/packages/emoji-mart-data/sets/5/twitter.json
diff --git a/packages/emoji-mart-website/example-emoji-component.html b/packages/emoji-mart-website/example-emoji-component.html
@@ -32,7 +32,7 @@
       <img id="img-parrot" src="./assets/parrot.gif" />
     </div>
     <script type="module">
-      import data from '@emoji-mart/data/sets/14/twitter.json'
+      import data from '@emoji-mart/data/sets/15/twitter.json'
       import { init } from 'emoji-mart'
 
       init({

diff --git a/packages/emoji-mart-website/index.html b/packages/emoji-mart-website/index.html
@@ -44,6 +44,7 @@
       <div class="flex flex-middle">
         Emoji version:&nbsp;<span class="select flex flex-grow"
           ><select id="version" class="flex-grow">
+            <option value="15">15.0</option>
             <option value="14">14.0</option>
             <option value="13.1">13.1</option>
             <option value="13.0">13.0</option>
@@ -74,7 +75,7 @@
             <option value="hi">हिन्दी</option>
             <option value="it">Italiano</option>
             <option value="ja">日本語</option>
-            <option value="kr">한국어</option>
+            <option value="ko">한국어</option>
             <option value="nl">Nederlands</option>
             <option value="pl">Polski</option>
             <option value="pt">Português</option>

diff --git a/packages/emoji-mart/README.md b/packages/emoji-mart/README.md
@@ -103,7 +103,7 @@ function App() {
 | **emojiVersion** | `14` | `1`, `2`, `3`, `4`, `5`, `11`, `12`, `12.1`, `13`, `13.1`, `14` | The version of the emoji data to use. Latest version supported in `@emoji-mart/data` is currently [14](https://emojipedia.org/emoji-14.0) |
 | **exceptEmojis** | `[]` | | List of emoji IDs that will be excluded from the picker |
 | **icons** | `auto` | `auto`, `outline`, `solid` | The type of icons to use for the picker. `outline` with light theme and `solid` with dark theme. |
-| **locale** | `en` | `en`, `ar`, `be`, `cs`, `de`, `es`, `fa`, `fi`, `fr`, `hi`, `it`, `ja`, `kr`, `nl`, `pl`, `pt`, `ru`, `sa`, `tr`, `uk`, `vi`, `zh` | The locale to use for the picker |
+| **locale** | `en` | `en`, `ar`, `be`, `cs`, `de`, `es`, `fa`, `fi`, `fr`, `hi`, `it`, `ja`, `ko`, `nl`, `pl`, `pt`, `ru`, `sa`, `tr`, `uk`, `vi`, `zh` | The locale to use for the picker |
 | **maxFrequentRows** | `4` | | The maximum number of frequent rows to show. `0` will disable frequent category |
 | **navPosition** | `top` | `top`, `bottom`, `none` | The position of the navigation bar |
 | **noCountryFlags** | `false` | | Whether to show country flags or not. If not provided, tbhis is handled automatically (Windows doesn’t support country flags) |

diff --git a/packages/emoji-mart/src/components/Emoji/Emoji.tsx b/packages/emoji-mart/src/components/Emoji/Emoji.tsx
@@ -26,13 +26,13 @@ export default function Emoji(props) {
     (props.set != 'native' && !props.spritesheet
       ? typeof props.getImageURL === 'function'
         ? props.getImageURL(props.set, emojiSkin.unified)
-        : `https://cdn.jsdelivr.net/npm/emoji-datasource-${props.set}@14.0.0/img/${props.set}/64/${emojiSkin.unified}.png`
+        : `https://cdn.jsdelivr.net/npm/emoji-datasource-${props.set}@15.0.1/img/${props.set}/64/${emojiSkin.unified}.png`
       : undefined)
 
   const spritesheetSrc =
     typeof props.getSpritesheetURL === 'function'
       ? props.getSpritesheetURL(props.set)
-      : `https://cdn.jsdelivr.net/npm/emoji-datasource-${props.set}@14.0.0/img/${props.set}/sheets-256/64.png`
+      : `https://cdn.jsdelivr.net/npm/emoji-datasource-${props.set}@15.0.1/img/${props.set}/sheets-256/64.png`
 
   return (
     <span class="emoji-mart-emoji" data-emoji-set={props.set}>

diff --git a/packages/emoji-mart/src/components/Picker/PickerProps.ts b/packages/emoji-mart/src/components/Picker/PickerProps.ts
@@ -18,8 +18,8 @@ export default {
     value: 24,
   },
   emojiVersion: {
-    value: 14,
-    choices: [1, 2, 3, 4, 5, 11, 12, 12.1, 13, 13.1, 14],
+    value: 15,
+    choices: [1, 2, 3, 4, 5, 11, 12, 12.1, 13, 13.1, 14, 15],
   },
   exceptEmojis: {
     value: [],
@@ -43,7 +43,7 @@ export default {
       'hi',
       'it',
       'ja',
-      'kr',
+      'ko',
       'nl',
       'pl',
       'pt',

diff --git a/packages/emoji-mart/src/helpers/native-support.ts b/packages/emoji-mart/src/helpers/native-support.ts
@@ -1,5 +1,6 @@
 const CACHE = new Map()
 const VERSIONS = [
+  { v: 15, emoji: '🫨' },
   { v: 14, emoji: '🫠' },
   { v: 13.1, emoji: '😶‍🌫️' },
   { v: 13, emoji: '🥸' },

diff --git a/yarn.lock b/yarn.lock
@@ -2079,20 +2079,20 @@ emittery@^0.10.2:
   resolved "https://registry.yarnpkg.com/emittery/-/emittery-0.10.2.tgz#902eec8aedb8c41938c46e9385e9db7e03182933"
   integrity sha512-aITqOwnLanpHLNXZJENbOgjUBeHocD+xsSJmNrjovKBW5HbSpW3d1pEls7GFQPUWXiwG9+0P4GtHfEqC/4M0Iw==
 
-emoji-datasource@14.0.0:
-  version "14.0.0"
-  resolved "https://registry.yarnpkg.com/emoji-datasource/-/emoji-datasource-14.0.0.tgz#99529a62f3a86546fc670c09b672ddc9f24f3d44"
-  integrity sha512-SoOv0lSa+9/2X9ulSRDhu2u1zAOaOv5vtMY3OYUDcQCoReEh0/3eQAMuBM9LyD7Hy3G4K7mDPDqVeHUWvy7cow==
+emoji-datasource@15.0.1:
+  version "15.0.1"
+  resolved "https://registry.yarnpkg.com/emoji-datasource/-/emoji-datasource-15.0.1.tgz#6cc7676e4d48d7559c2e068ffcacf84ec653584c"
+  integrity sha512-aF5Q6LCKXzJzpG4K0ETiItuzz0xLYxNexR9qWw45/shuuEDWZkOIbeGHA23uopOSYA/LmeZIXIFsySCx+YKg2g==
 
 emoji-regex@^8.0.0:
   version "8.0.0"
   resolved "https://registry.yarnpkg.com/emoji-regex/-/emoji-regex-8.0.0.tgz#e818fd69ce5ccfcb404594f842963bf53164cc37"
   integrity sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A==
 
-[email protected].6:
-  version "3.0.6"
-  resolved "https://registry.yarnpkg.com/emojilib/-/emojilib-3.0.6.tgz#09cb2d3bbf5df832a3842bbd0fc8a713db70fd54"
-  integrity sha512-/fjPG5+oTHzHDQhXwovBrggTNhOB6r2Ms1+e9ZX84kYov/5YK1b9Jk4f6uho8C9CmWkQzjTJXrphNkP27+7TqQ==
+[email protected].10:
+  version "3.0.10"
+  resolved "https://registry.yarnpkg.com/emojilib/-/emojilib-3.0.10.tgz#e2f9baaee5fabbc1e011ebd3aa2761b65e4da02f"
+  integrity sha512-VQtCRroFykPTJaoEBEGFg5tI+rEluabjuaVDDbSftDtiRJ5GuqRG/LGV1mmDzkJP4bh5rzuEBOafMN68/YXQcQ==
 
 entities@^2.0.0:
   version "2.2.0"
@@ -2440,10 +2440,10 @@ imurmurhash@^0.1.4:
   resolved "https://registry.yarnpkg.com/imurmurhash/-/imurmurhash-0.1.4.tgz#9218b9b2b928a238b13dc4fb6b6d576f231453ea"
   integrity sha512-JmXMZ6wuvDmLiHEml9ykzqO6lwFbof0GG4IkcGaENdCRDDmMVnny7s5HsIgHCbaq0w2MyPhDqkhTUgS2LU2PHA==
 
-inflection@1.13.2:
-  version "1.13.2"
-  resolved "https://registry.yarnpkg.com/inflection/-/inflection-1.13.2.tgz#15e8c797c6c3dadf31aa658f8df8a4ea024798b0"
-  integrity sha512-cmZlljCRTBFouT8UzMzrGcVEvkv6D/wBdcdKG7J1QH5cXjtU75Dm+P27v9EKu/Y43UYyCJd1WC4zLebRrC8NBw==
+inflection@2.0.1:
+  version "2.0.1"
+  resolved "https://registry.yarnpkg.com/inflection/-/inflection-2.0.1.tgz#bdf3a4c05d4275f41234910cbbe9a102ac72c99b"
+  integrity sha512-wzkZHqpb4eGrOKBl34xy3umnYHx8Si5R1U4fwmdxLo5gdH6mEK8gclckTj/qWqy4Je0bsDYe/qazZYuO7xe3XQ==
 
 inflight@^1.0.4:
   version "1.0.6"
@@ -4032,10 +4032,10 @@ [email protected]:
   resolved "https://registry.yarnpkg.com/typescript/-/typescript-4.6.4.tgz#caa78bbc3a59e6a5c510d35703f6a09877ce45e9"
   integrity sha512-9ia/jWHIEbo49HfjrLGfKbZSuWo9iTMwXO+Ca3pRsSpbsMbc7/IU8NKdCZVRRBafVPGnoJeFL76ZOAA84I9fEg==
 
-unicode-emoji-json@0.3.1:
-  version "0.3.1"
-  resolved "https://registry.yarnpkg.com/unicode-emoji-json/-/unicode-emoji-json-0.3.1.tgz#495ddf9a3483da91d25a1a4817249f4b3a5ab03f"
-  integrity sha512-qA76zUIfOMSj+rdd8XAz/SpuubjTqoy2uW+dHrUVZivIvzMYzs7lNlbLMG4R32KB8SFwtVUJYQzbAafjBYDSuw==
+unicode-emoji-json@0.4.0:
+  version "0.4.0"
+  resolved "https://registry.yarnpkg.com/unicode-emoji-json/-/unicode-emoji-json-0.4.0.tgz#021dd9a917b8af90756cf1eba21fda7b8e0ee5af"
+  integrity sha512-lVNOwh2AnmbwqtSrEVjAWKQoVzWgyWmXVqPuPkPfKb0tnA0+uYN/4ILCTdy9IRj/+3drAVhmjwjNJQr2dhCwnA==
 
 universalify@^0.1.2:
   version "0.1.2"