feat(bulk): add shift+click range selection in bulk mode

This commit is contained in:
Will Miao
2026-08-26 10:09:35 +08:00
parent 0b08ad283a
commit 4ed9f775f6
4 changed files with 255 additions and 6 deletions
+5 -2
View File
@@ -240,9 +240,12 @@ class RecipeCard {
// Recipe card click event - only attach if not in duplicates mode
if (!isDuplicatesMode) {
card.addEventListener('click', () => {
card.addEventListener('click', (e) => {
if (state.bulkMode) {
bulkManager.toggleCardSelection(card);
if (e.shiftKey) {
e.preventDefault();
}
bulkManager.toggleCardSelection(card, e.shiftKey);
return;
}
this.clickHandler(this.recipe);
+6 -3
View File
@@ -108,7 +108,10 @@ function handleModelCardEvent_internal(event, modelType) {
}
// If no specific element was clicked, handle the card click (show modal or toggle selection)
handleCardClick(card, modelType);
if (state.bulkMode && event.shiftKey) {
event.preventDefault(); // keep shift+click from extending a text selection
}
handleCardClick(card, modelType, event.shiftKey);
return false; // Continue with other handlers (e.g., bulk selection)
}
@@ -288,12 +291,12 @@ function handleViewLocalVersionsFromCard(card, modelType) {
}
}
function handleCardClick(card, modelType) {
function handleCardClick(card, modelType, extendSelection = false) {
const pageState = getCurrentPageState();
if (state.bulkMode) {
// Toggle selection using the bulk manager
bulkManager.toggleCardSelection(card);
bulkManager.toggleCardSelection(card, extendSelection);
} else if (pageState && pageState.duplicatesMode) {
// In duplicates mode, don't open modal when clicking cards
return;
+76 -1
View File
@@ -26,6 +26,10 @@ export class BulkManager {
this.marqueeElement = null;
this.initialSelectedModels = new Set();
// Shift+click range anchor: last plain-clicked filepath. Set in
// toggleCardSelection, cleared in clearSelection.
this.bulkAnchorFilepath = null;
// Drag detection properties
this.dragThreshold = 5; // Pixels to move before considering it a drag
this.dragDelayMs = 100; // Minimum hold time before a drag is treated as a marquee
@@ -351,6 +355,7 @@ export class BulkManager {
card.classList.remove('selected');
});
state.selectedModels.clear();
this.bulkAnchorFilepath = null;
// Update context menu header if visible
if (this.bulkContextMenu) {
@@ -358,9 +363,13 @@ export class BulkManager {
}
}
toggleCardSelection(card) {
toggleCardSelection(card, extendSelection = false) {
const filepath = card.dataset.filepath;
if (extendSelection && this.selectRangeFromAnchor(filepath)) {
return;
}
if (card.classList.contains('selected')) {
card.classList.remove('selected');
state.selectedModels.delete(filepath);
@@ -372,12 +381,78 @@ export class BulkManager {
this.updateMetadataCacheFromCard(filepath, card);
}
this.bulkAnchorFilepath = filepath;
// Update context menu header if visible
if (this.bulkContextMenu) {
this.bulkContextMenu.updateSelectedCountHeader();
}
}
/**
* Select exactly the items between the shift anchor and the target
* (inclusive), following list order. Explorer-style range semantics:
* selections outside the new range are dropped, and consecutive shifts
* re-derive the range from the same anchor. Returns false when there is
* no usable anchor so the caller can fall back to a single-card toggle.
*/
selectRangeFromAnchor(targetFilepath) {
const scroller = state.virtualScroller;
if (!scroller || !scroller.items || !this.bulkAnchorFilepath) {
return false;
}
const anchorIndex = scroller.findIndexByFilePath(this.bulkAnchorFilepath);
const targetIndex = scroller.findIndexByFilePath(targetFilepath);
if (anchorIndex === -1 || targetIndex === -1) {
return false;
}
const startIndex = Math.min(anchorIndex, targetIndex);
const endIndex = Math.max(anchorIndex, targetIndex);
const metadataCache = this.getMetadataCache();
const rangePaths = new Set();
for (let i = startIndex; i <= endIndex; i++) {
const item = scroller.items[i];
if (!item || !item.file_path) {
continue;
}
rangePaths.add(item.file_path);
if (!metadataCache.has(item.file_path)) {
const modelId = this.parseModelId(item?.civitai?.modelId);
metadataCache.set(item.file_path, {
fileName: item.file_name,
folder: item.folder || '',
usageTips: item.usage_tips || '{}',
modelName: item.name || item.file_name,
...(modelId !== null ? { modelId } : {})
});
}
state.selectedModels.add(item.file_path);
}
for (const filepath of [...state.selectedModels]) {
if (!rangePaths.has(filepath)) {
state.selectedModels.delete(filepath);
}
}
this.applySelectionState();
if (this.bulkContextMenu) {
this.bulkContextMenu.updateSelectedCountHeader();
}
if (this.isStripVisible) {
this.updateThumbnailStrip();
}
return true;
}
getMetadataCache() {
const currentType = state.currentPageType;
const pageState = getCurrentPageState();