@react-aria/dnd 3.0.0-alpha.7 → 3.0.0-alpha.8

package/dist/module.js

@@ -347,6 +347,7 @@ class $67560de7c78cb232$var$DragSession {
         window.addEventListener('focus', this.onFocus, true);
         window.addEventListener('blur', this.onBlur, true);
         document.addEventListener('click', this.onClick, true);
+        document.addEventListener('pointerdown', this.onPointerDown, true);
         for (let event of $67560de7c78cb232$var$CANCELED_EVENTS)document.addEventListener(event, this.cancelEvent, true);
         this.mutationObserver = new MutationObserver(()=>this.updateValidDropTargets()
         );
@@ -358,6 +359,7 @@ class $67560de7c78cb232$var$DragSession {
         window.removeEventListener('focus', this.onFocus, true);
         window.removeEventListener('blur', this.onBlur, true);
         document.removeEventListener('click', this.onClick, true);
+        document.removeEventListener('pointerdown', this.onPointerDown, true);
         for (let event of $67560de7c78cb232$var$CANCELED_EVENTS)document.removeEventListener(event, this.cancelEvent, true);
         this.mutationObserver.disconnect();
         this.restoreAriaHidden();
@@ -407,19 +409,26 @@ class $67560de7c78cb232$var$DragSession {
     }
     onClick(e) {
         this.cancelEvent(e);
-        if (e.detail !== 0) return;
-        if (e.target === this.dragTarget.element) {
-            this.cancel();
-            return;
-        }
-        let dropTarget = this.validDropTargets.find((target)=>target.element.contains(e.target)
-        );
-        if (dropTarget) {
-            let item = $67560de7c78cb232$var$dropItems.get(e.target);
-            this.setCurrentDropTarget(dropTarget, item);
-            this.drop(item);
+        if (e.detail === 0 || this.isVirtualClick) {
+            if (e.target === this.dragTarget.element) {
+                this.cancel();
+                return;
+            }
+            let dropTarget = this.validDropTargets.find((target)=>target.element.contains(e.target)
+            );
+            if (dropTarget) {
+                let item = $67560de7c78cb232$var$dropItems.get(e.target);
+                this.setCurrentDropTarget(dropTarget, item);
+                this.drop(item);
+            }
         }
     }
+    onPointerDown(e) {
+        // Android Talkback double tap has e.detail = 1 for onClick. Detect the virtual click in onPointerDown before onClick fires
+        // so we can properly perform cancel and drop operations.
+        this.cancelEvent(e);
+        this.isVirtualClick = $67560de7c78cb232$var$isVirtualPointerEvent(e);
+    }
     cancelEvent(e) {
         var ref;
         // Allow focusin and focusout on the drag target so focus ring works properly.
@@ -604,6 +613,7 @@ class $67560de7c78cb232$var$DragSession {
         this.onFocus = this.onFocus.bind(this);
         this.onBlur = this.onBlur.bind(this);
         this.onClick = this.onClick.bind(this);
+        this.onPointerDown = this.onPointerDown.bind(this);
         this.cancelEvent = this.cancelEvent.bind(this);
     }
 }
@@ -617,6 +627,14 @@ function $67560de7c78cb232$var$findValidDropTargets(options) {
         return true;
     });
 }
+function $67560de7c78cb232$var$isVirtualPointerEvent(event) {
+    // If the pointer size is zero, then we assume it's from a screen reader.
+    // Android TalkBack double tap will sometimes return a event with width and height of 1
+    // and pointerType === 'mouse' so we need to check for a specific combination of event attributes.
+    // Cannot use "event.pressure === 0" as the sole check due to Safari pointer events always returning pressure === 0
+    // instead of .5, see https://bugs.webkit.org/show_bug.cgi?id=206216
+    return event.width === 0 && event.height === 0 || event.width === 1 && event.height === 1 && event.pressure === 0 && event.detail === 0;
+}
 
 
 
@@ -858,6 +876,9 @@ function $8253ed7ece74b463$export$7941f8aafa4b6021(options) {
                     x = size.width / 2;
                     y = size.height / 2;
                 }
+                // Rounding height to an even number prevents blurry preview seen on some screens
+                let height = 2 * Math.round(rect.height / 2);
+                node.style.height = `${height}px`;
                 e1.dataTransfer.setDragImage(node, x, y);
                 // Remove the preview from the DOM after a frame so the browser has time to paint.
                 requestAnimationFrame(()=>{
@@ -1720,12 +1741,12 @@ function $fd98cf7cbf233429$export$b35afafff42da2d9(props, state) {
         }
     });
     let item = state.collection.getItem(props.key);
-    let numSelectedKeys = state.selectionManager.selectedKeys.size;
+    let numKeysForDrag = state.getKeysForDrag(props.key).size;
     let isSelected = state.selectionManager.isSelected(props.key);
     let message;
     var ref;
-    if (isSelected && numSelectedKeys > 1) message = formatMessage('dragSelectedItems', {
-        count: numSelectedKeys
+    if (isSelected && numKeysForDrag > 1) message = formatMessage('dragSelectedItems', {
+        count: numKeysForDrag
     });
     else message = formatMessage('dragItem', {
         itemText: (ref = item === null || item === void 0 ? void 0 : item.textValue) !== null && ref !== void 0 ? ref : ''