@azrico/reactgrid 1.3.28 → 1.3.31

package/dist/src/views/DataGrid.js

@@ -142,7 +142,10 @@ function DataGridEventsWrapper(props) {
   }, [props.dataSource]);
   /* ------------------------------- ContextMenu ------------------------------ */
   const onRowContextMenu = _react.default.useCallback((rowProps, event) => {
-    if (!rowProps || !rowProps.data || _func_child.func_selection.has_selection()) return true;
+    if (!rowProps || !rowProps.data || _func_child.func_selection.has_selection()) {
+      update_menuRow(null, null);
+      return true;
+    }
     event.preventDefault();
     const realRow = (0, _func_grid.find_realData)(rowProps.dataSourceArray, event.target, rowProps.data);
     const anEl = _func_child.func_selection.getVirtualElement(event.clientX, event.clientY);
@@ -150,25 +153,9 @@ function DataGridEventsWrapper(props) {
     return false;
   }, []);
   const update_menuRow = _react.default.useCallback((r = null, el = null) => {
-    // console.log('Set menuRow:', r);
     set_menuRow(r || null);
     set_menuAnchorEl(el || null);
   }, []);
-  const renderRowContextMenu = _react.default.useCallback((menuProps, {
-    rowProps
-  }) => {
-    menuProps.autoDismiss = true;
-    function onclose() {
-      menuProps.onDismiss();
-      update_menuRow();
-    }
-    return _react.default.createElement(_controls.ContextMenu, {
-      menuAnchorEl: menuAnchorEl,
-      menuRow: menuRow,
-      close: onclose,
-      menu_items: props.contextMenuItems
-    });
-  }, [props.contextMenuItems, menuAnchorEl, menuRow, update_menuRow]);
   /* -------------------------------------------------------------------------- */
   const onRenderRow = (0, _react.useCallback)(rowProps => {
     // save the original handlers to be called later
@@ -183,27 +170,29 @@ function DataGridEventsWrapper(props) {
       onRowClick: onRowClick,
       onRowContextMenu: onRowContextMenu
     };
-    const contextmenuProps = {
-      renderRowContextMenu: renderRowContextMenu
-    };
     const renderProps = {
       onRenderRow: onRenderRow
     };
     return {
       ...props.static_gridOptions,
       ...events,
-      ...contextmenuProps,
       ...renderProps
     };
-  }, [props.static_gridOptions, renderRowContextMenu]);
+  }, [props.static_gridOptions]);
   /* -------------------------------------------------------------------------- */
-  return props.details_dataSource ? _react.default.createElement(DataGridDetailsWrapper, {
+  return _react.default.createElement(_react.default.Fragment, null, _react.default.createElement(_controls.ContextMenu, {
+    menuAnchorEl: menuAnchorEl,
+    menuRow: menuRow,
+    close: update_menuRow,
+    dontAutoClose: false,
+    menu_items: props.contextMenuItems
+  }), props.details_dataSource ? _react.default.createElement(DataGridDetailsWrapper, {
     ...props,
     static_gridOptions: static_gridOptions
   }) : _react.default.createElement(DataGridSizeWrapper, {
     ...props,
     static_gridOptions: static_gridOptions
-  });
+  }));
 }
 function DataGridDetailsWrapper(props) {
   const cached_details_columns = _react.default.useMemo(() => {

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@azrico/reactgrid",
-	"version": "1.3.28",
+	"version": "1.3.31",
 	"main": "dist/index.js",
 	"description": "React Datagrid",
 	"author": "Azrideus <MehrdadTavangar@gmail.com>",
@@ -29,8 +29,8 @@
 		"typescript": "^4.8.4"
 	},
 	"dependencies": {
-		"@azrico/controls": "^1.5.62",
-		"@azrico/object": "^1.4.67",
+		"@azrico/controls": "^1.5.84",
+		"@azrico/object": "^1.4.84",
 		"@emotion/react": "^11.9.3",
 		"@emotion/styled": "^11.9.3",
 		"@inovua/reactdatagrid-enterprise": "^5.10.2",
@@ -60,5 +60,6 @@
 			"last 1 firefox version",
 			"last 1 safari version"
 		]
-	}
+	},
+	"packageManager": "yarn@3.5.0"
 }

