Merge branch 'fix-mobile-emoji-search' into 'develop'
EmojiPicker: Workaround to search immediately on mobile See merge request pleroma/pleroma-fe!1539
This commit is contained in:
commit
6fb483955e
4 changed files with 7 additions and 3 deletions
|
@ -6,6 +6,7 @@ import {
|
|||
faStickyNote,
|
||||
faSmileBeam
|
||||
} from '@fortawesome/free-solid-svg-icons'
|
||||
import { trim } from 'lodash'
|
||||
|
||||
library.add(
|
||||
faBoxOpen,
|
||||
|
@ -176,7 +177,7 @@ const EmojiPicker = {
|
|||
filteredEmoji () {
|
||||
return filterByKeyword(
|
||||
this.$store.state.instance.customEmoji || [],
|
||||
this.keyword
|
||||
trim(this.keyword)
|
||||
)
|
||||
},
|
||||
customEmojiBuffer () {
|
||||
|
@ -197,7 +198,7 @@ const EmojiPicker = {
|
|||
id: 'standard',
|
||||
text: this.$t('emoji.unicode'),
|
||||
icon: 'box-open',
|
||||
emojis: filterByKeyword(standardEmojis, this.keyword)
|
||||
emojis: filterByKeyword(standardEmojis, trim(this.keyword))
|
||||
}
|
||||
]
|
||||
},
|
||||
|
|
|
@ -47,6 +47,7 @@
|
|||
type="text"
|
||||
class="form-control"
|
||||
:placeholder="$t('emoji.search_emoji')"
|
||||
@input="$event.target.composing = false"
|
||||
>
|
||||
</div>
|
||||
<div
|
||||
|
|
|
@ -1,6 +1,7 @@
|
|||
import Popover from '../popover/popover.vue'
|
||||
import { library } from '@fortawesome/fontawesome-svg-core'
|
||||
import { faSmileBeam } from '@fortawesome/free-regular-svg-icons'
|
||||
import { trim } from 'lodash'
|
||||
|
||||
library.add(faSmileBeam)
|
||||
|
||||
|
@ -43,7 +44,7 @@ const ReactButton = {
|
|||
},
|
||||
emojis () {
|
||||
if (this.filterWord !== '') {
|
||||
const filterWordLowercase = this.filterWord.toLowerCase()
|
||||
const filterWordLowercase = trim(this.filterWord.toLowerCase())
|
||||
let orderedEmojiList = []
|
||||
for (const emoji of this.$store.state.instance.emoji) {
|
||||
if (emoji.replacement === this.filterWord) return [emoji]
|
||||
|
|
|
@ -12,6 +12,7 @@
|
|||
<div class="reaction-picker-filter">
|
||||
<input
|
||||
v-model="filterWord"
|
||||
@input="$event.target.composing = false"
|
||||
size="1"
|
||||
:placeholder="$t('emoji.search_emoji')"
|
||||
>
|
||||
|
|
Loading…
Reference in a new issue