Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add the emoji version 15.0 to emoji-mart/data #844

Merged
merged 5 commits into from
Jan 6, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion packages/emoji-mart-data/build.js
Original file line number Diff line number Diff line change
Expand Up @@ -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 = [
Expand Down
10 changes: 5 additions & 5 deletions packages/emoji-mart-data/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down
2 changes: 1 addition & 1 deletion packages/emoji-mart-data/sets/1/apple.json

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion packages/emoji-mart-data/sets/1/facebook.json

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion packages/emoji-mart-data/sets/1/google.json

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion packages/emoji-mart-data/sets/1/native.json

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion packages/emoji-mart-data/sets/1/twitter.json

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion packages/emoji-mart-data/sets/11/apple.json

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion packages/emoji-mart-data/sets/11/facebook.json

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion packages/emoji-mart-data/sets/11/google.json

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion packages/emoji-mart-data/sets/11/native.json

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion packages/emoji-mart-data/sets/11/twitter.json

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion packages/emoji-mart-data/sets/12.1/apple.json

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion packages/emoji-mart-data/sets/12.1/facebook.json

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion packages/emoji-mart-data/sets/12.1/google.json

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion packages/emoji-mart-data/sets/12.1/native.json

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion packages/emoji-mart-data/sets/12.1/twitter.json

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion packages/emoji-mart-data/sets/12/apple.json

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion packages/emoji-mart-data/sets/12/facebook.json

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion packages/emoji-mart-data/sets/12/google.json

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion packages/emoji-mart-data/sets/12/native.json

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion packages/emoji-mart-data/sets/12/twitter.json

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion packages/emoji-mart-data/sets/13.1/apple.json

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion packages/emoji-mart-data/sets/13.1/facebook.json

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion packages/emoji-mart-data/sets/13.1/google.json

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion packages/emoji-mart-data/sets/13.1/native.json

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion packages/emoji-mart-data/sets/13.1/twitter.json

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion packages/emoji-mart-data/sets/13/apple.json

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion packages/emoji-mart-data/sets/13/facebook.json

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion packages/emoji-mart-data/sets/13/google.json

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion packages/emoji-mart-data/sets/13/native.json

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion packages/emoji-mart-data/sets/13/twitter.json

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion packages/emoji-mart-data/sets/14/apple.json

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion packages/emoji-mart-data/sets/14/facebook.json

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion packages/emoji-mart-data/sets/14/google.json

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion packages/emoji-mart-data/sets/14/native.json

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion packages/emoji-mart-data/sets/14/twitter.json

Large diffs are not rendered by default.

1 change: 1 addition & 0 deletions packages/emoji-mart-data/sets/15/apple.json

Large diffs are not rendered by default.

1 change: 1 addition & 0 deletions packages/emoji-mart-data/sets/15/facebook.json

Large diffs are not rendered by default.

1 change: 1 addition & 0 deletions packages/emoji-mart-data/sets/15/google.json

Large diffs are not rendered by default.

1 change: 1 addition & 0 deletions packages/emoji-mart-data/sets/15/native.json

Large diffs are not rendered by default.

1 change: 1 addition & 0 deletions packages/emoji-mart-data/sets/15/twitter.json

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion packages/emoji-mart-data/sets/2/apple.json

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion packages/emoji-mart-data/sets/2/facebook.json

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion packages/emoji-mart-data/sets/2/google.json

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion packages/emoji-mart-data/sets/2/native.json

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion packages/emoji-mart-data/sets/2/twitter.json

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion packages/emoji-mart-data/sets/3/apple.json

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion packages/emoji-mart-data/sets/3/facebook.json

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion packages/emoji-mart-data/sets/3/google.json

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion packages/emoji-mart-data/sets/3/native.json

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion packages/emoji-mart-data/sets/3/twitter.json

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion packages/emoji-mart-data/sets/4/apple.json

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion packages/emoji-mart-data/sets/4/facebook.json

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion packages/emoji-mart-data/sets/4/google.json

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion packages/emoji-mart-data/sets/4/native.json

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion packages/emoji-mart-data/sets/4/twitter.json

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion packages/emoji-mart-data/sets/5/apple.json

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion packages/emoji-mart-data/sets/5/facebook.json

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion packages/emoji-mart-data/sets/5/google.json

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion packages/emoji-mart-data/sets/5/native.json

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion packages/emoji-mart-data/sets/5/twitter.json

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion packages/emoji-mart-website/example-emoji-component.html
Original file line number Diff line number Diff line change
Expand Up @@ -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({
Expand Down
1 change: 1 addition & 0 deletions packages/emoji-mart-website/index.html
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
4 changes: 2 additions & 2 deletions packages/emoji-mart/src/components/Emoji/Emoji.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -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}>
Expand Down
4 changes: 2 additions & 2 deletions packages/emoji-mart/src/components/Picker/PickerProps.ts
Original file line number Diff line number Diff line change
Expand Up @@ -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: [],
Expand Down
1 change: 1 addition & 0 deletions packages/emoji-mart/src/helpers/native-support.ts
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
const CACHE = new Map()
const VERSIONS = [
{ v: 15, emoji: '🫨' },
{ v: 14, emoji: '🫠' },
{ v: 13.1, emoji: '😶‍🌫️' },
{ v: 13, emoji: '🥸' },
Expand Down
32 changes: 16 additions & 16 deletions yarn.lock
Original file line number Diff line number Diff line change
Expand Up @@ -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==

emojilib@3.0.6:
version "3.0.6"
resolved "https://registry.yarnpkg.com/emojilib/-/emojilib-3.0.6.tgz#09cb2d3bbf5df832a3842bbd0fc8a713db70fd54"
integrity sha512-/fjPG5+oTHzHDQhXwovBrggTNhOB6r2Ms1+e9ZX84kYov/5YK1b9Jk4f6uho8C9CmWkQzjTJXrphNkP27+7TqQ==
emojilib@3.0.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"
Expand Down Expand Up @@ -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"
Expand Down Expand Up @@ -4032,10 +4032,10 @@ typescript@4.6.4:
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"
Expand Down
Loading