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

Fix item tree focus checks broken by view-specific tree IDs

Browse source 
The item tree's DOM id carries a view-specific suffix (e.g.
"item-tree-main-default", "item-tree-main-recentlyRead"), but three
call sites compared against a single hardcoded "item-tree-main":

- Collection highlighting on Ctrl/Option (zoteroPane.js) -- match on
  the "item-tree-main" prefix to cover all views. This restores
  highlighting in Recently Read, where it silently failed.
- Focusing the items list after Add Item by Identifier (lookup.js) --
  use the current view's tree id instead of a literal that resolved to
  null and threw.
- Shift-Tab from the item tree to the toolbar (zoteroPane.js) -- key the
  actionsMap on the current view's tree id.

Add a test confirming focus lands on the items list after a lookup.

https://forums.zotero.org/discussion/130968/collection-of-selected-papers-is-not-highlighted-in-recently-read-panel
This commit is contained in:
Dan Stillman 2026-06-08 12:55:13 -04:00
parent d0507e02c8
commit 31d9e89165
3 changed files with 23 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
chrome/content/zotero/lookup.js
View file

@ -147,7 +147,8 @@ var Zotero_Lookup = new function () {
// Send the focus to the item tree after the popup closes
ZoteroPane.lastFocusedElement = null;
document.getElementById("zotero-lookup-panel").hidePopup();
document.getElementById("item-tree-main-default").focus();
// The item tree's DOM id has a view-specific suffix, so use the current view's id
document.getElementById(ZoteroPane.itemsView.id).focus();
}
return false;
};

7
chrome/content/zotero/zoteroPane.js
View file

@ -438,7 +438,8 @@ var ZoteroPane = new function () {
itemTree.addEventListener("keydown", (event) => {
let actionsMap = {
'item-tree-main-default': {
// The item tree's DOM id has a view-specific suffix, so key on the current view's id
[ZoteroPane.itemsView?.id]: {
ShiftTab: () => document.getElementById('zotero-tb-toggle-item-pane-stacked')
}
};
@ -1066,7 +1067,9 @@ var ZoteroPane = new function () {
else {
enableHighlight = !event.shiftKey && !event.metaKey && event.key == "Control" && !event.altKey;
}
let isItemTreeFocused = document.activeElement.id == "item-tree-main-default";
// The item tree's DOM id has a view-specific suffix (e.g. "item-tree-main-default",
// "item-tree-main-recentlyRead"), so match on the prefix to cover all views
let isItemTreeFocused = document.activeElement.id.startsWith("item-tree-main");
// Only highlight collections when itemTree is focused to try to avoid
// conflicts with other shortcuts
if (enableHighlight && isItemTreeFocused) {

16
test/tests/lookupTest.js
View file

@ -49,6 +49,22 @@ describe("Add Item by Identifier", function () {
});
});
it("should focus the items list after adding items", async function () {
// Make sure the items list is non-empty (and therefore focusable)
await createDataObject('item');
await waitForItemsLoad(win);
// Stub the lookup itself so the test doesn't hit external services
var stub = sinon.stub(win.Zotero_Lookup, "addItemsFromIdentifier").resolves([{}]);
try {
var textbox = win.document.getElementById("zotero-lookup-textbox");
await win.Zotero_Lookup.accept(textbox);
assert.equal(win.document.activeElement.id, win.ZoteroPane.itemsView.id);
}
finally {
stub.restore();
}
});
it.skip("should add a DOI with an open-access PDF");
// e.g., arXiv