@azrico/reactgrid 1.1.14 → 1.1.16

package/dist/src/views/index.js

@@ -1,3 +1,23 @@
-export * from './DataGrid';
-import AzGrid from './DataGrid';
-export default AzGrid;
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+var _exportNames = {};
+exports.default = void 0;
+var _DataGrid = _interopRequireWildcard(require("./DataGrid"));
+Object.keys(_DataGrid).forEach(function (key) {
+  if (key === "default" || key === "__esModule") return;
+  if (Object.prototype.hasOwnProperty.call(_exportNames, key)) return;
+  if (key in exports && exports[key] === _DataGrid[key]) return;
+  Object.defineProperty(exports, key, {
+    enumerable: true,
+    get: function () {
+      return _DataGrid[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;
+exports.default = _default;

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@azrico/reactgrid",
-	"version": "1.1.14",
+	"version": "1.1.16",
 	"main": "dist/index.js",
 	"description": "React Datagrid",
 	"author": "Azrideus <MehrdadTavangar@gmail.com>",
@@ -33,7 +33,7 @@
 		"@azrico/object": "^1.3.1",
 		"@emotion/react": "^11.9.3",
 		"@emotion/styled": "^11.9.3",
-		"@inovua/reactdatagrid-enterprise": "^5.8.0",
+		"@inovua/reactdatagrid-enterprise": "^5.8.1",
 		"clsx": "^1.2.1",
 		"react": "^18.2.0",
 		"react-resize-detector": "^7.1.2"

package/src/example.tsx

@@ -11,6 +11,13 @@ const columns = [
 		title: 'Category',
 		defaultFlex: 1,
 	},
+	{
+		name: 'job',
+		title: 'Job',
+		type: 'combo',
+		items: ['Engineer', 'Doctor'],
+		defaultFlex: 1,
+	},
 ];
 const leftColumns = ['username', 'row'];
 const customColumns = [
@@ -96,6 +103,7 @@ export function ExampleGrid() {
 			contextMenuItems={contextMenuItems}
 			// customColumns={customColumns}
 			columns={columns}
+			editable={true}
 			// leftColumns={leftColumns}
 			gridOptions={
 				{

package/src/index.tsx

@@ -1,11 +1,15 @@
 export * from './views/DataGrid';
 
 import AzGrid from './views/DataGrid';
-/* -------------------------------------------------------------------------- */
 import ExampleGrid from './example';
 import React from 'react';
 import ReactDOM from 'react-dom/client';
+
+/* -------------------------------------------------------------------------- */
+
+
+
 export default AzGrid;
 
-// const root = ReactDOM.createRoot(document.getElementById('testroot') as HTMLElement);
-// root.render(<ExampleGrid />);
+const root = ReactDOM.createRoot(document.getElementById('testroot') as HTMLElement);
+root.render(<ExampleGrid />);

package/src/views/DataGrid.tsx

@@ -10,6 +10,7 @@ import {
 	TypeColumn,
 	TypeDataGridProps,
 	TypeDataSource,
+	TypeEditInfo,
 	TypeFilterTypes,
 	TypeRowDetailsInfo,
 	TypeRowProps,
@@ -64,14 +65,15 @@ type customColumnData = {
 type GridOptions = Partial<TypeDataGridProps>;
 /* -------------------------------------------------------------------------- */
 export type AzGridProps = {
-	columns?: columnOrString[];
 	dataSource?: any[] | ((args: any) => any[] | Promise<any[] | any>);
 
 	licenseKey?: string;
 
 	gridOptions?: GridOptions;
 
-	columnExtensions?: Array<{ name: string } & Partial<ColumnDefinition>>;
+	columns?: columnOrString[];
+	columnExtensions?: Array<{ name: string } & Partial<LooseColumnDefinition>>;
+
 	editableColumns?: string[];
 	leftColumns?: string[];
 	rightColumns?: string[];
@@ -84,6 +86,7 @@ export type AzGridProps = {
 
 	selected?: RowSelectionValue;
 	/* -------------------------------------------------------------------------- */
+	onEditComplete?: (editInfo: TypeEditInfo) => void;
 	onSelectionChange?: OnSelectionChangeFunc;
 
 	onRowClick?: (rowIndex: number, row: any) => void;
@@ -96,6 +99,7 @@ export type AzGridProps = {
 	//
 	loading?: boolean;
 	dark?: boolean;
+	editable: boolean;
 	allowChildRows?: boolean;
 	looseCacheCheck?: boolean;
 	className?: string;
@@ -128,7 +132,7 @@ const defaultOptions: GridOptions = {
 	//filterTypes: defaultfilterTypes,
 	remoteFilter: false,
 	remoteSort: false,
-
+	editStartEvent: 'click',
 	rowReorderColumn: false,
 	resizable: true,
 	rowIndexColumn: true,
@@ -280,19 +284,27 @@ function DataGrid(props: DataGridProps) {
 		const licenseKey = props.licenseKey || get_default_key();
 		const events: GridOptions = {
 			onRowClick: onRowClick,
+			onRowContextMenu: onRowContextMenu,
 			onSkipChange: props.onSkipChange,
 			onLimitChange: props.onLimitChange,
-			onRowContextMenu: onRowContextMenu,
+			onEditComplete: props.onEditComplete,
 		};
 		const extra_ops: GridOptions = {
 			onSelectionChange: props.onSelectionChange,
 			licenseKey: licenseKey,
+			editable: props.editable,
 			treeColumn: props.allowChildRows ? firstcolumn.name : undefined,
 			renderRowDetails: props.RowDetail,
 			theme: dark ? 'amber-dark' : 'default-light',
 		};
 		return { ...defaultOptions, ...events, ...extra_ops };
-	}, [columns, props.allowChildRows, props.RowDetail]);
+	}, [
+		columns,
+		props.allowChildRows,
+		props.editable,
+		props.RowDetail,
+		props.onEditComplete,
+	]);
 
 	const static_gridOptions = React.useMemo<GridOptions>(() => {
 		return { ...base_gridOptions, ...props.gridOptions, ...forcedOptions };
@@ -342,8 +354,8 @@ function DataGrid(props: DataGridProps) {
  * @param props
  * @returns
  */
-function ApplyColumnData(props: any) {
-	const final_columns: MakeWriteable<ColumnDefinition>[] = [];
+function ApplyColumnData(props: any): ColumnDefinition[] {
+	const final_columns: MakeWriteable<LooseColumnDefinition>[] = [];
 	let mcols = props.columns || [];
 	let mcolExts = props.columnExtensions || [];
 	let rightColumns = props.rightColumns || [];
@@ -424,30 +436,34 @@ function ApplyColumnData(props: any) {
 		}
 	}
 	for (let index = 0; index < final_columns.length; index++) {
-		const col: ColumnDefinition = final_columns[index];
+		const col = final_columns[index];
 
 		if (col.type) {
 			switch (col.type) {
 				case 'combo':
 				case 'select':
+					//@ts-ignore
 					col.editor = SelectEditor;
 					break;
-				case 'number':
-				case 'numberic':
-					col.editor = NumericEditor;
-					break;
-				case 'truefalse':
-				case 'bool':
-					col.editor = BoolEditor;
-					break;
+				//case 'number':
+				//case 'numberic':
+				//	col.editor = NumericEditor;
+				//	break;
+				//case 'truefalse':
+				//case 'bool':
+				//	col.editor = BoolEditor;
+				//	break;
 			}
 			delete col.type;
 		}
+		//@ts-ignore
 		if (!col.editorProps) col.editorProps = {};
-
 		if (col.items) {
+			//@ts-ignore
 			if (!col.editorProps.idProperty) col.editorProps.idProperty = 'id';
+			//@ts-ignore
 			if (!col.editorProps.collapseOnSelect) col.editorProps.collapseOnSelect = true;
+			//@ts-ignore
 			col.editorProps.dataSource = to_datasource(col.items, col.editorProps.idProperty);
 
 			delete col.items;
@@ -478,7 +494,7 @@ function ApplyColumnData(props: any) {
 		}
 	}
 	/* -------------------------------------------------------------------------- */
-
+	console.log(final_columns);
 	return final_columns;
 }
 
@@ -489,11 +505,13 @@ function to_datasource(arr: any[], idProperty: string) {
 		arr.map((s: any) => {
 			let elem = {};
 			elem[idProperty] = '_cid_' + index;
-			elem = { ...elem, ...s };
+			if (typeof s === 'object') elem = { ...elem, ...s };
+			else elem['label'] = s;
 			res.push(elem);
 			index++;
 		});
 	}
+
 	return res;
 }
 /**