Skip to content

Update useDropZone.ts #421

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
Flaain wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Update useDropZone.ts #421

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
35 changes: 14 additions & 21 deletions packages/core/src/hooks/useDropZone/useDropZone.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -155,8 +155,11 @@ export const useDropZone = ((...params: any[]) => {
const element = target ? isTarget.getElement(target) : internalRef.current;

if (!element) return;

const onEvent = (event: DragEvent, type: 'drop' | 'enter' | 'leave' | 'over') => {

const controller = new AbortController();
const options = { signal: controller.signal };

const onEvent = (event: DragEvent) => {
if (!event.dataTransfer) return;

const isValid = checkValidity(event.dataTransfer.items);
Expand All @@ -170,47 +173,37 @@ export const useDropZone = ((...params: any[]) => {

const currentFiles = getFiles(event);

if (type === 'drop') {
if (event.type === 'drop') {
counterRef.current = 0;
setOvered(false);
setFiles(currentFiles);
options.onDrop?.(currentFiles, event);
return;
}

if (type === 'enter') {
if (event.type === 'dragenter') {
counterRef.current += 1;
setOvered(true);
options.onEnter?.(event);
return;
}

if (type === 'leave') {
counterRef.current -= 1;
if (counterRef.current !== 0) return;
if (event.type === 'dragleave' && (counterRef.current -= 1) === 0) {
setOvered(false);
options.onLeave?.(event);
return;
}

if (type === 'over') options.onOver?.(event);
if (event.type === 'dragover') options.onOver?.(event);
};

const onDrop = ((event: DragEvent) => onEvent(event, 'drop')) as EventListener;
const onDragOver = ((event: DragEvent) => onEvent(event, 'over')) as EventListener;
const onDragEnter = ((event: DragEvent) => onEvent(event, 'enter')) as EventListener;
const onDragLeave = ((event: DragEvent) => onEvent(event, 'leave')) as EventListener;

element.addEventListener('dragenter', onDragEnter);
element.addEventListener('dragover', onDragOver);
element.addEventListener('dragleave', onDragLeave);
element.addEventListener('drop', onDrop);
element.addEventListener('dragenter', onEvent, options);
element.addEventListener('dragover', onEvent, options);
element.addEventListener('dragleave', onEvent, options);
element.addEventListener('drop', onEvent, options);

return () => {
element.removeEventListener('dragenter', onDragEnter);
element.removeEventListener('dragover', onDragOver);
element.removeEventListener('dragleave', onDragLeave);
element.removeEventListener('drop', onDrop);
controller.abort();
};
}, [target, internalRef.current]);

Expand Down