Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
42 changes: 42 additions & 0 deletions src/aria/tree/tree.spec.ts
Original file line number Diff line number Diff line change
Expand Up @@ -1067,6 +1067,48 @@ describe('Tree', () => {
expect(berriesEl.getAttribute('aria-expanded')).toBe('true');
});

it('should not affect selected item when collapse', () => {
setupTestTree();
updateTree({
nodes: [
{
value: 'fruits',
label: 'Fruits',
children: [
{value: 'apple', label: 'Apple'},
{value: 'banana', label: 'Banana'},
{
value: 'berries',
label: 'Berries',
children: [
{value: 'strawberry', label: 'Strawberry'},
{value: 'blueberry', label: 'Blueberry'},
],
expanded: true,
},
],
expanded: true,
},
],
});
const blueberryEl = getTreeItemElementByValue('blueberry')!;
const berriesEl = getTreeItemElementByValue('berries')!;
const fruits = getTreeItemElementByValue('fruits')!;

click(blueberryEl);
expect(treeInstance.values()).toEqual(['blueberry']);

left();
left(); // collapse berries
expect(berriesEl.getAttribute('aria-expanded')).toBe('false');
expect(treeInstance.values()).toEqual(['blueberry']);

left();
left(); // collapse fruits
expect(fruits.getAttribute('aria-expanded')).toBe('false');
expect(treeInstance.values()).toEqual(['blueberry']);
});

describe('LTR', () => {
beforeEach(() => {
setupTestTree();
Expand Down
2 changes: 2 additions & 0 deletions src/aria/tree/tree.ts
Original file line number Diff line number Diff line change
Expand Up @@ -208,6 +208,8 @@ export class Tree<V> {
});

afterRenderEffect(() => {
if (!(this._pattern instanceof ComboboxTreePattern)) return;

const items = inputs.allItems();
const values = untracked(() => this.values());

Expand Down
Loading