From 8366be7182c391f745afbdefcb37dd92765d9ead Mon Sep 17 00:00:00 2001 From: zerosoul Date: Sun, 20 Mar 2022 17:22:26 +0800 Subject: [PATCH] refactor: local emoji files --- src/assets/icons/emoji.celebrate.svg | 24 +++++++++++++++++ src/assets/icons/emoji.heart.svg | 3 +++ src/assets/icons/emoji.look.svg | 12 +++++++++ src/assets/icons/emoji.rocket.svg | 8 ++++++ src/assets/icons/emoji.smile.svg | 7 +++++ src/assets/icons/emoji.thumb.down.svg | 4 +++ src/assets/icons/emoji.thumb.up.svg | 11 ++++++++ src/assets/icons/emoji.unhappy.svg | 6 +++++ src/common/component/Emoji.js | 30 +++++++++++++++------ src/common/component/Message/EmojiPicker.js | 11 ++++---- 10 files changed, 103 insertions(+), 13 deletions(-) create mode 100644 src/assets/icons/emoji.celebrate.svg create mode 100644 src/assets/icons/emoji.heart.svg create mode 100644 src/assets/icons/emoji.look.svg create mode 100644 src/assets/icons/emoji.rocket.svg create mode 100644 src/assets/icons/emoji.smile.svg create mode 100644 src/assets/icons/emoji.thumb.down.svg create mode 100644 src/assets/icons/emoji.thumb.up.svg create mode 100644 src/assets/icons/emoji.unhappy.svg diff --git a/src/assets/icons/emoji.celebrate.svg b/src/assets/icons/emoji.celebrate.svg new file mode 100644 index 00000000..28a02920 --- /dev/null +++ b/src/assets/icons/emoji.celebrate.svg @@ -0,0 +1,24 @@ + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/assets/icons/emoji.heart.svg b/src/assets/icons/emoji.heart.svg new file mode 100644 index 00000000..7016259c --- /dev/null +++ b/src/assets/icons/emoji.heart.svg @@ -0,0 +1,3 @@ + + + diff --git a/src/assets/icons/emoji.look.svg b/src/assets/icons/emoji.look.svg new file mode 100644 index 00000000..18d1878c --- /dev/null +++ b/src/assets/icons/emoji.look.svg @@ -0,0 +1,12 @@ + + + + + + + + + + + + diff --git a/src/assets/icons/emoji.rocket.svg b/src/assets/icons/emoji.rocket.svg new file mode 100644 index 00000000..5cd1bfb3 --- /dev/null +++ b/src/assets/icons/emoji.rocket.svg @@ -0,0 +1,8 @@ + + + + + + + + diff --git a/src/assets/icons/emoji.smile.svg b/src/assets/icons/emoji.smile.svg new file mode 100644 index 00000000..88750257 --- /dev/null +++ b/src/assets/icons/emoji.smile.svg @@ -0,0 +1,7 @@ + + + + + + + diff --git a/src/assets/icons/emoji.thumb.down.svg b/src/assets/icons/emoji.thumb.down.svg new file mode 100644 index 00000000..055aff27 --- /dev/null +++ b/src/assets/icons/emoji.thumb.down.svg @@ -0,0 +1,4 @@ + + + + diff --git a/src/assets/icons/emoji.thumb.up.svg b/src/assets/icons/emoji.thumb.up.svg new file mode 100644 index 00000000..6cedbefe --- /dev/null +++ b/src/assets/icons/emoji.thumb.up.svg @@ -0,0 +1,11 @@ + + + + + + + + + + + diff --git a/src/assets/icons/emoji.unhappy.svg b/src/assets/icons/emoji.unhappy.svg new file mode 100644 index 00000000..ec2a8a64 --- /dev/null +++ b/src/assets/icons/emoji.unhappy.svg @@ -0,0 +1,6 @@ + + + + + + diff --git a/src/common/component/Emoji.js b/src/common/component/Emoji.js index a649c159..148fd3f7 100644 --- a/src/common/component/Emoji.js +++ b/src/common/component/Emoji.js @@ -1,11 +1,25 @@ -import { getEmojiDataFromNative, Emoji } from "emoji-mart"; -import data from "emoji-mart/data/all.json"; +import EmojiThumbUp from "../../assets/icons/emoji.thumb.up.svg"; +import EmojiThumbDown from "../../assets/icons/emoji.thumb.down.svg"; +import EmojiSmile from "../../assets/icons/emoji.smile.svg"; +import EmojiCelebrate from "../../assets/icons/emoji.celebrate.svg"; +import EmojiUnhappy from "../../assets/icons/emoji.unhappy.svg"; +import EmojiHeart from "../../assets/icons/emoji.heart.svg"; +import EmojiRocket from "../../assets/icons/emoji.rocket.svg"; +import EmojiLook from "../../assets/icons/emoji.look.svg"; -export default function EmojiItem({ native = "", set = "twitter", size = 16 }) { - if (!native) return null; +const Emojis = { + "👍": , + "👎": , + "😄": , + "👀": , + "🚀": , + "❤️": , + "🙁": , + "🎉": , +}; - const emojiData = getEmojiDataFromNative(native, "apple", data); - return ( - - ); +export default function EmojiItem({ native = "" }) { + if (!native || !Emojis[native]) return null; + + return Emojis[native]; } diff --git a/src/common/component/Message/EmojiPicker.js b/src/common/component/Message/EmojiPicker.js index eef9bad1..4b141923 100644 --- a/src/common/component/Message/EmojiPicker.js +++ b/src/common/component/Message/EmojiPicker.js @@ -19,7 +19,7 @@ const StyledPicker = styled.div` &.reacting { opacity: 0.6; } - .emoji { + .wrapper { cursor: pointer; border-radius: 8px; padding: 4px; @@ -27,8 +27,9 @@ const StyledPicker = styled.div` &.reacted { background-color: #f5f6f7; } - > * { - display: flex; + > .emoji { + width: 16px; + height: 16px; } } } @@ -63,11 +64,11 @@ export default function EmojiPicker({ mid, hidePicker }) { return (
  • - +
  • ); })}