@azrico/reactgrid 1.0.13 → 1.0.15

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/index.js

@@ -17,15 +17,21 @@ Object.keys(_DataGrid).forEach(function (key) {
     }
   });
 });
+var _example = _interopRequireDefault(require("./example"));
+var _react = _interopRequireDefault(require("react"));
+var _client = _interopRequireDefault(require("react-dom/client"));
+function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 function _getRequireWildcardCache(nodeInterop) { if (typeof WeakMap !== "function") return null; var cacheBabelInterop = new WeakMap(); var cacheNodeInterop = new WeakMap(); return (_getRequireWildcardCache = function (nodeInterop) { return nodeInterop ? cacheNodeInterop : cacheBabelInterop; })(nodeInterop); }
 function _interopRequireWildcard(obj, nodeInterop) { if (!nodeInterop && obj && obj.__esModule) { return obj; } if (obj === null || typeof obj !== "object" && typeof obj !== "function") { return { default: obj }; } var cache = _getRequireWildcardCache(nodeInterop); if (cache && cache.has(obj)) { return cache.get(obj); } var newObj = {}; var hasPropertyDescriptor = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var key in obj) { if (key !== "default" && Object.prototype.hasOwnProperty.call(obj, key)) { var desc = hasPropertyDescriptor ? Object.getOwnPropertyDescriptor(obj, key) : null; if (desc && (desc.get || desc.set)) { Object.defineProperty(newObj, key, desc); } else { newObj[key] = obj[key]; } } } newObj.default = obj; if (cache) { cache.set(obj, newObj); } return newObj; }
-var _default = _DataGrid.default; // if (process.env!.NODE_ENV === 'production') {
-// 	// set production urls
-// 	// enable sentry
-// } else if (process.env!.NODE_ENV === 'development') {
-// 	const root = ReactDOM.createRoot(document.getElementById('root') as HTMLElement);
-// 	root.render(<ExampleGrid />);
-// } else {
-// 	// set defaults
-// }
-exports.default = _default;
+/* -------------------------------------------------------------------------- */
+var _default = _DataGrid.default;
+exports.default = _default;
+if (process.env.NODE_ENV === 'production') {
+  // set production urls
+  // enable sentry
+} else if (process.env.NODE_ENV === 'development') {
+  const root = _client.default.createRoot(document.getElementById('root'));
+  root.render(_react.default.createElement(_example.default, null));
+} else {
+  // set defaults
+}

package/dist/src/themes/grid.css

@@ -0,0 +1,15 @@
+/* .InovuaReactDataGrid {
+	--grid-bg: '#fff';
+}
+.InovuaReactDataGrid {
+	background: var(--grid-bg) !important;
+}
+.InovuaReactDataGrid__header {
+	background: var(--grid-bg) !important;
+}
+.InovuaReactDataGrid__row {
+	background: var(--grid-bg) !important;
+}
+.InovuaReactDataGrid__cell {
+	background: var(--grid-bg) !important;
+} */

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

@@ -1,6 +1,8 @@
 import '@inovua/reactdatagrid-enterprise/index.css';
 import '@inovua/reactdatagrid-enterprise/theme/default-dark.css';
-import '../themes/styles.css';
+import '@inovua/reactdatagrid-enterprise/theme/amber-dark.css';
+import '../themes/base_styles.css';
+import '../themes/grid.css';
 import React from 'react';
 import { TypeColumn, TypeDataGridProps, TypeDataSource, TypeRowDetailsInfo, TypeRowProps, TypeRowSelection } from '@inovua/reactdatagrid-community/types';
 import { TypeOnSelectionChangeArg } from '@inovua/reactdatagrid-community/types/TypeDataGridProps';
