fix(ui): ignore internal card drags in model card preview drop (#1034)

Tag move-to-folder drags with a custom dataTransfer MIME type so card
preview-drop handlers skip them entirely (no highlight, no upload), and
mark the preview image non-draggable so the browser no longer synthesizes
a File payload when a drag starts on the image. Fixes card-on-card drops
and click-jitter self-drops replacing the preview with itself.
This commit is contained in:
Will Miao
2026-08-18 20:22:32 +08:00
parent d2f50f26f1
commit 5d1a22fb8f
4 changed files with 61 additions and 4 deletions
@@ -1,4 +1,5 @@
import { describe, it, expect, vi, beforeEach } from 'vitest';
import { MODEL_CARD_DRAG_MIME_TYPE } from '../../../static/js/utils/constants.js';
const {
MODEL_CARD_MODULE,
@@ -108,9 +109,9 @@ describe('ModelCard drag & drop preview upload', () => {
return createModelCard(model, 'loras');
}
function dispatchDrop(card, files) {
function dispatchDrop(card, files, types = []) {
const event = new Event('drop', { bubbles: true, cancelable: true });
Object.defineProperty(event, 'dataTransfer', { value: { files } });
Object.defineProperty(event, 'dataTransfer', { value: { files, types } });
card.dispatchEvent(event);
return event;
}
@@ -179,4 +180,41 @@ describe('ModelCard drag & drop preview upload', () => {
expect(event.defaultPrevented).toBe(true);
expect(card.classList.contains('drag-over')).toBe(false);
});
it('ignores drops tagged as internal card drags (move-to-folder)', () => {
const card = createCard();
const file = new File(['data'], 'preview.png', { type: 'image/png' });
const event = dispatchDrop(card, [file], [MODEL_CARD_DRAG_MIME_TYPE]);
expect(uploadPreviewMock).not.toHaveBeenCalled();
expect(showToastMock).not.toHaveBeenCalled();
expect(event.defaultPrevented).toBe(false);
expect(card.classList.contains('drag-over')).toBe(false);
});
it('does not highlight or intercept internal card drags during dragover', () => {
const card = createCard();
const dragOverEvent = new Event('dragover', { bubbles: true, cancelable: true });
Object.defineProperty(dragOverEvent, 'dataTransfer', {
value: { types: [MODEL_CARD_DRAG_MIME_TYPE] },
});
card.dispatchEvent(dragOverEvent);
expect(dragOverEvent.defaultPrevented).toBe(false);
expect(card.classList.contains('drag-over')).toBe(false);
});
it('keeps the card draggable (move-to-folder) but the preview image non-draggable', () => {
const card = createCard();
// The card itself must stay draggable for sidebar move-to-folder drags.
expect(card.draggable).toBe(true);
// The preview image must not start a native image drag: the browser would
// synthesize a File payload from it, which the drop handler would mistake
// for an external preview replacement.
const img = card.querySelector('.card-preview img');
expect(img.getAttribute('draggable')).toBe('false');
});
});