Thanks to visit codestin.com
Credit goes to github.com

Skip to content

Commit d02ff90

Browse files
BrunoQuaresmaBrunoQuaresma
authored
refactor: use apple emojis (#15965)
Closes #14998
1 parent 638247c commit d02ff90

File tree

4,066 files changed

+18
-399
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

4,066 files changed

+18
-399
lines changed

‎site/package.json

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,8 @@
3030
"test:watch": "jest --selectProjects test --watch",
3131
"test:storybook": "test-storybook",
3232
"stats": "STATS=true pnpm build && npx http-server ./stats -p 8081 -c-1",
33-
"deadcode": "ts-prune | grep -v \".stories\\|.config\\|e2e\\|__mocks__\\|used in module\\|testHelpers\\|typesGenerated\" || echo \"No deadcode found.\""
33+
"deadcode": "ts-prune | grep -v \".stories\\|.config\\|e2e\\|__mocks__\\|used in module\\|testHelpers\\|typesGenerated\" || echo \"No deadcode found.\"",
34+
"update-emojis": "cp -rf ./node_modules/emoji-datasource-apple/img/apple/64/* ./static/emojis"
3435
},
3536
"dependencies": {
3637
"@alwaysmeticulous/recorder-loader": "2.137.0",
@@ -82,6 +83,7 @@
8283
"cronstrue": "2.50.0",
8384
"date-fns": "2.30.0",
8485
"dayjs": "1.11.13",
86+
"emoji-datasource-apple": "15.1.2",
8587
"emoji-mart": "5.6.0",
8688
"file-saver": "2.0.5",
8789
"formik": "2.4.6",

‎site/pnpm-lock.yaml

Lines changed: 8 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎site/src/@types/emoji-mart.d.ts

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -35,6 +35,7 @@ declare module "@emoji-mart/react" {
3535
custom: CustomCategory[];
3636
emojiButtonSize?: number;
3737
emojiSize?: number;
38+
emojiVersion?: string;
3839
onEmojiSelect: (emoji: EmojiData) => void;
3940
}
4041

‎site/src/components/IconField/EmojiPicker.tsx

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1-
import data from "@emoji-mart/data/sets/14/twitter.json";
2-
import EmojiMart, { type EmojiMartProps } from "@emoji-mart/react";
3-
import type { FC } from "react";
1+
import data from "@emoji-mart/data/sets/15/apple.json";
2+
import EmojiMart from "@emoji-mart/react";
3+
import type { ComponentProps, FC } from "react";
44
import icons from "theme/icons.json";
55

66
const custom = [
@@ -21,15 +21,16 @@ const custom = [
2121
];
2222

2323
type EmojiPickerProps = Omit<
24-
EmojiMartProps,
24+
ComponentProps<typeof EmojiMart>,
2525
"custom" | "data" | "set" | "theme"
2626
>;
2727

2828
const EmojiPicker: FC<EmojiPickerProps> = (props) => {
2929
return (
3030
<EmojiMart
3131
theme="dark"
32-
set="twitter"
32+
set="apple"
33+
emojiVersion="15"
3334
data={data}
3435
custom={custom}
3536
{...props}

‎site/static/emojis/0023-fe0f-20e3.png

3.17 KB

‎site/static/emojis/002a-fe0f-20e3.png

3.36 KB

‎site/static/emojis/0030-fe0f-20e3.png

3.08 KB

‎site/static/emojis/0031-fe0f-20e3.png

2.24 KB

‎site/static/emojis/0032-fe0f-20e3.png

2.84 KB

‎site/static/emojis/0033-fe0f-20e3.png

3.17 KB

0 commit comments

Comments
 (0)