Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 14 additions & 0 deletions packages/svelte-dnd/src/lib/core/dnd/dnd-controller.svelte.ts
Original file line number Diff line number Diff line change
Expand Up @@ -89,6 +89,7 @@ export class DndController {
private simulator: DndSimulator
private modifiers: Modifier[]
private keyboardFlight: KeyboardFlight | null = null
private lastPointer: { x: number; y: number } | null = null

// --- Entity maps ---
// Reactive maps so $derived computations (TranslationEngine, dropPreviewSize)
Expand Down Expand Up @@ -399,11 +400,24 @@ export class DndController {
}

updateMousePosition(mouseX: number, mouseY: number) {
this.lastPointer = { x: mouseX, y: mouseY }
if (this.state.dragging && !this.state.performingDrop) {
this.animationCoordinator.updateDropPreview({ x: mouseX, y: mouseY })
}
}

/**
* Re-resolve the drop preview against the last known pointer position without
* a new pointer event. Used when zones shift under a stationary cursor, such
* as scrolling the container mid-drag.
*/
recomputeDropPreview() {
if (!this.lastPointer) return
if (this.state.dragging && !this.state.performingDrop) {
this.animationCoordinator.updateDropPreview(this.lastPointer)
}
}

handleAutoScroll(mouseX: number, mouseY: number) {
if (this.state.dragging && !this.state.performingDrop) {
this.scrollController.handleAutoScroll(mouseX, mouseY)
Expand Down
18 changes: 15 additions & 3 deletions packages/svelte-dnd/src/lib/core/entities/droppable.svelte.ts
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,7 @@ export type DroppableControllerRef = {
onZonesInvalidated(cb: () => void): () => void
onDragEnd(cb: DragEndCallback): () => void
refreshDroppableZones(droppable: Droppable): void
recomputeDropPreview(): void
dragging: boolean
}

Expand Down Expand Up @@ -197,28 +198,39 @@ export class Droppable {
if (this.scrollTimeout) clearTimeout(this.scrollTimeout)
this.scrollTimeout = setTimeout(() => {
this.invalidateZones()
this.controller.recomputeDropPreview()
this.scrollTimeout = null
}, 10)
}
}

private setupScrollListeners() {
if (!isBrowser) return
let parent = this.element?.parentElement
let parent: HTMLElement | null | undefined = this.element
while (parent) {
const style = window.getComputedStyle(parent)
if (
['auto', 'scroll', 'overlay'].includes(style.overflowY) ||
['auto', 'scroll', 'overlay'].includes(style.overflowX)
) {
parent.addEventListener('scroll', this.handleScroll, { passive: true })
this.scrollListeners.push(parent)
this.addScrollListener(parent)
}
parent = parent.parentElement
}
// Virtualizers delegate scrolling to a nested `data-dnd-scroll` viewport;
// scroll events don't bubble, so listen on it directly.
this.element
?.querySelectorAll<HTMLElement>('[data-dnd-scroll]')
.forEach((el) => this.addScrollListener(el))
window.addEventListener('scroll', this.handleScroll, { passive: true })
}

private addScrollListener(el: HTMLElement) {
if (this.scrollListeners.includes(el)) return
el.addEventListener('scroll', this.handleScroll, { passive: true })
this.scrollListeners.push(el)
}

private cleanupScrollListeners() {
this.scrollListeners.forEach((el) => el.removeEventListener('scroll', this.handleScroll))
if (isBrowser) window.removeEventListener('scroll', this.handleScroll)
Expand Down
104 changes: 104 additions & 0 deletions packages/svelte-dnd/tests/entities/droppable-scroll.test.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,104 @@
import { describe, it, expect, vi, beforeEach, afterEach } from 'vitest'
import {
Droppable,
type DroppableControllerRef
} from '../../src/lib/core/entities/droppable.svelte.js'
import { sortable } from '../../src/lib/core/containers/strategies/sortable-container-strategy.js'

type DragStartCallback = Parameters<DroppableControllerRef['onDragStart']>[0]

function makeController() {
let dragStart: DragStartCallback | undefined
const refreshDroppableZones = vi.fn<DroppableControllerRef['refreshDroppableZones']>()
const recomputeDropPreview = vi.fn<DroppableControllerRef['recomputeDropPreview']>()
const ref: DroppableControllerRef = {
session: null,
draggedElement: null,
cancelSession: () => {},
slots: new Map(),
onDragStart: (cb) => {
dragStart = cb
return () => {}
},
onZonesInvalidated: () => () => {},
onDragEnd: () => () => {},
refreshDroppableZones,
recomputeDropPreview,
dragging: true
}
return {
ref,
refreshDroppableZones,
recomputeDropPreview,
startDrag: () => dragStart?.({} as Parameters<DragStartCallback>[0])
}
}

function makeDroppable(element: HTMLElement, controller: DroppableControllerRef): Droppable {
const d = new Droppable({ id: 'd', strategy: sortable({ virtual: { itemCount: () => 3 } }) }, controller)
d.element = element
return d
}

describe('Droppable scroll handling during drag', () => {
beforeEach(() => vi.useFakeTimers())
afterEach(() => {
vi.runOnlyPendingTimers()
vi.useRealTimers()
document.body.innerHTML = ''
})

it('re-resolves zones and drop preview when its own element scrolls', () => {
const controller = makeController()
const el = document.createElement('div')
el.style.overflowY = 'auto'
document.body.appendChild(el)

const d = makeDroppable(el, controller.ref)
d.setupEventListeners()
controller.startDrag()

el.dispatchEvent(new Event('scroll'))
vi.advanceTimersByTime(10)

expect(controller.refreshDroppableZones).toHaveBeenCalledWith(d)
expect(controller.recomputeDropPreview).toHaveBeenCalledTimes(1)
})

it('listens on a nested virtualizer viewport marked data-dnd-scroll', () => {
const controller = makeController()
const el = document.createElement('div')
el.style.overflowY = 'hidden'
const viewport = document.createElement('div')
viewport.setAttribute('data-dnd-scroll', '')
el.appendChild(viewport)
document.body.appendChild(el)

const d = makeDroppable(el, controller.ref)
d.setupEventListeners()
controller.startDrag()

viewport.dispatchEvent(new Event('scroll'))
vi.advanceTimersByTime(10)

expect(controller.refreshDroppableZones).toHaveBeenCalledWith(d)
expect(controller.recomputeDropPreview).toHaveBeenCalledTimes(1)
})

it('stops re-resolving once the drag ends', () => {
const controller = makeController()
const el = document.createElement('div')
el.style.overflowY = 'auto'
document.body.appendChild(el)

const d = makeDroppable(el, controller.ref)
d.setupEventListeners()
controller.startDrag()
d.destroy()

el.dispatchEvent(new Event('scroll'))
vi.advanceTimersByTime(10)

expect(controller.recomputeDropPreview).not.toHaveBeenCalled()
})
})
1 change: 1 addition & 0 deletions packages/svelte-dnd/tests/helpers/fixtures.ts
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@ export function noopController(): DroppableControllerRef {
onZonesInvalidated: () => () => {},
onDragEnd: () => () => {},
refreshDroppableZones: () => {},
recomputeDropPreview: () => {},
dragging: false
}
}
Expand Down
Loading