fix isNodeElement method name/logic, guarantee boolean value

annieyw · annieyw · commit 7a963f5c9a00 · 2020-08-21T15:22:22.000-07:00
diff --git a/src/cdk/tree/tree.ts b/src/cdk/tree/tree.ts
@@ -393,7 +393,7 @@ export class CdkTreeNode<T> implements FocusableOption, OnDestroy, OnInit {
 
 function getParentNodeAriaLevel(nodeElement: HTMLElement): number {
   let parent = nodeElement.parentElement;
-  while (parent && isNodeElement(parent)) {
+  while (parent && !isNodeElement(parent)) {
     parent = parent.parentElement;
   }
   if (!parent) {
@@ -412,5 +412,5 @@ function getParentNodeAriaLevel(nodeElement: HTMLElement): number {
 
 function isNodeElement(element: HTMLElement) {
   const classList = element.classList;
-  return !(classList?.contains('cdk-nested-tree-node') || classList?.contains('cdk-tree'));
+  return !!(classList?.contains('cdk-nested-tree-node') || classList?.contains('cdk-tree'));
 }

Original file line number	Diff line number	Diff line change
`@@ -393,7 +393,7 @@ export class CdkTreeNode<T> implements FocusableOption, OnDestroy, OnInit {`
`393`	`393`
`394`	`394`	`function getParentNodeAriaLevel(nodeElement: HTMLElement): number {`
`395`	`395`	`let parent = nodeElement.parentElement;`
`396`		`- while (parent && isNodeElement(parent)) {`
	`396`	`+ while (parent && !isNodeElement(parent)) {`
`397`	`397`	`parent = parent.parentElement;`
`398`	`398`	`}`
`399`	`399`	`if (!parent) {`
`@@ -412,5 +412,5 @@ function getParentNodeAriaLevel(nodeElement: HTMLElement): number {`
`412`	`412`
`413`	`413`	`function isNodeElement(element: HTMLElement) {`
`414`	`414`	`const classList = element.classList;`
`415`		`- return !(classList?.contains('cdk-nested-tree-node') \|\| classList?.contains('cdk-tree'));`
	`415`	`+ return !!(classList?.contains('cdk-nested-tree-node') \|\| classList?.contains('cdk-tree'));`
`416`	`416`	`}`