status-im/status-desktop
2
0
Fork 0
mirror of https://github.com/status-im/status-desktop.git synced 2025-02-02 09:46:38 +00:00
Code Issues Projects Releases Wiki Activity

fix: fix emoji search messing up with recents

Browse Source
This commit is contained in:
Jonathan Rainville 2020-11-19 15:45:18 -05:00 committed by Iuri Matias
parent d49be78417
commit 7aef0e1710
2 changed files with 9 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
ui/shared/status/StatusEmojiPopup.qml
View File

@ -10,7 +10,7 @@ import "./emojiList.js" as EmojiJSON
Popup {
property var emojiSelected: function () {}
property var categories: []
property string searchString: searchBox.text
property alias searchString: searchBox.text
id: popup
modal: false
@ -89,17 +89,21 @@ Popup {
categories = newCategories
}
Connections {
id: connectionSettings
target: applicationWindow
onSettingsLoaded: {
connectionSettings.enabled = false
// Add recent
if (!appSettings.recentEmojis || !appSettings.recentEmojis.length) {
return
}
categories[0] = appSettings.recentEmojis
emojiSectionsRepeater.itemAt(0).allEmojis = appSettings.recentEmojis
}
}
onOpened: {
searchBox.text = ""
searchBox.forceActiveFocus(Qt.MouseFocusReason)
}

5
ui/shared/status/StatusEmojiSection.qml
View File

@ -43,10 +43,13 @@ Item {
onSearchStringLowercaseChanged: {
if (emojiSection.searchStringLowercase === "") {
this.emojis = modelData
this.emojis = allEmojis
return
}
this.emojis = modelData.filter(function (emoji) {
if (emoji.empty) {
return false
}
return emoji.name.includes(emojiSection.searchStringLowercase) ||
emoji.shortname.includes(emojiSection.searchStringLowercase) ||
emoji.aliases.some(a => a.includes(emojiSection.searchStringLowercase))