@react-aria/selection 3.7.3 → 3.8.2

package/dist/module.js

@@ -1,44 +1,44 @@
-import {useRef as $dgwbL$useRef, useEffect as $dgwbL$useEffect, useMemo as $dgwbL$useMemo} from "react";
-import {getFocusableTreeWalker as $dgwbL$getFocusableTreeWalker, focusSafely as $dgwbL$focusSafely} from "@react-aria/focus";
-import {focusWithoutScrolling as $dgwbL$focusWithoutScrolling, useEvent as $dgwbL$useEvent, scrollIntoView as $dgwbL$scrollIntoView, mergeProps as $dgwbL$mergeProps, isAppleDevice as $dgwbL$isAppleDevice, isMac as $dgwbL$isMac} from "@react-aria/utils";
-import {useLocale as $dgwbL$useLocale, useCollator as $dgwbL$useCollator} from "@react-aria/i18n";
-import {usePress as $dgwbL$usePress, useLongPress as $dgwbL$useLongPress} from "@react-aria/interactions";
+import {useRef as $eCAIO$useRef, useEffect as $eCAIO$useEffect, useMemo as $eCAIO$useMemo} from "react";
+import {getFocusableTreeWalker as $eCAIO$getFocusableTreeWalker, focusSafely as $eCAIO$focusSafely} from "@react-aria/focus";
+import {focusWithoutScrolling as $eCAIO$focusWithoutScrolling, useEvent as $eCAIO$useEvent, scrollIntoView as $eCAIO$scrollIntoView, mergeProps as $eCAIO$mergeProps, isAppleDevice as $eCAIO$isAppleDevice, isMac as $eCAIO$isMac} from "@react-aria/utils";
+import {useLocale as $eCAIO$useLocale, useCollator as $eCAIO$useCollator} from "@react-aria/i18n";
+import {usePress as $eCAIO$usePress, useLongPress as $eCAIO$useLongPress} from "@react-aria/interactions";
 
 function $parcel$export(e, n, v, s) {
   Object.defineProperty(e, n, {get: v, set: s, enumerable: true, configurable: true});
 }
-var $52ac987c016884e9$exports = {};
+var $ae20dd8cbca75726$exports = {};
 
-$parcel$export($52ac987c016884e9$exports, "useSelectableCollection", () => $52ac987c016884e9$export$d6daf82dcd84e87c);
+$parcel$export($ae20dd8cbca75726$exports, "useSelectableCollection", () => $ae20dd8cbca75726$export$d6daf82dcd84e87c);
 
 
 
 
 
