From b626989e3a603bd674a8fa4de174eb92dd510d79 Mon Sep 17 00:00:00 2001 From: maks Date: Mon, 17 Feb 2025 14:49:12 +0000 Subject: [PATCH] feat: improved typing and grouping --- src/components/data/revogr-data.tsx | 2 +- src/plugins/groupingRow/grouping.row.plugin.ts | 1 + src/plugins/groupingRow/grouping.row.types.ts | 1 + src/utils/column.utils.ts | 2 +- 4 files changed, 4 insertions(+), 2 deletions(-) diff --git a/src/components/data/revogr-data.tsx b/src/components/data/revogr-data.tsx index 83c5016b..e7c4fe5f 100644 --- a/src/components/data/revogr-data.tsx +++ b/src/components/data/revogr-data.tsx @@ -235,7 +235,7 @@ export class RevogrData { ...rgRow, index: rgRow.itemIndex, model: dataItem, - groupingCustomRenderer: groupingCustomRenderer, + groupingCustomRenderer, hasExpand: this.columnService.hasGrouping, providers: this.providers, }; diff --git a/src/plugins/groupingRow/grouping.row.plugin.ts b/src/plugins/groupingRow/grouping.row.plugin.ts index 82806a56..a6a1c00a 100644 --- a/src/plugins/groupingRow/grouping.row.plugin.ts +++ b/src/plugins/groupingRow/grouping.row.plugin.ts @@ -42,6 +42,7 @@ import { TRIMMED_GROUPING, } from './grouping.trimmed.service'; +export * from './grouping.const'; export * from './grouping.row.expand.service'; export * from './grouping.row.types'; export * from './grouping.service'; diff --git a/src/plugins/groupingRow/grouping.row.types.ts b/src/plugins/groupingRow/grouping.row.types.ts index 3c7fef5a..faa82d84 100644 --- a/src/plugins/groupingRow/grouping.row.types.ts +++ b/src/plugins/groupingRow/grouping.row.types.ts @@ -20,6 +20,7 @@ interface GroupTemplateProp { export type GroupLabelTemplateFunc = ( createElement: HyperFunc, props: GroupTemplateProp, + ...args: any[] ) => any; export type GroupingOptions = { diff --git a/src/utils/column.utils.ts b/src/utils/column.utils.ts index 4be393b2..3b0e91af 100644 --- a/src/utils/column.utils.ts +++ b/src/utils/column.utils.ts @@ -26,7 +26,7 @@ export function getCellData(val?: any) { return val; } -export function getCellRaw(model: DataType, column?: ColumnRegular) { +export function getCellRaw(model: DataType = {}, column?: ColumnRegular) { if (!column) { return; }