@azrico/reactgrid 1.0.21 → 1.0.23

package/dist/src/example.js

@@ -78,11 +78,6 @@ function getData() {
   return fd;
 }
 function ExampleGrid() {
-  const renderContactsGrid = ({
-    data
-  }) => {
-    return _react.default.createElement("div", null, _react.default.createElement("div", null, 'Test'));
-  };
   const [selected, setSelected] = _react.default.useState(null);
   const onSelectionChange = _react.default.useCallback(({
     selected
@@ -90,12 +85,18 @@ function ExampleGrid() {
     setSelected(selected);
   }, []);
   const dataSource = _react.default.useCallback(async dt => {
-    return {
-      data: getData(),
-      count: 999
-    };
+    console.log('Start loading');
+    return await new Promise(resolve => {
+      setTimeout(() => {
+        console.log('end loading');
+        resolve({
+          data: getData(),
+          count: 999
+        });
+      }, 1000);
+    });
   }, []);
-  return _react.default.createElement(_DataGrid.default, {
+  return _react.default.createElement("div", null, _react.default.createElement(_DataGrid.default, {
     dark: true,
     allowChildRows: true,
     onSelectionChange: onSelectionChange,
@@ -103,6 +104,7 @@ function ExampleGrid() {
     contextMenuItems: contextMenuItems,
     customColumns: customColumns,
     columns: columns,
+    leftColumns: leftColumns,
     gridOptions: {
       pagination: 'remote',
       defaultLimit: 100,
@@ -111,9 +113,26 @@ function ExampleGrid() {
       rowIndexColumn: true,
       checkboxColumn: true
     },
-    dataSource: dataSource,
-    leftColumns: leftColumns
-  });
+    dataSource: dataSource
+  }), _react.default.createElement(_DataGrid.default, {
+    dark: true,
+    allowChildRows: true,
+    onSelectionChange: onSelectionChange,
+    selected: selected,
+    contextMenuItems: contextMenuItems,
+    customColumns: customColumns,
+    columns: columns,
+    leftColumns: leftColumns,
+    gridOptions: {
+      pagination: 'remote',
+      defaultLimit: 100,
+      limit: 100,
+      pageSizes: [100],
+      rowIndexColumn: true,
+      checkboxColumn: true
+    },
+    dataSource: dataSource
+  }));
 }
 var _default = ExampleGrid;
 exports.default = _default;

package/dist/src/index.js

@@ -19,13 +19,6 @@ Object.keys(_DataGrid).forEach(function (key) {
 });
 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
-// }
+var _default = _DataGrid.default; // const root = ReactDOM.createRoot(document.getElementById('root') as HTMLElement);
+// root.render(<ExampleGrid />);
 exports.default = _default;

package/dist/src/views/DataGrid.js

@@ -43,25 +43,18 @@ function AzGrid(props) {
   /*                                 Row changes                                */
   /* -------------------------------------------------------------------------- */
   const dataSource = _react.default.useCallback(async dt => {
-    let result_rows = [];
     let result_data = undefined;
     if (typeof props.dataSource === 'function') {
       result_data = await props.dataSource(dt);
-      if (typeof result_data === 'object') {
-        result_rows = result_data.data;
-      } else result_rows = result_data;
-    } else {
-      result_rows = props.dataSource || [];
     }
-    if (!Array.isArray(result_rows)) result_rows = [result_rows];
-    if (props.allowChildRows) result_rows = (0, _helpers.fix_parent_child_relations)(result_rows);
-    if (result_data && typeof result_data === 'object') {
-      return {
-        ...result_data,
-        data: result_rows
-      };
-    }
-    return result_rows;
+    if (!result_data) result_data = [];
+    if (Array.isArray(result_data) || typeof result_data !== 'object') result_data = {
+      data: result_data
+    };
+    if (!Array.isArray(result_data.data)) result_data.data = [result_data.data];
+    if (props.allowChildRows) result_data.data = (0, _helpers.fix_parent_child_relations)(result_data.data);
+    if (!result_data.count) result_data.count = result_data.data.length;
+    return result_data;
   }, [props.dataSource]);
   return _react.default.createElement(DataGrid, {
     ...props,

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@azrico/reactgrid",
-	"version": "1.0.21",
+	"version": "1.0.23",
 	"main": "dist/index.js",
 	"description": "React Datagrid",
 	"author": "Azrideus <MehrdadTavangar@gmail.com>",
@@ -32,7 +32,7 @@
 		"@azrico/controls": "1.3.0",
 		"@emotion/react": "^11.9.3",
 		"@emotion/styled": "^11.9.3",
-		"@inovua/reactdatagrid-enterprise": "^5.6.1",
+		"@inovua/reactdatagrid-enterprise": "^5.8.0",
 		"clsx": "^1.2.1",
 		"react": "^18.2.0",
 		"react-resize-detector": "^7.1.2"

package/src/example.tsx

@@ -49,13 +49,6 @@ function getData() {
 }
 
 export function ExampleGrid() {
-	const renderContactsGrid = ({ data }) => {
-		return (
-			<div>
-				<div>{'Test'}</div>
-			</div>
-		);
-	};
 	const [selected, setSelected] = React.useState(null);
 
 	const onSelectionChange = React.useCallback(({ selected }) => {
@@ -63,29 +56,56 @@ export function ExampleGrid() {
 	}, []);
 
 	const dataSource = React.useCallback(async (dt) => {
-		return { data: getData(), count: 999 };
+		console.log('Start loading');
+		return await new Promise((resolve) => {
+			setTimeout(() => {
+				console.log('end loading');
+				resolve({ data: getData(), count: 999 });
+			}, 1000);
+		});
 	}, []);
 
 	return (
-		<AzGrid
-			dark
-			allowChildRows
-			onSelectionChange={onSelectionChange}
-			selected={selected}
-			contextMenuItems={contextMenuItems}
-			customColumns={customColumns}
-			columns={columns}
-			gridOptions={{
-				pagination: 'remote',
-				defaultLimit: 100,
-				limit: 100,
-				pageSizes: [100],
-				rowIndexColumn: true,
-				checkboxColumn: true,
-			}}
-			dataSource={dataSource}
-			leftColumns={leftColumns}
-		/>
+		<div>
+			<AzGrid
+				dark
+				allowChildRows
+				onSelectionChange={onSelectionChange}
+				selected={selected}
+				contextMenuItems={contextMenuItems}
+				customColumns={customColumns}
+				columns={columns}
+				leftColumns={leftColumns}
+				gridOptions={{
+					pagination: 'remote',
+					defaultLimit: 100,
+					limit: 100,
+					pageSizes: [100],
+					rowIndexColumn: true,
+					checkboxColumn: true,
+				}}
+				dataSource={dataSource}
+			/>
+			<AzGrid
+				dark
+				allowChildRows
+				onSelectionChange={onSelectionChange}
+				selected={selected}
+				contextMenuItems={contextMenuItems}
+				customColumns={customColumns}
+				columns={columns}
+				leftColumns={leftColumns}
+				gridOptions={{
+					pagination: 'remote',
+					defaultLimit: 100,
+					limit: 100,
+					pageSizes: [100],
+					rowIndexColumn: true,
+					checkboxColumn: true,
+				}}
+				dataSource={dataSource}
+			/>
+		</div>
 	);
 }
 export default ExampleGrid;

package/src/index.tsx

@@ -7,12 +7,5 @@ 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
-// }
+// const root = ReactDOM.createRoot(document.getElementById('root') as HTMLElement);
+// root.render(<ExampleGrid />);

package/src/views/DataGrid.tsx

@@ -134,23 +134,21 @@ export function AzGrid(props: AzGridProps) {
 	/* -------------------------------------------------------------------------- */
 	const dataSource = React.useCallback(
 		async (dt) => {
-			let result_rows: any[] = [];
 			let result_data: any = undefined;
 			if (typeof props.dataSource === 'function') {
 				result_data = await props.dataSource(dt);
-				if (typeof result_data === 'object') {
-					result_rows = result_data.data;
-				} else result_rows = result_data;
-			} else {
-				result_rows = props.dataSource || [];
 			}
-			if (!Array.isArray(result_rows)) result_rows = [result_rows];
-			if (props.allowChildRows) result_rows = fix_parent_child_relations(result_rows);
+			if (!result_data) result_data = [];
 
-			if (result_data && typeof result_data === 'object') {
-				return { ...result_data, data: result_rows };
-			}
-			return result_rows;
+			if (Array.isArray(result_data) || typeof result_data !== 'object')
+				result_data = { data: result_data };
+
+			if (!Array.isArray(result_data.data)) result_data.data = [result_data.data];
+			if (props.allowChildRows)
+				result_data.data = fix_parent_child_relations(result_data.data);
+			if (!result_data.count) result_data.count = (result_data.data as Array<any>).length;
+
+			return result_data;
 		},
 		[props.dataSource]
 	);