@react-aria/selection 3.17.5 → 3.18.0

package/dist/useTypeSelect.module.js

@@ -0,0 +1,68 @@
+import {useRef as $dAE4Y$useRef} from "react";
+
+/*
+ * Copyright 2020 Adobe. All rights reserved.
+ * This file is licensed to you under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License. You may obtain a copy
+ * of the License at http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under
+ * the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR REPRESENTATIONS
+ * OF ANY KIND, either express or implied. See the License for the specific language
+ * governing permissions and limitations under the License.
+ */ 
+/**
+ * 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 state = (0, $dAE4Y$useRef)({
+        search: "",
+        timeout: null
+    }).current;
+    let onKeyDown = (e)=>{
+        let character = $fb3050f43d946246$var$getStringForKey(e.key);
+        if (!character || e.ctrlKey || e.metaKey || !e.currentTarget.contains(e.target)) 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.
+        // Trimming is to account for the case of pressing the Spacebar more than once,
+        // which should cycle through the selection/deselection of the focused item.
+        if (character === " " && state.search.trim().length > 0) {
+            e.preventDefault();
+            if (!("continuePropagation" in e)) e.stopPropagation();
+        }
+        state.search += character;
+        // Use the delegate to find a key to focus.
+        // Prioritize items after the currently focused item, falling back to searching the whole list.
+        let key = keyboardDelegate.getKeyForSearch(state.search, selectionManager.focusedKey);
+        // If no key found, search from the top.
+        if (key == null) key = keyboardDelegate.getKeyForSearch(state.search);
+        if (key != null) {
+            selectionManager.setFocusedKey(key);
+            if (onTypeSelect) onTypeSelect(key);
+        }
+        clearTimeout(state.timeout);
+        state.timeout = setTimeout(()=>{
+            state.search = "";
+        }, $fb3050f43d946246$var$TYPEAHEAD_DEBOUNCE_WAIT_MS);
+    };
+    return {
+        typeSelectProps: {
+            // Using a capturing listener to catch the keydown event before
+            // other hooks in order to handle the Spacebar event.
+            onKeyDownCapture: keyboardDelegate.getKeyForSearch ? onKeyDown : null
+        }
+    };
+}
+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.
+    // See https://www.w3.org/TR/uievents-key/
+    if (key.length === 1 || !/^[A-Z]/i.test(key)) return key;
+    return "";
+}
+
+
+export {$fb3050f43d946246$export$e32c88dfddc6e1d8 as useTypeSelect};
+//# sourceMappingURL=useTypeSelect.module.js.map

package/dist/useTypeSelect.module.js.map

@@ -0,0 +1 @@
+{"mappings":";;AAAA;;;;;;;;;;CAUC;AAMD;;CAEC,GACD,MAAM,mDAA6B,MAAM,WAAW;AA2B7C,SAAS,0CAAc,OAA8B;IAC1D,IAAI,oBAAC,gBAAgB,oBAAE,gBAAgB,gBAAE,YAAY,EAAC,GAAG;IACzD,IAAI,QAAQ,CAAA,GAAA,aAAK,EAAE;QACjB,QAAQ;QACR,SAAS;IACX,GAAG,OAAO;IAEV,IAAI,YAAY,CAAC;QACf,IAAI,YAAY,sCAAgB,EAAE,GAAG;QACrC,IAAI,CAAC,aAAa,EAAE,OAAO,IAAI,EAAE,OAAO,IAAI,CAAC,EAAE,aAAa,CAAC,QAAQ,CAAC,EAAE,MAAM,GAC5E;QAGF,8EAA8E;QAC9E,8EAA8E;QAC9E,+EAA+E;QAC/E,4EAA4E;QAC5E,IAAI,cAAc,OAAO,MAAM,MAAM,CAAC,IAAI,GAAG,MAAM,GAAG,GAAG;YACvD,EAAE,cAAc;YAChB,IAAI,CAAE,CAAA,yBAAyB,CAAA,GAC7B,EAAE,eAAe;QAErB;QAEA,MAAM,MAAM,IAAI;QAEhB,2CAA2C;QAC3C,+FAA+F;QAC/F,IAAI,MAAM,iBAAiB,eAAe,CAAC,MAAM,MAAM,EAAE,iBAAiB,UAAU;QAEpF,wCAAwC;QACxC,IAAI,OAAO,MACT,MAAM,iBAAiB,eAAe,CAAC,MAAM,MAAM;QAGrD,IAAI,OAAO,MAAM;YACf,iBAAiB,aAAa,CAAC;YAC/B,IAAI,cACF,aAAa;QAEjB;QAEA,aAAa,MAAM,OAAO;QAC1B,MAAM,OAAO,GAAG,WAAW;YACzB,MAAM,MAAM,GAAG;QACjB,GAAG;IACL;IAEA,OAAO;QACL,iBAAiB;YACf,+DAA+D;YAC/D,qDAAqD;YACrD,kBAAkB,iBAAiB,eAAe,GAAG,YAAY;QACnE;IACF;AACF;AAEA,SAAS,sCAAgB,GAAW;IAClC,mDAAmD;IACnD,+DAA+D;IAC/D,6BAA6B;IAC7B,0CAA0C;IAC1C,IAAI,IAAI,MAAM,KAAK,KAAK,CAAC,UAAU,IAAI,CAAC,MACtC,OAAO;IAGT,OAAO;AACT","sources":["packages/@react-aria/selection/src/useTypeSelect.ts"],"sourcesContent":["/*\n * Copyright 2020 Adobe. All rights reserved.\n * This file is licensed to you under the Apache License, Version 2.0 (the \"License\");\n * you may not use this file except in compliance with the License. You may obtain a copy\n * of the License at http://www.apache.org/licenses/LICENSE-2.0\n *\n * Unless required by applicable law or agreed to in writing, software distributed under\n * the License is distributed on an \"AS IS\" BASIS, WITHOUT WARRANTIES OR REPRESENTATIONS\n * OF ANY KIND, either express or implied. See the License for the specific language\n * governing permissions and limitations under the License.\n */\n\nimport {DOMAttributes, Key, KeyboardDelegate} from '@react-types/shared';\nimport {KeyboardEvent, useRef} from 'react';\nimport {MultipleSelectionManager} from '@react-stately/selection';\n\n/**\n * Controls how long to wait before clearing the typeahead buffer.\n */\nconst TYPEAHEAD_DEBOUNCE_WAIT_MS = 1000; // 1 second\n\nexport interface AriaTypeSelectOptions {\n  /**\n   * A delegate that returns collection item keys with respect to visual layout.\n   */\n  keyboardDelegate: KeyboardDelegate,\n  /**\n   * An interface for reading and updating multiple selection state.\n   */\n  selectionManager: MultipleSelectionManager,\n  /**\n   * Called when an item is focused by typing.\n   */\n  onTypeSelect?: (key: Key) => void\n}\n\nexport interface TypeSelectAria {\n  /**\n   * Props to be spread on the owner of the options.\n   */\n  typeSelectProps: DOMAttributes\n}\n\n/**\n * Handles typeahead interactions with collections.\n */\nexport function useTypeSelect(options: AriaTypeSelectOptions): TypeSelectAria {\n  let {keyboardDelegate, selectionManager, onTypeSelect} = options;\n  let state = useRef({\n    search: '',\n    timeout: null\n  }).current;\n\n  let onKeyDown = (e: KeyboardEvent) => {\n    let character = getStringForKey(e.key);\n    if (!character || e.ctrlKey || e.metaKey || !e.currentTarget.contains(e.target as HTMLElement)) {\n      return;\n    }\n\n    // Do not propagate the Spacebar event if it's meant to be part of the search.\n    // When we time out, the search term becomes empty, hence the check on length.\n    // Trimming is to account for the case of pressing the Spacebar more than once,\n    // which should cycle through the selection/deselection of the focused item.\n    if (character === ' ' && state.search.trim().length > 0) {\n      e.preventDefault();\n      if (!('continuePropagation' in e)) {\n        e.stopPropagation();\n      }\n    }\n\n    state.search += character;\n\n    // Use the delegate to find a key to focus.\n    // Prioritize items after the currently focused item, falling back to searching the whole list.\n    let key = keyboardDelegate.getKeyForSearch(state.search, selectionManager.focusedKey);\n\n    // If no key found, search from the top.\n    if (key == null) {\n      key = keyboardDelegate.getKeyForSearch(state.search);\n    }\n\n    if (key != null) {\n      selectionManager.setFocusedKey(key);\n      if (onTypeSelect) {\n        onTypeSelect(key);\n      }\n    }\n\n    clearTimeout(state.timeout);\n    state.timeout = setTimeout(() => {\n      state.search = '';\n    }, TYPEAHEAD_DEBOUNCE_WAIT_MS);\n  };\n\n  return {\n    typeSelectProps: {\n      // Using a capturing listener to catch the keydown event before\n      // other hooks in order to handle the Spacebar event.\n      onKeyDownCapture: keyboardDelegate.getKeyForSearch ? onKeyDown : null\n    }\n  };\n}\n\nfunction getStringForKey(key: string) {\n  // If the key is of length 1, it is an ASCII value.\n  // Otherwise, if there are no ASCII characters in the key name,\n  // it is a Unicode character.\n  // See https://www.w3.org/TR/uievents-key/\n  if (key.length === 1 || !/^[A-Z]/i.test(key)) {\n    return key;\n  }\n\n  return '';\n}\n"],"names":[],"version":3,"file":"useTypeSelect.module.js.map"}

