when looking up a rows group, make sure it takes acount of the dataTr…

…ee if present
vdm-io · May 2, 2022 · 99b1742 · 99b1742
1 parent bc9318b
commit 99b1742
Show file tree

Hide file tree

Showing 4 changed files with 17 additions and 1 deletion.
diff --git a/dist/js/tabulator_esm.js b/dist/js/tabulator_esm.js
@@ -4448,6 +4448,10 @@ class DataTree extends Module{
 		return row.modules.dataTree.parent ? row.modules.dataTree.parent.getComponent() : false;
 	}
 
+	getTreeParentRoot(row){
+		return row.modules.dataTree.parent ? this.getTreeParentRoot(row.modules.dataTree.parent) : row;
+	}
+
 	getFilteredTreeChildren(row){
 		var config = row.modules.dataTree,
 		output = [], children;
@@ -11684,6 +11688,10 @@ class GroupRows extends Module{
 	getRowGroup(row){
 		var match = false;
 
+		if(this.options("dataTree")){
+			row = this.table.modules.dataTree.getTreeParentRoot(row);
+		}
+
 		this.groupList.forEach((group) => {
 			var result = group.getRowGroup(row);
 

diff --git a/dist/js/tabulator_esm.js.map b/dist/js/tabulator_esm.js.map
diff --git a/src/js/modules/DataTree/DataTree.js b/src/js/modules/DataTree/DataTree.js
@@ -432,6 +432,10 @@ class DataTree extends Module{
 		return row.modules.dataTree.parent ? row.modules.dataTree.parent.getComponent() : false;
 	}
 
+	getTreeParentRoot(row){
+		return row.modules.dataTree.parent ? this.getTreeParentRoot(row.modules.dataTree.parent) : row;
+	}
+
 	getFilteredTreeChildren(row){
 		var config = row.modules.dataTree,
 		output = [], children;

diff --git a/src/js/modules/GroupRows/GroupRows.js b/src/js/modules/GroupRows/GroupRows.js
@@ -436,6 +436,10 @@ class GroupRows extends Module{
 	getRowGroup(row){
 		var match = false;
 
+		if(this.options("dataTree")){
+			row = this.table.modules.dataTree.getTreeParentRoot(row);
+		}
+
 		this.groupList.forEach((group) => {
 			var result = group.getRowGroup(row);