gaschz/trilium
1
0
Fork 0
mirror of https://github.com/zadam/trilium.git synced 2025-06-06 18:08:33 +02:00
Code Issues Actions Packages Projects Releases Wiki Activity

read filter values in icon selector only after async events, #4044

Browse Source
This commit is contained in:
zadam 2023-06-20 21:19:56 +02:00
parent defd997424
commit 6cfd18b29b
1 changed files with 6 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
src/public/app/widgets/note_icon.js
View File

@ -93,11 +93,11 @@ export default class NoteIconWidget extends NoteContextAwareWidget {
}); });
this.$iconCategory = this.$widget.find("select[name='icon-category']"); this.$iconCategory = this.$widget.find("select[name='icon-category']");
this.$iconCategory.on('change', () => this.renderFilteredDropdown()); this.$iconCategory.on('change', () => this.renderDropdown());
this.$iconCategory.on('click', e => e.stopPropagation()); this.$iconCategory.on('click', e => e.stopPropagation());
this.$iconSearch = this.$widget.find("input[name='icon-search']"); this.$iconSearch = this.$widget.find("input[name='icon-search']");
this.$iconSearch.on('input', () => this.renderFilteredDropdown()); this.$iconSearch.on('input', () => this.renderDropdown());
this.$notePathList = this.$widget.find(".note-path-list"); this.$notePathList = this.$widget.find(".note-path-list");
this.$widget.on('show.bs.dropdown', async () => { this.$widget.on('show.bs.dropdown', async () => {
@ -140,14 +140,7 @@ export default class NoteIconWidget extends NoteContextAwareWidget {
} }
} }
renderFilteredDropdown() { async renderDropdown() {
const categoryId = parseInt(this.$iconCategory.find('option:selected').val());
const search = this.$iconSearch.val();
this.renderDropdown(categoryId, search);
}
async renderDropdown(categoryId, search) {
const iconToCountPromise = this.getIconToCountMap(); const iconToCountPromise = this.getIconToCountMap();
this.$iconList.empty(); this.$iconList.empty();
@ -165,8 +158,10 @@ export default class NoteIconWidget extends NoteContextAwareWidget {
} }
const {icons} = (await import('./icon_list.js')).default; const {icons} = (await import('./icon_list.js')).default;
const iconToCount = await iconToCountPromise;
search = search?.trim()?.toLowerCase(); const categoryId = parseInt(this.$iconCategory.find('option:selected').val());
const search = this.$iconSearch.val().trim().toLowerCase();
const filteredIcons = icons.filter(icon => { const filteredIcons = icons.filter(icon => {
if (categoryId && icon.category_id !== categoryId) { if (categoryId && icon.category_id !== categoryId) {
@ -182,8 +177,6 @@ export default class NoteIconWidget extends NoteContextAwareWidget {
return true; return true;
}); });
const iconToCount = await iconToCountPromise;
filteredIcons.sort((a, b) => { filteredIcons.sort((a, b) => {
const countA = iconToCount[a.className] || 0; const countA = iconToCount[a.className] || 0;
const countB = iconToCount[b.className] || 0; const countB = iconToCount[b.className] || 0;