package/dist/utils.main.js

@@ -0,0 +1,32 @@
+var $gP8Dl$reactariautils = require("@react-aria/utils");
+
+
+function $parcel$export(e, n, v, s) {
+  Object.defineProperty(e, n, {get: v, set: s, enumerable: true, configurable: true});
+}
+
+$parcel$export(module.exports, "isNonContiguousSelectionModifier", () => $ee0bdf4faa47f2a8$export$d3e3bd3e26688c04);
+$parcel$export(module.exports, "isCtrlKeyPressed", () => $ee0bdf4faa47f2a8$export$16792effe837dba3);
+/*
+ * Copyright 2020 Adobe. All rights reserved.
+ * This file is licensed to you under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License. You may obtain a copy
+ * of the License at http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under
+ * the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR REPRESENTATIONS
+ * OF ANY KIND, either express or implied. See the License for the specific language
+ * governing permissions and limitations under the License.
+ */ 
+function $ee0bdf4faa47f2a8$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 (0, $gP8Dl$reactariautils.isAppleDevice)() ? e.altKey : e.ctrlKey;
+}
+function $ee0bdf4faa47f2a8$export$16792effe837dba3(e) {
+    if ((0, $gP8Dl$reactariautils.isMac)()) return e.metaKey;
+    return e.ctrlKey;
+}
+
+
+//# sourceMappingURL=utils.main.js.map

