@react-aria/dnd 3.0.0-nightly.3491 → 3.0.0-nightly.3502

package/dist/main.js

@@ -329,7 +329,7 @@ function $28e10663603f5ea1$export$549dbcf8649bf3b2(target1, stringFormatter) {
     $28e10663603f5ea1$var$dragSession = new $28e10663603f5ea1$var$DragSession(target1, stringFormatter);
     requestAnimationFrame(()=>{
         $28e10663603f5ea1$var$dragSession.setup();
-        if ($4620ae0dc40f0031$export$1fb2158d224b542c() === 'keyboard' || $4620ae0dc40f0031$export$1fb2158d224b542c() === 'touch' && $4vY0V$reactariainteractions.getInteractionModality() === 'virtual') {
+        if ($4620ae0dc40f0031$export$1fb2158d224b542c() === 'keyboard') {
             let target = $28e10663603f5ea1$var$dragSession.findNearestDropTarget();
             $28e10663603f5ea1$var$dragSession.setCurrentDropTarget(target);
         }
@@ -379,7 +379,6 @@ const $28e10663603f5ea1$var$CANCELED_EVENTS = [
     'touchstart',
     'touchmove',
     'touchend',
-    'keyup',
     'focusin',
     'focusout'
 ];
@@ -396,6 +395,7 @@ const $28e10663603f5ea1$var$MESSAGES = {
 class $28e10663603f5ea1$var$DragSession {
     setup() {
         document.addEventListener('keydown', this.onKeyDown, true);
+        document.addEventListener('keyup', this.onKeyUp, true);
         window.addEventListener('focus', this.onFocus, true);
         window.addEventListener('blur', this.onBlur, true);
         document.addEventListener('click', this.onClick, true);
@@ -408,6 +408,7 @@ class $28e10663603f5ea1$var$DragSession {
     }
     teardown() {
         document.removeEventListener('keydown', this.onKeyDown, true);
+        document.removeEventListener('keyup', this.onKeyUp, true);
         window.removeEventListener('focus', this.onFocus, true);
         window.removeEventListener('blur', this.onBlur, true);
         document.removeEventListener('click', this.onClick, true);
@@ -423,17 +424,19 @@ class $28e10663603f5ea1$var$DragSession {
             this.cancel();
             return;
         }
-        if (e.key === 'Enter') {
-            if (e.altKey) this.activate();
-            else this.drop();
-            return;
-        }
         if (e.key === 'Tab' && !(e.metaKey || e.altKey || e.ctrlKey)) {
             if (e.shiftKey) this.previous();
             else this.next();
         }
         if (typeof ((ref = this.currentDropTarget) === null || ref === void 0 ? void 0 : ref.onKeyDown) === 'function') this.currentDropTarget.onKeyDown(e, this.dragTarget);
     }
+    onKeyUp(e) {
+        this.cancelEvent(e);
+        if (e.key === 'Enter') {
+            if (e.altKey) this.activate();
+            else this.drop();
+        }
+    }
     onFocus(e) {
         // Prevent focus events, except to the original drag target.
         if (e.target !== this.dragTarget.element) this.cancelEvent(e);
@@ -460,7 +463,7 @@ class $28e10663603f5ea1$var$DragSession {
     }
     onClick(e) {
         this.cancelEvent(e);
-        if (e.detail === 0 || this.isVirtualClick) {
+        if ($4vY0V$reactariautils.isVirtualClick(e) || this.isVirtualClick) {
             if (e.target === this.dragTarget.element) {
                 this.cancel();
                 return;
@@ -478,7 +481,7 @@ class $28e10663603f5ea1$var$DragSession {
         // 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 = $28e10663603f5ea1$var$isVirtualPointerEvent(e);
+        this.isVirtualClick = $4vY0V$reactariautils.isVirtualPointerEvent(e);
     }
     cancelEvent(e) {
         var ref;
@@ -694,6 +697,7 @@ class $28e10663603f5ea1$var$DragSession {
         this.dragTarget = target;
         this.stringFormatter = stringFormatter;
         this.onKeyDown = this.onKeyDown.bind(this);
+        this.onKeyUp = this.onKeyUp.bind(this);
         this.onFocus = this.onFocus.bind(this);
         this.onBlur = this.onBlur.bind(this);
         this.onClick = this.onClick.bind(this);
@@ -712,14 +716,6 @@ function $28e10663603f5ea1$var$findValidDropTargets(options) {
         return true;
     });
 }
-function $28e10663603f5ea1$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;
-}
 
 
 
@@ -2842,11 +2838,7 @@ function $dc204e8ec58447a6$export$7941f8aafa4b6021(options) {
         setDragging(true);
     };
     let modality = $4620ae0dc40f0031$export$49bac5d6d4b352ea();
-    let message;
-    if (!isDraggingRef.current) {
-        if (modality === 'touch' && !hasDragButton) message = 'dragDescriptionLongPress';
-        else message = $dc204e8ec58447a6$var$MESSAGES[modality].start;
-    } else message = $dc204e8ec58447a6$var$MESSAGES[modality].end;
+    let message = !isDraggingRef.current ? $dc204e8ec58447a6$var$MESSAGES[modality].start : $dc204e8ec58447a6$var$MESSAGES[modality].end;
     let descriptionProps = $4vY0V$reactariautils.useDescription(stringFormatter.format(message));
     let interactions;
     if (!hasDragButton) // If there's no separate button to trigger accessible drag and drop mode,
@@ -2858,7 +2850,8 @@ function $dc204e8ec58447a6$export$7941f8aafa4b6021(options) {
     interactions = {
         ...descriptionProps,
         onPointerDown (e) {
-            // Try to detect virtual drags.
+            modalityOnPointerDown.current = $4vY0V$reactariautils.isVirtualPointerEvent(e.nativeEvent) ? 'virtual' : e.pointerType;
+            // Try to detect virtual drag passthrough gestures.
             if (e.width < 1 && e.height < 1) // iOS VoiceOver.
             modalityOnPointerDown.current = 'virtual';
             else {
@@ -2867,7 +2860,7 @@ function $dc204e8ec58447a6$export$7941f8aafa4b6021(options) {
                 let offsetY = e.clientY - rect.y;
                 let centerX = rect.width / 2;
                 let centerY = rect.height / 2;
-                if (Math.abs(offsetX - centerX) < 0.5 && Math.abs(offsetY - centerY) < 0.5) // Android TalkBack.
+                if (Math.abs(offsetX - centerX) <= 0.5 && Math.abs(offsetY - centerY) <= 0.5) // Android TalkBack.
                 modalityOnPointerDown.current = 'virtual';
                 else modalityOnPointerDown.current = e.pointerType;
             }
@@ -2884,6 +2877,14 @@ function $dc204e8ec58447a6$export$7941f8aafa4b6021(options) {
                 e.stopPropagation();
                 startDragging(e.target);
             }
+        },
+        onClick (e) {
+            // Handle NVDA/JAWS in browse mode, and touch screen readers. In this case, no keyboard events are fired.
+            if ($4vY0V$reactariautils.isVirtualClick(e.nativeEvent) || modalityOnPointerDown.current === 'virtual') {
+                e.preventDefault();
+                e.stopPropagation();
+                startDragging(e.target);
+            }
         }
     };
     return {
@@ -3911,13 +3912,16 @@ function $0cbbd00cda972c67$export$b35afafff42da2d9(props, state) {
     // Override description to include selected item count.
     let modality = $4620ae0dc40f0031$export$49bac5d6d4b352ea();
     var ref;
-    if (!props.hasDragButton) {
+    if (!props.hasDragButton && state.selectionManager.selectionMode !== 'none') {
         let msg = $0cbbd00cda972c67$var$MESSAGES[modality][isSelected ? 'selected' : 'notSelected'];
         if (props.hasAction && modality === 'keyboard') msg += 'Alt';
         if (isSelected) description = stringFormatter.format(msg, {
             count: numKeysForDrag
         });
         else description = stringFormatter.format(msg);
+        // Remove the onClick handler from useDrag. Long pressing will be required on touch devices,
+        // and NVDA/JAWS are always in forms mode within collection components.
+        delete dragProps.onClick;
     } else if (isSelected) dragButtonLabel = stringFormatter.format('dragSelectedItems', {
         count: numKeysForDrag
     });
@@ -4079,7 +4083,9 @@ let $2dccaca1f4baa446$export$905ab40ac2179daa = /*#__PURE__*/ ($parcel$interopDe
 
 class $2268795bbb597ecb$export$fbd65d14c79e28cc {
     getDropTargetFromPoint(x, y, isValidDropTarget) {
-        if (this.collection.size === 0) return;
+        if (this.collection.size === 0) return {
+            type: 'root'
+        };
         let rect = this.ref.current.getBoundingClientRect();
         x += rect.x;
         y += rect.y;