fix isNodeElement method name/logic, guarantee boolean value

annieyw · annieyw · commit 738ec925a36c · 2020-08-12T14:29:03.000-07:00
diff --git a/src/cdk/tree/tree.ts b/src/cdk/tree/tree.ts
@@ -389,7 +389,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) {
@@ -408,5 +408,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
`@@ -389,7 +389,7 @@ export class CdkTreeNode<T> implements FocusableOption, OnDestroy, OnInit {`
`389`	`389`
`390`	`390`	`function getParentNodeAriaLevel(nodeElement: HTMLElement): number {`
`391`	`391`	`let parent = nodeElement.parentElement;`
`392`		`- while (parent && isNodeElement(parent)) {`
	`392`	`+ while (parent && !isNodeElement(parent)) {`
`393`	`393`	`parent = parent.parentElement;`
`394`	`394`	`}`
`395`	`395`	`if (!parent) {`
`@@ -408,5 +408,5 @@ function getParentNodeAriaLevel(nodeElement: HTMLElement): number {`
`408`	`408`
`409`	`409`	`function isNodeElement(element: HTMLElement) {`
`410`	`410`	`const classList = element.classList;`
`411`		`- return !(classList?.contains('cdk-nested-tree-node') \|\| classList?.contains('cdk-tree'));`
	`411`	`+ return !!(classList?.contains('cdk-nested-tree-node') \|\| classList?.contains('cdk-tree'));`
`412`	`412`	`}`