fix: TS build error from ItemMetadata and Column intefaces

6pac · Jan 9, 2024 · e8fd4c8 · e8fd4c8
1 parent feb154c
commit e8fd4c8
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/src/models/column.interface.ts b/src/models/column.interface.ts
@@ -60,7 +60,7 @@ export interface Column<TData = any> {
   columnGroup?: string;
 
   /** Column span in cell count or use `*` to span across the entire row */
-  colspan?: number | '*';
+  colspan?: number | string | '*';
 
   /** CSS class to add to the column cell */
   cssClass?: string;
@@ -84,7 +84,7 @@ export interface Column<TData = any> {
   disableTooltip?: boolean;
 
   /** Any inline editor function that implements Editor for the cell value or ColumnEditor */
-  editor?: Editor | { model?: Editor; };
+  editor?: Editor | { model?: Editor; } | null;
 
   /** Editor number fixed decimal places */
   editorFixedDecimalPlaces?: number;