@react-aria/dnd 3.0.0-alpha.11 → 3.0.0-alpha.12

package/dist/module.js

@@ -273,12 +273,15 @@ function $67560de7c78cb232$export$aef80212ac99c003(item) {
         $67560de7c78cb232$var$dropItems.delete(item.element);
     };
 }
-function $67560de7c78cb232$export$549dbcf8649bf3b2(target, stringFormatter) {
+function $67560de7c78cb232$export$549dbcf8649bf3b2(target1, stringFormatter) {
     if ($67560de7c78cb232$var$dragSession) throw new Error('Cannot begin dragging while already dragging');
-    $67560de7c78cb232$var$dragSession = new $67560de7c78cb232$var$DragSession(target, stringFormatter);
+    $67560de7c78cb232$var$dragSession = new $67560de7c78cb232$var$DragSession(target1, stringFormatter);
     requestAnimationFrame(()=>{
         $67560de7c78cb232$var$dragSession.setup();
-        if ($7252cd45fc48c07c$export$1fb2158d224b542c() === 'keyboard' || $7252cd45fc48c07c$export$1fb2158d224b542c() === 'touch' && $fP8tg$getInteractionModality() === 'virtual') $67560de7c78cb232$var$dragSession.next();
+        if ($7252cd45fc48c07c$export$1fb2158d224b542c() === 'keyboard' || $7252cd45fc48c07c$export$1fb2158d224b542c() === 'touch' && $fP8tg$getInteractionModality() === 'virtual') {
+            let target = $67560de7c78cb232$var$dragSession.findNearestDropTarget();
+            $67560de7c78cb232$var$dragSession.setCurrentDropTarget(target);
+        }
     });
     for (let cb of $67560de7c78cb232$var$subscriptions)cb();
 }
@@ -504,6 +507,22 @@ class $67560de7c78cb232$var$DragSession {
             } else this.setCurrentDropTarget(this.validDropTargets[this.validDropTargets.length - 1]);
         } else this.setCurrentDropTarget(this.validDropTargets[index - 1]);
     }
