Skip to content

fix: TreeView inadvertent focus trap #8277

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 6 commits into from
Jun 3, 2025
Merged

fix: TreeView inadvertent focus trap #8277

Changes from 1 commit
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
997d152
fix: TreeView inadvertent focus trap
snowystinger May 21, 2025
09ec7c2
add test stories
snowystinger Jun 2, 2025
1e5c2db
Merge branch 'main' into snowystinger-patch-1
snowystinger Jun 2, 2025
d31d6f7
apply same fix to S2
snowystinger Jun 3, 2025
c688eb7
fix lint
snowystinger Jun 3, 2025
13853c0
add prevent focus on press to RAC
snowystinger Jun 3, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions packages/@react-aria/tree/src/useTreeItem.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,8 +15,8 @@ import {AriaGridListItemOptions, GridListItemAria, useGridListItem} from '@react
import {DOMAttributes, FocusableElement, Node, RefObject} from '@react-types/shared';
// @ts-ignore
import intlMessages from '../intl/*.json';
import {isAndroid, useLabels} from '@react-aria/utils';
import {TreeState} from '@react-stately/tree';
import {useLabels} from '@react-aria/utils';
import {useLocalizedStringFormatter} from '@react-aria/i18n';

export interface AriaTreeItemOptions extends Omit<AriaGridListItemOptions, 'isVirtualized'> {
Expand Down Expand Up @@ -59,7 +59,7 @@ export function useTreeItem<T>(props: AriaTreeItemOptions, state: TreeState<T>,
state.selectionManager.setFocusedKey(node.key);
}
},
tabIndex: isAndroid() ? -1 : null,
excludeFromTabOrder: true,
'data-react-aria-prevent-focus': true,
...labelProps
};
Expand Down