feat(cdk/tree): update goldens, add descriptions to methods

Author: BobobUnicorn

src/cdk/tree/tree.ts

@@ -553,6 +553,7 @@ export class CdkTree<T, K = T> implements AfterContentChecked, CollectionViewer,
     return this.treeControl?.getChildren ?? this.childrenAccessor;
   }
 
+<<<<<<< HEAD
 <<<<<<< HEAD
   /**
    * Gets the direct children of a node; used for compatibility between the old tree and the
@@ -634,11 +635,26 @@ export class CdkTree<T, K = T> implements AfterContentChecked, CollectionViewer,
     return group.indexOf(dataNode) + 1;
   }
 
+  /**
+    * For the given node, determine the size of the parent's child set.
+    *
+    * This is intended to be used for `aria-setsize`.
+    */
   _getSetSize(dataNode: T) {
     const group = this._getNodeGroup(dataNode);
     return group.length;
   }
 
+  /**
+    * For the given node, determine the index (starting from 1) of the node in its parent's child set.
+    *
+    * This is intended to be used for `aria-posinset`.
+    */
+  _getPositionInSet(dataNode: T) {
+    const group = this._getNodeGroup(dataNode);
+    return group.indexOf(dataNode) + 1;
+  }
+
   private _getAllDescendants(): Observable<T[]> {
     return merge(...this._dataNodes.value.map(dataNode => this._getDescendants(dataNode)));
   }
@@ -888,10 +904,20 @@ export class CdkTreeNode<T, K = T> implements FocusableOption, OnDestroy, OnInit
     return this._tree._getLevel(this._data) ?? this._parentNodeAriaLevel;
   }
 
+  /**
+    * Determines the size of this node's parent's child set.
+    *
+    * This is intended to be used for `aria-setsize`.
+    */
   _getSetSize(): number {
     return this._tree._getSetSize(this._data);
   }
 
+  /**
+    * Determines the index (starting from 1) of this node in its parent's child set.
+    *
+    * This is intended to be used for `aria-posinset`.
+    */
   _getPositionInSet(): number {
     return this._tree._getPositionInSet(this._data);
   }

tools/public_api_guard/cdk/tree.md

@@ -29,7 +29,7 @@ import { TemplateRef } from '@angular/core';
 import { TrackByFunction } from '@angular/core';
 import { ViewContainerRef } from '@angular/core';
 
-// @public
+// @public @deprecated
 export abstract class BaseTreeControl<T, K = T> implements TreeControl<T, K> {
     collapse(dataNode: T): void;
     collapseAll(): void;
@@ -91,6 +91,8 @@ export class CdkTree<T, K = T> implements AfterContentChecked, CollectionViewer,
     _getChildrenAccessor(): ((dataNode: T) => T[] | Observable<T[]> | null | undefined) | undefined;
     _getLevelAccessor(): ((dataNode: T) => number) | undefined;
     _getNodeDef(data: T, i: number): CdkTreeNodeDef<T>;
+    _getPositionInSet(dataNode: T): number;
+    _getSetSize(dataNode: T): number;
     insertNode(nodeData: T, index: number, viewContainer?: ViewContainerRef, parentData?: T): void;
     isExpanded(dataNode: T): boolean;
     levelAccessor?: (dataNode: T) => number;
@@ -141,6 +143,8 @@ export class CdkTreeNode<T, K = T> implements FocusableOption, OnDestroy, OnInit
     // (undocumented)
     protected _elementRef: ElementRef<HTMLElement>;
     focus(): void;
+    _getPositionInSet(): number;
+    _getSetSize(): number;
     // (undocumented)
     isExpandable: boolean;
     // (undocumented)
@@ -244,7 +248,7 @@ export class CdkTreeNodeToggle<T, K = T> {
     static ɵfac: i0.ɵɵFactoryDeclaration<CdkTreeNodeToggle<any, any>, never>;
 }
 
-// @public
+// @public @deprecated
 export class FlatTreeControl<T, K = T> extends BaseTreeControl<T, K> {
     constructor(getLevel: (dataNode: T) => number, isExpandable: (dataNode: T) => boolean, options?: FlatTreeControlOptions<T, K> | undefined);
     expandAll(): void;
@@ -281,7 +285,7 @@ export function getTreeMultipleDefaultNodeDefsError(): Error;
 // @public
 export function getTreeNoValidDataSourceError(): Error;
 
-// @public
+// @public @deprecated
 export class NestedTreeControl<T, K = T> extends BaseTreeControl<T, K> {
     constructor(getChildren: (dataNode: T) => Observable<T[]> | T[] | undefined | null, options?: NestedTreeControlOptions<T, K> | undefined);
     expandAll(): void;
@@ -299,7 +303,7 @@ export interface NestedTreeControlOptions<T, K> {
     trackBy?: (dataNode: T) => K;
 }
 
-// @public
+// @public @deprecated
 export interface TreeControl<T, K = T> {
     collapse(dataNode: T): void;
     collapseAll(): void;