fix(cdk/tree): tests

Author: BobobUnicorn

src/cdk/a11y/key-manager/tree-key-manager.ts

@@ -298,6 +298,12 @@ export class TreeKeyManager<T extends TreeKeyManagerItem> implements TreeKeyMana
     if (newIndex > -1 && newIndex !== this._activeItemIndex) {
       this._activeItemIndex = newIndex;
       this._typeahead?.setCurrentSelectedItemIndex(newIndex);
+    } else if (newIndex === -1) {
+      // if there's no new matching element, then we reset the state of this
+      // key manager
+      this._activeItem = null;
+      this._activeItemIndex = -1;
+      this._hasInitialFocused = false;
     }
   }
 

src/cdk/tree/tree.spec.ts

@@ -1225,6 +1225,7 @@ describe('CdkTree', () => {
         fixture.destroy();
 
         fixture = TestBed.createComponent(StaticNestedCdkTreeApp);
+        fixture.detectChanges();
 
         component = fixture.componentInstance;
         dataSource = component.dataSource as FakeDataSource;
@@ -1251,7 +1252,6 @@ describe('CdkTree', () => {
       it('the tree does not have a tabindex when an element is active', () => {
         // activate the second child by clicking on it
         nodes[1].click();
-        fixture.detectChanges();
 
         expect(treeElement.hasAttribute('tabindex')).toBeFalse();
       });

src/cdk/tree/tree.ts

@@ -624,15 +624,7 @@ export class CdkTree<T, K = T>
       }
     });
 
-    // Note: we only `detectChanges` from a top-level call, otherwise we risk overflowing
-    // the call stack since this method is called recursively (see #29733.)
-    // TODO: change to `this._changeDetectorRef.markForCheck()`,
-    // or just switch this component to use signals.
-    if (parentData) {
-      this._changeDetectorRef.markForCheck();
-    } else {
-      this._changeDetectorRef.detectChanges();
-    }
+    this._changeDetectorRef.markForCheck();
   }
 
   /**
@@ -1461,7 +1453,6 @@ export class CdkTreeNode<T, K = T> implements OnDestroy, OnInit, TreeKeyManagerI
   /** Focuses this data node. Implemented for TreeKeyManagerItem. */
   focus(): void {
     this._tabindex.set(0);
-    this._changeDetectorRef.detectChanges();
     if (this._shouldFocus) {
       this._elementRef.nativeElement.focus();
     }
@@ -1470,7 +1461,6 @@ export class CdkTreeNode<T, K = T> implements OnDestroy, OnInit, TreeKeyManagerI
   /** Defocus this data node. */
   unfocus(): void {
     this._tabindex.set(-1);
-    this._changeDetectorRef.detectChanges();
   }
 
   /** Emits an activation event. Implemented for TreeKeyManagerItem. */
@@ -1498,7 +1488,6 @@ export class CdkTreeNode<T, K = T> implements OnDestroy, OnInit, TreeKeyManagerI
   /** Makes the node focusable. Implemented for TreeKeyManagerItem. */
   makeFocusable(): void {
     this._tabindex.set(0);
-    this._changeDetectorRef.detectChanges();
   }
 
   _focusItem() {