-function $c636d3b6065ca9f6$export$d3e3bd3e26688c04(e) {
+function $feb5ffebff200149$export$d3e3bd3e26688c04(e) {
     // Ctrl + Arrow Up/Arrow Down has a system wide meaning on macOS, so use Alt instead.
     // On Windows and Ubuntu, Alt + Space has a system wide meaning.
-    return $dgwbL$isAppleDevice() ? e.altKey : e.ctrlKey;
+    return $eCAIO$isAppleDevice() ? e.altKey : e.ctrlKey;
 }
-function $c636d3b6065ca9f6$export$16792effe837dba3(e) {
-    if ($dgwbL$isMac()) return e.metaKey;
+function $feb5ffebff200149$export$16792effe837dba3(e) {
+    if ($eCAIO$isMac()) return e.metaKey;
     return e.ctrlKey;
 }
 
 
 
-var $a6f03d1cafa48b51$exports = {};
+var $fb3050f43d946246$exports = {};
 
-$parcel$export($a6f03d1cafa48b51$exports, "useTypeSelect", () => $a6f03d1cafa48b51$export$e32c88dfddc6e1d8);
+$parcel$export($fb3050f43d946246$exports, "useTypeSelect", () => $fb3050f43d946246$export$e32c88dfddc6e1d8);
 
-function $a6f03d1cafa48b51$export$e32c88dfddc6e1d8(options) {
+function $fb3050f43d946246$export$e32c88dfddc6e1d8(options) {
     let { keyboardDelegate: keyboardDelegate , selectionManager: selectionManager , onTypeSelect: onTypeSelect  } = options;
-    let state = $dgwbL$useRef({
+    let state = $eCAIO$useRef({
         search: '',
         timeout: null
     }).current;
     let onKeyDown = (e)=>{
-        let character = $a6f03d1cafa48b51$var$getStringForKey(e.key);
+        let character = $fb3050f43d946246$var$getStringForKey(e.key);
         if (!character || e.ctrlKey || e.metaKey) return;
         // Do not propagate the Spacebar event if it's meant to be part of the search.
         // When we time out, the search term becomes empty, hence the check on length.
@@ -71,7 +71,7 @@ function $a6f03d1cafa48b51$export$e32c88dfddc6e1d8(options) {
         }
     };
 }
-function $a6f03d1cafa48b51$var$getStringForKey(key) {
+function $fb3050f43d946246$var$getStringForKey(key) {
     // If the key is of length 1, it is an ASCII value.
     // Otherwise, if there are no ASCII characters in the key name,
     // it is a Unicode character.
@@ -81,10 +81,10 @@ function $a6f03d1cafa48b51$var$getStringForKey(key) {
 }
 
 
-function $52ac987c016884e9$export$d6daf82dcd84e87c(options) {
+function $ae20dd8cbca75726$export$d6daf82dcd84e87c(options) {
     let { selectionManager: manager , keyboardDelegate: delegate , ref: ref , autoFocus: autoFocus = false , shouldFocusWrap: shouldFocusWrap = false , disallowEmptySelection: disallowEmptySelection = false , disallowSelectAll: disallowSelectAll = false , selectOnFocus: selectOnFocus = manager.selectionBehavior === 'replace' , disallowTypeAhead: disallowTypeAhead = false , shouldUseVirtualFocus: shouldUseVirtualFocus , allowsTabNavigation: allowsTabNavigation = false , isVirtualized: isVirtualized , scrollRef: // If no scrollRef is provided, assume the collection ref is the scrollable region
     scrollRef = ref  } = options;
-    let { direction: direction  } = $dgwbL$useLocale();
+    let { direction: direction  } = $eCAIO$useLocale();
     let onKeyDown = (e)=>{
         // Prevent option + tab from doing anything since it doesn't move focus to the cells, only buttons/checkboxes
         if (e.altKey && e.key === 'Tab') e.preventDefault();
@@ -95,7 +95,7 @@ function $52ac987c016884e9$export$d6daf82dcd84e87c(options) {
             if (key != null) {
                 manager.setFocusedKey(key, childFocus);
                 if (e.shiftKey && manager.selectionMode === 'multiple') manager.extendSelection(key);
-                else if (selectOnFocus && !$c636d3b6065ca9f6$export$d3e3bd3e26688c04(e)) manager.replaceSelection(key);
+                else if (selectOnFocus && !$feb5ffebff200149$export$d3e3bd3e26688c04(e)) manager.replaceSelection(key);
             }
         };
         switch(e.key){
@@ -134,18 +134,18 @@ function $52ac987c016884e9$export$d6daf82dcd84e87c(options) {
             case 'Home':
                 if (delegate.getFirstKey) {
                     e.preventDefault();
-                    let firstKey = delegate.getFirstKey(manager.focusedKey, $c636d3b6065ca9f6$export$16792effe837dba3(e));
+                    let firstKey = delegate.getFirstKey(manager.focusedKey, $feb5ffebff200149$export$16792effe837dba3(e));
                     manager.setFocusedKey(firstKey);
-                    if ($c636d3b6065ca9f6$export$16792effe837dba3(e) && e.shiftKey && manager.selectionMode === 'multiple') manager.extendSelection(firstKey);
+                    if ($feb5ffebff200149$export$16792effe837dba3(e) && e.shiftKey && manager.selectionMode === 'multiple') manager.extendSelection(firstKey);
                     else if (selectOnFocus) manager.replaceSelection(firstKey);
                 }
                 break;
             case 'End':
                 if (delegate.getLastKey) {
                     e.preventDefault();
-                    let lastKey = delegate.getLastKey(manager.focusedKey, $c636d3b6065ca9f6$export$16792effe837dba3(e));
+                    let lastKey = delegate.getLastKey(manager.focusedKey, $feb5ffebff200149$export$16792effe837dba3(e));
                     manager.setFocusedKey(lastKey);
-                    if ($c636d3b6065ca9f6$export$16792effe837dba3(e) && e.shiftKey && manager.selectionMode === 'multiple') manager.extendSelection(lastKey);
+                    if ($feb5ffebff200149$export$16792effe837dba3(e) && e.shiftKey && manager.selectionMode === 'multiple') manager.extendSelection(lastKey);
                     else if (selectOnFocus) manager.replaceSelection(lastKey);
                 }
                 break;
@@ -164,7 +164,7 @@ function $52ac987c016884e9$export$d6daf82dcd84e87c(options) {
                 }
                 break;
             case 'a':
-                if ($c636d3b6065ca9f6$export$16792effe837dba3(e) && manager.selectionMode === 'multiple' && disallowSelectAll !== true) {
+                if ($feb5ffebff200149$export$16792effe837dba3(e) && manager.selectionMode === 'multiple' && disallowSelectAll !== true) {
                     e.preventDefault();
                     manager.selectAll();
                 }
@@ -183,7 +183,7 @@ function $52ac987c016884e9$export$d6daf82dcd84e87c(options) {
                     // rather than the currently focused one.
                     if (e.shiftKey) ref.current.focus();
                     else {
-                        let walker = $dgwbL$getFocusableTreeWalker(ref.current, {
+                        let walker = $eCAIO$getFocusableTreeWalker(ref.current, {
                             tabbable: true
                         });
                         let next;
@@ -192,18 +192,18 @@ function $52ac987c016884e9$export$d6daf82dcd84e87c(options) {
                             last = walker.lastChild();
                             if (last) next = last;
                         }while (last)
-                        if (next && !next.contains(document.activeElement)) $dgwbL$focusWithoutScrolling(next);
+                        if (next && !next.contains(document.activeElement)) $eCAIO$focusWithoutScrolling(next);
                     }
                     break;
                 }
         }
     };
     // Store the scroll position so we can restore it later.
-    let scrollPos = $dgwbL$useRef({
+    let scrollPos = $eCAIO$useRef({
         top: 0,
         left: 0
     });
-    $dgwbL$useEvent(scrollRef, 'scroll', isVirtualized ? null : ()=>{
+    $eCAIO$useEvent(scrollRef, 'scroll', isVirtualized ? null : ()=>{
         scrollPos.current = {
             top: scrollRef.current.scrollTop,
             left: scrollRef.current.scrollLeft
@@ -240,8 +240,8 @@ function $52ac987c016884e9$export$d6daf82dcd84e87c(options) {
             let element = scrollRef.current.querySelector(`[data-key="${manager.focusedKey}"]`);
             if (element) {
                 // This prevents a flash of focus on the first/last element in the collection
-                $dgwbL$focusWithoutScrolling(element);
-                $dgwbL$scrollIntoView(scrollRef.current, element);
+                $eCAIO$focusWithoutScrolling(element);
+                $eCAIO$scrollIntoView(scrollRef.current, element);
             }
         }
     };
@@ -249,8 +249,8 @@ function $52ac987c016884e9$export$d6daf82dcd84e87c(options) {
         // Don't set blurred and then focused again if moving focus within the collection.
         if (!e.currentTarget.contains(e.relatedTarget)) manager.setFocused(false);
     };
-    const autoFocusRef = $dgwbL$useRef(autoFocus);
-    $dgwbL$useEffect(()=>{
+    const autoFocusRef = $eCAIO$useRef(autoFocus);
+    $eCAIO$useEffect(()=>{
         if (autoFocusRef.current) {
             let focusedKey = null;
             // Check focus strategy to determine which item to focus
@@ -262,17 +262,17 @@ function $52ac987c016884e9$export$d6daf82dcd84e87c(options) {
             manager.setFocused(true);
             manager.setFocusedKey(focusedKey);
             // If no default focus key is selected, focus the collection itself.
-            if (focusedKey == null && !shouldUseVirtualFocus) $dgwbL$focusSafely(ref.current);
+            if (focusedKey == null && !shouldUseVirtualFocus) $eCAIO$focusSafely(ref.current);
         }
         autoFocusRef.current = false;
     // eslint-disable-next-line react-hooks/exhaustive-deps
     }, []);
     // If not virtualized, scroll the focused element into view when the focusedKey changes.
     // When virtualized, Virtualizer handles this internally.
-    $dgwbL$useEffect(()=>{
+    $eCAIO$useEffect(()=>{
         if (!isVirtualized && manager.focusedKey && (scrollRef === null || scrollRef === void 0 ? void 0 : scrollRef.current)) {
             let element = scrollRef.current.querySelector(`[data-key="${manager.focusedKey}"]`);
-            if (element) $dgwbL$scrollIntoView(scrollRef.current, element);
+            if (element) $eCAIO$scrollIntoView(scrollRef.current, element);
         }
     }, [
         isVirtualized,
@@ -289,11 +289,11 @@ function $52ac987c016884e9$export$d6daf82dcd84e87c(options) {
             e.preventDefault();
         }
     };
-    let { typeSelectProps: typeSelectProps  } = $a6f03d1cafa48b51$export$e32c88dfddc6e1d8({
+    let { typeSelectProps: typeSelectProps  } = $fb3050f43d946246$export$e32c88dfddc6e1d8({
         keyboardDelegate: delegate,
         selectionManager: manager
     });
-    if (!disallowTypeAhead) handlers = $dgwbL$mergeProps(typeSelectProps, handlers);
+    if (!disallowTypeAhead) handlers = $eCAIO$mergeProps(typeSelectProps, handlers);
     // If nothing is focused within the collection, make the collection itself tabbable.
     // This will be marshalled to either the first or last item depending on where focus came from.
     // If using virtual focus, don't set a tabIndex at all so that VoiceOver on iOS 14 doesn't try
@@ -309,35 +309,35 @@ function $52ac987c016884e9$export$d6daf82dcd84e87c(options) {
 }
 
 
-var $5ec5a493f6042709$exports = {};
+var $880e95eb8b93ba9a$exports = {};
 
-$parcel$export($5ec5a493f6042709$exports, "useSelectableItem", () => $5ec5a493f6042709$export$ecf600387e221c37);
+$parcel$export($880e95eb8b93ba9a$exports, "useSelectableItem", () => $880e95eb8b93ba9a$export$ecf600387e221c37);
 
 
 
 
 
-function $5ec5a493f6042709$export$ecf600387e221c37(options) {
-    let { selectionManager: manager , key: key , ref: ref , shouldSelectOnPressUp: shouldSelectOnPressUp , isVirtualized: isVirtualized , shouldUseVirtualFocus: shouldUseVirtualFocus , focus: focus , isDisabled: isDisabled , onAction: onAction  } = options;
+function $880e95eb8b93ba9a$export$ecf600387e221c37(options) {
+    let { selectionManager: manager , key: key , ref: ref , shouldSelectOnPressUp: shouldSelectOnPressUp , isVirtualized: isVirtualized , shouldUseVirtualFocus: shouldUseVirtualFocus , focus: focus , isDisabled: isDisabled , onAction: onAction , allowsDifferentPressOrigin: allowsDifferentPressOrigin  } = options;
     let onSelect = (e)=>{
-        if (e.pointerType === 'keyboard' && $c636d3b6065ca9f6$export$d3e3bd3e26688c04(e)) manager.toggleSelection(key);
+        if (e.pointerType === 'keyboard' && $feb5ffebff200149$export$d3e3bd3e26688c04(e)) manager.toggleSelection(key);
         else {
             if (manager.selectionMode === 'none') return;
             if (manager.selectionMode === 'single') {
                 if (manager.isSelected(key) && !manager.disallowEmptySelection) manager.toggleSelection(key);
                 else manager.replaceSelection(key);
             } else if (e && e.shiftKey) manager.extendSelection(key);
-            else if (manager.selectionBehavior === 'toggle' || e && ($c636d3b6065ca9f6$export$16792effe837dba3(e) || e.pointerType === 'touch' || e.pointerType === 'virtual')) // if touch or virtual (VO) then we just want to toggle, otherwise it's impossible to multi select because they don't have modifier keys
+            else if (manager.selectionBehavior === 'toggle' || e && ($feb5ffebff200149$export$16792effe837dba3(e) || e.pointerType === 'touch' || e.pointerType === 'virtual')) // if touch or virtual (VO) then we just want to toggle, otherwise it's impossible to multi select because they don't have modifier keys
             manager.toggleSelection(key);
             else manager.replaceSelection(key);
         }
     };
     // Focus the associated DOM node when this item becomes the focusedKey
     let isFocused = key === manager.focusedKey;
-    $dgwbL$useEffect(()=>{
+    $eCAIO$useEffect(()=>{
         if (isFocused && manager.isFocused && !shouldUseVirtualFocus && document.activeElement !== ref.current) {
             if (focus) focus();
-            else $dgwbL$focusSafely(ref.current);
+            else $eCAIO$focusSafely(ref.current);
         }
     }, [
         ref,
@@ -358,7 +358,7 @@ function $5ec5a493f6042709$export$ecf600387e221c37(options) {
             if (e.target === ref.current) manager.setFocusedKey(key);
         }
     };
-    let modality = $dgwbL$useRef(null);
+    let modality = $eCAIO$useRef(null);
     let hasPrimaryAction = onAction && manager.selectionMode === 'none';
     let hasSecondaryAction = onAction && manager.selectionMode !== 'none' && manager.selectionBehavior === 'replace';
     let allowsSelection = !isDisabled && manager.canSelectItem(key);
@@ -376,11 +376,19 @@ function $5ec5a493f6042709$export$ecf600387e221c37(options) {
             modality.current = e.pointerType;
             if (e.pointerType === 'keyboard') onSelect(e);
         };
-        itemPressProps.onPressUp = (e)=>{
+        // If allowsDifferentPressOrigin, make selection happen on pressUp (e.g. open menu on press down, selection on menu item happens on press up.)
+        // Otherwise, have selection happen onPress (prevents listview row selection when clicking on interactable elements in the row)
+        if (!allowsDifferentPressOrigin) itemPressProps.onPress = (e)=>{
             if (e.pointerType !== 'keyboard') onSelect(e);
+            if (hasPrimaryAction) onAction();
         };
-        itemPressProps.onPress = hasPrimaryAction ? ()=>onAction()
-         : null;
+        else {
+            itemPressProps.onPressUp = (e)=>{
+                if (e.pointerType !== 'keyboard') onSelect(e);
+            };
+            itemPressProps.onPress = hasPrimaryAction ? ()=>onAction()
+             : null;
+        }
     } else {
         // On touch, it feels strange to select on touch down, so we special case this.
         itemPressProps.onPressStart = (e)=>{
@@ -398,7 +406,7 @@ function $5ec5a493f6042709$export$ecf600387e221c37(options) {
     }
     if (!isVirtualized) itemProps['data-key'] = key;
     itemPressProps.preventFocusOnPress = shouldUseVirtualFocus;
-    let { pressProps: pressProps , isPressed: isPressed  } = $dgwbL$usePress(itemPressProps);
+    let { pressProps: pressProps , isPressed: isPressed  } = $eCAIO$usePress(itemPressProps);
     // Double clicking with a mouse with selectionBehavior = 'replace' performs an action.
     let onDoubleClick = hasSecondaryAction ? (e)=>{
         if (modality.current === 'mouse') {
@@ -411,7 +419,7 @@ function $5ec5a493f6042709$export$ecf600387e221c37(options) {
     // to 'toggle'. This changes the single tap behavior from performing an action (i.e. navigating) to
     // selecting, and may toggle the appearance of a UI affordance like checkboxes on each item.
     // TODO: what about when drag and drop is also enabled??
-    let { longPressProps: longPressProps  } = $dgwbL$useLongPress({
+    let { longPressProps: longPressProps  } = $eCAIO$useLongPress({
         isDisabled: !hasSecondaryAction,
         onLongPress (e) {
             if (e.pointerType === 'touch') {
@@ -425,7 +433,7 @@ function $5ec5a493f6042709$export$ecf600387e221c37(options) {
         if (e.key === 'Enter') onAction();
     } : undefined;
     return {
-        itemProps: $dgwbL$mergeProps(itemProps, allowsSelection || hasPrimaryAction ? pressProps : {
+        itemProps: $eCAIO$mergeProps(itemProps, allowsSelection || hasPrimaryAction ? pressProps : {
         }, hasSecondaryAction ? longPressProps : {
         }, {
             onKeyUp: onKeyUp,
@@ -436,14 +444,14 @@ function $5ec5a493f6042709$export$ecf600387e221c37(options) {
 }
 
 
-var $38e0ab555fbd8768$exports = {};
+var $982254629710d113$exports = {};
 
-$parcel$export($38e0ab555fbd8768$exports, "useSelectableList", () => $38e0ab555fbd8768$export$b95089534ab7c1fd);
+$parcel$export($982254629710d113$exports, "useSelectableList", () => $982254629710d113$export$b95089534ab7c1fd);
 
-var $8dd8d9b0d53d6ca8$exports = {};
+var $2a25aae57d74318e$exports = {};
 
-$parcel$export($8dd8d9b0d53d6ca8$exports, "ListKeyboardDelegate", () => $8dd8d9b0d53d6ca8$export$a05409b8bb224a5a);
-class $8dd8d9b0d53d6ca8$export$a05409b8bb224a5a {
+$parcel$export($2a25aae57d74318e$exports, "ListKeyboardDelegate", () => $2a25aae57d74318e$export$a05409b8bb224a5a);
+class $2a25aae57d74318e$export$a05409b8bb224a5a {
     getKeyBelow(key) {
         key = this.collection.getKeyAfter(key);
         while(key != null){
@@ -524,15 +532,15 @@ class $8dd8d9b0d53d6ca8$export$a05409b8bb224a5a {
 
 
 
-function $38e0ab555fbd8768$export$b95089534ab7c1fd(props) {
+function $982254629710d113$export$b95089534ab7c1fd(props) {
     let { selectionManager: selectionManager , collection: collection , disabledKeys: disabledKeys , ref: ref , keyboardDelegate: keyboardDelegate , autoFocus: autoFocus , shouldFocusWrap: shouldFocusWrap , isVirtualized: isVirtualized , disallowEmptySelection: disallowEmptySelection , selectOnFocus: selectOnFocus = false , disallowTypeAhead: disallowTypeAhead , shouldUseVirtualFocus: shouldUseVirtualFocus , allowsTabNavigation: allowsTabNavigation  } = props;
     // By default, a KeyboardDelegate is provided which uses the DOM to query layout information (e.g. for page up/page down).
     // When virtualized, the layout object will be passed in as a prop and override this.
-    let collator = $dgwbL$useCollator({
+    let collator = $eCAIO$useCollator({
         usage: 'search',
         sensitivity: 'base'
     });
-    let delegate = $dgwbL$useMemo(()=>keyboardDelegate || new $8dd8d9b0d53d6ca8$export$a05409b8bb224a5a(collection, disabledKeys, ref, collator)
+    let delegate = $eCAIO$useMemo(()=>keyboardDelegate || new $2a25aae57d74318e$export$a05409b8bb224a5a(collection, disabledKeys, ref, collator)
     , [
         keyboardDelegate,
         collection,
@@ -540,7 +548,7 @@ function $38e0ab555fbd8768$export$b95089534ab7c1fd(props) {
         ref,
         collator
     ]);
-    let { collectionProps: collectionProps  } = $52ac987c016884e9$export$d6daf82dcd84e87c({
+    let { collectionProps: collectionProps  } = $ae20dd8cbca75726$export$d6daf82dcd84e87c({
         ref: ref,
         selectionManager: selectionManager,
         keyboardDelegate: delegate,
@@ -564,5 +572,5 @@ function $38e0ab555fbd8768$export$b95089534ab7c1fd(props) {
 
 
 
-export {$52ac987c016884e9$export$d6daf82dcd84e87c as useSelectableCollection, $5ec5a493f6042709$export$ecf600387e221c37 as useSelectableItem, $38e0ab555fbd8768$export$b95089534ab7c1fd as useSelectableList, $8dd8d9b0d53d6ca8$export$a05409b8bb224a5a as ListKeyboardDelegate, $a6f03d1cafa48b51$export$e32c88dfddc6e1d8 as useTypeSelect};
+export {$ae20dd8cbca75726$export$d6daf82dcd84e87c as useSelectableCollection, $880e95eb8b93ba9a$export$ecf600387e221c37 as useSelectableItem, $982254629710d113$export$b95089534ab7c1fd as useSelectableList, $2a25aae57d74318e$export$a05409b8bb224a5a as ListKeyboardDelegate, $fb3050f43d946246$export$e32c88dfddc6e1d8 as useTypeSelect};
 //# sourceMappingURL=module.js.map