@azrico/reactgrid 1.0.13 → 1.0.14

package/dist/src/func/helpers.js

@@ -28,7 +28,7 @@ function fix_parent_child_relations(rows) {
     assign_children(mrow, converted_rows);
   }
   const result = top_level_rows.map(r => r.data);
-  console.log(result);
+  //console.log(result);
   return result;
 }
 function assign_children(row, all_rows) {
@@ -40,7 +40,7 @@ function assign_children(row, all_rows) {
       assign_children(child, all_rows);
     }
     row.data.__children = my_children.map(r => r.data);
-  } else row.data.__children = undefined;
+  } else if (!Array.isArray(row.data.__children) || row.data.__children.length == 0) row.data.__children = undefined;
 }
 class func_selection {
   static getVirtualElement(x = 0, y = 0) {

package/dist/src/views/DataGrid.js

@@ -76,10 +76,11 @@ function AzGrid(props) {
       const ext = mcolExts[index];
       const ext_cl = get_col_name(ext);
       const mcol = final_columns.find(s => s.name === ext_cl);
-      if (!mcol) continue;
-      if (ext.width) mcol.width = ext.width;
-      if (ext.visible) mcol.visible = ext.visible;
-      if (ext.draggable) mcol.draggable = ext.draggable;
+      if (mcol) {
+        for (const key in ext) {
+          if (!mcol[key] && key != 'name') mcol[key] = ext[key];
+        }
+      }
       // if (ext.widthGrow) mcol.widthGrow = ext.widthGrow;
     }
     /* ------------------------------- frozen cols ------------------------------ */
@@ -133,7 +134,7 @@ function AzGrid(props) {
   /* -------------------------------------------------------------------------- */
   _react.default.useEffect(() => {
     if (pendingChanges <= 0) return;
-    console.log('Updated Pending Changes: ', pendingChanges);
+    //console.log('Updated Pending Changes: ', pendingChanges);
     let new_rows = [];
     if (typeof props.get_rows === 'function') {
       new_rows = props.get_rows();
@@ -147,11 +148,11 @@ function AzGrid(props) {
     set_pendingChanges(0);
   }, [pendingChanges]);
   _react.default.useEffect(() => {
-    console.log('Rows Changed !');
+    //console.log('Rows Changed !');
     set_pendingChanges(r => r + 1);
   }, [props.rows]);
   function onRowsChange(rows, options) {
-    console.log('onRowsChange');
+    //console.log('onRowsChange');
     if (props.onRowsChange) props.onRowsChange(rows, options);
     set_pendingChanges(r => r + 1); //notify the cache to update rows after we made changes to them
   }

package/package.json

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

package/src/func/helpers.ts

@@ -24,7 +24,7 @@ export function fix_parent_child_relations<T extends mrow>(rows: T[]): T[] {
 		assign_children(mrow, converted_rows);
 	}
 	const result = top_level_rows.map((r) => r.data) as T[];
-	console.log(result);
+	//console.log(result);
 	return result;
 }
 
@@ -37,7 +37,7 @@ function assign_children(row: converted_row, all_rows: converted_row[]) {
 			assign_children(child, all_rows);
 		}
 		row.data.__children = my_children.map((r) => r.data);
-	} else row.data.__children = undefined;
+	} else if (!Array.isArray(row.data.__children) || row.data.__children.length == 0) row.data.__children = undefined;
 }
 export class func_selection {
 	static getVirtualElement(x = 0, y = 0) {

package/src/views/DataGrid.tsx

@@ -152,11 +152,11 @@ export function AzGrid(props: AzGridProps) {
 				const ext = mcolExts[index];
 				const ext_cl = get_col_name(ext);
 				const mcol = final_columns.find((s) => s.name === ext_cl);
-				if (!mcol) continue;
-				if (ext.width) mcol.width = ext.width;
-				if (ext.visible) mcol.visible = ext.visible;
-				if (ext.draggable) mcol.draggable = ext.draggable;
-
+				if (mcol) {
+					for (const key in ext) {
+						if (!mcol[key] && key != 'name') mcol[key] = ext[key];
+					}
+				}
 				// if (ext.widthGrow) mcol.widthGrow = ext.widthGrow;
 			}
 
@@ -213,7 +213,7 @@ export function AzGrid(props: AzGridProps) {
 	/* -------------------------------------------------------------------------- */
 	React.useEffect(() => {
 		if (pendingChanges <= 0) return;
-		console.log('Updated Pending Changes: ', pendingChanges);
+		//console.log('Updated Pending Changes: ', pendingChanges);
 		let new_rows: any[] = [];
 		if (typeof props.get_rows === 'function') {
 			new_rows = props.get_rows();
@@ -229,12 +229,12 @@ export function AzGrid(props: AzGridProps) {
 	}, [pendingChanges]);
 
 	React.useEffect(() => {
-		console.log('Rows Changed !');
+		//console.log('Rows Changed !');
 		set_pendingChanges((r) => r + 1);
 	}, [props.rows]);
 
 	function onRowsChange(rows: any[], options: any) {
-		console.log('onRowsChange');
+		//console.log('onRowsChange');
 		if (props.onRowsChange) props.onRowsChange(rows, options);
 		set_pendingChanges((r) => r + 1); //notify the cache to update rows after we made changes to them
 	}