fix(cdk/tree): fix build errors

Author: BobobUnicorn

src/cdk/tree/nested-node.ts

@@ -95,7 +95,7 @@ export class CdkNestedTreeNode<T, K = T>
     }
     if (outlet && this._children) {
       const viewContainer = outlet.viewContainer;
-      this._tree._renderNodeChanges(this._children, this._dataDiffer, viewContainer, this._data);
+      this._tree.renderNodeChanges(this._children, this._dataDiffer, viewContainer, this._data);
     } else {
       // Reset the data differ if there's no children nodes displayed
       this._dataDiffer.diff([]);

src/cdk/tree/tree.ts

@@ -698,7 +698,7 @@ export class CdkTree<T, K = T> implements AfterContentChecked, CollectionViewer,
 
   /** Given a CdkTreeNode, gets the node that renders that node's parent's data. */
   _getNodeParent(node: CdkTreeNode<T, K>) {
-    const parent = this._parents.get(node.data);
+    const parent = this._parents.get(this._getExpansionKey(node.data));
     return parent && this._nodes.value.get(this._getExpansionKey(parent));
   }
 
@@ -817,39 +817,6 @@ export class CdkTree<T, K = T> implements AfterContentChecked, CollectionViewer,
     return this.expansionKey?.(dataNode) ?? (dataNode as unknown as K);
   }
 
-  /**
-   * Converts children for certain tree configurations. Note also that this
-   * caches the known nodes for use in other parts of the tree.
-   */
-  private _convertChildren(nodes: readonly T[]): Observable<readonly T[]> {
-    // The only situations where we have to convert children types is when
-    // they're mismatched; i.e. if the tree is using a childrenAccessor and the
-    // nodes are flat, or if the tree is using a levelAccessor and the nodes are
-    // nested.
-    if (this.childrenAccessor && this.nodeType === 'flat') {
-      // This flattens children into a single array.
-      return observableOf(...nodes).pipe(
-        concatMap(node => concat(observableOf([node]), this._getAllChildrenRecursively(node))),
-        reduce((results, children) => {
-          results.push(...children);
-          return results;
-        }, [] as T[]),
-        tap(allNodes => {
-          this._dataNodes.next(allNodes);
-        }),
-      );
-    } else if (this.levelAccessor && this.nodeType === 'nested') {
-      this._dataNodes.next(nodes);
-      // In the nested case, we only look for root nodes. The CdkNestedNode
-      // itself will handle rendering each individual node's children.
-      const levelAccessor = this.levelAccessor;
-      return observableOf(nodes.filter(node => levelAccessor(node) === 0));
-    } else {
-      this._dataNodes.next(nodes);
-      return observableOf(nodes);
-    }
-  }
-
   private _getNodeGroup(node: T) {
     const level = this._levels.get(this._getExpansionKey(node));
     const parent = this._parents.get(this._getExpansionKey(node));
@@ -876,19 +843,36 @@ export class CdkTree<T, K = T> implements AfterContentChecked, CollectionViewer,
     return null;
   }
 
-  private _flattenChildren(nodes: readonly T[]): Observable<readonly T[]> {
-    // If we're using TreeControl or levelAccessor, we don't need to manually
-    // flatten things here.
-    if (!this.childrenAccessor) {
-      return observableOf(nodes);
-    } else {
+  /**
+   * Converts children for certain tree configurations. Note also that this
+   * caches the known nodes for use in other parts of the tree.
+   */
+  private _convertChildren(nodes: readonly T[]): Observable<readonly T[]> {
+    // The only situations where we have to convert children types is when
+    // they're mismatched; i.e. if the tree is using a childrenAccessor and the
+    // nodes are flat, or if the tree is using a levelAccessor and the nodes are
+    // nested.
+    if (this.childrenAccessor && this.nodeType === 'flat') {
+      // This flattens children into a single array.
       return observableOf(...nodes).pipe(
         concatMap(node => concat(observableOf([node]), this._getAllChildrenRecursively(node))),
-        reduce((results, nodes) => {
-          results.push(...nodes);
+        reduce((results, children) => {
+          results.push(...children);
           return results;
         }, [] as T[]),
+        tap(allNodes => {
+          this._dataNodes.next(allNodes);
+        }),
       );
+    } else if (this.levelAccessor && this.nodeType === 'nested') {
+      this._dataNodes.next(nodes);
+      // In the nested case, we only look for root nodes. The CdkNestedNode
+      // itself will handle rendering each individual node's children.
+      const levelAccessor = this.levelAccessor;
+      return observableOf(nodes.filter(node => levelAccessor(node) === 0));
+    } else {
+      this._dataNodes.next(nodes);
+      return observableOf(nodes);
     }
   }
 }