@azrico/reactgrid 1.1.28 → 1.1.29

package/dist/src/example.js

@@ -108,7 +108,7 @@ function ExampleGrid() {
     });
   }
   const onRowDoubleClick = _react.default.useCallback((index, rowdata) => {
-    console.log((rowdata === null || rowdata === void 0 ? void 0 : rowdata.data) || rowdata);
+    console.log('dbl', (rowdata === null || rowdata === void 0 ? void 0 : rowdata.data) || rowdata);
   }, []);
   const onRowClick = _react.default.useCallback((index, rowdata) => {
     //console.log(rowdata?.data || rowdata);

package/dist/src/views/DataGrid.js

@@ -148,7 +148,6 @@ function AzGrid(props) {
   }, dynamic_option_names.map(r => props[r]));
   return _react.default.createElement(DataGridEventsWrapper, {
     ...props,
-    base_gridOptions: base_gridOptions,
     static_gridOptions: static_gridOptions,
     dynamic_gridOptions: dynamic_gridOptions,
     columns: cached_columns,
@@ -186,7 +185,7 @@ function DataGridEventsWrapper(props) {
     }
     click_data.current[get_row_id(rowProps)] = nowDate;
     return props.onRowClick && props.onRowClick(rowProps.rowIndex, rowProps.data);
-  }, []);
+  }, [props.onRowClick, props.onRowDoubleClick]);
   _react.default.useEffect(() => {
     click_data.current = {};
   }, [props.dataSource]);
@@ -201,19 +200,22 @@ function DataGridEventsWrapper(props) {
       set_menuRow(r);
     } else set_menuRow(null);
   }, []);
-  const base_gridOptions = _react.default.useMemo(() => {
+  /**
+   * Merge click events into grid options
+   */
+  const static_gridOptions = _react.default.useMemo(() => {
     const events = {
       onRowClick: onRowClick,
       onRowContextMenu: onRowContextMenu
     };
     return {
-      ...props.base_gridOptions,
+      ...props.static_gridOptions,
       ...events
     };
-  }, [props.base_gridOptions]);
+  }, [props.static_gridOptions, onRowClick]);
   return _react.default.createElement(DataGridSizeWrapper, {
     ...props,
-    base_gridOptions: base_gridOptions
+    static_gridOptions: static_gridOptions
   }, _react.default.createElement(_controls.ContextMenu, {
     menuAnchorEl: menuAnchorEl,
     set_menuAnchorEl: update_menuAnchorEl,
@@ -222,6 +224,7 @@ function DataGridEventsWrapper(props) {
   }), props.children);
 }
 function DataGridSizeWrapper(props) {
+  console.log(props);
   if (props.delayedSize) {
     return _react.default.createElement(DataGridDelayedSize, {
       ...props

package/package.json

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

package/src/example.tsx

@@ -95,7 +95,7 @@ export function ExampleGrid() {
 	}
 
 	const onRowDoubleClick = React.useCallback((index: number, rowdata: any) => {
-		console.log(rowdata?.data || rowdata);
+		console.log('dbl', rowdata?.data || rowdata);
 	}, []);
 	const onRowClick = React.useCallback((index: number, rowdata: any) => {
 		//console.log(rowdata?.data || rowdata);

package/src/views/DataGrid.tsx

@@ -116,9 +116,8 @@ type DataGridProps = ModifyFields<
 type DataGridWrapperProps = ModifyFields<
 	DataGridProps,
 	{
-		base_gridOptions: GridOptions;
-		dynamic_gridOptions: GridOptions;
 		static_gridOptions: GridOptions;
+		dynamic_gridOptions: GridOptions;
 		children?: React.ReactNode;
 	}
 >;
@@ -273,7 +272,6 @@ export function AzGrid(props: AzGridProps) {
 	return (
 		<DataGridEventsWrapper
 			{...props}
-			base_gridOptions={base_gridOptions}
 			static_gridOptions={static_gridOptions}
 			dynamic_gridOptions={dynamic_gridOptions}
 			columns={cached_columns}
@@ -305,23 +303,26 @@ function DataGridEventsWrapper(props: DataGridWrapperProps) {
 		update_menuAnchorEl(func_selection.getVirtualElement(event.clientX, event.clientY));
 		event.preventDefault();
 	}, []);
-	const onRowClick = React.useCallback((rowProps, event) => {
-		const nowDate = Date.now();
-		const lastclick: number = click_data.current[get_row_id(rowProps)];
-		if (lastclick) {
-			const diffTime = Math.abs(nowDate - lastclick);
-			if (diffTime < 400) {
-				click_data.current[get_row_id(rowProps)] = null;
-				return (
-					props.onRowDoubleClick &&
-					props.onRowDoubleClick(rowProps.rowIndex, rowProps.data)
-				);
+	const onRowClick = React.useCallback(
+		(rowProps, event) => {
+			const nowDate = Date.now();
+			const lastclick: number = click_data.current[get_row_id(rowProps)];
+			if (lastclick) {
+				const diffTime = Math.abs(nowDate - lastclick);
+				if (diffTime < 400) {
+					click_data.current[get_row_id(rowProps)] = null;
+					return (
+						props.onRowDoubleClick &&
+						props.onRowDoubleClick(rowProps.rowIndex, rowProps.data)
+					);
+				}
 			}
-		}
 
-		click_data.current[get_row_id(rowProps)] = nowDate;
-		return props.onRowClick && props.onRowClick(rowProps.rowIndex, rowProps.data);
-	}, []);
+			click_data.current[get_row_id(rowProps)] = nowDate;
+			return props.onRowClick && props.onRowClick(rowProps.rowIndex, rowProps.data);
+		},
+		[props.onRowClick, props.onRowDoubleClick]
+	);
 
 	React.useEffect(() => {
 		click_data.current = {};
@@ -340,16 +341,19 @@ function DataGridEventsWrapper(props: DataGridWrapperProps) {
 		} else set_menuRow(null);
 	}, []);
 
-	const base_gridOptions = React.useMemo<GridOptions>(() => {
+	/**
+	 * Merge click events into grid options
+	 */
+	const static_gridOptions = React.useMemo<GridOptions>(() => {
 		const events: GridOptions = {
 			onRowClick: onRowClick,
 			onRowContextMenu: onRowContextMenu,
 		};
-		return { ...props.base_gridOptions, ...events };
-	}, [props.base_gridOptions]);
+		return { ...props.static_gridOptions, ...events };
+	}, [props.static_gridOptions, onRowClick]);
 
 	return (
-		<DataGridSizeWrapper {...props} base_gridOptions={base_gridOptions}>
+		<DataGridSizeWrapper {...props} static_gridOptions={static_gridOptions}>
 			<ContextMenu
 				menuAnchorEl={menuAnchorEl}
 				set_menuAnchorEl={update_menuAnchorEl}
@@ -361,6 +365,7 @@ function DataGridEventsWrapper(props: DataGridWrapperProps) {
 	);
 }
 function DataGridSizeWrapper(props: DataGridWrapperProps) {
+	console.log(props);
 	if (props.delayedSize) {
 		return <DataGridDelayedSize {...props} />;
 	} else {