@react-aria/selection 3.16.2 → 3.17.0

package/dist/import.mjs

@@ -1,6 +1,7 @@
+import {flushSync as $eCAIO$flushSync} from "react-dom";
 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, scrollIntoViewport as $eCAIO$scrollIntoViewport, scrollIntoView as $eCAIO$scrollIntoView, mergeProps as $eCAIO$mergeProps, isAppleDevice as $eCAIO$isAppleDevice, isMac as $eCAIO$isMac, isScrollable as $eCAIO$isScrollable} from "@react-aria/utils";
+import {useRouter as $eCAIO$useRouter, focusWithoutScrolling as $eCAIO$focusWithoutScrolling, useEvent as $eCAIO$useEvent, scrollIntoViewport as $eCAIO$scrollIntoViewport, scrollIntoView as $eCAIO$scrollIntoView, mergeProps as $eCAIO$mergeProps, isAppleDevice as $eCAIO$isAppleDevice, isMac as $eCAIO$isMac, openLink as $eCAIO$openLink, isScrollable as $eCAIO$isScrollable} from "@react-aria/utils";
 import {getInteractionModality as $eCAIO$getInteractionModality, usePress as $eCAIO$usePress, useLongPress as $eCAIO$useLongPress} from "@react-aria/interactions";
 import {useLocale as $eCAIO$useLocale, useCollator as $eCAIO$useCollator} from "@react-aria/i18n";
 
@@ -28,6 +29,7 @@ import {useLocale as $eCAIO$useLocale, useCollator as $eCAIO$useCollator} from "
 
 
 
