Rewrite findIndexInSelection (Tree and TreeSelect)

primefaces · Oct 5, 2024 · 93ce735 · 93ce735
1 parent f0a27b7
commit 93ce735
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 33 deletions.
diff --git a/src/app/components/tree/tree.ts b/src/app/components/tree/tree.ts
@@ -1435,24 +1435,11 @@ export class Tree implements OnInit, AfterContentInit, OnChanges, OnDestroy, Blo
     }
 
     findIndexInSelection(node: TreeNode) {
-        let index: number = -1;
         if (this.selectionMode && this.selection) {
-            if (this.isSingleSelectionMode()) {
-                let areNodesEqual = (this.selection.key !== undefined && this.selection.key === node.key) || this.selection == node;
-                index = areNodesEqual ? 0 : -1;
-            } else {
-                for (let i = 0; i < this.selection.length; i++) {
-                    let selectedNode = this.selection[i];
-                    let areNodesEqual = (selectedNode.key !== undefined && selectedNode.key === node.key) || selectedNode == node;
-                    if (areNodesEqual) {
-                        index = i;
-                        break;
-                    }
-                }
-            }
+            const selection = this.isSingleSelectionMode() ? [this.selection] : this.selection;
+            return selection.findIndex(selectedNode => selectedNode === node || selectedNode.key === node.key && selectedNode.key !== undefined);
         }
-
-        return index;
+        return -1;
     }
 
     syncNodeOption(node: TreeNode, parentNodes: TreeNode<any>[], option: any, value?: any) {

diff --git a/src/app/components/treeselect/treeselect.ts b/src/app/components/treeselect/treeselect.ts
@@ -907,25 +907,11 @@ export class TreeSelect implements AfterContentInit {
     }
 
     findIndexInSelection(node: TreeNode) {
-        let index: number = -1;
-
         if (this.value) {
-            if (this.selectionMode === 'single') {
-                let areNodesEqual = (this.value.key !== undefined && this.value.key === node.key) || this.value === node;
-                index = areNodesEqual ? 0 : -1;
-            } else {
-                for (let i = 0; i < this.value.length; i++) {
-                    let selectedNode = this.value[i];
-                    let areNodesEqual = (selectedNode.key !== undefined && selectedNode.key === node.key) || selectedNode === node;
-                    if (areNodesEqual) {
-                        index = i;
-                        break;
-                    }
-                }
-            }
+            const value = this.selectionMode === 'single' ? [this.value] : this.value;
+            return value.findIndex(selectedNode => selectedNode === node || selectedNode.key === node.key && selectedNode.key !== undefined);
         }
-
-        return index;
+        return -1;
     }
 
     onSelect(event: TreeNodeSelectEvent) {