Skip to content
Open
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
4 changes: 2 additions & 2 deletions src/__tests__/draggable.test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -42,8 +42,8 @@ describe('makeDraggable', () => {
const unsubscribe = makeDraggable(el, onDrag, onStart, onEnd, 0)

el.dispatchEvent(new PointerEvent('pointerdown', { clientX: 10, clientY: 10 }))
document.dispatchEvent(new PointerEvent('pointermove', { clientX: 20, clientY: 20 }))
document.dispatchEvent(new PointerEvent('pointerup', { clientX: 20, clientY: 20 }))
window.dispatchEvent(new PointerEvent('pointermove', { clientX: 20, clientY: 20 }))
window.dispatchEvent(new PointerEvent('pointerup', { clientX: 20, clientY: 20 }))

expect(onStart).toHaveBeenCalled()
expect(onDrag).toHaveBeenCalled()
Expand Down
20 changes: 5 additions & 15 deletions src/draggable.ts
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,7 @@ export function makeDraggable(

let startX = event.clientX
let startY = event.clientY

let isDragging = false
const touchStartTime = Date.now()

Expand Down Expand Up @@ -63,13 +64,6 @@ export function makeDraggable(
unsubscribeDocument()
}

const onPointerLeave = (e: PointerEvent) => {
// Listen to events only on the document and not on inner elements
if (!e.relatedTarget || e.relatedTarget === document.documentElement) {
onPointerUp(e)
}
}

const onClick = (event: MouseEvent) => {
if (isDragging) {
event.stopPropagation()
Expand All @@ -83,18 +77,14 @@ export function makeDraggable(
}
}

document.addEventListener('pointermove', onPointerMove)
document.addEventListener('pointerup', onPointerUp)
document.addEventListener('pointerout', onPointerLeave)
document.addEventListener('pointercancel', onPointerLeave)
window.addEventListener('pointermove', onPointerMove)
window.addEventListener('pointerup', onPointerUp)
document.addEventListener('touchmove', onTouchMove, { passive: false })
document.addEventListener('click', onClick, { capture: true })

unsubscribeDocument = () => {
document.removeEventListener('pointermove', onPointerMove)
document.removeEventListener('pointerup', onPointerUp)
document.removeEventListener('pointerout', onPointerLeave)
document.removeEventListener('pointercancel', onPointerLeave)
window.removeEventListener('pointermove', onPointerMove)
window.removeEventListener('pointerup', onPointerUp)
document.removeEventListener('touchmove', onTouchMove)
setTimeout(() => {
document.removeEventListener('click', onClick, { capture: true })
Expand Down
2 changes: 1 addition & 1 deletion src/plugins/hover.ts
Original file line number Diff line number Diff line change
Expand Up @@ -121,6 +121,7 @@ class HoverPlugin extends BasePlugin<HoverPluginEvents, HoverPluginOptions> {

this.wavesurfer.on('zoom', onUpdate)
this.wavesurfer.on('scroll', onUpdate)

this.unsubscribe = () => {
container.removeEventListener('pointermove', this.onPointerMove)
container.removeEventListener('pointerleave', this.onPointerLeave)
Expand All @@ -132,7 +133,6 @@ class HoverPlugin extends BasePlugin<HoverPluginEvents, HoverPluginOptions> {
private onPointerMove = (e: PointerEvent) => {
if (!this.wavesurfer) return

// Used when zooming
this.lastPointerMove = e

// Position
Expand Down
Loading