Merge pull request #664 from revolist/missing-column-props

fix: issue with missing column props
revolist · Dec 9, 2024 · 6d16baf · 6d16baf
2 parents 55ee688 + da3714f
commit 6d16baf
Show file tree

Hide file tree

Showing 8 changed files with 13 additions and 8 deletions.
diff --git a/docs b/docs
diff --git a/formats/number b/formats/number
diff --git a/packages/angular b/packages/angular
diff --git a/packages/react b/packages/react
diff --git a/packages/vue2 b/packages/vue2
diff --git a/packages/vue3 b/packages/vue3
diff --git 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
@@ -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;
 }
+2 −2		package.json
+2 −2		projects/angular-datagrid/package.json
-Original file line number
+Diff line change
@@ Expand Up / @@ -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;
         }
@@ Expand Down @@