+
 /*
  * Copyright 2020 Adobe. All rights reserved.
  * This file is licensed to you under the Apache License, Version 2.0 (the "License");
@@ -66,7 +68,7 @@ function $feb5ffebff200149$export$16792effe837dba3(e) {
  * Controls how long to wait before clearing the typeahead buffer.
  */ const $fb3050f43d946246$var$TYPEAHEAD_DEBOUNCE_WAIT_MS = 1000; // 1 second
 function $fb3050f43d946246$export$e32c88dfddc6e1d8(options) {
-    let { keyboardDelegate: keyboardDelegate , selectionManager: selectionManager , onTypeSelect: onTypeSelect  } = options;
+    let { keyboardDelegate: keyboardDelegate, selectionManager: selectionManager, onTypeSelect: onTypeSelect } = options;
     let state = (0, $eCAIO$useRef)({
         search: "",
         timeout: null
@@ -116,9 +118,10 @@ function $fb3050f43d946246$var$getStringForKey(key) {
 
 
 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  } = (0, $eCAIO$useLocale)();
+    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, linkBehavior: linkBehavior = "action" } = options;
+    let { direction: direction } = (0, $eCAIO$useLocale)();
+    let router = (0, $eCAIO$useRouter)();
     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();
@@ -127,7 +130,17 @@ function $ae20dd8cbca75726$export$d6daf82dcd84e87c(options) {
         if (!ref.current.contains(e.target)) return;
         const navigateToKey = (key, childFocus)=>{
             if (key != null) {
+                if (manager.isLink(key) && linkBehavior === "selection" && selectOnFocus && !(0, $feb5ffebff200149$export$d3e3bd3e26688c04)(e)) {
+                    // Set focused key and re-render synchronously to bring item into view if needed.
+                    (0, $eCAIO$flushSync)(()=>{
+                        manager.setFocusedKey(key, childFocus);
+                    });
+                    let item = scrollRef.current.querySelector(`[data-key="${key}"]`);
+                    router.open(item, e);
+                    return;
+                }
                 manager.setFocusedKey(key, childFocus);
+                if (manager.isLink(key) && linkBehavior === "override") return;
                 if (e.shiftKey && manager.selectionMode === "multiple") manager.extendSelection(key);
                 else if (selectOnFocus && !(0, $feb5ffebff200149$export$d3e3bd3e26688c04)(e)) manager.replaceSelection(key);
             }
@@ -344,7 +357,7 @@ function $ae20dd8cbca75726$export$d6daf82dcd84e87c(options) {
             e.preventDefault();
         }
     };
-    let { typeSelectProps: typeSelectProps  } = (0, $fb3050f43d946246$export$e32c88dfddc6e1d8)({
+    let { typeSelectProps: typeSelectProps } = (0, $fb3050f43d946246$export$e32c88dfddc6e1d8)({
         keyboardDelegate: delegate,
         selectionManager: manager
     });
@@ -380,11 +393,20 @@ function $ae20dd8cbca75726$export$d6daf82dcd84e87c(options) {
 
 
 function $880e95eb8b93ba9a$export$ecf600387e221c37(options) {
-    let { selectionManager: manager , key: key , ref: ref , shouldSelectOnPressUp: shouldSelectOnPressUp , shouldUseVirtualFocus: shouldUseVirtualFocus , focus: focus , isDisabled: isDisabled , onAction: onAction , allowsDifferentPressOrigin: allowsDifferentPressOrigin  } = options;
+    let { selectionManager: manager, key: key, ref: ref, shouldSelectOnPressUp: shouldSelectOnPressUp, shouldUseVirtualFocus: shouldUseVirtualFocus, focus: focus, isDisabled: isDisabled, onAction: onAction, allowsDifferentPressOrigin: allowsDifferentPressOrigin, linkBehavior: linkBehavior = "action" } = options;
+    let router = (0, $eCAIO$useRouter)();
     let onSelect = (e)=>{
         if (e.pointerType === "keyboard" && (0, $feb5ffebff200149$export$d3e3bd3e26688c04)(e)) manager.toggleSelection(key);
         else {
             if (manager.selectionMode === "none") return;
+            if (manager.isLink(key)) {
+                if (linkBehavior === "selection") {
+                    router.open(ref.current, e);
+                    // Always set selected keys back to what they were so that select and combobox close.
+                    manager.setSelectedKeys(manager.selectedKeys);
+                    return;
+                } else if (linkBehavior === "override" || linkBehavior === "none") return;
+            }
             if (manager.selectionMode === "single") {
                 if (manager.isSelected(key) && !manager.disallowEmptySelection) manager.toggleSelection(key);
                 else manager.replaceSelection(key);
@@ -429,15 +451,21 @@ function $880e95eb8b93ba9a$export$ecf600387e221c37(options) {
     // Clicking the checkbox enters selection mode, after which clicking anywhere on any row toggles selection for that row.
     // With highlight selection, onAction is secondary, and occurs on double click. Single click selects the row.
     // With touch, onAction occurs on single tap, and long press enters selection mode.
-    let allowsSelection = !isDisabled && manager.canSelectItem(key);
-    let allowsActions = onAction && !isDisabled;
-    let hasPrimaryAction = allowsActions && (manager.selectionBehavior === "replace" ? !allowsSelection : manager.isEmpty);
+    let isLinkOverride = manager.isLink(key) && linkBehavior === "override";
+    let hasLinkAction = manager.isLink(key) && linkBehavior !== "selection" && linkBehavior !== "none";
+    let allowsSelection = !isDisabled && manager.canSelectItem(key) && !isLinkOverride;
+    let allowsActions = (onAction || hasLinkAction) && !isDisabled;
+    let hasPrimaryAction = allowsActions && (manager.selectionBehavior === "replace" ? !allowsSelection : !allowsSelection || manager.isEmpty);
     let hasSecondaryAction = allowsActions && allowsSelection && manager.selectionBehavior === "replace";
     let hasAction = hasPrimaryAction || hasSecondaryAction;
     let modality = (0, $eCAIO$useRef)(null);
     let longPressEnabled = hasAction && allowsSelection;
     let longPressEnabledOnPressStart = (0, $eCAIO$useRef)(false);
     let hadPrimaryActionOnPressStart = (0, $eCAIO$useRef)(false);
+    let performAction = (e)=>{
+        if (onAction) onAction();
+        if (hasLinkAction) router.open(ref.current, e);
+    };
     // By default, selection occurs on pointer down. This can be strange if selecting an
     // item causes the UI to disappear immediately (e.g. menus).
     // If shouldSelectOnPressUp is true, we use onPressUp instead of onPressStart.
@@ -457,14 +485,14 @@ function $880e95eb8b93ba9a$export$ecf600387e221c37(options) {
         if (!allowsDifferentPressOrigin) itemPressProps.onPress = (e)=>{
             if (hasPrimaryAction || hasSecondaryAction && e.pointerType !== "mouse") {
                 if (e.pointerType === "keyboard" && !$880e95eb8b93ba9a$var$isActionKey()) return;
-                onAction();
-            } else if (e.pointerType !== "keyboard") onSelect(e);
+                performAction(e);
+            } else if (e.pointerType !== "keyboard" && allowsSelection) onSelect(e);
         };
         else {
-            itemPressProps.onPressUp = (e)=>{
-                if (e.pointerType !== "keyboard") onSelect(e);
+            itemPressProps.onPressUp = hasPrimaryAction ? null : (e)=>{
+                if (e.pointerType !== "keyboard" && allowsSelection) onSelect(e);
             };
-            itemPressProps.onPress = hasPrimaryAction ? ()=>onAction() : null;
+            itemPressProps.onPress = hasPrimaryAction ? performAction : null;
         }
     } else {
         itemPressProps.onPressStart = (e)=>{
@@ -474,33 +502,33 @@ function $880e95eb8b93ba9a$export$ecf600387e221c37(options) {
             // Select on mouse down unless there is a primary action which will occur on mouse up.
             // For keyboard, select on key down. If there is an action, the Space key selects on key down,
             // and the Enter key performs onAction on key up.
-            if (e.pointerType === "mouse" && !hasPrimaryAction || e.pointerType === "keyboard" && (!onAction || $880e95eb8b93ba9a$var$isSelectionKey())) onSelect(e);
+            if (allowsSelection && (e.pointerType === "mouse" && !hasPrimaryAction || e.pointerType === "keyboard" && (!allowsActions || $880e95eb8b93ba9a$var$isSelectionKey()))) onSelect(e);
         };
         itemPressProps.onPress = (e)=>{
             // Selection occurs on touch up. Primary actions always occur on pointer up.
             // Both primary and secondary actions occur on Enter key up. The only exception
             // is secondary actions, which occur on double click with a mouse.
             if (e.pointerType === "touch" || e.pointerType === "pen" || e.pointerType === "virtual" || e.pointerType === "keyboard" && hasAction && $880e95eb8b93ba9a$var$isActionKey() || e.pointerType === "mouse" && hadPrimaryActionOnPressStart.current) {
-                if (hasAction) onAction();
-                else onSelect(e);
+                if (hasAction) performAction(e);
+                else if (allowsSelection) onSelect(e);
             }
         };
     }
     itemProps["data-key"] = key;
     itemPressProps.preventFocusOnPress = shouldUseVirtualFocus;
-    let { pressProps: pressProps , isPressed: isPressed  } = (0, $eCAIO$usePress)(itemPressProps);
+    let { pressProps: pressProps, isPressed: isPressed } = (0, $eCAIO$usePress)(itemPressProps);
     // Double clicking with a mouse with selectionBehavior = 'replace' performs an action.
     let onDoubleClick = hasSecondaryAction ? (e)=>{
         if (modality.current === "mouse") {
             e.stopPropagation();
             e.preventDefault();
-            onAction();
+            performAction(e);
         }
     } : undefined;
     // Long pressing an item with touch when selectionBehavior = 'replace' switches the selection behavior
     // 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.
-    let { longPressProps: longPressProps  } = (0, $eCAIO$useLongPress)({
+    let { longPressProps: longPressProps } = (0, $eCAIO$useLongPress)({
         isDisabled: !longPressEnabled,
         onLongPress (e) {
             if (e.pointerType === "touch") {
@@ -516,10 +544,16 @@ function $880e95eb8b93ba9a$export$ecf600387e221c37(options) {
     let onDragStartCapture = (e)=>{
         if (modality.current === "touch" && longPressEnabledOnPressStart.current) e.preventDefault();
     };
+    // Prevent default on link clicks so that we control exactly
+    // when they open (to match selection behavior).
+    let onClick = manager.isLink(key) ? (e)=>{
+        if (!(0, $eCAIO$openLink).isOpening) e.preventDefault();
+    } : undefined;
     return {
         itemProps: (0, $eCAIO$mergeProps)(itemProps, allowsSelection || hasPrimaryAction ? pressProps : {}, longPressEnabled ? longPressProps : {}, {
             onDoubleClick: onDoubleClick,
-            onDragStartCapture: onDragStartCapture
+            onDragStartCapture: onDragStartCapture,
+            onClick: onClick
         }),
         isPressed: isPressed,
         isSelected: manager.isSelected(key),
@@ -550,6 +584,7 @@ function $880e95eb8b93ba9a$var$isSelectionKey() {
  * OF ANY KIND, either express or implied. See the License for the specific language
  * governing permissions and limitations under the License.
  */ 
+
 /*
  * Copyright 2020 Adobe. All rights reserved.
  * This file is licensed to you under the Apache License, Version 2.0 (the "License");
@@ -712,6 +747,7 @@ class $2a25aae57d74318e$export$a05409b8bb224a5a {
             let opts = args[0];
             this.collection = opts.collection;
             this.ref = opts.ref;
+            this.collator = opts.collator;
             this.disabledKeys = opts.disabledKeys || new Set();
             this.orientation = opts.orientation;
             this.direction = opts.direction;
@@ -735,9 +771,8 @@ class $2a25aae57d74318e$export$a05409b8bb224a5a {
 
 
 
-
 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 = selectionManager.selectionBehavior === "replace" , disallowTypeAhead: disallowTypeAhead , shouldUseVirtualFocus: shouldUseVirtualFocus , allowsTabNavigation: allowsTabNavigation  } = props;
+    let { selectionManager: selectionManager, collection: collection, disabledKeys: disabledKeys, ref: ref, keyboardDelegate: keyboardDelegate } = 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 = (0, $eCAIO$useCollator)({
@@ -753,19 +788,11 @@ function $982254629710d113$export$b95089534ab7c1fd(props) {
         collator,
         disabledBehavior
     ]);
-    let { collectionProps: collectionProps  } = (0, $ae20dd8cbca75726$export$d6daf82dcd84e87c)({
+    let { collectionProps: collectionProps } = (0, $ae20dd8cbca75726$export$d6daf82dcd84e87c)({
+        ...props,
         ref: ref,
         selectionManager: selectionManager,
-        keyboardDelegate: delegate,
-        autoFocus: autoFocus,
-        shouldFocusWrap: shouldFocusWrap,
-        disallowEmptySelection: disallowEmptySelection,
-        selectOnFocus: selectOnFocus,
-        disallowTypeAhead: disallowTypeAhead,
-        shouldUseVirtualFocus: shouldUseVirtualFocus,
-        allowsTabNavigation: allowsTabNavigation,
-        isVirtualized: isVirtualized,
-        scrollRef: ref
+        keyboardDelegate: delegate
     });
     return {
         listProps: collectionProps

package/dist/main.js

@@ -1,3 +1,4 @@
+var $glPPV$reactdom = require("react-dom");
 var $glPPV$react = require("react");
 var $glPPV$reactariafocus = require("@react-aria/focus");
 var $glPPV$reactariautils = require("@react-aria/utils");
@@ -37,6 +38,7 @@ $parcel$export(module.exports, "useTypeSelect", () => $a1189052f36475e8$export$e
 
 
 
+
 /*
  * Copyright 2020 Adobe. All rights reserved.
  * This file is licensed to you under the Apache License, Version 2.0 (the "License");
@@ -75,7 +77,7 @@ function $ee0bdf4faa47f2a8$export$16792effe837dba3(e) {
  * Controls how long to wait before clearing the typeahead buffer.
  */ const $a1189052f36475e8$var$TYPEAHEAD_DEBOUNCE_WAIT_MS = 1000; // 1 second
 function $a1189052f36475e8$export$e32c88dfddc6e1d8(options) {
-    let { keyboardDelegate: keyboardDelegate , selectionManager: selectionManager , onTypeSelect: onTypeSelect  } = options;
+    let { keyboardDelegate: keyboardDelegate, selectionManager: selectionManager, onTypeSelect: onTypeSelect } = options;
     let state = (0, $glPPV$react.useRef)({
         search: "",
         timeout: null
@@ -125,9 +127,10 @@ function $a1189052f36475e8$var$getStringForKey(key) {
 
 
 function $b6837c2f80a3c32f$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  } = (0, $glPPV$reactariai18n.useLocale)();
+    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, linkBehavior: linkBehavior = "action" } = options;
+    let { direction: direction } = (0, $glPPV$reactariai18n.useLocale)();
+    let router = (0, $glPPV$reactariautils.useRouter)();
     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();
@@ -136,7 +139,17 @@ function $b6837c2f80a3c32f$export$d6daf82dcd84e87c(options) {
         if (!ref.current.contains(e.target)) return;
         const navigateToKey = (key, childFocus)=>{
             if (key != null) {
+                if (manager.isLink(key) && linkBehavior === "selection" && selectOnFocus && !(0, $ee0bdf4faa47f2a8$export$d3e3bd3e26688c04)(e)) {
+                    // Set focused key and re-render synchronously to bring item into view if needed.
+                    (0, $glPPV$reactdom.flushSync)(()=>{
+                        manager.setFocusedKey(key, childFocus);
+                    });
+                    let item = scrollRef.current.querySelector(`[data-key="${key}"]`);
+                    router.open(item, e);
+                    return;
+                }
                 manager.setFocusedKey(key, childFocus);
+                if (manager.isLink(key) && linkBehavior === "override") return;
                 if (e.shiftKey && manager.selectionMode === "multiple") manager.extendSelection(key);
                 else if (selectOnFocus && !(0, $ee0bdf4faa47f2a8$export$d3e3bd3e26688c04)(e)) manager.replaceSelection(key);
             }
@@ -353,7 +366,7 @@ function $b6837c2f80a3c32f$export$d6daf82dcd84e87c(options) {
             e.preventDefault();
         }
     };
-    let { typeSelectProps: typeSelectProps  } = (0, $a1189052f36475e8$export$e32c88dfddc6e1d8)({
+    let { typeSelectProps: typeSelectProps } = (0, $a1189052f36475e8$export$e32c88dfddc6e1d8)({
         keyboardDelegate: delegate,
         selectionManager: manager
     });
@@ -389,11 +402,20 @@ function $b6837c2f80a3c32f$export$d6daf82dcd84e87c(options) {
 
 
 function $433b1145b0781e10$export$ecf600387e221c37(options) {
-    let { selectionManager: manager , key: key , ref: ref , shouldSelectOnPressUp: shouldSelectOnPressUp , shouldUseVirtualFocus: shouldUseVirtualFocus , focus: focus , isDisabled: isDisabled , onAction: onAction , allowsDifferentPressOrigin: allowsDifferentPressOrigin  } = options;
+    let { selectionManager: manager, key: key, ref: ref, shouldSelectOnPressUp: shouldSelectOnPressUp, shouldUseVirtualFocus: shouldUseVirtualFocus, focus: focus, isDisabled: isDisabled, onAction: onAction, allowsDifferentPressOrigin: allowsDifferentPressOrigin, linkBehavior: linkBehavior = "action" } = options;
+    let router = (0, $glPPV$reactariautils.useRouter)();
     let onSelect = (e)=>{
         if (e.pointerType === "keyboard" && (0, $ee0bdf4faa47f2a8$export$d3e3bd3e26688c04)(e)) manager.toggleSelection(key);
         else {
             if (manager.selectionMode === "none") return;
+            if (manager.isLink(key)) {
+                if (linkBehavior === "selection") {
+                    router.open(ref.current, e);
+                    // Always set selected keys back to what they were so that select and combobox close.
+                    manager.setSelectedKeys(manager.selectedKeys);
+                    return;
+                } else if (linkBehavior === "override" || linkBehavior === "none") return;
+            }
             if (manager.selectionMode === "single") {
                 if (manager.isSelected(key) && !manager.disallowEmptySelection) manager.toggleSelection(key);
                 else manager.replaceSelection(key);
@@ -438,15 +460,21 @@ function $433b1145b0781e10$export$ecf600387e221c37(options) {
     // Clicking the checkbox enters selection mode, after which clicking anywhere on any row toggles selection for that row.
     // With highlight selection, onAction is secondary, and occurs on double click. Single click selects the row.
     // With touch, onAction occurs on single tap, and long press enters selection mode.
-    let allowsSelection = !isDisabled && manager.canSelectItem(key);
-    let allowsActions = onAction && !isDisabled;
-    let hasPrimaryAction = allowsActions && (manager.selectionBehavior === "replace" ? !allowsSelection : manager.isEmpty);
+    let isLinkOverride = manager.isLink(key) && linkBehavior === "override";
+    let hasLinkAction = manager.isLink(key) && linkBehavior !== "selection" && linkBehavior !== "none";
+    let allowsSelection = !isDisabled && manager.canSelectItem(key) && !isLinkOverride;
+    let allowsActions = (onAction || hasLinkAction) && !isDisabled;
+    let hasPrimaryAction = allowsActions && (manager.selectionBehavior === "replace" ? !allowsSelection : !allowsSelection || manager.isEmpty);
     let hasSecondaryAction = allowsActions && allowsSelection && manager.selectionBehavior === "replace";
     let hasAction = hasPrimaryAction || hasSecondaryAction;
     let modality = (0, $glPPV$react.useRef)(null);
     let longPressEnabled = hasAction && allowsSelection;
     let longPressEnabledOnPressStart = (0, $glPPV$react.useRef)(false);
     let hadPrimaryActionOnPressStart = (0, $glPPV$react.useRef)(false);
+    let performAction = (e)=>{
+        if (onAction) onAction();
+        if (hasLinkAction) router.open(ref.current, e);
+    };
     // By default, selection occurs on pointer down. This can be strange if selecting an
     // item causes the UI to disappear immediately (e.g. menus).
     // If shouldSelectOnPressUp is true, we use onPressUp instead of onPressStart.
@@ -466,14 +494,14 @@ function $433b1145b0781e10$export$ecf600387e221c37(options) {
         if (!allowsDifferentPressOrigin) itemPressProps.onPress = (e)=>{
             if (hasPrimaryAction || hasSecondaryAction && e.pointerType !== "mouse") {
                 if (e.pointerType === "keyboard" && !$433b1145b0781e10$var$isActionKey()) return;
-                onAction();
-            } else if (e.pointerType !== "keyboard") onSelect(e);
+                performAction(e);
+            } else if (e.pointerType !== "keyboard" && allowsSelection) onSelect(e);
         };
         else {
-            itemPressProps.onPressUp = (e)=>{
-                if (e.pointerType !== "keyboard") onSelect(e);
+            itemPressProps.onPressUp = hasPrimaryAction ? null : (e)=>{
+                if (e.pointerType !== "keyboard" && allowsSelection) onSelect(e);
             };
-            itemPressProps.onPress = hasPrimaryAction ? ()=>onAction() : null;
+            itemPressProps.onPress = hasPrimaryAction ? performAction : null;
         }
     } else {
         itemPressProps.onPressStart = (e)=>{
@@ -483,33 +511,33 @@ function $433b1145b0781e10$export$ecf600387e221c37(options) {
             // Select on mouse down unless there is a primary action which will occur on mouse up.
             // For keyboard, select on key down. If there is an action, the Space key selects on key down,
             // and the Enter key performs onAction on key up.
-            if (e.pointerType === "mouse" && !hasPrimaryAction || e.pointerType === "keyboard" && (!onAction || $433b1145b0781e10$var$isSelectionKey())) onSelect(e);
+            if (allowsSelection && (e.pointerType === "mouse" && !hasPrimaryAction || e.pointerType === "keyboard" && (!allowsActions || $433b1145b0781e10$var$isSelectionKey()))) onSelect(e);
         };
         itemPressProps.onPress = (e)=>{
             // Selection occurs on touch up. Primary actions always occur on pointer up.
             // Both primary and secondary actions occur on Enter key up. The only exception
             // is secondary actions, which occur on double click with a mouse.
             if (e.pointerType === "touch" || e.pointerType === "pen" || e.pointerType === "virtual" || e.pointerType === "keyboard" && hasAction && $433b1145b0781e10$var$isActionKey() || e.pointerType === "mouse" && hadPrimaryActionOnPressStart.current) {
-                if (hasAction) onAction();
-                else onSelect(e);
+                if (hasAction) performAction(e);
+                else if (allowsSelection) onSelect(e);
             }
         };
     }
     itemProps["data-key"] = key;
     itemPressProps.preventFocusOnPress = shouldUseVirtualFocus;
-    let { pressProps: pressProps , isPressed: isPressed  } = (0, $glPPV$reactariainteractions.usePress)(itemPressProps);
+    let { pressProps: pressProps, isPressed: isPressed } = (0, $glPPV$reactariainteractions.usePress)(itemPressProps);
     // Double clicking with a mouse with selectionBehavior = 'replace' performs an action.
     let onDoubleClick = hasSecondaryAction ? (e)=>{
         if (modality.current === "mouse") {
             e.stopPropagation();
             e.preventDefault();
-            onAction();
+            performAction(e);
         }
     } : undefined;
     // Long pressing an item with touch when selectionBehavior = 'replace' switches the selection behavior
     // 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.
-    let { longPressProps: longPressProps  } = (0, $glPPV$reactariainteractions.useLongPress)({
+    let { longPressProps: longPressProps } = (0, $glPPV$reactariainteractions.useLongPress)({
         isDisabled: !longPressEnabled,
         onLongPress (e) {
             if (e.pointerType === "touch") {
@@ -525,10 +553,16 @@ function $433b1145b0781e10$export$ecf600387e221c37(options) {
     let onDragStartCapture = (e)=>{
         if (modality.current === "touch" && longPressEnabledOnPressStart.current) e.preventDefault();
     };
+    // Prevent default on link clicks so that we control exactly
+    // when they open (to match selection behavior).
+    let onClick = manager.isLink(key) ? (e)=>{
+        if (!(0, $glPPV$reactariautils.openLink).isOpening) e.preventDefault();
+    } : undefined;
     return {
         itemProps: (0, $glPPV$reactariautils.mergeProps)(itemProps, allowsSelection || hasPrimaryAction ? pressProps : {}, longPressEnabled ? longPressProps : {}, {
             onDoubleClick: onDoubleClick,
-            onDragStartCapture: onDragStartCapture
+            onDragStartCapture: onDragStartCapture,
+            onClick: onClick
         }),
         isPressed: isPressed,
         isSelected: manager.isSelected(key),
@@ -559,6 +593,7 @@ function $433b1145b0781e10$var$isSelectionKey() {
  * OF ANY KIND, either express or implied. See the License for the specific language
  * governing permissions and limitations under the License.
  */ 
+
 /*
  * Copyright 2020 Adobe. All rights reserved.
  * This file is licensed to you under the Apache License, Version 2.0 (the "License");
@@ -721,6 +756,7 @@ class $836f880b12dcae5c$export$a05409b8bb224a5a {
             let opts = args[0];
             this.collection = opts.collection;
             this.ref = opts.ref;
+            this.collator = opts.collator;
             this.disabledKeys = opts.disabledKeys || new Set();
             this.orientation = opts.orientation;
             this.direction = opts.direction;
@@ -744,9 +780,8 @@ class $836f880b12dcae5c$export$a05409b8bb224a5a {
 
 
 
-
 function $bd230acee196f50c$export$b95089534ab7c1fd(props) {
-    let { selectionManager: selectionManager , collection: collection , disabledKeys: disabledKeys , ref: ref , keyboardDelegate: keyboardDelegate , autoFocus: autoFocus , shouldFocusWrap: shouldFocusWrap , isVirtualized: isVirtualized , disallowEmptySelection: disallowEmptySelection , selectOnFocus: selectOnFocus = selectionManager.selectionBehavior === "replace" , disallowTypeAhead: disallowTypeAhead , shouldUseVirtualFocus: shouldUseVirtualFocus , allowsTabNavigation: allowsTabNavigation  } = props;
+    let { selectionManager: selectionManager, collection: collection, disabledKeys: disabledKeys, ref: ref, keyboardDelegate: keyboardDelegate } = 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 = (0, $glPPV$reactariai18n.useCollator)({
@@ -762,19 +797,11 @@ function $bd230acee196f50c$export$b95089534ab7c1fd(props) {
         collator,
         disabledBehavior
     ]);
-    let { collectionProps: collectionProps  } = (0, $b6837c2f80a3c32f$export$d6daf82dcd84e87c)({
+    let { collectionProps: collectionProps } = (0, $b6837c2f80a3c32f$export$d6daf82dcd84e87c)({
+        ...props,
         ref: ref,
         selectionManager: selectionManager,
-        keyboardDelegate: delegate,
-        autoFocus: autoFocus,
-        shouldFocusWrap: shouldFocusWrap,
-        disallowEmptySelection: disallowEmptySelection,
-        selectOnFocus: selectOnFocus,
-        disallowTypeAhead: disallowTypeAhead,
-        shouldUseVirtualFocus: shouldUseVirtualFocus,
-        allowsTabNavigation: allowsTabNavigation,
-        isVirtualized: isVirtualized,
-        scrollRef: ref
+        keyboardDelegate: delegate
     });
     return {
         listProps: collectionProps