@@ -32,6 +34,7 @@ type GridOptions = Partial<TypeDataGridProps>;
 export type AzGridProps = {
     columns?: columnOrString[];
     rows?: any[];
+    get_rows?: () => any[];
     licenseKey?: string;
     gridOptions?: GridOptions;
     tableColumnExtensions?: Array<{
@@ -44,7 +47,6 @@ export type AzGridProps = {
     contextMenuItems?: any[];
     highlightedRow?: any;
     RowDetail?: RowDetailsFunc;
-    get_rows?: () => any[];
     selected?: RowSelectionValue;
     onSelectionChange?: OnSelectionChangeFunc;
     onRowsChange?: (rows: any[], options: any) => void;

package/dist/src/views/DataGrid.js

@@ -7,7 +7,9 @@ exports.AzGrid = AzGrid;
 exports.default = void 0;
 require("@inovua/reactdatagrid-enterprise/index.css");
 require("@inovua/reactdatagrid-enterprise/theme/default-dark.css");
-require("../themes/styles.css");
+require("@inovua/reactdatagrid-enterprise/theme/amber-dark.css");
+require("../themes/base_styles.css");
+require("../themes/grid.css");
 var _react = _interopRequireDefault(require("react"));
 var _helpers = require("../func/helpers");
 var _controls = require("@azrico/controls");
@@ -76,10 +78,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 +136,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 +150,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
   }
@@ -195,7 +198,7 @@ function DataGrid(props) {
       licenseKey: licenseKey,
       treeColumn: props.allowChildRows ? firstcolumn.name : undefined,
       renderRowDetails: props.RowDetail,
-      theme: dark ? 'default-dark' : 'default-light'
+      theme: dark ? 'amber-dark' : 'default-light'
     };
     return {
       ...defaultOptions,
@@ -248,7 +251,7 @@ function DataGrid(props) {
     ...dynamic_gridOptions,
     className: 'azgrid-filler',
     columns: columns,
-    dataSource: rows
+    dataSource: static_gridOptions.dataSource ? static_gridOptions.dataSource : rows
   }), _react.default.createElement(_controls.ContextMenu, {
     menuAnchorEl: menuAnchorEl,
     set_menuAnchorEl: update_menuAnchorEl,

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@azrico/reactgrid",
-	"version": "1.0.13",
+	"version": "1.0.15",
 	"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/index.tsx

@@ -7,12 +7,12 @@ import React from 'react';
 import ReactDOM from 'react-dom/client';
 export default AzGrid;
 
-// if (process.env!.NODE_ENV === 'production') {
-// 	// set production urls
-// 	// enable sentry
-// } else if (process.env!.NODE_ENV === 'development') {
-// 	const root = ReactDOM.createRoot(document.getElementById('root') as HTMLElement);
-// 	root.render(<ExampleGrid />);
-// } else {
-// 	// set defaults
-// }
+if (process.env!.NODE_ENV === 'production') {
+	// set production urls
+	// enable sentry
+} else if (process.env!.NODE_ENV === 'development') {
+	const root = ReactDOM.createRoot(document.getElementById('root') as HTMLElement);
+	root.render(<ExampleGrid />);
+} else {
+	// set defaults
+}

package/src/themes/grid.css

@@ -0,0 +1,15 @@
+/* .InovuaReactDataGrid {
+	--grid-bg: '#fff';
+}
+.InovuaReactDataGrid {
+	background: var(--grid-bg) !important;
+}
+.InovuaReactDataGrid__header {
+	background: var(--grid-bg) !important;
+}
+.InovuaReactDataGrid__row {
+	background: var(--grid-bg) !important;
+}
+.InovuaReactDataGrid__cell {
+	background: var(--grid-bg) !important;
+} */

package/src/views/DataGrid.tsx

@@ -1,6 +1,8 @@
 import '@inovua/reactdatagrid-enterprise/index.css';
 import '@inovua/reactdatagrid-enterprise/theme/default-dark.css';
-import '../themes/styles.css';
+import '@inovua/reactdatagrid-enterprise/theme/amber-dark.css';
+import '../themes/base_styles.css';
+import '../themes/grid.css';
 
 import React, { useCallback, useState } from 'react';
 import {
@@ -49,6 +51,8 @@ type GridOptions = Partial<TypeDataGridProps>;
 export type AzGridProps = {
 	columns?: columnOrString[];
 	rows?: any[];
+	get_rows?: () => any[];
+
 	licenseKey?: string;
 
 	gridOptions?: GridOptions;
@@ -63,7 +67,6 @@ export type AzGridProps = {
 
 	highlightedRow?: any;
 	RowDetail?: RowDetailsFunc;
-	get_rows?: () => any[];
 
 	selected?: RowSelectionValue;
 	onSelectionChange?: OnSelectionChangeFunc;
@@ -152,11 +155,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 +216,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 +232,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
 	}
@@ -271,7 +274,7 @@ function DataGrid(props: DataGridProps) {
 			licenseKey: licenseKey,
 			treeColumn: props.allowChildRows ? firstcolumn.name : undefined,
 			renderRowDetails: props.RowDetail,
-			theme: dark ? 'default-dark' : 'default-light',
+			theme: dark ? 'amber-dark' : 'default-light',
 		};
 		return { ...defaultOptions, ...events, ...extra_ops, ...props.gridOptions, ...forcedOptions };
 	}, [props.gridOptions]);
@@ -319,7 +322,13 @@ function DataGrid(props: DataGridProps) {
 
 	return (
 		<div className={clsx(props.className, 'azgrid-nooverflow', 'azgrid-filler')}>
-			<ReactDataGrid {...static_gridOptions} {...dynamic_gridOptions} className={'azgrid-filler'} columns={columns} dataSource={rows} />
+			<ReactDataGrid
+				{...static_gridOptions}
+				{...dynamic_gridOptions}
+				className={'azgrid-filler'}
+				columns={columns}
+				dataSource={static_gridOptions.dataSource ? static_gridOptions.dataSource : rows}
+			/>
 			<ContextMenu menuAnchorEl={menuAnchorEl} set_menuAnchorEl={update_menuAnchorEl} menuRow={menuRow} items={contextMenuItems} />
 		</div>
 	);