Skip to content

Handle undefined children in useTreeData #2549

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 5 commits into from
Dec 23, 2021
Merged

Handle undefined children in useTreeData #2549

Show file tree
Hide file tree
Changes from 4 commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
f0942a5
handle no children in useTreeData
reidbarber Nov 11, 2021
d3065f6
fix tests to cover
reidbarber Nov 11, 2021
e6ac511
Merge branch 'main' into useTreeData-undefined-children
snowystinger Dec 22, 2021
80e719b
Merge branch 'main' into useTreeData-undefined-children
snowystinger Dec 23, 2021
7b8bcf8
Merge branch 'main' into useTreeData-undefined-children
dannify Dec 23, 2021
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-stately/data/src/useTreeData.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -123,7 +123,7 @@ export function useTreeData<T extends object>(options: TreeOptions<T>): TreeData
initialItems = [],
initialSelectedKeys,
getKey = (item: any) => item.id || item.key,
getChildren = (item: any) => item.children || []
getChildren = (item: any) => item.children
} = options;
let map = useMemo(() => new Map<Key, TreeNode<T>>(), []);

Expand All @@ -133,7 +133,7 @@ export function useTreeData<T extends object>(options: TreeOptions<T>): TreeData
let [items, setItems] = useState(initialNodes);
let [selectedKeys, setSelectedKeys] = useState(new Set<Key>(initialSelectedKeys || []));

function buildTree(initialItems: T[], parentKey?: Key | null) {
function buildTree(initialItems: T[] = [], parentKey?: Key | null) {
return initialItems.map(item => {
let node: TreeNode<T> = {
key: getKey(item),
Expand Down
2 changes: 1 addition & 1 deletion packages/@react-stately/data/test/useTreeData.test.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ const initial = [
];

let getKey = (item) => item.name;
let getChildren = (item) => item.children || [];
let getChildren = (item) => item.children;

describe('useTreeData', function () {
it('should construct a tree using initial data', function () {
Expand Down