package/dist/utils.main.js.map

@@ -0,0 +1 @@
+{"mappings":";;;;;;;;;AAAA;;;;;;;;;;CAUC;AAUM,SAAS,0CAAiC,CAAQ;IACvD,qFAAqF;IACrF,gEAAgE;IAChE,OAAO,CAAA,GAAA,mCAAY,MAAM,EAAE,MAAM,GAAG,EAAE,OAAO;AAC/C;AAEO,SAAS,0CAAiB,CAAQ;IACvC,IAAI,CAAA,GAAA,2BAAI,KACN,OAAO,EAAE,OAAO;IAGlB,OAAO,EAAE,OAAO;AAClB","sources":["packages/@react-aria/selection/src/utils.ts"],"sourcesContent":["/*\n * Copyright 2020 Adobe. All rights reserved.\n * This file is licensed to you under the Apache License, Version 2.0 (the \"License\");\n * you may not use this file except in compliance with the License. You may obtain a copy\n * of the License at http://www.apache.org/licenses/LICENSE-2.0\n *\n * Unless required by applicable law or agreed to in writing, software distributed under\n * the License is distributed on an \"AS IS\" BASIS, WITHOUT WARRANTIES OR REPRESENTATIONS\n * OF ANY KIND, either express or implied. See the License for the specific language\n * governing permissions and limitations under the License.\n */\n\nimport {isAppleDevice, isMac} from '@react-aria/utils';\n\ninterface Event {\n  altKey: boolean,\n  ctrlKey: boolean,\n  metaKey: boolean\n}\n\nexport function isNonContiguousSelectionModifier(e: Event) {\n  // Ctrl + Arrow Up/Arrow Down has a system wide meaning on macOS, so use Alt instead.\n  // On Windows and Ubuntu, Alt + Space has a system wide meaning.\n  return isAppleDevice() ? e.altKey : e.ctrlKey;\n}\n\nexport function isCtrlKeyPressed(e: Event) {\n  if (isMac()) {\n    return e.metaKey;\n  }\n\n  return e.ctrlKey;\n}\n"],"names":[],"version":3,"file":"utils.main.js.map"}

