mirrors/zotero
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

qf: improved multiselect (#4217)

Browse source 
- richlistbox shift-click selects a range starting with
_selectionStart. After a few cmd/ctrl clicks, _selectionStart
ends up not being correct - it can even point at an unselected item.
To help richlistbox properly select a range, before each click is
processed, reset _selectionStart to be either the first
or last selected item, depending on where shift-click landed.
- also, fixed a small glitch where inputs would be created if
you click on the red border outside of the actual editor.

Fixes: #4206
This commit is contained in:
abaevbog 2024-06-08 03:55:24 -05:00 committed by GitHub
parent 85a15175ae
commit 98066b1bc5
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
1 changed files with 16 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
chrome/content/zotero/integration/quickFormat.js
View file

@ -162,6 +162,21 @@ var Zotero_QuickFormat = new function () {
if (e.shiftKey && referenceBox.selectedCount < 1) {
_selectFirstReference();
}
// Shift-Click selects a range starting from _selectionStart
// https://searchfox.org/mozilla-central/source/toolkit/content/widgets/richlistbox.js#469
// which is not be always correct after selecting and un-selecting items
// with a few cmd/ctrl-clicks. To achieve a more consistent behavior, reset _selectionStart
// to be the first or last selected node, depending on which item is clicked.
let allItems = [...referenceBox.childNodes];
let firstSelectedIndex = allItems.findIndex(node => node == referenceBox.querySelector("[selected=true]"));
let clickedItemIndex = allItems.findIndex(node => node == item);
let allSelected = [...referenceBox.querySelectorAll("[selected=true]")];
if (clickedItemIndex < firstSelectedIndex) {
referenceBox._selectionStart = allSelected[allSelected.length - 1];
}
else {
referenceBox._selectionStart = allSelected[0];
}
// Shift-click can end up selecting disabled separator, so make sure it's removed
setTimeout(() => {
let selectedSeparators = [...document.querySelectorAll("richlistitem[disabled='true'][selected='true']")];
@ -1773,6 +1788,7 @@ var Zotero_QuickFormat = new function () {
function _onQuickSearchClick(event) {
if (qfGuidance) qfGuidance.hide();
if (!event.target.classList.contains("editor")) return;
let clickX = event.clientX;
let clickY = event.clientY;
let { lastBubble, startOfTheLine } = getLastBubbleBeforePoint(clickX, clickY);