@azrico/reactgrid 1.1.17 → 1.1.19

package/dist/src/views/DataGrid.d.ts

@@ -29,7 +29,6 @@ type loose_column_fields = loose_column_names & {
     items: any[];
 };
 export type LooseColumnDefinition = Partial<loose_column_fields & ColumnDefinition>;
-type columnOrString = string | LooseColumnDefinition;
 type customColumnData = {
     name: string;
     render: (cell: any, formatterParams: any, onRendered: any) => React.ReactNode | undefined | null;
@@ -39,10 +38,8 @@ export type AzGridProps = {
     dataSource?: any[] | ((args: any) => any[] | Promise<any[] | any>);
     licenseKey?: string;
     gridOptions?: GridOptions;
-    columns?: columnOrString[];
-    columnExtensions?: Array<{
-        name: string;
-    } & Partial<LooseColumnDefinition>>;
+    columns?: LooseColumnDefinition[];
+    columnExtensions?: Partial<LooseColumnDefinition>;
     editableColumns?: string[];
     leftColumns?: string[];
     rightColumns?: string[];

package/dist/src/views/DataGrid.js

@@ -264,6 +264,10 @@ function ApplyColumnData(props) {
   if (mcolExts && Array.isArray(mcolExts)) for (let index = 0; index < mcolExts.length; index++) {
     const ext = mcolExts[index];
     const ext_cl = get_col_name(ext);
+    if (!ext_cl) {
+      console.warn('ColumnExtension must have a name');
+      continue;
+    }
     const mcol = final_columns.find(s => get_col_name(s) === ext_cl);
     if (mcol) {
       for (const key in ext) {
@@ -385,10 +389,10 @@ function to_datasource(arr, idProperty) {
  * @returns
  */
 function get_col_name(obj) {
-  if (!obj) return 'default';
+  if (!obj) return '';
   if (typeof obj == 'string') return obj;
-  if (typeof obj != 'object') return 'default';
-  return obj.name || obj.field || obj.key || obj.columnName || 'default';
+  if (typeof obj != 'object') return '';
+  return obj.name || obj.field || obj.key || obj.columnName || '';
 }
 /**
  * Gets header of a column
@@ -396,9 +400,9 @@ function get_col_name(obj) {
  * @returns
  */
 function get_col_header(obj) {
-  if (!obj) return 'default';
+  if (!obj) return '';
   if (typeof obj == 'string') return obj;
-  if (typeof obj != 'object') return 'default';
+  if (typeof obj != 'object') return '';
   return obj.header || obj.title || get_col_name(obj);
 }
 /**
@@ -407,10 +411,10 @@ function get_col_header(obj) {
  * @returns
  */
 function get_row_id(obj) {
-  if (!obj) return 'default';
+  if (!obj) return '-1';
   if (typeof obj == 'string') return obj;
-  if (typeof obj != 'object') return 'default';
-  return obj.__table_id || obj.id || 'default';
+  if (typeof obj != 'object') return '-1';
+  return obj.__table_id || obj.id || '-1';
 }
 /**
  * Gets default activation key for grid plugin

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@azrico/reactgrid",
-	"version": "1.1.17",
+	"version": "1.1.19",
 	"main": "dist/index.js",
 	"description": "React Datagrid",
 	"author": "Azrideus <MehrdadTavangar@gmail.com>",

package/src/views/DataGrid.tsx

@@ -57,7 +57,7 @@ type loose_column_fields = loose_column_names & {
 };
 export type LooseColumnDefinition = Partial<loose_column_fields & ColumnDefinition>;
 //
-type columnOrString = string | LooseColumnDefinition;
+
 type customColumnData = {
 	name: string;
 	render: (cell: any, formatterParams, onRendered) => React.ReactNode | undefined | null;
@@ -71,8 +71,8 @@ export type AzGridProps = {
 
 	gridOptions?: GridOptions;
 
-	columns?: columnOrString[];
-	columnExtensions?: Array<{ name: string } & Partial<LooseColumnDefinition>>;
+	columns?: LooseColumnDefinition[];
+	columnExtensions?: Partial<LooseColumnDefinition>;
 
 	editableColumns?: string[];
 	leftColumns?: string[];
@@ -395,6 +395,10 @@ function ApplyColumnData(props: any): ColumnDefinition[] {
 		for (let index = 0; index < mcolExts.length; index++) {
 			const ext = mcolExts[index];
 			const ext_cl = get_col_name(ext);
+			if (!ext_cl) {
+				console.warn('ColumnExtension must have a name');
+				continue;
+			}
 			const mcol = final_columns.find((s) => get_col_name(s) === ext_cl);
 			if (mcol) {
 				for (const key in ext) {
@@ -520,10 +524,10 @@ function to_datasource(arr: any[], idProperty: string) {
  * @returns
  */
 function get_col_name(obj: any): string {
-	if (!obj) return 'default';
+	if (!obj) return '';
 	if (typeof obj == 'string') return obj;
-	if (typeof obj != 'object') return 'default';
-	return obj.name || obj.field || obj.key || obj.columnName || 'default';
+	if (typeof obj != 'object') return '';
+	return obj.name || obj.field || obj.key || obj.columnName || '';
 }
 /**
  * Gets header of a column
@@ -531,9 +535,9 @@ function get_col_name(obj: any): string {
  * @returns
  */
 function get_col_header(obj: any): string {
-	if (!obj) return 'default';
+	if (!obj) return '';
 	if (typeof obj == 'string') return obj;
-	if (typeof obj != 'object') return 'default';
+	if (typeof obj != 'object') return '';
 	return obj.header || obj.title || get_col_name(obj);
 }
 /**
@@ -542,10 +546,10 @@ function get_col_header(obj: any): string {
  * @returns
  */
 function get_row_id(obj: any): any {
-	if (!obj) return 'default';
+	if (!obj) return '-1';
 	if (typeof obj == 'string') return obj;
-	if (typeof obj != 'object') return 'default';
-	return obj.__table_id || obj.id || 'default';
+	if (typeof obj != 'object') return '-1';
+	return obj.__table_id || obj.id || '-1';
 }
 
 /**