devs
/
emoji-picker-element
mirror of https://github.com/nolanlawson/emoji-picker-element.git
4
0
Fork 0
Code Issues Projects Releases Wiki Activity

fix: fix search results with mixed custom/native

This commit is contained in:
Nolan Lawson 2020-06-22 00:17:44 -07:00
parent 89d1102a6d
commit 78c424409a
2 changed files with 14 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
docs/bundle.js
View File

File diff suppressed because one or more lines are too long

18
src/picker/components/Picker/Picker.js
View File

@ -286,14 +286,14 @@ $: {
async function updateEmojis () {
log('updateEmojis')
if (!database) {
searchMode = false
currentEmojis = []
} else if (searchText.length >= MIN_SEARCH_TEXT_LENGTH) {
searchMode = true
currentEmojis = await getEmojisBySearchQuery(searchText)
} else if (currentGroup) {
searchMode = false
} else if (searchText.length >= MIN_SEARCH_TEXT_LENGTH) {
currentEmojis = await getEmojisBySearchQuery(searchText)
searchMode = true
} else if (currentGroup) {
currentEmojis = await getEmojisByGroup(currentGroup.id)
searchMode = false
}
}
/* no await */ updateEmojis()
@ -369,6 +369,14 @@ $: {
$: {
function calculateCurrentEmojisWithCategories () {
if (searchMode) {
return [
{
category: '',
emojis: currentEmojis
}
]
}
const categoriesToEmoji = new Map()
for (const emoji of currentEmojis) {
const category = emoji.category || ''