fix(aria/tree): only reset selected values if used in combobox

Author: ok7sai

src/aria/tree/tree.spec.ts

@@ -5,6 +5,7 @@ import {By} from '@angular/platform-browser';
 import {Direction} from '@angular/cdk/bidi';
 import {provideFakeDirectionality, runAccessibilityChecks} from '@angular/cdk/testing/private';
 import {Tree, TreeItem, TreeItemGroup} from './tree';
+import {A} from '@angular/cdk/keycodes';
 
 interface ModifierKeys {
   ctrlKey?: boolean;
@@ -1067,6 +1068,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();

src/aria/tree/tree.ts

@@ -208,6 +208,8 @@ export class Tree<V> {
     });
 
     afterRenderEffect(() => {
+      if (!(this._pattern instanceof ComboboxTreePattern)) return;
+
       const items = inputs.allItems();
       const values = untracked(() => this.values());