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
2 changes: 2 additions & 0 deletions src/misc/pairs.ts
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,8 @@ export function* pairs<T>(array: T[]): Generator<readonly [T, T], void, unknown>

for (let j = i + 1; j < array.length; j++) {
const b = array[j];

// @todo filter spares?
yield [a!, b!];
}
}
Expand Down
29 changes: 28 additions & 1 deletion src/react/use-drag-and-drop.ts
Original file line number Diff line number Diff line change
Expand Up @@ -183,6 +183,31 @@ export function useDragAndDrop<T extends HTMLElement>(
clientPosition,
});

state.pointerId = -1;
state.captured = false;
});

// handle touchend because scrolling inside target mutes pointer events
const onTouchEnd = useStableCallback((event: TouchEvent) => {
const element = ref.current;

if (!element) {
return;
}

if (!(event.target instanceof Node && ref.current?.contains(event.target))) {
return;
}

const clientPosition = Vector2.of(event.touches[0]?.clientX ?? 0, event.touches[0]?.clientY);

onDrop?.({
target: element,
offset: state.offset.clone(),
clientPosition,
});

state.pointerId = -1;
state.captured = false;
});

Expand All @@ -196,19 +221,21 @@ export function useDragAndDrop<T extends HTMLElement>(
element.addEventListener('pointerdown', onPointerDown);
window.addEventListener('pointermove', onPointerMove);
window.addEventListener('pointerup', onPointerUp);
window.addEventListener('touchend', onTouchEnd, true);

return () => {
element.removeEventListener('pointerdown', onPointerDown);
element.removeEventListener('pointerdown', onPointerDown);
window.removeEventListener('pointermove', onPointerMove);
window.removeEventListener('pointerup', onPointerUp);
window.removeEventListener('touchend', onTouchEnd, true);
};
}, [
ref,
disabled,
onPointerDown,
onPointerMove,
onPointerUp,
onTouchEnd,

// eslint-disable-next-line react-hooks/exhaustive-deps
...extraDeps,
Expand Down