package/src/views/DataGrid.tsx

@@ -303,8 +303,12 @@ function DataGridEventsWrapper(props: DataGridWrapperProps) {
 
 	/* ------------------------------- ContextMenu ------------------------------ */
 	const onRowContextMenu = React.useCallback((rowProps, event) => {
-		if (!rowProps || !rowProps.data || func_selection.has_selection()) return true;
+		if (!rowProps || !rowProps.data || func_selection.has_selection()) {
+			update_menuRow(null, null);
+			return true;
+		}
 		event.preventDefault();
+
 		const realRow = find_realData(rowProps.dataSourceArray, event.target, rowProps.data);
 		const anEl = func_selection.getVirtualElement(event.clientX, event.clientY);
 		update_menuRow(realRow, anEl);
@@ -312,30 +316,10 @@ function DataGridEventsWrapper(props: DataGridWrapperProps) {
 	}, []);
 
 	const update_menuRow = React.useCallback((r: any = null, el: any = null) => {
-		// console.log('Set menuRow:', r);
 		set_menuRow(r || null);
 		set_menuAnchorEl(el || null);
 	}, []);
 
-	const renderRowContextMenu = React.useCallback(
-		(menuProps, { rowProps }) => {
-			menuProps.autoDismiss = true;
-			function onclose() {
-				menuProps.onDismiss();
-				update_menuRow();
-			}
-
-			return (
-				<ContextMenu
-					menuAnchorEl={menuAnchorEl}
-					menuRow={menuRow}
-					close={onclose}
-					menu_items={props.contextMenuItems as any}
-				/>
-			);
-		},
-		[props.contextMenuItems, menuAnchorEl, menuRow, update_menuRow]
-	);
 	/* -------------------------------------------------------------------------- */
 	const onRenderRow = useCallback((rowProps) => {
 		// save the original handlers to be called later
@@ -350,26 +334,34 @@ function DataGridEventsWrapper(props: DataGridWrapperProps) {
 			onRowClick: onRowClick,
 			onRowContextMenu: onRowContextMenu,
 		};
-		const contextmenuProps: AzGridOptions = {
-			renderRowContextMenu: renderRowContextMenu,
-		};
+
 		const renderProps: any = {
 			onRenderRow: onRenderRow,
 		};
 		return {
 			...props.static_gridOptions,
 			...events,
-			...contextmenuProps,
 			...renderProps,
 		};
-	}, [props.static_gridOptions, renderRowContextMenu]);
+	}, [props.static_gridOptions]);
 
 	/* -------------------------------------------------------------------------- */
 
-	return props.details_dataSource ? (
-		<DataGridDetailsWrapper {...props} static_gridOptions={static_gridOptions} />
-	) : (
-		<DataGridSizeWrapper {...props} static_gridOptions={static_gridOptions} />
+	return (
+		<>
+			<ContextMenu
+				menuAnchorEl={menuAnchorEl}
+				menuRow={menuRow}
+				close={update_menuRow}
+				dontAutoClose={false}
+				menu_items={props.contextMenuItems as any}
+			/>
+			{props.details_dataSource ? (
+				<DataGridDetailsWrapper {...props} static_gridOptions={static_gridOptions} />
+			) : (
+				<DataGridSizeWrapper {...props} static_gridOptions={static_gridOptions} />
+			)}
+		</>
 	);
 }
 
@@ -399,7 +391,7 @@ function DataGridDetailsWrapper(props: DataGridWrapperProps) {
 				defaultFilterValue={props.details_filter}
 				dataSource={details_dataSource}
 				columns={cached_details_columns}
-			></ReactDataGrid>
+			/>
 		);
 	};