commit: c655699935ce6fd8b5d0a744dafd6403e32277b7
parent 133294dc2aa56927097e7641dec7f15ad9179d80
Author: Shpuld Shpludson <shp@cock.li>
Date: Tue, 1 Dec 2020 11:01:29 +0000
Merge branch 'feat/react-picker-titles-support-filter-by-emoji' into 'develop'
Fix #1014 add titles in react picker, support filtering by emoji itself
Closes #1014
See merge request pleroma/pleroma-fe!1294
Diffstat:
3 files changed, 14 insertions(+), 2 deletions(-)
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -6,6 +6,8 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/).
## [Unreleased]
### Added
+- Mouseover titles for emojis in reaction picker
+- Support to input emoji into the search box in reaction picker
- Added some missing unicode emoji
### Fixed
diff --git a/src/components/react_button/react_button.js b/src/components/react_button/react_button.js
@@ -27,13 +27,21 @@ const ReactButton = {
},
computed: {
commonEmojis () {
- return ['👍', '😠', '👀', '😂', '🔥']
+ return [
+ { displayText: 'thumbsup', replacement: '👍' },
+ { displayText: 'angry', replacement: '😠' },
+ { displayText: 'eyes', replacement: '👀' },
+ { displayText: 'joy', replacement: '😂' },
+ { displayText: 'fire', replacement: '🔥' }
+ ]
},
emojis () {
if (this.filterWord !== '') {
const filterWordLowercase = this.filterWord.toLowerCase()
let orderedEmojiList = []
for (const emoji of this.$store.state.instance.emoji) {
+ if (emoji.replacement === this.filterWord) return [emoji]
+
const indexOfFilterWord = emoji.displayText.toLowerCase().indexOf(filterWordLowercase)
if (indexOfFilterWord > -1) {
if (!Array.isArray(orderedEmojiList[indexOfFilterWord])) {
diff --git a/src/components/react_button/react_button.vue b/src/components/react_button/react_button.vue
@@ -22,15 +22,17 @@
v-for="emoji in commonEmojis"
:key="emoji"
class="emoji-button"
+ :title="emoji.displayText"
@click="addReaction($event, emoji, close)"
>
- {{ emoji }}
+ {{ emoji.replacement }}
</span>
<div class="reaction-picker-divider" />
<span
v-for="(emoji, key) in emojis"
:key="key"
class="emoji-button"
+ :title="emoji.displayText"
@click="addReaction($event, emoji.replacement, close)"
>
{{ emoji.replacement }}