Fixed #2276 - TreeSelect.value should be an array in multiselect mode

primefaces · Nov 6, 2021 · 81b3019 · 81b3019
1 parent 93754e1
commit 81b3019
Show file tree

Hide file tree

Showing 3 changed files with 27 additions and 6 deletions.
diff --git a/src/components/tree/Tree.d.ts b/src/components/tree/Tree.d.ts
@@ -3,7 +3,9 @@ import TreeNode from '../treenode';
 
 type TreeSelectionModeType = 'single' | 'multiple' | 'checkbox';
 
-type TreeSelectionKeys = string | TreeSelectionKeysType | undefined | null;
+type TreeSelectionKeys = string | TreeSelectionKeysType | TreeSelectionKeysType[] | undefined | null;
+
+type TreeSelectionKeyType = boolean | TreeCheckboxSelectionKeyType;
 
 type TreeFilterModeType = 'lenient' | 'strict';
 
@@ -48,7 +50,12 @@ interface TreeTogglerTemplateOptions {
 }
 
 interface TreeSelectionKeysType {
-    [key: string]: boolean;
+    [key: string]: TreeSelectionKeyType;
+}
+
+interface TreeCheckboxSelectionKeyType {
+    checked?: boolean;
+    partialChecked?: boolean;
 }
 
 interface TreeExpandedKeysType {

diff --git a/src/components/treeselect/TreeSelect.d.ts b/src/components/treeselect/TreeSelect.d.ts
@@ -3,7 +3,7 @@ import TreeNode from '../treenode';
 
 type TreeSelectSelectionModeType = 'single' | 'multiple' | 'checkbox';
 
-type TreeSelectSelectionKeys = string | TreeSelectSelectionKeysType | undefined | null;
+type TreeSelectSelectionKeys = string | TreeSelectSelectionKeysType | TreeSelectSelectionKeysType[] | undefined | null;
 
 type TreeSelectDisplayType = 'comma' | 'chip';
 
@@ -42,8 +42,15 @@ interface TreeSelectChangeParams {
     target: TreeSelectChangeTargetOptions;
 }
 
+type TreeSelectSelectionKeyType = boolean | TreeSelectCheckboxSelectionKeyType;
+
 interface TreeSelectSelectionKeysType {
-    [key: string]: boolean;
+    [key: string]: TreeSelectSelectionKeyType;
+}
+
+interface TreeSelectCheckboxSelectionKeyType {
+    checked?: boolean;
+    partialChecked?: boolean;
 }
 
 interface TreeSelectEventNodeParams {

diff --git a/src/components/treetable/TreeTable.d.ts b/src/components/treetable/TreeTable.d.ts
@@ -19,14 +19,21 @@ type TreeTableFilterMatchModeType = 'startsWith' | 'contains' | 'endsWith' | 'eq
 
 type TreeTableGlobalFilterType = string | undefined | null;
 
-type TreeTableSelectionKeys = string | TreeTableSelectionKeysType | undefined | null;
+type TreeTableSelectionKeys = string | TreeTableSelectionKeysType | TreeTableSelectionKeysType[] | undefined | null;
+
+type TreeTableSelectionKeyType = boolean | TreeTableCheckboxSelectionKeyType;
 
 type TreeTableFilterModeType = 'lenient' | 'strict';
 
 type TreeTableAppendToType = 'self' | HTMLElement | undefined | null;
 
 interface TreeTableSelectionKeysType {
-    [key: string]: boolean;
+    [key: string]: TreeTableSelectionKeyType;
+}
+
+interface TreeTableCheckboxSelectionKeyType {
+    checked?: boolean;
+    partialChecked?: boolean;
 }
 
 type TreeTableExpandedKeysType = {