Skip to content

Commit b54c0d4

Browse files
authored
fix: [BUG] - Autocomplete - Text selection with Shift + Home/End isn't working (#7228) (#7403)
Possible fix for #7228
1 parent ab9fd5c commit b54c0d4

File tree

1 file changed

+6
-0
lines changed

1 file changed

+6
-0
lines changed

packages/@react-aria/selection/src/useSelectableCollection.ts

+6
Original file line numberDiff line numberDiff line change
@@ -222,6 +222,9 @@ export function useSelectableCollection(options: AriaSelectableCollectionOptions
222222
}
223223
case 'Home':
224224
if (delegate.getFirstKey) {
225+
if (manager.focusedKey === null && e.shiftKey) {
226+
return;
227+
}
225228
e.preventDefault();
226229
let firstKey: Key | null = delegate.getFirstKey(manager.focusedKey, isCtrlKeyPressed(e));
227230
manager.setFocusedKey(firstKey);
@@ -236,6 +239,9 @@ export function useSelectableCollection(options: AriaSelectableCollectionOptions
236239
break;
237240
case 'End':
238241
if (delegate.getLastKey) {
242+
if (manager.focusedKey === null && e.shiftKey) {
243+
return;
244+
}
239245
e.preventDefault();
240246
let lastKey = delegate.getLastKey(manager.focusedKey, isCtrlKeyPressed(e));
241247
manager.setFocusedKey(lastKey);

0 commit comments

Comments
 (0)