package/dist/utils.mjs

@@ -0,0 +1,26 @@
+import {isAppleDevice as $jUnAJ$isAppleDevice, isMac as $jUnAJ$isMac} from "@react-aria/utils";
+
+/*
+ * Copyright 2020 Adobe. All rights reserved.
+ * This file is licensed to you under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License. You may obtain a copy
+ * of the License at http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under
+ * the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR REPRESENTATIONS
+ * OF ANY KIND, either express or implied. See the License for the specific language
+ * governing permissions and limitations under the License.
+ */ 
+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 (0, $jUnAJ$isAppleDevice)() ? e.altKey : e.ctrlKey;
+}
+function $feb5ffebff200149$export$16792effe837dba3(e) {
+    if ((0, $jUnAJ$isMac)()) return e.metaKey;
+    return e.ctrlKey;
+}
+
+
+export {$feb5ffebff200149$export$d3e3bd3e26688c04 as isNonContiguousSelectionModifier, $feb5ffebff200149$export$16792effe837dba3 as isCtrlKeyPressed};
+//# sourceMappingURL=utils.mjs.map

package/dist/utils.module.js

@@ -0,0 +1,26 @@
+import {isAppleDevice as $jUnAJ$isAppleDevice, isMac as $jUnAJ$isMac} from "@react-aria/utils";
+
+/*
+ * Copyright 2020 Adobe. All rights reserved.
+ * This file is licensed to you under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License. You may obtain a copy
+ * of the License at http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under
+ * the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR REPRESENTATIONS
+ * OF ANY KIND, either express or implied. See the License for the specific language
+ * governing permissions and limitations under the License.
+ */ 
+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 (0, $jUnAJ$isAppleDevice)() ? e.altKey : e.ctrlKey;
+}
+function $feb5ffebff200149$export$16792effe837dba3(e) {
+    if ((0, $jUnAJ$isMac)()) return e.metaKey;
+    return e.ctrlKey;
+}
+
+
+export {$feb5ffebff200149$export$d3e3bd3e26688c04 as isNonContiguousSelectionModifier, $feb5ffebff200149$export$16792effe837dba3 as isCtrlKeyPressed};
+//# sourceMappingURL=utils.module.js.map

package/dist/utils.module.js.map

