Refactor #7237

primefaces · Feb 13, 2019 · 2f4c7ce · 2f4c7ce
1 parent 15ed451
commit 2f4c7ce
Showing 1 changed file with 8 additions and 3 deletions.
diff --git a/src/app/components/tree/tree.ts b/src/app/components/tree/tree.ts
@@ -621,6 +621,10 @@ export class Tree implements OnInit,AfterContentInit,OnDestroy,BlockableUI {
 
             if (this.hasFilteredNodes()) {
                 node = this.getNodeWithKey(node.key, this.value);
+
+                if (!node) {
+                    return;
+                }
             }
 
             let index = this.findIndexInSelection(node);
@@ -784,11 +788,12 @@ export class Tree implements OnInit,AfterContentInit,OnDestroy,BlockableUI {
             }
 
             if (node.children) {
-                return this.getNodeWithKey(key, node.children);
+                let matchedNode = this.getNodeWithKey(key, node.children);
+                if (matchedNode) {
+                    return matchedNode;
+                }
             }
         }
-
-        return null;
     }
 
     propagateUp(node: TreeNode, select: boolean) {