+    findNearestDropTarget() {
+        let dragTargetRect = this.dragTarget.element.getBoundingClientRect();
+        let minDistance = Infinity;
+        let nearest = null;
+        for (let dropTarget of this.validDropTargets){
+            let rect = dropTarget.element.getBoundingClientRect();
+            let dx = rect.left - dragTargetRect.left;
+            let dy = rect.top - dragTargetRect.top;
+            let dist = dx * dx + dy * dy;
+            if (dist < minDistance) {
+                minDistance = dist;
+                nearest = dropTarget;
+            }
+        }
+        return nearest;
+    }
     setCurrentDropTarget(dropTarget, item) {
         if (dropTarget !== this.currentDropTarget) {
             if (this.currentDropTarget && typeof this.currentDropTarget.onDropExit === 'function') {
@@ -2090,28 +2109,66 @@ function $5c06e4929e123553$export$ccdee5eaf73cf661(options) {
     let state = $fP8tg$useRef({
         x: 0,
         y: 0,
-        dragEnterCount: 0,
+        dragOverElements: new Set(),
         dropEffect: 'none',
+        effectAllowed: 'none',
         dropActivateTimer: null
     }).current;
+    let fireDropEnter = (e)=>{
+        setDropTarget(true);
+        if (typeof options.onDropEnter === 'function') {
+            let rect = e.currentTarget.getBoundingClientRect();
+            options.onDropEnter({
+                type: 'dropenter',
+                x: e.clientX - rect.x,
+                y: e.clientY - rect.y
+            });
+        }
+    };
+    let fireDropExit = (e)=>{
+        setDropTarget(false);
+        if (typeof options.onDropExit === 'function') {
+            let rect = e.currentTarget.getBoundingClientRect();
+            options.onDropExit({
+                type: 'dropexit',
+                x: e.clientX - rect.x,
+                y: e.clientY - rect.y
+            });
+        }
+    };
     let onDragOver = (e)=>{
         e.preventDefault();
         e.stopPropagation();
-        if (e.clientX === state.x && e.clientY === state.y) {
+        if (e.clientX === state.x && e.clientY === state.y && e.dataTransfer.effectAllowed === state.effectAllowed) {
             e.dataTransfer.dropEffect = state.dropEffect;
             return;
         }
         state.x = e.clientX;
         state.y = e.clientY;
+        let prevDropEffect = state.dropEffect;
+        // Update drop effect if allowed drop operations changed (e.g. user pressed modifier key).
+        if (e.dataTransfer.effectAllowed !== state.effectAllowed) {
+            let allowedOperations = $5c06e4929e123553$var$effectAllowedToOperations(e.dataTransfer.effectAllowed);
+            let dropOperation = allowedOperations[0];
+            if (typeof options.getDropOperation === 'function') {
+                let types = new $7252cd45fc48c07c$export$7f04ce188c91447c(e.dataTransfer);
+                dropOperation = $5c06e4929e123553$var$getDropOperation(e.dataTransfer.effectAllowed, options.getDropOperation(types, allowedOperations));
+            }
+            state.dropEffect = $103790afe9474d1c$export$5eacb0769d26d3b2[dropOperation] || 'none';
+        }
         if (typeof options.getDropOperationForPoint === 'function') {
             let allowedOperations = $5c06e4929e123553$var$effectAllowedToOperations(e.dataTransfer.effectAllowed);
             let types = new $7252cd45fc48c07c$export$7f04ce188c91447c(e.dataTransfer);
             let rect = e.currentTarget.getBoundingClientRect();
-            let dropOperation = options.getDropOperationForPoint(types, allowedOperations, state.x - rect.x, state.y - rect.y);
+            let dropOperation = $5c06e4929e123553$var$getDropOperation(e.dataTransfer.effectAllowed, options.getDropOperationForPoint(types, allowedOperations, state.x - rect.x, state.y - rect.y));
             state.dropEffect = $103790afe9474d1c$export$5eacb0769d26d3b2[dropOperation] || 'none';
         }
+        state.effectAllowed = e.dataTransfer.effectAllowed;
         e.dataTransfer.dropEffect = state.dropEffect;
-        if (typeof options.onDropMove === 'function') {
+        // If the drop operation changes, update state and fire events appropriately.
+        if (state.dropEffect === 'none' && prevDropEffect !== 'none') fireDropExit(e);
+        else if (state.dropEffect !== 'none' && prevDropEffect === 'none') fireDropEnter(e);
+        if (typeof options.onDropMove === 'function' && state.dropEffect !== 'none') {
             let rect = e.currentTarget.getBoundingClientRect();
             options.onDropMove({
                 type: 'dropmove',
@@ -2133,46 +2190,39 @@ function $5c06e4929e123553$export$ccdee5eaf73cf661(options) {
     };
     let onDragEnter = (e)=>{
         e.stopPropagation();
-        state.dragEnterCount++;
-        if (state.dragEnterCount > 1) return;
+        state.dragOverElements.add(e.target);
+        if (state.dragOverElements.size > 1) return;
         let allowedOperations = $5c06e4929e123553$var$effectAllowedToOperations(e.dataTransfer.effectAllowed);
         let dropOperation = allowedOperations[0];
         if (typeof options.getDropOperation === 'function') {
             let types = new $7252cd45fc48c07c$export$7f04ce188c91447c(e.dataTransfer);
-            dropOperation = options.getDropOperation(types, allowedOperations);
+            dropOperation = $5c06e4929e123553$var$getDropOperation(e.dataTransfer.effectAllowed, options.getDropOperation(types, allowedOperations));
         }
-        if (dropOperation !== 'cancel') setDropTarget(true);
         if (typeof options.getDropOperationForPoint === 'function') {
             let types = new $7252cd45fc48c07c$export$7f04ce188c91447c(e.dataTransfer);
             let rect = e.currentTarget.getBoundingClientRect();
-            dropOperation = options.getDropOperationForPoint(types, allowedOperations, e.clientX - rect.x, e.clientY - rect.y);
-        }
-        state.dropEffect = $103790afe9474d1c$export$5eacb0769d26d3b2[dropOperation] || 'none';
-        e.dataTransfer.dropEffect = state.dropEffect;
-        if (typeof options.onDropEnter === 'function' && dropOperation !== 'cancel') {
-            let rect = e.currentTarget.getBoundingClientRect();
-            options.onDropEnter({
-                type: 'dropenter',
-                x: e.clientX - rect.x,
-                y: e.clientY - rect.y
-            });
+            dropOperation = $5c06e4929e123553$var$getDropOperation(e.dataTransfer.effectAllowed, options.getDropOperationForPoint(types, allowedOperations, e.clientX - rect.x, e.clientY - rect.y));
         }
         state.x = e.clientX;
         state.y = e.clientY;
+        state.effectAllowed = e.dataTransfer.effectAllowed;
+        state.dropEffect = $103790afe9474d1c$export$5eacb0769d26d3b2[dropOperation] || 'none';
+        e.dataTransfer.dropEffect = state.dropEffect;
+        if (dropOperation !== 'cancel') fireDropEnter(e);
     };
     let onDragLeave = (e)=>{
         e.stopPropagation();
-        state.dragEnterCount--;
-        if (state.dragEnterCount > 0) return;
-        if (typeof options.onDropExit === 'function' && state.dropEffect !== 'none') {
-            let rect = e.currentTarget.getBoundingClientRect();
-            options.onDropExit({
-                type: 'dropexit',
-                x: e.clientX - rect.x,
-                y: e.clientY - rect.y
-            });
-        }
-        setDropTarget(false);
+        // We would use e.relatedTarget to detect if the drag is still inside the drop target,
+        // but it is always null in WebKit. https://bugs.webkit.org/show_bug.cgi?id=66547
+        // Instead, we track all of the targets of dragenter events in a set, and remove them
+        // in dragleave. When the set becomes empty, we've left the drop target completely.
+        // We must also remove any elements that are no longer in the DOM, because dragleave
+        // events will never be fired for these. This can happen, for example, with drop
+        // indicators between items, which disappear when the drop target changes.
+        state.dragOverElements.delete(e.target);
+        for (let element of state.dragOverElements)if (!e.currentTarget.contains(element)) state.dragOverElements.delete(element);
+        if (state.dragOverElements.size > 0) return;
+        if (state.dropEffect !== 'none') fireDropExit(e);
         clearTimeout(state.dropActivateTimer);
     };
     let onDrop = (e)=>{
@@ -2197,16 +2247,8 @@ function $5c06e4929e123553$export$ccdee5eaf73cf661(options) {
                 options.onDrop(event);
             }, 0);
         }
-        if (typeof options.onDropExit === 'function') {
-            let rect = e.currentTarget.getBoundingClientRect();
-            options.onDropExit({
-                type: 'dropexit',
-                x: e.clientX - rect.x,
-                y: e.clientY - rect.y
-            });
-        }
-        state.dragEnterCount = 0;
-        setDropTarget(false);
+        state.dragOverElements.clear();
+        fireDropExit(e);
         clearTimeout(state.dropActivateTimer);
     };
     let optionsRef = $fP8tg$useRef(options);
@@ -2252,6 +2294,11 @@ function $5c06e4929e123553$var$effectAllowedToOperations(effectAllowed) {
     if (allowedOperationsBits & $103790afe9474d1c$export$60b7b4bcf3903d8e.link) allowedOperations.push('link');
     return allowedOperations;
 }
+function $5c06e4929e123553$var$getDropOperation(effectAllowed, operation) {
+    let allowedOperationsBits = $103790afe9474d1c$export$9bbdfc78cf083e16[effectAllowed];
+    let op = $103790afe9474d1c$export$60b7b4bcf3903d8e[operation];
+    return allowedOperationsBits & op ? operation : 'cancel';
+}
 
 
 
@@ -2329,22 +2376,23 @@ function $4b52e4eff84e5217$export$f4e2f423c21f7b04(props, state1, ref2) {
     let autoScroll = $80d9daea3067eff3$export$6323452ca4533ed8(ref2);
     let { dropProps: dropProps  } = $5c06e4929e123553$export$ccdee5eaf73cf661({
         ref: ref2,
-        onDropEnter (e) {
-            let target = props.getDropTargetFromPoint(e.x, e.y);
-            state1.setTarget(target);
+        onDropEnter () {
+            state1.setTarget(localState.nextTarget);
         },
         onDropMove (e) {
             state1.setTarget(localState.nextTarget);
             autoScroll.move(e.x, e.y);
         },
         getDropOperationForPoint (types, allowedOperations, x, y) {
-            let target = props.getDropTargetFromPoint(x, y);
-            if (!target) {
+            let isValidDropTarget = (target)=>state1.getDropOperation(target, types, allowedOperations) !== 'cancel'
+            ;
+            let target1 = props.dropTargetDelegate.getDropTargetFromPoint(x, y, isValidDropTarget);
+            if (!target1) {
                 localState.dropOperation = 'cancel';
                 localState.nextTarget = null;
                 return 'cancel';
             }
-            localState.dropOperation = state1.getDropOperation(target, types, allowedOperations);
+            localState.dropOperation = state1.getDropOperation(target1, types, allowedOperations);
             // If the target doesn't accept the drop, see if the root accepts it instead.
             if (localState.dropOperation === 'cancel') {
                 let rootTarget = {
@@ -2352,11 +2400,11 @@ function $4b52e4eff84e5217$export$f4e2f423c21f7b04(props, state1, ref2) {
                 };
                 let dropOperation = state1.getDropOperation(rootTarget, types, allowedOperations);
                 if (dropOperation !== 'cancel') {
-                    target = rootTarget;
+                    target1 = rootTarget;
                     localState.dropOperation = dropOperation;
                 }
             }
-            localState.nextTarget = localState.dropOperation === 'cancel' ? null : target;
+            localState.nextTarget = localState.dropOperation === 'cancel' ? null : target1;
             return localState.dropOperation;
         },
         onDropExit () {
@@ -2717,7 +2765,8 @@ function $bfaab576ce1c580e$export$f7b0c5d28b66b6a5(options, state, ref) {
         dropProps: {
             ...dropProps,
             'aria-hidden': !dragSession || isValidDropTarget ? undefined : 'true'
-        }
+        },
+        isDropTarget: isDropTarget
     };
 }
 
@@ -2761,6 +2810,8 @@ function $ddf25448c71fc93a$export$8d0e41d2815afac5(props, state, ref1) {
             itemText: getText(after)
         });
     }
+    let isDropTarget = state.isDropTarget(target);
+    let ariaHidden = !dragSession ? 'true' : dropProps['aria-hidden'];
     return {
         dropIndicatorProps: {
             ...dropProps,
@@ -2768,9 +2819,14 @@ function $ddf25448c71fc93a$export$8d0e41d2815afac5(props, state, ref1) {
             'aria-roledescription': stringFormatter.format('dropIndicator'),
             'aria-label': label,
             'aria-labelledby': labelledBy,
-            'aria-hidden': !dragSession ? 'true' : dropProps['aria-hidden'],
+            'aria-hidden': ariaHidden,
             tabIndex: -1
-        }
+        },
+        isDropTarget: isDropTarget,
+        // If aria-hidden, we are either not in a drag session or the drop target is invalid.
+        // In that case, there's no need to render anything at all unless we need to show the indicator visually.
+        // This can happen when dragging using the native DnD API as opposed to keyboard dragging.
+        isHidden: !isDropTarget && !!ariaHidden
     };
 }
 
@@ -2785,6 +2841,7 @@ function $fd98cf7cbf233429$export$b35afafff42da2d9(props, state) {
             return state.getItems(props.key);
         },
         preview: state.preview,
+        getAllowedDropOperations: state.getAllowedDropOperations,
         onDragStart (e) {
             state.startDrag(props.key, e);
         },
@@ -2935,7 +2992,81 @@ function $ad0e3f3d9c50e4ba$var$DragPreview(props, ref) {
 let $ad0e3f3d9c50e4ba$export$905ab40ac2179daa = /*#__PURE__*/ $fP8tg$react.forwardRef($ad0e3f3d9c50e4ba$var$DragPreview);
 
 
+class $3ca85212bf8898e4$export$fbd65d14c79e28cc {
+    getDropTargetFromPoint(x, y, isValidDropTarget) {
+        if (this.collection.size === 0) return;
+        let rect = this.ref.current.getBoundingClientRect();
+        x += rect.x;
+        y += rect.y;
+        let elements = this.ref.current.querySelectorAll('[data-key]');
+        let elementMap = new Map();
+        for (let item of elements)if (item instanceof HTMLElement) elementMap.set(item.dataset.key, item);
+        let items = [
+            ...this.collection
+        ];
+        let low = 0;
+        let high = items.length;
+        while(low < high){
+            let mid = Math.floor((low + high) / 2);
+            let item = items[mid];
+            let element = elementMap.get(String(item.key));
+            let rect = element.getBoundingClientRect();
+            if (y < rect.top) high = mid;
+            else if (y > rect.bottom) low = mid + 1;
+            else {
+                let target = {
+                    type: 'item',
+                    key: item.key,
+                    dropPosition: 'on'
+                };
+                if (isValidDropTarget(target)) {
+                    // Otherwise, if dropping on the item is accepted, try the before/after positions if within 5px
+                    // of the top or bottom of the item.
+                    if (y <= rect.top + 5 && isValidDropTarget({
+                        ...target,
+                        dropPosition: 'before'
+                    })) target.dropPosition = 'before';
+                    else if (y >= rect.bottom - 5 && isValidDropTarget({
+                        ...target,
+                        dropPosition: 'after'
+                    })) target.dropPosition = 'after';
+                } else {
+                    // If dropping on the item isn't accepted, try the target before or after depending on the y position.
+                    let midY = rect.top + rect.height / 2;
+                    if (y <= midY && isValidDropTarget({
+                        ...target,
+                        dropPosition: 'before'
+                    })) target.dropPosition = 'before';
+                    else if (y >= midY && isValidDropTarget({
+                        ...target,
+                        dropPosition: 'after'
+                    })) target.dropPosition = 'after';
+                }
+                return target;
+            }
+        }
+        let item1 = items[Math.min(low, items.length - 1)];
+        let element = elementMap.get(String(item1.key));
+        rect = element.getBoundingClientRect();
+        if (Math.abs(y - rect.top) < Math.abs(y - rect.bottom)) return {
+            type: 'item',
+            key: item1.key,
+            dropPosition: 'before'
+        };
+        return {
+            type: 'item',
+            key: item1.key,
+            dropPosition: 'after'
+        };
+    }
+    constructor(collection, ref){
+        this.collection = collection;
+        this.ref = ref;
+    }
+}
+
+
 
 
-export {$8253ed7ece74b463$export$7941f8aafa4b6021 as useDrag, $5c06e4929e123553$export$ccdee5eaf73cf661 as useDrop, $4b52e4eff84e5217$export$f4e2f423c21f7b04 as useDroppableCollection, $bfaab576ce1c580e$export$f7b0c5d28b66b6a5 as useDroppableItem, $ddf25448c71fc93a$export$8d0e41d2815afac5 as useDropIndicator, $fd98cf7cbf233429$export$b35afafff42da2d9 as useDraggableItem, $9fcc7f0d70d084ee$export$2314ca2a3e892862 as useClipboard, $ad0e3f3d9c50e4ba$export$905ab40ac2179daa as DragPreview};
+export {$8253ed7ece74b463$export$7941f8aafa4b6021 as useDrag, $5c06e4929e123553$export$ccdee5eaf73cf661 as useDrop, $4b52e4eff84e5217$export$f4e2f423c21f7b04 as useDroppableCollection, $bfaab576ce1c580e$export$f7b0c5d28b66b6a5 as useDroppableItem, $ddf25448c71fc93a$export$8d0e41d2815afac5 as useDropIndicator, $fd98cf7cbf233429$export$b35afafff42da2d9 as useDraggableItem, $9fcc7f0d70d084ee$export$2314ca2a3e892862 as useClipboard, $ad0e3f3d9c50e4ba$export$905ab40ac2179daa as DragPreview, $3ca85212bf8898e4$export$fbd65d14c79e28cc as ListDropTargetDelegate};
 //# sourceMappingURL=module.js.map