scriptoriumadmin/zotero
1
0
Fork 0
mirror of https://github.com/zotero/zotero.git synced 2026-08-28 05:25:31 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Advanced search: Indent subcollections in Collection condition menu

Browse source 
Instead of just prefixing the labels with "-", indent the whole row,
including the icon. This looks better and fixes FAYT on subcollection
names.

https://forums.zotero.org/discussion/132561/
This commit is contained in:
Dan Stillman 2026-07-04 18:13:18 -04:00
parent 03a610e696
commit 606d8f19ba
3 changed files with 21 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
chrome/content/zotero/elements/zoteroSearch.js
View file

@ -1164,18 +1164,11 @@
let cols = Zotero.Collections.getByLibrary(libraryID, true);
for (let col of cols) {
// Indent subcollections
var indent = '';
if (col.level) {
for (let j = 1; j < col.level; j++) {
indent += ' ';
}
indent += '- ';
}
rows.push({
name: indent + Zotero.Utilities.trimInternal(col.name),
name: Zotero.Utilities.trimInternal(col.name),
value: 'C' + col.key,
image: Zotero.Collection.prototype.treeViewImage
image: Zotero.Collection.prototype.treeViewImage,
level: col.level
});
}
@ -1361,6 +1354,11 @@
menuitem.className = 'menuitem-iconic';
menuitem.setAttribute('image', row.image);
}
// Indent nested rows (subcollections) via CSS rather than by prefixing
// the label, which would break find-as-you-type in the menu
if (row.level) {
menuitem.style.setProperty('--nesting-level', row.level);
}
}
valueMenu.selectedIndex = 0;

5
scss/elements/_zoteroSearch.scss
View file

@ -320,8 +320,9 @@ zoterosearch {
max-height: 16px;
}
#valuemenu::part(label), #valuemenu menuitem > .menu-iconic-text {
white-space: pre;
// Indent subcollections below their parents, icon included
#valuemenu menuitem > .menu-icon {
margin-inline-start: calc(var(--nesting-level, 0) * 16px);
}
#condition-tooltips hbox > label

12
test/tests/advancedSearchTest.js
View file

@ -1075,12 +1075,20 @@ describe("Advanced Search", function () {
assert.isFalse(valueMenu.hidden);
// Only the collections, with the saved searches no longer mixed in
assert.equal(valueMenu.itemCount, 4);
// Subcollections are indented via their icons rather than in the label,
// which would break find-as-you-type in the menu
function getIndent(menuitem) {
return win.getComputedStyle(menuitem.querySelector('.menu-icon'))
.marginInlineStart;
}
var valueMenuItem = valueMenu.getItemAtIndex(1);
assert.equal(valueMenuItem.getAttribute('label'), "- " + col2.name);
assert.equal(valueMenuItem.getAttribute('label'), col2.name);
assert.equal(valueMenuItem.getAttribute('value'), "C" + col2.key);
assert.equal(getIndent(valueMenuItem), '16px');
valueMenuItem = valueMenu.getItemAtIndex(2);
assert.equal(valueMenuItem.getAttribute('label'), " - " + col3.name);
assert.equal(valueMenuItem.getAttribute('label'), col3.name);
assert.equal(valueMenuItem.getAttribute('value'), "C" + col3.key);
assert.equal(getIndent(valueMenuItem), '32px');
var values = [];
for (let i = 0; i < valueMenu.itemCount; i++) {
values.push(valueMenu.getItemAtIndex(i).getAttribute('value'));