@@ -0,0 +1 @@
+{"mappings":";;AAAA;;;;;;;;;;CAUC;AAUM,SAAS,0CAAiC,CAAQ;IACvD,qFAAqF;IACrF,gEAAgE;IAChE,OAAO,CAAA,GAAA,oBAAY,MAAM,EAAE,MAAM,GAAG,EAAE,OAAO;AAC/C;AAEO,SAAS,0CAAiB,CAAQ;IACvC,IAAI,CAAA,GAAA,YAAI,KACN,OAAO,EAAE,OAAO;IAGlB,OAAO,EAAE,OAAO;AAClB","sources":["packages/@react-aria/selection/src/utils.ts"],"sourcesContent":["/*\n * Copyright 2020 Adobe. All rights reserved.\n * This file is licensed to you under the Apache License, Version 2.0 (the \"License\");\n * you may not use this file except in compliance with the License. You may obtain a copy\n * of the License at http://www.apache.org/licenses/LICENSE-2.0\n *\n * Unless required by applicable law or agreed to in writing, software distributed under\n * the License is distributed on an \"AS IS\" BASIS, WITHOUT WARRANTIES OR REPRESENTATIONS\n * OF ANY KIND, either express or implied. See the License for the specific language\n * governing permissions and limitations under the License.\n */\n\nimport {isAppleDevice, isMac} from '@react-aria/utils';\n\ninterface Event {\n  altKey: boolean,\n  ctrlKey: boolean,\n  metaKey: boolean\n}\n\nexport function isNonContiguousSelectionModifier(e: Event) {\n  // Ctrl + Arrow Up/Arrow Down has a system wide meaning on macOS, so use Alt instead.\n  // On Windows and Ubuntu, Alt + Space has a system wide meaning.\n  return isAppleDevice() ? e.altKey : e.ctrlKey;\n}\n\nexport function isCtrlKeyPressed(e: Event) {\n  if (isMac()) {\n    return e.metaKey;\n  }\n\n  return e.ctrlKey;\n}\n"],"names":[],"version":3,"file":"utils.module.js.map"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@react-aria/selection",
-  "version": "3.17.5",
+  "version": "3.18.0",
   "description": "Spectrum UI components in React",
   "license": "Apache-2.0",
   "main": "dist/main.js",
@@ -22,12 +22,12 @@
     "url": "https://github.com/adobe/react-spectrum"
   },
   "dependencies": {
-    "@react-aria/focus": "^3.16.2",
-    "@react-aria/i18n": "^3.10.2",
-    "@react-aria/interactions": "^3.21.1",
-    "@react-aria/utils": "^3.23.2",
-    "@react-stately/selection": "^3.14.3",
-    "@react-types/shared": "^3.22.1",
+    "@react-aria/focus": "^3.17.0",
+    "@react-aria/i18n": "^3.11.0",
+    "@react-aria/interactions": "^3.21.2",
+    "@react-aria/utils": "^3.24.0",
+    "@react-stately/selection": "^3.15.0",
+    "@react-types/shared": "^3.23.0",
     "@swc/helpers": "^0.5.0"
   },
   "peerDependencies": {
@@ -37,5 +37,5 @@
   "publishConfig": {
     "access": "public"
   },
-  "gitHead": "de9f84a22583fc741c29b341d14cd35ef4cca161"
+  "gitHead": "f645f29edc1322153fd60af4640cbcab1d992dbd"
 }

package/src/ListKeyboardDelegate.ts

@@ -10,7 +10,7 @@
  * governing permissions and limitations under the License.
  */
 
-import {Collection, Direction, Key, KeyboardDelegate, Node, Orientation} from '@react-types/shared';
+import {Collection, Direction, DisabledBehavior, Key, KeyboardDelegate, Node, Orientation} from '@react-types/shared';
 import {isScrollable} from '@react-aria/utils';
 import {RefObject} from 'react';
 
