From da3714f0e8ae7dd56157757325b9604290f86dcf Mon Sep 17 00:00:00 2001
From: maks <mojpo4tovik@gmail.com>
Date: Mon, 9 Dec 2024 12:38:21 +0000
Subject: [PATCH] fix: issue with missing column props

---
 docs                                  | 2 +-
 formats/number                        | 2 +-
 packages/angular                      | 2 +-
 packages/react                        | 2 +-
 packages/vue2                         | 2 +-
 packages/vue3                         | 2 +-
 src/components/revoGrid/revo-grid.tsx | 2 +-
 src/utils/column.utils.ts             | 7 ++++++-
 8 files changed, 13 insertions(+), 8 deletions(-)

diff --git a/docs b/docs
index 2386a13a..a50cb9b8 160000
--- a/docs
+++ b/docs
@@ -1 +1 @@
-Subproject commit 2386a13a2bc67d80e8b95f356776097534a8acf4
+Subproject commit a50cb9b87beb1cff99d0fabd840363f2886140ff
diff --git a/formats/number b/formats/number
index 8c419966..48aa4fdd 160000
--- a/formats/number
+++ b/formats/number
@@ -1 +1 @@
-Subproject commit 8c41996615e9608febad0df5a67983505851a8c9
+Subproject commit 48aa4fddc8e544e4a9e2b438d780fbc1ee335c31
diff --git a/packages/angular b/packages/angular
index 8e91f356..6c510459 160000
--- a/packages/angular
+++ b/packages/angular
@@ -1 +1 @@
-Subproject commit 8e91f3564e3ac3e65a5e0caf5b4cfa601a553ac3
+Subproject commit 6c5104596e6deb2b78f65fa034fca39aaec4890c
diff --git a/packages/react b/packages/react
index b687dede..265d3fb5 160000
--- a/packages/react
+++ b/packages/react
@@ -1 +1 @@
-Subproject commit b687dede6c5522e04fea0e36d19e45589e300709
+Subproject commit 265d3fb51ff9c237e8e5eb74c02e8b9fb711437e
diff --git a/packages/vue2 b/packages/vue2
index 7b55b55d..7272f8e6 160000
--- a/packages/vue2
+++ b/packages/vue2
@@ -1 +1 @@
-Subproject commit 7b55b55d4e4d5ae658ff7252cd821e89e849508d
+Subproject commit 7272f8e6f936faecd188ce2836997642916f7d43
diff --git a/packages/vue3 b/packages/vue3
index 83e6c291..26def6a8 160000
--- a/packages/vue3
+++ b/packages/vue3
@@ -1 +1 @@
-Subproject commit 83e6c2912367aeff64c9688a0bdb853e57a92891
+Subproject commit 26def6a805a3225e509a56d27a5cccd499014661
diff --git a/src/components/revoGrid/revo-grid.tsx b/src/components/revoGrid/revo-grid.tsx
index de0b5619..205e3c69 100644
--- a/src/components/revoGrid/revo-grid.tsx
+++ b/src/components/revoGrid/revo-grid.tsx
@@ -1409,7 +1409,7 @@ export class RevoGridComponent {
     }
   }
 
-  private getPluginData(): PluginProviders | undefined {
+  getPluginData(): PluginProviders | undefined {
     if (!this.dimensionProvider || !this.dataProvider || !this.columnProvider || !this.viewportProvider || !this.selectionStoreConnector) {
       return;
     }
diff --git a/src/utils/column.utils.ts b/src/utils/column.utils.ts
index 78a6caab..4be393b2 100644
--- a/src/utils/column.utils.ts
+++ b/src/utils/column.utils.ts
@@ -132,12 +132,13 @@ export function getColumns(
     (res: ColumnCollection, colData: ColumnGrouping | ColumnRegular) => {
       // Grouped column
       if (isColGrouping(colData)) {
-        return gatherGroup(
+        res = gatherGroup(
           res,
           colData,
           getColumns(colData.children, level + 1, types),
           level,
         );
+        return res;
       }
       // Column type
       const columnDefinitionFromType = colData.columnType && types?.[colData.columnType];
@@ -211,6 +212,10 @@ export function gatherGroup<T extends ColumnCollection>(
   }
   res.maxLevel = Math.max(res.maxLevel, collection.maxLevel);
   res.sort = { ...res.sort, ...collection.sort };
+  res.columnByProp = {
+    ...res.columnByProp,
+    ...collection.columnByProp,
+  };
   return res;
 }