Support empty TreeNode.key in findIndexInSelection (#16495)

* Support empty `TreeNode.key` in `findIndexInSelection` * Rewrite `findIndexInSelection` (`Tree` and `TreeSelect`) * Add `Tree.selection` tests
primefaces · Nov 18, 2024 · 7e7de62 · 7e7de62
1 parent 6a6606f
commit 7e7de62
Show file tree

Hide file tree

Showing 3 changed files with 38 additions and 33 deletions.
diff --git a/src/app/components/tree/tree.spec.ts b/src/app/components/tree/tree.spec.ts
@@ -290,4 +290,36 @@ describe('Tree', () => {
         expect(tree.filteredNodes).toBeTruthy();
         expect(tree.filteredNodes.length).toEqual(2);
     });
+
+    it('should select nodes by reference', () => {
+        // <p-tree selectionMode="single" [value]="[root]" [selection]="root" />
+
+        const root = {key: undefined, label: '(root)'};
+        tree.selectionMode = 'single';
+        tree.value = [root];
+
+        tree.selection = root;
+        fixture.detectChanges();
+        expect(fixture.debugElement.query(By.css('.p-highlight'))).toBeTruthy();
+
+        tree.selection = undefined;
+        fixture.detectChanges();
+        expect(fixture.debugElement.query(By.css('.p-highlight'))).toBeFalsy();
+    });
+
+    it('should select nodes by key (even if key is empty!)', () => {
+        // <p-tree selectionMode="single" [value]="[root]" [selection]="{key: root.key, label: root.label}" />
+
+        const root = {key: '', label: '(root)'};
+        tree.selectionMode = 'single';
+        tree.value = [root];
+
+        tree.selection = {key: root.key, label: root.label};
+        fixture.detectChanges();
+        expect(fixture.debugElement.query(By.css('.p-highlight'))).toBeTruthy();
+
+        tree.selection = {key: 'non-' + root.key, label: root.label};
+        fixture.detectChanges();
+        expect(fixture.debugElement.query(By.css('.p-highlight'))).toBeFalsy();
+    });
 });
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 && 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 && 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 && 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 && 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) {