@@ -21,12 +21,14 @@ interface ListKeyboardDelegateOptions<T> {
   layout?: 'stack' | 'grid',
   orientation?: Orientation,
   direction?: Direction,
-  disabledKeys?: Set<Key>
+  disabledKeys?: Set<Key>,
+  disabledBehavior?: DisabledBehavior
 }
 
 export class ListKeyboardDelegate<T> implements KeyboardDelegate {
   private collection: Collection<Node<T>>;
   private disabledKeys: Set<Key>;
+  private disabledBehavior: DisabledBehavior;
   private ref: RefObject<HTMLElement>;
   private collator: Intl.Collator | undefined;
   private layout: 'stack' | 'grid';
@@ -42,6 +44,7 @@ export class ListKeyboardDelegate<T> implements KeyboardDelegate {
       this.ref = opts.ref;
       this.collator = opts.collator;
       this.disabledKeys = opts.disabledKeys || new Set();
+      this.disabledBehavior = opts.disabledBehavior || 'all';
       this.orientation = opts.orientation;
       this.direction = opts.direction;
       this.layout = opts.layout || 'stack';
@@ -52,6 +55,7 @@ export class ListKeyboardDelegate<T> implements KeyboardDelegate {
       this.collator = args[3];
       this.layout = 'stack';
       this.orientation = 'vertical';
+      this.disabledBehavior = 'all';
     }
 
     // If this is a vertical stack, remove the left/right methods completely
@@ -62,11 +66,15 @@ export class ListKeyboardDelegate<T> implements KeyboardDelegate {
     }
   }
 
+  private isDisabled(item: Node<unknown>) {
+    return this.disabledBehavior === 'all' && (item.props?.isDisabled || this.disabledKeys.has(item.key));
+  }
+
   getNextKey(key: Key) {
     key = this.collection.getKeyAfter(key);
     while (key != null) {
       let item = this.collection.getItem(key);
-      if (item.type === 'item' && !this.disabledKeys.has(key)) {
+      if (item.type === 'item' && !this.isDisabled(item)) {
         return key;
       }
 
@@ -80,7 +88,7 @@ export class ListKeyboardDelegate<T> implements KeyboardDelegate {
     key = this.collection.getKeyBefore(key);
     while (key != null) {
       let item = this.collection.getItem(key);
-      if (item.type === 'item' && !this.disabledKeys.has(key)) {
+      if (item.type === 'item' && !this.isDisabled(item)) {
         return key;
       }
 
@@ -170,7 +178,7 @@ export class ListKeyboardDelegate<T> implements KeyboardDelegate {
     let key = this.collection.getFirstKey();
     while (key != null) {
       let item = this.collection.getItem(key);
-      if (item?.type === 'item' && !this.disabledKeys.has(key)) {
+      if (item?.type === 'item' && !this.isDisabled(item)) {
         return key;
       }
 
@@ -184,7 +192,7 @@ export class ListKeyboardDelegate<T> implements KeyboardDelegate {
     let key = this.collection.getLastKey();
     while (key != null) {
       let item = this.collection.getItem(key);
-      if (item.type === 'item' && !this.disabledKeys.has(key)) {
+      if (item.type === 'item' && !this.isDisabled(item)) {
         return key;
       }
 
@@ -195,7 +203,7 @@ export class ListKeyboardDelegate<T> implements KeyboardDelegate {
   }
 
   private getItem(key: Key): HTMLElement {
-    return this.ref.current.querySelector(`[data-key="${CSS.escape(key.toString())}"]`);
+    return key !== null ? this.ref.current.querySelector(`[data-key="${CSS.escape(key.toString())}"]`) : null;
   }
 
   getKeyPageAbove(key: Key) {

package/src/useSelectableCollection.ts

@@ -141,7 +141,8 @@ export function useSelectableCollection(options: AriaSelectableCollectionOptions
           });
 
           let item = scrollRef.current.querySelector(`[data-key="${CSS.escape(key.toString())}"]`);
-          router.open(item, e);
+          let itemProps = manager.getItemProps(key);
+          router.open(item, e, itemProps.href, itemProps.routerOptions);
 
           return;
         }
@@ -254,8 +255,9 @@ export function useSelectableCollection(options: AriaSelectableCollectionOptions
         }
         break;
       case 'Escape':
-        e.preventDefault();
-        if (!disallowEmptySelection) {
+        if (!disallowEmptySelection && manager.selectedKeys.size !== 0) {
+          e.stopPropagation();
+          e.preventDefault();
           manager.clearSelection();
         }
         break;

package/src/useSelectableItem.ts

@@ -131,7 +131,8 @@ export function useSelectableItem(options: SelectableItemOptions): SelectableIte
 
       if (manager.isLink(key)) {
         if (linkBehavior === 'selection') {
-          router.open(ref.current, e);
+          let itemProps = manager.getItemProps(key);
+          router.open(ref.current, e, itemProps.href, itemProps.routerOptions);
           // Always set selected keys back to what they were so that select and combobox close.
           manager.setSelectedKeys(manager.selectedKeys);
           return;
@@ -218,7 +219,8 @@ export function useSelectableItem(options: SelectableItemOptions): SelectableIte
     }
 
     if (hasLinkAction) {
-      router.open(ref.current, e);
+      let itemProps = manager.getItemProps(key);
+      router.open(ref.current, e, itemProps.href, itemProps.routerOptions);
     }
   };
 

package/src/useSelectableList.ts

@@ -55,7 +55,13 @@ export function useSelectableList(props: AriaSelectableListOptions): SelectableL
   let collator = useCollator({usage: 'search', sensitivity: 'base'});
   let disabledBehavior = selectionManager.disabledBehavior;
   let delegate = useMemo(() => (
-    keyboardDelegate || new ListKeyboardDelegate(collection, disabledBehavior === 'selection' ? new Set() : disabledKeys, ref, collator)
+    keyboardDelegate || new ListKeyboardDelegate({
+      collection,
+      disabledKeys,
+      disabledBehavior,
+      ref,
+      collator
+    })
   ), [keyboardDelegate, collection, disabledKeys, ref, collator, disabledBehavior]);
 
   let {collectionProps} = useSelectableCollection({