nbsp/pleroma-fe
1
1
Fork 0
forked from AkkomaGang/akkoma-fe
Code Issues Pull requests Projects Releases Wiki Activity

feat/reorder-emojis-by-position-of-keyword

Browse source
This commit is contained in:
Dym Sohin 2020-09-21 17:29:36 +02:00
parent 0c0722a092
commit fee654f1ee
2 changed files with 18 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
src/components/emoji_picker/emoji_picker.js
View file

@ -8,10 +8,17 @@ const LOAD_EMOJI_BY = 60
const LOAD_EMOJI_MARGIN = 64 const LOAD_EMOJI_MARGIN = 64
const filterByKeyword = (list, keyword = '') => { const filterByKeyword = (list, keyword = '') => {
if (keyword === '') return list
const keywordLowercase = keyword.toLowerCase() const keywordLowercase = keyword.toLowerCase()
return list.filter(emoji => const orderedEmojiList = []
emoji.displayText.toLowerCase().includes(keywordLowercase) for (const emoji of list) {
) const indexOfKeyword = emoji.displayText.toLowerCase().indexOf( keywordLowercase )
if ( indexOfKeyword > -1 ) {
orderedEmojiList.splice(indexOfKeyword, 0, emoji)
}
}
return orderedEmojiList
} }
const EmojiPicker = { const EmojiPicker = {

11
src/components/react_button/react_button.js
View file

@ -29,9 +29,14 @@ const ReactButton = {
emojis () { emojis () {
if (this.filterWord !== '') { if (this.filterWord !== '') {
const filterWordLowercase = this.filterWord.toLowerCase() const filterWordLowercase = this.filterWord.toLowerCase()
return this.$store.state.instance.emoji.filter(emoji => const orderedEmojiList = []
emoji.displayText.toLowerCase().includes(filterWordLowercase) for (const emoji of this.$store.state.instance.emoji) {
) const indexOfFilterWord = emoji.displayText.toLowerCase().indexOf( filterWordLowercase )
if ( indexOfFilterWord > -1 ) {
orderedEmojiList.splice(indexOfFilterWord, 0, emoji)
}
}
return orderedEmojiList
} }
return this.$store.state.instance.emoji || [] return this.$store.state.instance.emoji || []
}, },